Merge remote-tracking branch 'origin_src' into e2e-doc

test/e2e/internal/testdata/artifact/blob/const.go

@@ -0,0 +1,30 @@
+/*
+Copyright The ORAS Authors.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package blob
+
+import "oras.land/oras/test/e2e/internal/utils/match"
+
+const (
+	Tag = "blob"
+)
+
+var (
+	StateKeys = []match.StateKey{
+		{Digest: "44136fa355b3", Name: "application/vnd.oci.empty.v1+json"},
+		{Digest: "2ef548696ac7", Name: "hello.tar"},
+		{Digest: "ccd5f15fb7e0", Name: "application/vnd.oci.image.manifest.v1+json"},
+	}
+)

test/e2e/internal/testdata/artifact/config/const.go

@@ -0,0 +1,30 @@
+/*
+Copyright The ORAS Authors.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package config
+
+import "oras.land/oras/test/e2e/internal/utils/match"
+
+const (
+	Tag = "config"
+)
+
+var (
+	StateKeys = []match.StateKey{
+		{Digest: "fe9dbc99451d", Name: "application/vnd.oci.image.config.v1+json"},
+		{Digest: "2ef548696ac7", Name: "hello.tar"},
+		{Digest: "0e7404d1cc4a", Name: "application/vnd.oci.image.manifest.v1+json"},
+	}
+)

test/e2e/internal/testdata/artifact/const.go

@@ -0,0 +1,36 @@
+/*
+Copyright The ORAS Authors.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package artifact
+
+import (
+	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
+	"oras.land/oras/test/e2e/internal/utils/match"
+)
+
+const (
+	DefaultArtifactType    = "application/vnd.unknown.artifact.v1"
+	DefaultConfigMediaType = "application/vnd.oci.empty.v1+json"
+)
+
+var (
+	DefaultConfigStateKey = match.StateKey{Digest: "44136fa355b3", Name: "application/vnd.oci.empty.v1+json"}
+	EmptyLayerJSON        = ocispec.Descriptor{
+		MediaType: "application/vnd.oci.empty.v1+json",
+		Digest:    "sha256:44136fa355b3678a1146ad16f7e8649e94fb4fc21fe77e8310c060f61caaff8a",
+		Size:      2,
+		Data:      []byte(`{}`),
+	}
+)

test/e2e/internal/testdata/artifact/index/const.go

@@ -0,0 +1,26 @@
+/*
+Copyright The ORAS Authors.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package index
+
+import "oras.land/oras/test/e2e/internal/utils/match"
+
+var (
+	ManifestDigest    = "sha256:7679bc22c33b87aa345c6950a993db98a6df7a6cc77a35c388908a3a50be6bad"
+	ManifestStatusKey = match.StateKey{
+		Digest: "7679bc22c33b",
+		Name:   "application/vnd.oci.image.index.v1+json",
+	}
+)

test/e2e/internal/testdata/multi_arch/const.go

@@ -34,6 +34,7 @@ var (
 		{Digest: "2ef548696ac7", Name: "hello.tar"},
 		{Digest: "fe9dbc99451d", Name: "application/vnd.oci.image.config.v1+json"},
 		{Digest: "9d84a5716c66", Name: "application/vnd.oci.image.manifest.v1+json"},
+		{Digest: "e2bfc9cc6a84", Name: "application/vnd.oci.image.index.v1+json"},
 	}
 	// below are newly baked artifacts for ZOT
 	IndexZOTReferrerStateKey = match.StateKey{Digest: "d37baf66300b", Name: "application/vnd.oci.image.manifest.v1+json"}

test/e2e/suite/command/cp.go

@@ -27,6 +27,9 @@ import (
 	"github.com/onsi/gomega/gbytes"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 	"oras.land/oras-go/v2"
+	"oras.land/oras/test/e2e/internal/testdata/artifact/blob"
+	"oras.land/oras/test/e2e/internal/testdata/artifact/config"
+	"oras.land/oras/test/e2e/internal/testdata/artifact/index"
 	"oras.land/oras/test/e2e/internal/testdata/feature"
 	"oras.land/oras/test/e2e/internal/testdata/foobar"
 	ma "oras.land/oras/test/e2e/internal/testdata/multi_arch"
@@ -70,9 +73,29 @@ func CompareRef(src, dst string) {
 
 var _ = Describe("1.1 registry users:", func() {
 	When("running `cp`", func() {
+		It("should copy an artifact with blob", func() {
+			src := RegistryRef(ZOTHost, ArtifactRepo, blob.Tag)
+			dst := RegistryRef(ZOTHost, cpTestRepo("artifact-with-blob"), "copied")
+			ORAS("cp", src, dst, "-v").MatchStatus(blob.StateKeys, true, len(blob.StateKeys)).Exec()
+			CompareRef(src, dst)
+		})
+
+		It("should copy an artifact with config", func() {
+			src := RegistryRef(ZOTHost, ArtifactRepo, config.Tag)
+			dst := RegistryRef(ZOTHost, cpTestRepo("artifact-with-config"), "copied")
+			ORAS("cp", src, dst, "-v").MatchStatus(config.StateKeys, true, len(config.StateKeys)).Exec()
+		})
+
+		It("should copy index and its subject", func() {
+			stateKeys := append(ma.IndexStateKeys, index.ManifestStatusKey)
+			src := RegistryRef(ZOTHost, ArtifactRepo, index.ManifestDigest)
+			dst := RegistryRef(ZOTHost, cpTestRepo("index-with-subject"), "")
+			ORAS("cp", src, dst, "-v").MatchStatus(stateKeys, true, len(stateKeys)).Exec()
+		})
+
 		It("should copy an image to a new repository via tag", func() {
 			src := RegistryRef(ZOTHost, ImageRepo, foobar.Tag)
-			dst := RegistryRef(ZOTHost, cpTestRepo("tag"), "copiedTag")
+			dst := RegistryRef(ZOTHost, cpTestRepo("tag"), "copied")
 			ORAS("cp", src, dst, "-v").MatchStatus(foobarStates, true, len(foobarStates)).Exec()
 			CompareRef(src, dst)
 		})
@@ -111,7 +134,7 @@ var _ = Describe("1.1 registry users:", func() {
 			// validate
 			CompareRef(RegistryRef(ZOTHost, ImageRepo, ma.Digest), dst)
 			var index ocispec.Index
-			bytes := ORAS("discover", dst, "-o", "json").
+			bytes := ORAS("discover", dst, "-o", "json", "--artifact-type", ma.IndexReferrerConfigStateKey.Name).
 				MatchKeyWords(ma.IndexReferrerDigest).
 				WithDescription("copy image referrer").
 				Exec().Out.Contents()
@@ -136,7 +159,7 @@ var _ = Describe("1.1 registry users:", func() {
 			// validate
 			CompareRef(RegistryRef(ZOTHost, ImageRepo, ma.Digest), dst)
 			var index ocispec.Index
-			bytes := ORAS("discover", dst, "-o", "json").
+			bytes := ORAS("discover", dst, "-o", "json", "--artifact-type", ma.IndexReferrerConfigStateKey.Name).
 				MatchKeyWords(ma.IndexReferrerDigest).
 				WithDescription("copy image referrer").
 				Exec().Out.Contents()
@@ -454,8 +477,8 @@ var _ = Describe("OCI layout users:", func() {
 			dstManifest := ORAS("manifest", "fetch", dst, Flags.Layout).WithDescription("fetch from destination to validate").Exec().Out.Contents()
 			Expect(srcManifest).To(Equal(dstManifest))
 			var index ocispec.Index
-			bytes := ORAS("discover", dst, "-o", "json", Flags.Layout).
-				MatchKeyWords(ma.IndexReferrerDigest).
+			bytes := ORAS("discover", dst, "-o", "json", Flags.Layout, "--artifact-type", ma.IndexReferrerConfigStateKey.Name).
+				// MatchKeyWords(ma.IndexReferrerDigest).
 				WithDescription("copy image referrer").
 				Exec().Out.Contents()
 			Expect(json.Unmarshal(bytes, &index)).ShouldNot(HaveOccurred())
@@ -484,7 +507,7 @@ var _ = Describe("OCI layout users:", func() {
 			dstManifest := ORAS("manifest", "fetch", dst).WithDescription("fetch from destination to validate").Exec().Out.Contents()
 			Expect(srcManifest).To(Equal(dstManifest))
 			var index ocispec.Index
-			bytes := ORAS("discover", dst, "-o", "json").
+			bytes := ORAS("discover", dst, "-o", "json", "--artifact-type", ma.IndexReferrerConfigStateKey.Name).
 				MatchKeyWords(ma.IndexReferrerDigest).
 				WithDescription("copy image referrer").
 				Exec().Out.Contents()

test/e2e/suite/command/pull.go

@@ -26,6 +26,8 @@ import (
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/gbytes"
 	"oras.land/oras-go/v2"
+	"oras.land/oras/test/e2e/internal/testdata/artifact/blob"
+	"oras.land/oras/test/e2e/internal/testdata/artifact/config"
 	"oras.land/oras/test/e2e/internal/testdata/feature"
 	"oras.land/oras/test/e2e/internal/testdata/foobar"
 	"oras.land/oras/test/e2e/internal/testdata/multi_arch"
@@ -41,7 +43,7 @@ var _ = Describe("ORAS beginners:", func() {
 	})
 })
 
-var _ = Describe("Remote registry users:", func() {
+var _ = Describe("OCI spec 1.1 registry users:", func() {
 	When("pulling images from remote registry", func() {
 		var (
 			configName = "test.config"
@@ -105,6 +107,69 @@ var _ = Describe("Remote registry users:", func() {
 			ORAS("pull", RegistryRef(ZOTHost, ImageRepo, "multi"), "--platform", "linux/amd64", "-v", "-o", GinkgoT().TempDir()).
 				MatchStatus(multi_arch.LinuxAMD64StateKeys, true, len(multi_arch.LinuxAMD64StateKeys)).Exec()
 		})
+
+		It("should pull an artifact with blob", func() {
+			pullRoot := GinkgoT().TempDir()
+			ORAS("pull", RegistryRef(ZOTHost, ArtifactRepo, blob.Tag), "-v", "-o", pullRoot).Exec()
+			Expect(filepath.Join(pullRoot, multi_arch.LayerName)).Should(BeAnExistingFile())
+		})
+
+		It("should pull an artifact with config", func() {
+			pullRoot := GinkgoT().TempDir()
+			ORAS("pull", RegistryRef(ZOTHost, ArtifactRepo, config.Tag), "-v", "-o", pullRoot).Exec()
+			Expect(filepath.Join(pullRoot, multi_arch.LayerName)).Should(BeAnExistingFile())
+		})
+
+		It("should copy an artifact with blob", func() {
+			repo := cpTestRepo("artifact-with-blob")
+			stateKeys := append(append(foobarStates, foobar.ImageReferrersStateKeys...), foobar.ImageReferrerConfigStateKeys...)
+			src := RegistryRef(ZOTHost, ArtifactRepo, foobar.SignatureImageReferrer.Digest.String())
+			dst := RegistryRef(FallbackHost, repo, "")
+			ORAS("cp", "-r", src, dst, "-v").MatchStatus(stateKeys, true, len(stateKeys)).Exec()
+			CompareRef(src, RegistryRef(FallbackHost, repo, foobar.SignatureImageReferrer.Digest.String()))
+			ORAS("discover", "-o", "tree", RegistryRef(FallbackHost, repo, foobar.Digest)).
+				WithDescription("discover referrer via subject").MatchKeyWords(foobar.SignatureImageReferrer.Digest.String(), foobar.SBOMImageReferrer.Digest.String()).Exec()
+		})
+	})
+})
+
+var _ = Describe("OCI spec 1.0 registry users:", func() {
+	It("should pull all files in an image to a target folder", func() {
+		pullRoot := "pulled"
+		configName := "test.config"
+		tempDir := PrepareTempFiles()
+		stateKeys := append(foobar.ImageLayerStateKeys, foobar.ManifestStateKey, foobar.ImageConfigStateKey(configName))
+		ORAS("pull", RegistryRef(FallbackHost, ArtifactRepo, foobar.Tag), "-v", "--config", configName, "-o", pullRoot).
+			MatchStatus(stateKeys, true, len(stateKeys)).
+			WithWorkDir(tempDir).Exec()
+		// check config
+		configPath := filepath.Join(tempDir, pullRoot, configName)
+		Expect(configPath).Should(BeAnExistingFile())
+		f, err := os.Open(configPath)
+		Expect(err).ShouldNot(HaveOccurred())
+		defer f.Close()
+		Eventually(gbytes.BufferReader(f)).Should(gbytes.Say("{}"))
+		for _, f := range foobar.ImageLayerNames {
+			// check layers
+			Binary("diff", filepath.Join(tempDir, "foobar", f), filepath.Join(pullRoot, f)).
+				WithWorkDir(tempDir).Exec()
+		}
+
+		ORAS("pull", RegistryRef(FallbackHost, ArtifactRepo, foobar.Tag), "-v", "-o", pullRoot, "--keep-old-files").
+			ExpectFailure().
+			WithDescription("fail if overwrite old files are disabled")
+	})
+
+	It("should pull subject", func() {
+		tempDir := GinkgoT().TempDir()
+		stateKeys := append(append(
+			foobar.ImageLayerStateKeys,
+			foobar.ManifestStateKey),
+			foobar.ImageReferrersStateKeys...,
+		)
+		ORAS("pull", RegistryRef(FallbackHost, ArtifactRepo, foobar.SignatureImageReferrer.Digest.String()), "-v", "--include-subject").
+			MatchStatus(stateKeys, true, len(stateKeys)).
+			WithWorkDir(tempDir).Exec()
 	})
 })