Align image tag CLI with local tag API

Author: chruffins

pkg/cmd/imagecmd_test.go

@@ -104,5 +104,5 @@ func TestTagCommandFallsBackToDockerWhenHypemanMisses(t *testing.T) {
 		"hypeman", "--base-url", server.URL,
 		"tag", "not a valid image", "myapp:latest",
 	})
-	require.ErrorContains(t, err, "was not found in Hypeman or Docker")
+	require.ErrorContains(t, err, "was not found in Hypeman; stage it from Docker")
 }

pkg/cmd/push.go

@@ -48,8 +48,9 @@ Examples:
   hypeman tag alpine:latest 123456789.dkr.ecr.us-east-1.amazonaws.com/myapp:v1
   hypeman push 123456789.dkr.ecr.us-east-1.amazonaws.com/myapp:v1
 
-  # Push a local Docker tag to ECR
+  # Stage a local Docker tag, then push it to ECR
   docker tag alpine:latest 123456789.dkr.ecr.us-east-1.amazonaws.com/myapp:v1
+  hypeman push local 123456789.dkr.ecr.us-east-1.amazonaws.com/myapp:v1
   hypeman push 123456789.dkr.ecr.us-east-1.amazonaws.com/myapp:v1
 
   # Push a cached Hypeman image directly to a different remote target

pkg/cmd/pushcmd.go

@@ -107,7 +107,7 @@ func handleRemotePushTarget(ctx context.Context, cmd *cli.Command, target string
 
 	// If Hypeman does not have the image, preserve the Docker-daemon fallback.
 	if _, err := stageDockerImage(ctx, cmd, &client, target, target); err != nil {
-		return fmt.Errorf("load local Docker image %q: %w; tag it first or use hypeman push <image> <target> for a cached Hypeman image", target, err)
+		return fmt.Errorf("image %q was not found in Hypeman; stage it from Docker: %w", target, err)
 	}
 
 	return runRemotePush(ctx, cmd, target, target)

pkg/cmd/tag.go

@@ -13,12 +13,16 @@ import (
 )
 
 var tagCmd = cli.Command{
-	Name:      "tag",
-	Usage:     "Create a local image tag",
-	ArgsUsage: "<source> <target>",
-	Description: `Create a local image tag in Hypeman. If the source is not already
-cached in Hypeman, fall back to the matching image in the local Docker daemon.`,
-	Action: handleTag,
+	Name:            "tag",
+	Usage:           "Create a local image tag",
+	ArgsUsage:       "<source> <target>",
+	Description:     "Create a local image tag in Hypeman without pulling or converting the image.",
+	Action:          handleTag,
+	HideHelpCommand: true,
+}
+
+type tagImageRequest struct {
+	Target string `json:"target"`
 }
 
 func handleTag(ctx context.Context, cmd *cli.Command) error {
@@ -37,17 +41,18 @@ func handleTag(ctx context.Context, cmd *cli.Command) error {
 
 	var res []byte
 	opts = append(opts, option.WithResponseBodyInto(&res))
-	body := struct {
-		Target string `json:"target"`
-	}{Target: target}
 	path := "/images/" + url.PathEscape(source) + "/tag"
-	if err := client.Post(ctx, path, body, nil, opts...); err != nil {
+	if err := client.Post(ctx, path, tagImageRequest{Target: target}, nil, opts...); err != nil {
 		if !isNotFoundError(err) {
 			return err
 		}
+
+		// Keep the Docker fallback for sources that have not been imported into
+		// Hypeman yet. Once staged, the image is available under the requested
+		// target and can be pushed through the normal cached-image flow.
 		staged, stageErr := stageDockerImage(ctx, cmd, &client, source, target)
 		if stageErr != nil {
-			return fmt.Errorf("image %q was not found in Hypeman or Docker: %w", source, stageErr)
+			return fmt.Errorf("image %q was not found in Hypeman; stage it from Docker: %w", source, stageErr)
 		}
 		res = []byte(staged.RawJSON())
 	}