test(e2e): OCI layout e2e specs for oras push

Signed-off-by: Billy Zha <[email protected]>
oras-project · Mar 13, 2023 · 9651e0b · 9651e0b
1 parent 63d4e54
commit 9651e0b
Show file tree

Hide file tree

Showing 3 changed files with 249 additions and 97 deletions.
diff --git a/test/e2e/internal/testdata/foobar/const.go b/test/e2e/internal/testdata/foobar/const.go
@@ -29,25 +29,30 @@ var (
 	FileLayerNames = []string{
 		"foobar/foo1",
 		"foobar/foo2",
-		"foobar/bar",
+		FileBarName,
 	}
 	FileConfigName     = "foobar/config.json"
+	FileConfigSize     = 13
+	FileConfigDigest   = digest.Digest("sha256:46b68ac1696c3870d537f376868d9402400de28587e345264a77b65da09669be")
 	FileConfigStateKey = match.StateKey{
 		Digest: "46b68ac1696c", Name: "application/vnd.unknown.config.v1+json",
 	}
-	FileStateKeys = []match.StateKey{
+
+	FileBarName     = "foobar/bar"
+	FileBarStateKey = match.StateKey{Digest: "fcde2b2edba5", Name: FileLayerNames[2]}
+	FileStateKeys   = []match.StateKey{
 		{Digest: "2c26b46b68ff", Name: FileLayerNames[0]},
 		{Digest: "2c26b46b68ff", Name: FileLayerNames[1]},
-		{Digest: "fcde2b2edba5", Name: FileLayerNames[2]},
+		FileBarStateKey,
 	}
 
-	ConfigDesc         = "{\"mediaType\":\"application/vnd.unknown.config.v1+json\",\"digest\":\"sha256:44136fa355b3678a1146ad16f7e8649e94fb4fc21fe77e8310c060f61caaff8a\",\"size\":2}"
 	AttachFileName     = "foobar/to-be-attached"
 	AttachFileMedia    = "test/oras.e2e"
 	AttachFileStateKey = match.StateKey{
 		Digest: "d3b29f7d12d9", Name: AttachFileName,
 	}
 
+	ImageConfigDesc = "{\"mediaType\":\"application/vnd.unknown.config.v1+json\",\"digest\":\"sha256:44136fa355b3678a1146ad16f7e8649e94fb4fc21fe77e8310c060f61caaff8a\",\"size\":2}"
 	ImageLayerNames = []string{
 		"foo1",
 		"foo2",
@@ -60,11 +65,24 @@ var (
 	}
 	ImageConfigName = "config.json"
 
-	FooBlobDigest     = "sha256:2c26b46b68ffc68ff99b453c1d30413413422d706483bfa0f98a5e886266e7ae"
-	FooBlobContent    = "foo"
-	FooBlobDescriptor = `{"mediaType":"application/octet-stream","digest":"sha256:2c26b46b68ffc68ff99b453c1d30413413422d706483bfa0f98a5e886266e7ae","size":3}`
+	FooBlobDigest       = "sha256:2c26b46b68ffc68ff99b453c1d30413413422d706483bfa0f98a5e886266e7ae"
+	FooBlobContent      = "foo"
+	FooBlobDescriptor   = `{"mediaType":"application/octet-stream","digest":"sha256:2c26b46b68ffc68ff99b453c1d30413413422d706483bfa0f98a5e886266e7ae","size":3}`
+	BarBlobDigest       = "sha256:fcde2b2edba56bf408601fb721fe9b5c338d10ee429ea04fae5511b68fbf8fb9"
+	BlobBarDescTemplate = `{"mediaType":"%s","digest":"sha256:fcde2b2edba56bf408601fb721fe9b5c338d10ee429ea04fae5511b68fbf8fb9","size":3,"annotations":{"org.opencontainers.image.title":"foobar/bar"}}`
 )
 
+func BlobBarDescriptor(mediaType string) ocispec.Descriptor {
+	return ocispec.Descriptor{
+		MediaType: mediaType,
+		Digest:    digest.Digest(BarBlobDigest),
+		Size:      3,
+		Annotations: map[string]string{
+			"org.opencontainers.image.title": FileBarName,
+		},
+	}
+}
+
 func ImageConfigStateKey(configName string) match.StateKey {
 	return match.StateKey{Digest: "44136fa355b3", Name: configName}
 }

diff --git a/test/e2e/suite/command/manifest.go b/test/e2e/suite/command/manifest.go
@@ -309,7 +309,7 @@ var _ = Describe("Common registry users:", func() {
 
 		It("should fetch a config descriptor via a tag", func() {
 			ORAS("manifest", "fetch-config", "--descriptor", RegistryRef(Host, ImageRepo, foobar.Tag)).
-				MatchContent(foobar.ConfigDesc).Exec()
+				MatchContent(foobar.ImageConfigDesc).Exec()
 		})
 
 		It("should fetch a config via digest", func() {
@@ -319,7 +319,7 @@ var _ = Describe("Common registry users:", func() {
 
 		It("should fetch a config descriptor via a digest", func() {
 			ORAS("manifest", "fetch-config", "--descriptor", RegistryRef(Host, ImageRepo, foobar.Digest)).
-				MatchContent(foobar.ConfigDesc).Exec()
+				MatchContent(foobar.ImageConfigDesc).Exec()
 		})
 
 		It("should fetch a config of a specific platform", func() {