imagetools: output pushed digest to stdout

Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com>

Author: crazy-max

commands/imagetools/create.go

@@ -240,6 +240,9 @@ func runCreate(ctx context.Context, dockerCli command.Cli, in createOptions, arg
 	if err == nil {
 		err = err1
 	}
+	if err == nil {
+		fmt.Println(desc.Digest.String())
+	}
 
 	return err
 }

tests/imagetools.go

@@ -1,14 +1,17 @@
 package tests
 
 import (
+	"bytes"
 	"encoding/json"
 	"os/exec"
+	"strings"
 	"testing"
 
 	"github.com/containerd/containerd/v2/core/images"
 	"github.com/containerd/continuity/fs/fstest"
 	"github.com/containerd/platforms"
 	"github.com/moby/buildkit/util/testutil/integration"
+	"github.com/opencontainers/go-digest"
 	ocispecs "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/pkg/errors"
 	"github.com/stretchr/testify/require"
@@ -51,8 +54,16 @@ func testImagetoolsCopyManifest(t *testing.T, sb integration.Sandbox) {
 	target2 := registry2 + "/buildx/imtools2-manifest:latest"
 
 	cmd = buildxCmd(sb, withArgs("imagetools", "create", "-t", target2, target))
-	dt, err = cmd.CombinedOutput()
-	require.NoError(t, err, string(dt))
+	stdout := bytes.Buffer{}
+	stderr := bytes.Buffer{}
+	cmd.Stdout = &stdout
+	cmd.Stderr = &stderr
+	require.NoError(t, cmd.Run(), stdout.String(), stderr.String())
+	outputDigest := strings.TrimSpace(stdout.String())
+	require.NotEmpty(t, outputDigest)
+	t.Logf("digest: %s", outputDigest)
+	_, err = digest.Parse(outputDigest)
+	require.NoError(t, err)
 
 	cmd = buildxCmd(sb, withArgs("imagetools", "inspect", target2, "--raw"))
 	dt, err = cmd.CombinedOutput()
@@ -80,8 +91,16 @@ func testImagetoolsCopyManifest(t *testing.T, sb integration.Sandbox) {
 	}
 
 	cmd = buildxCmd(sb, withArgs("imagetools", "create", "--prefer-index=false", "-t", target2+"-not-index", target))
-	dt, err = cmd.CombinedOutput()
-	require.NoError(t, err, string(dt))
+	stdout = bytes.Buffer{}
+	stderr = bytes.Buffer{}
+	cmd.Stdout = &stdout
+	cmd.Stderr = &stderr
+	require.NoError(t, cmd.Run(), stdout.String(), stderr.String())
+	outputDigest = strings.TrimSpace(stdout.String())
+	require.NotEmpty(t, outputDigest)
+	t.Logf("digest: %s", outputDigest)
+	_, err = digest.Parse(outputDigest)
+	require.NoError(t, err)
 
 	cmd = buildxCmd(sb, withArgs("imagetools", "inspect", target2+"-not-index", "--raw"))
 	dt, err = cmd.CombinedOutput()
@@ -124,8 +143,16 @@ func testImagetoolsCopyIndex(t *testing.T, sb integration.Sandbox) {
 	target2 := registry2 + "/buildx/imtools2:latest"
 
 	cmd = buildxCmd(sb, withArgs("imagetools", "create", "-t", target2, target))
-	dt, err = cmd.CombinedOutput()
-	require.NoError(t, err, string(dt))
+	stdout := bytes.Buffer{}
+	stderr := bytes.Buffer{}
+	cmd.Stdout = &stdout
+	cmd.Stderr = &stderr
+	require.NoError(t, cmd.Run(), stdout.String(), stderr.String())
+	outputDigest := strings.TrimSpace(stdout.String())
+	require.NotEmpty(t, outputDigest)
+	t.Logf("digest: %s", outputDigest)
+	_, err = digest.Parse(outputDigest)
+	require.NoError(t, err)
 
 	cmd = buildxCmd(sb, withArgs("imagetools", "inspect", target2, "--raw"))
 	dt, err = cmd.CombinedOutput()
@@ -142,8 +169,16 @@ func testImagetoolsCopyIndex(t *testing.T, sb integration.Sandbox) {
 	}
 
 	cmd = buildxCmd(sb, withArgs("imagetools", "create", "--prefer-index=false", "-t", target2+"-still-index", target))
-	dt, err = cmd.CombinedOutput()
-	require.NoError(t, err, string(dt))
+	stdout = bytes.Buffer{}
+	stderr = bytes.Buffer{}
+	cmd.Stdout = &stdout
+	cmd.Stderr = &stderr
+	require.NoError(t, cmd.Run(), stdout.String(), stderr.String())
+	outputDigest = strings.TrimSpace(stdout.String())
+	require.NotEmpty(t, outputDigest)
+	t.Logf("digest: %s", outputDigest)
+	_, err = digest.Parse(outputDigest)
+	require.NoError(t, err)
 
 	cmd = buildxCmd(sb, withArgs("imagetools", "inspect", target2+"-still-index", "--raw"))
 	dt, err = cmd.CombinedOutput()