From 448c16a695cfa8d24753ed7e876ae26eba523bff Mon Sep 17 00:00:00 2001
From: Bryce Lampe <bryce@pulumi.com>
Date: Wed, 4 Jun 2025 11:53:24 -0700
Subject: [PATCH] Improve exec error messages (#553)

Fixes https://github.com/pulumi/pulumi-docker-build/issues/549.
---
 CHANGELOG.md              |  4 ++++
 provider/internal/host.go | 21 +++++++++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9e2609a..b811d10 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 ## Unreleased
 
+### Changed
+
+- Docker Build Cloud and `exec` errors are more helpful. (https://github.com/pulumi/pulumi-docker-build/issues/549)
+
 ## 0.0.12 (2025-05-16)
 
 ### Changed
diff --git a/provider/internal/host.go b/provider/internal/host.go
index 3f852b0..cb9ad91 100644
--- a/provider/internal/host.go
+++ b/provider/internal/host.go
@@ -16,8 +16,10 @@ package internal
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"path/filepath"
+	"strings"
 	"sync"
 	"time"
 
@@ -93,6 +95,19 @@ func (h *host) builderFor(ctx context.Context, build Build) (*cachedBuilder, err
 		builder.WithContextPathHash(contextPathHash),
 		builder.WithStore(txn),
 	)
+	if err != nil && build.ShouldExec() && strings.HasPrefix(opts.Builder, "cloud-") {
+		//nolint:revive // Human-readable.
+		err = errors.Join(err,
+			errors.New("Make sure you're logged in to Docker (`docker login`) if you're trying to use a cloud builder."),
+			errors.New("Make sure you have the correct buildx plugin installed (https://github.com/docker/buildx-desktop)."),
+		)
+	}
+	if err != nil && build.ShouldExec() {
+		//nolint:revive // Human-readable.
+		err = errors.Join(err, errors.New(
+			"Make sure your buildx plugin is executable (`docker buildx version`)"),
+		)
+	}
 	if err != nil {
 		return nil, fmt.Errorf("new builder: %w", err)
 	}
@@ -159,6 +174,12 @@ func (h *host) builderFor(ctx context.Context, build Build) (*cachedBuilder, err
 	// drivers that are unknown to us.
 	nodes, err := b.LoadNodes(ctx, builder.WithData())
 	if err != nil && !build.ShouldExec() {
+		if strings.Contains(err.Error(), "failed to find driver") {
+			//nolint:revive // Human-readable.
+			err = errors.Join(err, errors.New(
+				"Use `exec: true` if you're trying to use Docker Build Cloud or other custom drivers.",
+			))
+		}
 		return nil, fmt.Errorf("loading nodes: %w", err)
 	}
 	// Attempt to determine our builder's buildkit version.