Merge pull request #208 from depot/fix/onboard-loading

fix(load): use selected project during onboarding for fast load

pkg/build/build.go

@@ -26,6 +26,16 @@ type Build struct {
 	Response *connect.Response[cliv1.CreateBuildResponse]
 }
 
+// BuildProject returns the project ID to be used for the build.
+// This is important as the API may use a different project ID than the one
+// initially requested (e.g. onboarding)
+func (b *Build) BuildProject() string {
+	if b.Response == nil || b.Response.Msg == nil {
+		return ""
+	}
+	return b.Response.Msg.ProjectId
+}
+
 func NewBuild(ctx context.Context, req *cliv1.CreateBuildRequest, token string) (Build, error) {
 	client := depotapi.NewBuildClient()
 	res, err := client.CreateBuild(ctx, depotapi.WithAuthentication(connect.NewRequest(req), token))

pkg/buildx/commands/bake.go

@@ -290,6 +290,10 @@ func BakeCmd(dockerCli command.Cli) *cobra.Command {
 
 			options.builderOptions = []builder.Option{builder.WithDepotOptions(buildPlatform, build)}
 
+			buildProject := build.BuildProject()
+			if buildProject != "" {
+				options.project = buildProject
+			}
 			options.buildID = build.ID
 			options.buildURL = build.BuildURL
 			options.token = build.Token

pkg/buildx/commands/build.go

@@ -664,6 +664,10 @@ func BuildCmd(dockerCli command.Cli) *cobra.Command {
 			}()
 
 			options.builderOptions = []builder.Option{builder.WithDepotOptions(buildPlatform, build)}
+			buildProject := build.BuildProject()
+			if buildProject != "" {
+				options.project = buildProject
+			}
 			options.buildID = build.ID
 			options.buildURL = build.BuildURL
 			options.token = build.Token

pkg/cmd/buildctl/dial-stdio.go

@@ -131,7 +131,7 @@ func run() error {
 	acquireState := func() ProxyState {
 		once.Do(func() {
 			req := &cliv1.CreateBuildRequest{
-				ProjectId: projectID,
+				ProjectId: &projectID,
 				Options:   []*cliv1.BuildOptions{{Command: cliv1.Command_COMMAND_BUILDX}},
 			}
 			build, err := helpers.BeginBuild(ctx, req, token)

pkg/helpers/build.go

@@ -30,7 +30,7 @@ func BeginBuild(ctx context.Context, req *cliv1.CreateBuildRequest, token string
 			}
 
 			// Ok, now try from the top again!
-			req.ProjectId = selectedProject.ID
+			req.ProjectId = &selectedProject.ID
 			return BeginBuild(ctx, req, token)
 		}
 		return depotbuild.Build{}, err
@@ -77,7 +77,7 @@ func NewBuildRequest(project string, opts map[string]buildx.Options, features Us
 		}
 
 		return &cliv1.CreateBuildRequest{
-			ProjectId: project,
+			ProjectId: &project,
 			Options: []*cliv1.BuildOptions{
 				{
 					Command:    cliv1.Command_COMMAND_BUILD,
@@ -93,7 +93,7 @@ func NewBuildRequest(project string, opts map[string]buildx.Options, features Us
 	}
 
 	// Should never be reached.
-	return &cliv1.CreateBuildRequest{ProjectId: project}
+	return &cliv1.CreateBuildRequest{ProjectId: &project}
 }
 
 func NewBakeRequest(project string, opts map[string]buildx.Options, features UsingDepotFeatures) *cliv1.CreateBuildRequest {
@@ -121,7 +121,7 @@ func NewBakeRequest(project string, opts map[string]buildx.Options, features Usi
 	}
 
 	return &cliv1.CreateBuildRequest{
-		ProjectId: project,
+		ProjectId: &project,
 		Options:   targets,
 	}
 }

proto/depot/cli/v1/build.proto

@@ -17,7 +17,7 @@ service BuildService {
 }
 
 message CreateBuildRequest {
-  string project_id = 1;
+  optional string project_id = 1;
   // This is an option per build target; in other words many for bake and one for build.
   repeated BuildOptions options = 2;
 }
@@ -63,6 +63,8 @@ message CreateBuildResponse {
 
   // Build URL is the URL to the build output.
   string build_url = 5;
+
+  string project_id = 6;
 }
 
 message Registry {