From 018ca95a0a64473970ff1ed4435291bdfa908098 Mon Sep 17 00:00:00 2001 From: Billy Zha Date: Fri, 1 Sep 2023 10:28:57 +0800 Subject: [PATCH] test(e2e): re-bake test data (#1094) Signed-off-by: Billy Zha --- test/e2e/README.md | 2 - test/e2e/internal/testdata/foobar/const.go | 37 ++++-------------- test/e2e/suite/command/cp.go | 8 ++-- test/e2e/suite/command/discover.go | 20 +++++----- .../distribution/mount/artifacts.tar.gz | Bin 2294 -> 3289 bytes .../mount/artifacts_fallback.tar.gz | Bin 1449 -> 0 bytes .../mount_fallback/artifacts.tar.gz | Bin 4378 -> 3145 bytes ...141091b9239218e3125a35e17e8bcd05fa3a5e714} | 2 +- ...592718c73c41e809fb9818de232a635904a74d48d} | 2 +- .../testdata/zot/command/artifacts/index.json | 4 +- 10 files changed, 24 insertions(+), 51 deletions(-) delete mode 100644 test/e2e/testdata/distribution/mount/artifacts_fallback.tar.gz rename test/e2e/testdata/zot/command/artifacts/blobs/sha256/{0e007dcb9ded7f49c4dc8e3eed4a446712eb6fdf08a665a4f2352d6d2f8bdf17 => 0cb8c4da7e9ff2e7eefca33141091b9239218e3125a35e17e8bcd05fa3a5e714} (71%) rename test/e2e/testdata/zot/command/artifacts/blobs/sha256/{32b78bd00723cd7d5251d4586f84d252530b7b5fe1c4104532767e6da4e04e47 => e2c6633a79985906f1ed55c592718c73c41e809fb9818de232a635904a74d48d} (90%) diff --git a/test/e2e/README.md b/test/e2e/README.md index 716361a61..8ab639028 100644 --- a/test/e2e/README.md +++ b/test/e2e/README.md @@ -112,8 +112,6 @@ graph TD; direction TB E1["test.sbom.file(artifact)"] -- subject --> C1 E2["test.signature.file(artifact)"] -- subject --> E1 - end - subgraph "file: artifacts_fallback.tar.gz" direction TB D1["test.sbom.file(image)"] -- subject --> C1 D2["test.signature.file(image)"] -- subject --> D1 diff --git a/test/e2e/internal/testdata/foobar/const.go b/test/e2e/internal/testdata/foobar/const.go index 0ea5471f0..6a280118e 100644 --- a/test/e2e/internal/testdata/foobar/const.go +++ b/test/e2e/internal/testdata/foobar/const.go @@ -91,16 +91,16 @@ func ImageConfigStateKey(configName string) match.StateKey { var ( SBOMImageReferrer = ocispec.Descriptor{ MediaType: "application/vnd.oci.image.manifest.v1+json", - Digest: digest.Digest("sha256:32b78bd00723cd7d5251d4586f84d252530b7b5fe1c4104532767e6da4e04e47"), + Digest: digest.Digest("sha256:e2c6633a79985906f1ed55c592718c73c41e809fb9818de232a635904a74d48d"), Size: 660, Annotations: map[string]string{ "org.opencontainers.image.created": "2023-01-18T08:37:42Z", }, - ArtifactType: "test.sbom.file", + ArtifactType: "test/sbom.file", } SignatureImageReferrer = ocispec.Descriptor{ MediaType: "application/vnd.oci.image.manifest.v1+json", - Digest: digest.Digest("sha256:0e007dcb9ded7f49c4dc8e3eed4a446712eb6fdf08a665a4f2352d6d2f8bdf17"), + Digest: digest.Digest("sha256:0cb8c4da7e9ff2e7eefca33141091b9239218e3125a35e17e8bcd05fa3a5e714"), Size: 670, } SBOMArtifactReferrer = ocispec.Descriptor{ @@ -122,34 +122,11 @@ var ( {Digest: "2dbea575a349", Name: "application/vnd.oci.artifact.manifest.v1+json"}, } ImageReferrersStateKeys = []match.StateKey{ - {Digest: "0e007dcb9ded", Name: "application/vnd.oci.image.manifest.v1+json"}, - {Digest: "32b78bd00723", Name: "application/vnd.oci.image.manifest.v1+json"}, + {Digest: "0cb8c4da7e9f", Name: "application/vnd.oci.image.manifest.v1+json"}, + {Digest: "e2c6633a7998", Name: "application/vnd.oci.image.manifest.v1+json"}, } ImageReferrerConfigStateKeys = []match.StateKey{ - {Digest: "44136fa355b3", Name: "test.signature.file"}, - {Digest: "44136fa355b3", Name: "test.sbom.file"}, - } - FallbackImageReferrersStateKeys = []match.StateKey{ - {Digest: "316405db72cc", Name: "application/vnd.oci.image.manifest.v1+json"}, - {Digest: "8b3f7e000c4a", Name: "application/vnd.oci.image.manifest.v1+json"}, - } -) - -// fallback referrers -var ( - FallbackSignatureImageReferrer = ocispec.Descriptor{ - MediaType: "application/vnd.oci.image.manifest.v1+json", - Digest: digest.Digest("sha256:8b3f7e000c4a6d32cd6bfcabfe874ed470d470501a09adc65afaf1c342f988ff"), - Size: 670, - } - - FallbackSBOMImageReferrer = ocispec.Descriptor{ - MediaType: "application/vnd.oci.image.manifest.v1+json", - Digest: digest.Digest("sha256:316405db72cc8f0212c19db23b498f9af8a456c9cd288f9e33acd1ba9e7cd534"), - Size: 660, - Annotations: map[string]string{ - "org.opencontainers.image.created": "2023-01-29T02:32:18Z", - }, - ArtifactType: "test.sbom.file", + {Digest: "44136fa355b3", Name: "test/signature.file"}, + {Digest: "44136fa355b3", Name: "test/sbom.file"}, } ) diff --git a/test/e2e/suite/command/cp.go b/test/e2e/suite/command/cp.go index 3d06cf1e4..cdcab5c8f 100644 --- a/test/e2e/suite/command/cp.go +++ b/test/e2e/suite/command/cp.go @@ -257,13 +257,13 @@ var _ = Describe("OCI spec 1.0 registry users:", func() { }) It("should copy an image artifact and its referrers from a fallback registry to a registry", func() { repo := cpTestRepo("from-fallback") - stateKeys := append(append(foobarStates, foobar.FallbackImageReferrersStateKeys...), foobar.ImageReferrerConfigStateKeys...) - src := RegistryRef(FallbackHost, ArtifactRepo, foobar.FallbackSBOMImageReferrer.Digest.String()) + stateKeys := append(append(foobarStates, foobar.ImageReferrersStateKeys...), foobar.ImageReferrerConfigStateKeys...) + src := RegistryRef(FallbackHost, ArtifactRepo, foobar.SBOMImageReferrer.Digest.String()) dst := RegistryRef(Host, repo, "") ORAS("cp", "-r", src, dst, "-v").MatchStatus(stateKeys, true, len(stateKeys)).Exec() - CompareRef(src, RegistryRef(Host, repo, foobar.FallbackSBOMImageReferrer.Digest.String())) + CompareRef(src, RegistryRef(Host, repo, foobar.SBOMImageReferrer.Digest.String())) ORAS("discover", "-o", "tree", RegistryRef(Host, repo, foobar.Digest)). - WithDescription("discover referrer via subject").MatchKeyWords(foobar.FallbackSignatureImageReferrer.Digest.String(), foobar.FallbackSBOMImageReferrer.Digest.String()).Exec() + WithDescription("discover referrer via subject").MatchKeyWords(foobar.SignatureImageReferrer.Digest.String(), foobar.SBOMImageReferrer.Digest.String()).Exec() }) It("should copy an image from a fallback registry to an OCI image layout via digest", func() { diff --git a/test/e2e/suite/command/discover.go b/test/e2e/suite/command/discover.go index 5690f535c..04ac3c377 100644 --- a/test/e2e/suite/command/discover.go +++ b/test/e2e/suite/command/discover.go @@ -83,8 +83,7 @@ var _ = Describe("1.1 registry users:", func() { bytes := ORAS("discover", subjectRef, "-o", format, "--artifact-type", foobar.SBOMArtifactReferrer.ArtifactType).Exec().Out.Contents() var index ocispec.Index Expect(json.Unmarshal(bytes, &index)).ShouldNot(HaveOccurred()) - Expect(index.Manifests).To(HaveLen(2)) - Expect(index.Manifests).Should(ContainElement(foobar.SBOMImageReferrer)) + Expect(index.Manifests).To(HaveLen(1)) Expect(index.Manifests).Should(ContainElement(foobar.SBOMArtifactReferrer)) }) @@ -145,15 +144,15 @@ var _ = Describe("1.0 registry users:", func() { var index ocispec.Index Expect(json.Unmarshal(bytes, &index)).ShouldNot(HaveOccurred()) Expect(index.Manifests).To(HaveLen(1)) - Expect(index.Manifests).Should(ContainElement(foobar.FallbackSBOMImageReferrer)) + Expect(index.Manifests).Should(ContainElement(foobar.SBOMImageReferrer)) }) It("should discover matched referrer when filtering via json output", func() { - bytes := ORAS("discover", subjectRef, "-o", "json", "--artifact-type", foobar.FallbackSBOMImageReferrer.ArtifactType).Exec().Out.Contents() + bytes := ORAS("discover", subjectRef, "-o", "json", "--artifact-type", foobar.SBOMImageReferrer.ArtifactType).Exec().Out.Contents() var index ocispec.Index Expect(json.Unmarshal(bytes, &index)).ShouldNot(HaveOccurred()) Expect(index.Manifests).To(HaveLen(1)) - Expect(index.Manifests).Should(ContainElement(foobar.FallbackSBOMImageReferrer)) + Expect(index.Manifests).Should(ContainElement(foobar.SBOMImageReferrer)) }) It("should discover no referrer when not matching via json output", func() { @@ -164,28 +163,28 @@ var _ = Describe("1.0 registry users:", func() { }) It("should discover all referrers of a subject via tree output", func() { - referrers := []ocispec.Descriptor{foobar.FallbackSBOMImageReferrer, foobar.FallbackSignatureImageReferrer} + referrers := []ocispec.Descriptor{foobar.SBOMImageReferrer, foobar.SignatureImageReferrer} ORAS("discover", subjectRef, "-o", "tree"). MatchKeyWords(append(discoverKeyWords(false, referrers...), RegistryRef(FallbackHost, ArtifactRepo, foobar.Digest))...). Exec() }) It("should discover all referrers with annotation via tree output", func() { - referrers := []ocispec.Descriptor{foobar.FallbackSBOMImageReferrer, foobar.FallbackSignatureImageReferrer} + referrers := []ocispec.Descriptor{foobar.SBOMImageReferrer, foobar.SignatureImageReferrer} ORAS("discover", subjectRef, "-o", "tree", "-v"). MatchKeyWords(append(discoverKeyWords(true, referrers...), RegistryRef(FallbackHost, ArtifactRepo, foobar.Digest))...). Exec() }) It("should discover direct referrers of a subject via table output", func() { - referrers := []ocispec.Descriptor{foobar.FallbackSBOMImageReferrer} + referrers := []ocispec.Descriptor{foobar.SBOMImageReferrer} ORAS("discover", subjectRef, "-o", "table"). MatchKeyWords(append(discoverKeyWords(false, referrers...), foobar.Digest)...). Exec() }) It("should discover direct referrers explicitly via tag scheme", func() { - referrers := []ocispec.Descriptor{foobar.FallbackSBOMImageReferrer} + referrers := []ocispec.Descriptor{foobar.SBOMImageReferrer} ORAS("discover", subjectRef, "-o", "table", "--distribution-spec", "v1.1-referrers-tag"). MatchKeyWords(append(discoverKeyWords(false, referrers...), foobar.Digest)...). Exec() @@ -220,8 +219,7 @@ var _ = Describe("OCI image layout users:", func() { bytes := ORAS("discover", subjectRef, "-o", format, "--artifact-type", foobar.SBOMArtifactReferrer.ArtifactType, Flags.Layout).Exec().Out.Contents() var index ocispec.Index Expect(json.Unmarshal(bytes, &index)).ShouldNot(HaveOccurred()) - Expect(index.Manifests).To(HaveLen(2)) - Expect(index.Manifests).Should(ContainElement(foobar.SBOMImageReferrer)) + Expect(index.Manifests).To(HaveLen(1)) Expect(index.Manifests).Should(ContainElement(foobar.SBOMArtifactReferrer)) }) diff --git a/test/e2e/testdata/distribution/mount/artifacts.tar.gz b/test/e2e/testdata/distribution/mount/artifacts.tar.gz index aee352e7e6557be856c08c343674f4875b3d1cc2..03e66cca76fc41d34a3afed9037f60645e6abf7c 100644 GIT binary patch literal 3289 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 literal 2294 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 D1iBV< diff --git a/test/e2e/testdata/distribution/mount_fallback/artifacts.tar.gz b/test/e2e/testdata/distribution/mount_fallback/artifacts.tar.gz index e0ca94ab56c12a5c57b333dfa28b8bded5e4fb4c..fa72531787cfe7d177ed2efc54ebfbf96579c5ab 100644 GIT binary patch literal 3145 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 literal 4378 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 diff --git a/test/e2e/testdata/zot/command/artifacts/blobs/sha256/0e007dcb9ded7f49c4dc8e3eed4a446712eb6fdf08a665a4f2352d6d2f8bdf17 b/test/e2e/testdata/zot/command/artifacts/blobs/sha256/0cb8c4da7e9ff2e7eefca33141091b9239218e3125a35e17e8bcd05fa3a5e714 similarity index 71% rename from test/e2e/testdata/zot/command/artifacts/blobs/sha256/0e007dcb9ded7f49c4dc8e3eed4a446712eb6fdf08a665a4f2352d6d2f8bdf17 rename to test/e2e/testdata/zot/command/artifacts/blobs/sha256/0cb8c4da7e9ff2e7eefca33141091b9239218e3125a35e17e8bcd05fa3a5e714 index a51f76dac..5c3dfc745 100644 --- a/test/e2e/testdata/zot/command/artifacts/blobs/sha256/0e007dcb9ded7f49c4dc8e3eed4a446712eb6fdf08a665a4f2352d6d2f8bdf17 +++ b/test/e2e/testdata/zot/command/artifacts/blobs/sha256/0cb8c4da7e9ff2e7eefca33141091b9239218e3125a35e17e8bcd05fa3a5e714 @@ -1 +1 @@ -{"schemaVersion":2,"mediaType":"application/vnd.oci.image.manifest.v1+json","config":{"mediaType":"test.signature.file","digest":"sha256:44136fa355b3678a1146ad16f7e8649e94fb4fc21fe77e8310c060f61caaff8a","size":2},"layers":[{"mediaType":"application/vnd.oci.image.layer.v1.tar","digest":"sha256:ae2d56717c9334fdc5fdb1888b9351d80f6f5458dca9d3abef6560e7be255a3d","size":16,"annotations":{"org.opencontainers.image.title":"signature"}}],"subject":{"mediaType":"application/vnd.oci.image.manifest.v1+json","digest":"sha256:32b78bd00723cd7d5251d4586f84d252530b7b5fe1c4104532767e6da4e04e47","size":660},"annotations":{"org.opencontainers.image.created":"2023-01-18T08:37:57Z"}} \ No newline at end of file +{"schemaVersion":2,"mediaType":"application/vnd.oci.image.manifest.v1+json","config":{"mediaType":"test/signature.file","digest":"sha256:44136fa355b3678a1146ad16f7e8649e94fb4fc21fe77e8310c060f61caaff8a","size":2},"layers":[{"mediaType":"application/vnd.oci.image.layer.v1.tar","digest":"sha256:ae2d56717c9334fdc5fdb1888b9351d80f6f5458dca9d3abef6560e7be255a3d","size":16,"annotations":{"org.opencontainers.image.title":"signature"}}],"subject":{"mediaType":"application/vnd.oci.image.manifest.v1+json","digest":"sha256:e2c6633a79985906f1ed55c592718c73c41e809fb9818de232a635904a74d48d","size":660},"annotations":{"org.opencontainers.image.created":"2023-01-18T08:37:57Z"}} \ No newline at end of file diff --git a/test/e2e/testdata/zot/command/artifacts/blobs/sha256/32b78bd00723cd7d5251d4586f84d252530b7b5fe1c4104532767e6da4e04e47 b/test/e2e/testdata/zot/command/artifacts/blobs/sha256/e2c6633a79985906f1ed55c592718c73c41e809fb9818de232a635904a74d48d similarity index 90% rename from test/e2e/testdata/zot/command/artifacts/blobs/sha256/32b78bd00723cd7d5251d4586f84d252530b7b5fe1c4104532767e6da4e04e47 rename to test/e2e/testdata/zot/command/artifacts/blobs/sha256/e2c6633a79985906f1ed55c592718c73c41e809fb9818de232a635904a74d48d index 73ffd55d3..c691b4fc6 100644 --- a/test/e2e/testdata/zot/command/artifacts/blobs/sha256/32b78bd00723cd7d5251d4586f84d252530b7b5fe1c4104532767e6da4e04e47 +++ b/test/e2e/testdata/zot/command/artifacts/blobs/sha256/e2c6633a79985906f1ed55c592718c73c41e809fb9818de232a635904a74d48d @@ -1 +1 @@ -{"schemaVersion":2,"mediaType":"application/vnd.oci.image.manifest.v1+json","config":{"mediaType":"test.sbom.file","digest":"sha256:44136fa355b3678a1146ad16f7e8649e94fb4fc21fe77e8310c060f61caaff8a","size":2},"layers":[{"mediaType":"application/vnd.oci.image.layer.v1.tar","digest":"sha256:f5d51c0823fc419652bb6beb40e8175760dbb8615d2f815a6ca5239c901c6b38","size":11,"annotations":{"org.opencontainers.image.title":"sbom"}}],"subject":{"mediaType":"application/vnd.oci.image.manifest.v1+json","digest":"sha256:fd6ed2f36b5465244d5dc86cb4e7df0ab8a9d24adc57825099f522fe009a22bb","size":851},"annotations":{"org.opencontainers.image.created":"2023-01-18T08:37:42Z"}} \ No newline at end of file +{"schemaVersion":2,"mediaType":"application/vnd.oci.image.manifest.v1+json","config":{"mediaType":"test/sbom.file","digest":"sha256:44136fa355b3678a1146ad16f7e8649e94fb4fc21fe77e8310c060f61caaff8a","size":2},"layers":[{"mediaType":"application/vnd.oci.image.layer.v1.tar","digest":"sha256:f5d51c0823fc419652bb6beb40e8175760dbb8615d2f815a6ca5239c901c6b38","size":11,"annotations":{"org.opencontainers.image.title":"sbom"}}],"subject":{"mediaType":"application/vnd.oci.image.manifest.v1+json","digest":"sha256:fd6ed2f36b5465244d5dc86cb4e7df0ab8a9d24adc57825099f522fe009a22bb","size":851},"annotations":{"org.opencontainers.image.created":"2023-01-18T08:37:42Z"}} \ No newline at end of file diff --git a/test/e2e/testdata/zot/command/artifacts/index.json b/test/e2e/testdata/zot/command/artifacts/index.json index e1a345312..434d3f3d2 100644 --- a/test/e2e/testdata/zot/command/artifacts/index.json +++ b/test/e2e/testdata/zot/command/artifacts/index.json @@ -11,12 +11,12 @@ }, { "mediaType": "application/vnd.oci.image.manifest.v1+json", - "digest": "sha256:32b78bd00723cd7d5251d4586f84d252530b7b5fe1c4104532767e6da4e04e47", + "digest": "sha256:e2c6633a79985906f1ed55c592718c73c41e809fb9818de232a635904a74d48d", "size": 660 }, { "mediaType": "application/vnd.oci.image.manifest.v1+json", - "digest": "sha256:0e007dcb9ded7f49c4dc8e3eed4a446712eb6fdf08a665a4f2352d6d2f8bdf17", + "digest": "sha256:0cb8c4da7e9ff2e7eefca33141091b9239218e3125a35e17e8bcd05fa3a5e714", "size": 670 } ]