feat: add support for custom save tags

we first send the tags that we want to use in order to verify them with
the API, then we send said tags to the buildkit instance to push when
it's completed.

Author: billyb2

flake.lock

@@ -0,0 +1,27 @@
+{
+  description = "Development shell for app";
+
+  inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+    flake-utils.url = "github:numtide/flake-utils";
+  };
+
+  outputs = { self, nixpkgs, flake-utils }:
+    flake-utils.lib.eachDefaultSystem (system:
+      let pkgs = import nixpkgs { inherit system; };
+      in {
+        devShell = pkgs.mkShell {
+          name = "api-devshell";
+
+          packages = with pkgs; [
+            go
+            gopls
+            buf
+            golangci-lint
+          ];
+
+          shellHook = ''
+          '';
+        };
+      });
+}

flake.nix

@@ -112,6 +112,7 @@ func RunBake(dockerCli command.Cli, in BakeOptions, validator BakeValidator, pri
 			AdditionalTags:        in.additionalTags,
 			AdditionalCredentials: in.additionalCredentials,
 			AddTargetSuffix:       true,
+			SaveTags:              in.saveTags,
 		}
 		buildOpts = registry.WithDepotSave(buildOpts, opts)
 	}
@@ -295,10 +296,11 @@ func BakeCmd() *cobra.Command {
 					options.project,
 					bakeOpts,
 					helpers.UsingDepotFeatures{
-						Push: options.exportPush,
-						Load: options.exportLoad,
-						Save: options.save,
-						Lint: options.lint,
+						Push:     options.exportPush,
+						Load:     options.exportLoad,
+						Save:     options.save,
+						SaveTags: options.saveTags,
+						Lint:     options.lint,
 					},
 				)
 				build, err := helpers.BeginBuild(context.Background(), req, token)

pkg/buildx/commands/bake.go

@@ -120,6 +120,7 @@ type DepotOptions struct {
 	build         *depotbuild.Build
 
 	save                  bool
+	saveTags              []string
 	additionalTags        []string
 	additionalCredentials []depotbuild.Credential
 
@@ -240,6 +241,7 @@ func buildTargets(ctx context.Context, dockerCli command.Cli, nodes []builder.No
 			BuildID:               depotOpts.buildID,
 			AdditionalTags:        depotOpts.additionalTags,
 			AdditionalCredentials: depotOpts.additionalCredentials,
+			SaveTags:              depotOpts.saveTags,
 		}
 		opts = registry.WithDepotSave(opts, saveOpts)
 	}
@@ -647,10 +649,11 @@ func BuildCmd() *cobra.Command {
 				options.project,
 				validatedOpts,
 				helpers.UsingDepotFeatures{
-					Push: options.exportPush,
-					Load: options.exportLoad,
-					Save: options.save,
-					Lint: options.lint,
+					Push:     options.exportPush,
+					Load:     options.exportLoad,
+					Save:     options.save,
+					SaveTags: options.saveTags,
+					Lint:     options.lint,
 				},
 			)
 
@@ -867,6 +870,8 @@ func depotAttestationFlags(_ *cobra.Command, options *DepotOptions, flags *pflag
 
 func depotRegistryFlags(_ *cobra.Command, options *DepotOptions, flags *pflag.FlagSet) {
 	flags.BoolVar(&options.save, "save", false, `Saves the build to the depot registry`)
+	// TODO(billy): bad wording
+	flags.StringArrayVar(&options.saveTags, "save-tags", []string{}, `Custom tags to save the image with`)
 }
 
 func checkWarnedFlags(f *pflag.Flag) {

pkg/buildx/commands/build.go

@@ -39,10 +39,11 @@ func BeginBuild(ctx context.Context, req *cliv1.CreateBuildRequest, token string
 }
 
 type UsingDepotFeatures struct {
-	Push bool
-	Load bool
-	Save bool
-	Lint bool
+	Push     bool
+	Load     bool
+	Save     bool
+	SaveTags []string
+	Lint     bool
 }
 
 func NewBuildRequest(project string, opts map[string]buildx.Options, features UsingDepotFeatures) *cliv1.CreateBuildRequest {
@@ -60,13 +61,14 @@ func NewBuildRequest(project string, opts map[string]buildx.Options, features Us
 		if opts.Target != "" {
 			target = &opts.Target
 		}
+		tags := append(opts.Tags, features.SaveTags...)
 
 		return &cliv1.CreateBuildRequest{
 			ProjectId: &project,
 			Options: []*cliv1.BuildOptions{
 				{
 					Command:    cliv1.Command_COMMAND_BUILD,
-					Tags:       opts.Tags,
+					Tags:       tags,
 					Outputs:    outputs,
 					Push:       features.Push,
 					Load:       features.Load,
@@ -94,9 +96,11 @@ func NewBakeRequest(project string, opts map[string]buildx.Options, features Usi
 			}
 		}
 
+		tags := append(opts.Tags, features.SaveTags...)
+
 		targets = append(targets, &cliv1.BuildOptions{
 			Command:    cliv1.Command_COMMAND_BAKE,
-			Tags:       opts.Tags,
+			Tags:       tags,
 			Outputs:    outputs,
 			Push:       features.Push,
 			Load:       features.Load,

pkg/helpers/build.go

@@ -12,6 +12,7 @@ type SaveOptions struct {
 	AdditionalCredentials []build.Credential
 	ProjectID             string
 	BuildID               string
+	SaveTags              []string
 	// AddTargetSuffix adds the target suffix to the additional tags.
 	// Useful for bake targets.
 	AddTargetSuffix bool
@@ -62,6 +63,7 @@ func WithDepotSave(buildOpts map[string]buildx.Options, opts SaveOptions) map[st
 			buildOpt.Tags = additionalTags
 		} else {
 			buildOpt.Tags = append(buildOpt.Tags, additionalTags...)
+			buildOpt.Tags = append(buildOpt.Tags, opts.SaveTags...)
 		}
 		buildOpts[target] = buildOpt
 	}