diff --git a/pkg/attest/verify_test.go b/pkg/attest/verify_test.go index dd2c33e..9c38687 100644 --- a/pkg/attest/verify_test.go +++ b/pkg/attest/verify_test.go @@ -100,7 +100,7 @@ func TestVSA(t *testing.T) { policyOpts := &policy.Options{ LocalPolicyDir: PassPolicyDir, } - src, err := oci.ParseImageSpec("oci://"+outputLayout, oci.WithPlatform(LinuxAMD64)) + src, err := oci.ParseImageSpec(oci.LocalPrefix+outputLayout, oci.WithPlatform(LinuxAMD64)) require.NoError(t, err) results, err := Verify(ctx, src, policyOpts) require.NoError(t, err) @@ -158,7 +158,7 @@ func TestVerificationFailure(t *testing.T) { policyOpts := &policy.Options{ LocalPolicyDir: FailPolicyDir, } - src, err := oci.ParseImageSpec("oci://"+outputLayout, oci.WithPlatform(LinuxAMD64)) + src, err := oci.ParseImageSpec(oci.LocalPrefix+outputLayout, oci.WithPlatform(LinuxAMD64)) require.NoError(t, err) results, err := Verify(ctx, src, policyOpts) require.NoError(t, err) @@ -239,7 +239,7 @@ func TestSignVerify(t *testing.T) { policyOpts := &policy.Options{ LocalPolicyDir: tc.policyDir, } - src, err := oci.ParseImageSpec("oci://"+outputLayout, oci.WithPlatform(LinuxAMD64)) + src, err := oci.ParseImageSpec(oci.LocalPrefix+outputLayout, oci.WithPlatform(LinuxAMD64)) require.NoError(t, err) results, err := Verify(ctx, src, policyOpts) if tc.expectError { diff --git a/pkg/mirror/mirror_test.go b/pkg/mirror/mirror_test.go index d1ad092..7a42d80 100644 --- a/pkg/mirror/mirror_test.go +++ b/pkg/mirror/mirror_test.go @@ -36,7 +36,7 @@ func TestSavingIndex(t *testing.T) { err = SaveIndex(output, attIdx.Index, indexName) require.NoError(t, err) - ociOutput, err := oci.ParseImageSpecs("oci://" + outputLayout) + ociOutput, err := oci.ParseImageSpecs(oci.LocalPrefix + outputLayout) require.NoError(t, err) err = SaveIndex(ociOutput, attIdx.Index, indexName) require.NoError(t, err) @@ -59,7 +59,7 @@ func TestSavingImage(t *testing.T) { err = SaveImage(output, img, indexName) require.NoError(t, err) - ociOutput, err := oci.ParseImageSpec("oci://" + outputLayout) + ociOutput, err := oci.ParseImageSpec(oci.LocalPrefix + outputLayout) require.NoError(t, err) err = SaveImage(ociOutput, img, indexName) require.NoError(t, err) diff --git a/pkg/oci/oci_test.go b/pkg/oci/oci_test.go index 545ad36..3039aac 100644 --- a/pkg/oci/oci_test.go +++ b/pkg/oci/oci_test.go @@ -95,10 +95,10 @@ func TestWithoutTag(t *testing.T) { {name: "image:tag", expected: "index.docker.io/library/image"}, {name: "image", expected: "index.docker.io/library/image"}, {name: "image:sha256-digest.att", expected: "index.docker.io/library/image"}, - {name: "docker://image:tag", expected: "docker://index.docker.io/library/image"}, + {name: RegistryPrefix + "image:tag", expected: RegistryPrefix + "index.docker.io/library/image"}, {name: "image@sha256:166710df254975d4a6c4c407c315951c22753dcaa829e020a3fd5d18fff70dd2", expected: "index.docker.io/library/image"}, - {name: "docker://image@sha256:166710df254975d4a6c4c407c315951c22753dcaa829e020a3fd5d18fff70dd2", expected: "docker://index.docker.io/library/image"}, - {name: "docker://127.0.0.1:36555/repo:latest", expected: "docker://127.0.0.1:36555/repo"}, + {name: RegistryPrefix + "image@sha256:166710df254975d4a6c4c407c315951c22753dcaa829e020a3fd5d18fff70dd2", expected: RegistryPrefix + "index.docker.io/library/image"}, + {name: RegistryPrefix + "127.0.0.1:36555/repo:latest", expected: RegistryPrefix + "127.0.0.1:36555/repo"}, } for _, c := range tc { t.Run(c.name, func(t *testing.T) { @@ -116,11 +116,11 @@ func TestReplaceTag(t *testing.T) { {name: "image:tag", expected: "index.docker.io/library/image:sha256-digest.att"}, {name: "image", expected: "index.docker.io/library/image:sha256-digest.att"}, {name: "image:sha256-digest.att", expected: "index.docker.io/library/image:sha256-digest.att"}, - {name: "docker://image:tag", expected: "docker://index.docker.io/library/image:sha256-digest.att"}, + {name: RegistryPrefix + "image:tag", expected: RegistryPrefix + "index.docker.io/library/image:sha256-digest.att"}, {name: "image@sha256:166710df254975d4a6c4c407c315951c22753dcaa829e020a3fd5d18fff70dd2", expected: "index.docker.io/library/image:sha256-digest.att"}, - {name: "oci://foobar", expected: "oci://foobar"}, - {name: "docker://image@sha256:166710df254975d4a6c4c407c315951c22753dcaa829e020a3fd5d18fff70dd2", expected: "docker://index.docker.io/library/image:sha256-digest.att"}, - {name: "docker://127.0.0.1:36555/repo:latest", expected: "docker://127.0.0.1:36555/repo:sha256-digest.att"}, + {name: LocalPrefix + "foobar", expected: LocalPrefix + "foobar"}, + {name: RegistryPrefix + "image@sha256:166710df254975d4a6c4c407c315951c22753dcaa829e020a3fd5d18fff70dd2", expected: RegistryPrefix + "index.docker.io/library/image:sha256-digest.att"}, + {name: RegistryPrefix + "127.0.0.1:36555/repo:latest", expected: RegistryPrefix + "127.0.0.1:36555/repo:sha256-digest.att"}, } digest := v1.Hash{