From 33ea55b8e6ab6ed02311a29bdb42d4e1219abbca Mon Sep 17 00:00:00 2001 From: Carlos A Becker Date: Tue, 15 Nov 2022 08:29:01 -0300 Subject: [PATCH] refactor: use the variable from artifact refs #3496 Signed-off-by: Carlos A Becker --- internal/pipe/docker/docker.go | 1 - internal/pipe/docker/docker_test.go | 6 +++--- internal/pipe/docker/manifest.go | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/internal/pipe/docker/docker.go b/internal/pipe/docker/docker.go index a8ccf5ff1e2..d1ea058eed7 100644 --- 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 index ef8a3ae2580..3a62994b359 100644 --- 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 index e1d84168c88..a74dce13c12 100644 --- 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