refactor: use the variable from artifact

refs #3496 Signed-off-by: Carlos A Becker <caarlos0@users.noreply.github.com>
goreleaser · Nov 15, 2022 · 33ea55b · 33ea55b
1 parent 4863781
commit 33ea55b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/internal/pipe/docker/docker.go b/internal/pipe/docker/docker.go
@@ -20,7 +20,6 @@ import (
 
 const (
 	dockerConfigExtra = "DockerConfig"
-	dockerDigestExtra = artifact.ExtraDigest
 
 	useBuildx = "buildx"
 	useDocker = "docker"

diff --git a/internal/pipe/docker/docker_test.go b/internal/pipe/docker/docker_test.go
@@ -1094,7 +1094,7 @@ func TestRunPipe(t *testing.T) {
 				}
 
 				_ = ctx.Artifacts.Filter(artifact.ByType(artifact.DockerImage)).Visit(func(a *artifact.Artifact) error {
-					digest, err := artifact.Extra[string](*a, dockerDigestExtra)
+					digest, err := artifact.Extra[string](*a, artifact.ExtraDigest)
 					require.NoError(t, err)
 					require.NotEmpty(t, digest)
 					return nil
@@ -1430,14 +1430,14 @@ func TestWithDigest(t *testing.T) {
 		Name: "owner/img:t1",
 		Type: artifact.DockerImage,
 		Extra: artifact.Extras{
-			dockerDigestExtra: "sha256:d1",
+			artifact.ExtraDigest: "sha256:d1",
 		},
 	})
 	artifacts.Add(&artifact.Artifact{
 		Name: "owner/img:t2",
 		Type: artifact.DockerImage,
 		Extra: artifact.Extras{
-			dockerDigestExtra: "sha256:d2",
+			artifact.ExtraDigest: "sha256:d2",
 		},
 	})
 	artifacts.Add(&artifact.Artifact{

diff --git a/internal/pipe/docker/manifest.go b/internal/pipe/docker/manifest.go
@@ -134,7 +134,7 @@ func manifestImages(ctx *context.Context, manifest config.DockerManifest) ([]str
 func withDigest(name string, images []*artifact.Artifact) string {
 	for _, art := range images {
 		if art.Name == name {
-			if digest := artifact.ExtraOr(*art, dockerDigestExtra, ""); digest != "" {
+			if digest := artifact.ExtraOr(*art, artifact.ExtraDigest, ""); digest != "" {
 				return name + "@" + digest
 			}
 			break