feat: support oci layout target

cmd/oras/attach.go

@@ -25,16 +25,16 @@ import (
 	"oras.land/oras-go/v2"
 	"oras.land/oras-go/v2/content"
 	"oras.land/oras-go/v2/content/file"
+	"oras.land/oras-go/v2/registry/remote"
 	oerrors "oras.land/oras/cmd/oras/internal/errors"
 	"oras.land/oras/cmd/oras/internal/option"
 )
 
 type attachOptions struct {
 	option.Common
-	option.Remote
 	option.Packer
+	option.Target
 
-	targetRef    string
 	artifactType string
 	concurrency  int
 }
@@ -65,11 +65,11 @@ Example - Attach file 'hi.txt' and export the pushed manifest to 'manifest.json'
 `,
 		Args: cobra.MinimumNArgs(1),
 		PreRunE: func(cmd *cobra.Command, args []string) error {
-			return opts.ReadPassword()
+			opts.FileRefs = args[1:]
+			opts.FqdnRef = args[0]
+			return option.Parse(&opts)
 		},
 		RunE: func(cmd *cobra.Command, args []string) error {
-			opts.targetRef = args[0]
-			opts.FileRefs = args[1:]
 			return runAttach(opts)
 		},
 	}
@@ -96,14 +96,15 @@ func runAttach(opts attachOptions) error {
 	defer store.Close()
 	store.AllowPathTraversalOnWrite = opts.PathValidationDisabled
 
-	dst, err := opts.NewRepository(opts.targetRef, opts.Common)
+	dst, err := opts.NewTarget(opts.Common)
 	if err != nil {
 		return err
 	}
-	if dst.Reference.Reference == "" {
-		return oerrors.NewErrInvalidReference(dst.Reference)
+	// sanctity check: should not be tarball
+	if opts.Reference == "" {
+		return oerrors.NewErrInvalidReferenceStr(opts.FqdnRef)
 	}
-	subject, err := dst.Resolve(ctx, dst.Reference.Reference)
+	subject, err := dst.Resolve(ctx, opts.Reference)
 	if err != nil {
 		return err
 	}
@@ -142,9 +143,13 @@ func runAttach(opts attachOptions) error {
 		return err
 	}
 
-	targetRef := dst.Reference
-	targetRef.Reference = subject.Digest.String()
-	fmt.Println("Attached to", targetRef)
+	if opts.Type == option.RemoteType {
+		// Reassemble a reference with subject digest
+		ref := dst.(*remote.Repository).Reference
+		ref.Reference = subject.Digest.String()
+		opts.FqdnRef = ref.String()
+	}
+	fmt.Println("Attached to", opts.FullReference())
 	fmt.Println("Digest:", root.Digest)
 
 	// Export manifest

cmd/oras/blob/delete.go

@@ -59,7 +59,7 @@ Example - Delete a blob and print its descriptor:
 			if opts.OutputDescriptor && !opts.Confirmed {
 				return errors.New("must apply --force to confirm the deletion if the descriptor is outputted")
 			}
-			return opts.ReadPassword()
+			return option.Parse(&opts)
 		},
 		RunE: func(cmd *cobra.Command, args []string) error {
 			opts.targetRef = args[0]

cmd/oras/blob/fetch.go

@@ -21,10 +21,12 @@ import (
 	"io"
 	"os"
 
+	"github.com/opencontainers/go-digest"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/spf13/cobra"
 	"oras.land/oras-go/v2"
 	"oras.land/oras-go/v2/content"
+	"oras.land/oras-go/v2/registry/remote"
 	"oras.land/oras/cmd/oras/internal/option"
 )
 
@@ -33,10 +35,9 @@ type fetchBlobOptions struct {
 	option.Common
 	option.Descriptor
 	option.Pretty
-	option.Remote
+	option.Target
 
 	outputPath string
-	targetRef  string
 }
 
 func fetchCmd() *cobra.Command {
@@ -62,19 +63,17 @@ Example - Fetch the blob, save it to a local file and print the descriptor:
 `,
 		Args: cobra.ExactArgs(1),
 		PreRunE: func(cmd *cobra.Command, args []string) error {
+			opts.FqdnRef = args[0]
 			if opts.outputPath == "" && !opts.OutputDescriptor {
 				return errors.New("either `--output` or `--descriptor` must be provided")
 			}
-
 			if opts.outputPath == "-" && opts.OutputDescriptor {
 				return errors.New("`--output -` cannot be used with `--descriptor` at the same time")
 			}
-
-			return opts.ReadPassword()
+			return option.Parse(&opts)
 		},
 		Aliases: []string{"get"},
 		RunE: func(cmd *cobra.Command, args []string) error {
-			opts.targetRef = args[0]
 			return fetchBlob(opts)
 		},
 	}
@@ -86,32 +85,34 @@ Example - Fetch the blob, save it to a local file and print the descriptor:
 
 func fetchBlob(opts fetchBlobOptions) (fetchErr error) {
 	ctx, _ := opts.SetLoggerLevel()
-
-	repo, err := opts.NewRepository(opts.targetRef, opts.Common)
+	var target oras.ReadOnlyTarget
+	target, err := opts.NewReadonlyTarget(ctx, opts.Common)
 	if err != nil {
 		return err
 	}
-
-	if _, err = repo.Reference.Digest(); err != nil {
-		return fmt.Errorf("%s: blob reference must be of the form <name@digest>", opts.targetRef)
+	if err := digest.Digest(opts.Reference).Validate(); err != nil {
+		return fmt.Errorf("%s: blob reference must be of the form <name@digest>: %w", opts.FqdnRef, err)
 	}
 
-	src, err := opts.CachedTarget(repo.Blobs())
+	if repo, ok := target.(*remote.Repository); ok {
+		target = repo.Blobs()
+	}
+	src, err := opts.CachedTarget(target)
 	if err != nil {
 		return err
 	}
 
 	var desc ocispec.Descriptor
 	if opts.outputPath == "" {
 		// fetch blob descriptor only
-		desc, err = oras.Resolve(ctx, src, opts.targetRef, oras.DefaultResolveOptions)
+		desc, err = oras.Resolve(ctx, src, opts.Reference, oras.DefaultResolveOptions)
 		if err != nil {
 			return err
 		}
 	} else {
 		// fetch blob content
 		var rc io.ReadCloser
-		desc, rc, err = oras.Fetch(ctx, src, opts.targetRef, oras.DefaultFetchOptions)
+		desc, rc, err = oras.Fetch(ctx, src, opts.Reference, oras.DefaultFetchOptions)
 		if err != nil {
 			return err
 		}

cmd/oras/blob/push.go

@@ -31,12 +31,11 @@ type pushBlobOptions struct {
 	option.Common
 	option.Descriptor
 	option.Pretty
-	option.Remote
+	option.Target
 
-	fileRef   string
 	mediaType string
 	size      int64
-	targetRef string
+	fileRef   string
 }
 
 func pushCmd() *cobra.Command {
@@ -71,7 +70,7 @@ Example - Push blob without TLS:
 `,
 		Args: cobra.ExactArgs(2),
 		PreRunE: func(cmd *cobra.Command, args []string) error {
-			opts.targetRef = args[0]
+			opts.FqdnRef = args[0]
 			opts.fileRef = args[1]
 			if opts.fileRef == "-" {
 				if opts.PasswordFromStdin {
@@ -81,7 +80,7 @@ Example - Push blob without TLS:
 					return errors.New("`--size` must be provided if the blob is read from stdin")
 				}
 			}
-			return opts.ReadPassword()
+			return option.Parse(&opts)
 		},
 		RunE: func(cmd *cobra.Command, args []string) error {
 			return pushBlob(opts)
@@ -97,19 +96,19 @@ Example - Push blob without TLS:
 func pushBlob(opts pushBlobOptions) (err error) {
 	ctx, _ := opts.SetLoggerLevel()
 
-	repo, err := opts.NewRepository(opts.targetRef, opts.Common)
+	target, err := opts.NewTarget(opts.Common)
 	if err != nil {
 		return err
 	}
 
 	// prepare blob content
-	desc, rc, err := file.PrepareBlobContent(opts.fileRef, opts.mediaType, repo.Reference.Reference, opts.size)
+	desc, rc, err := file.PrepareBlobContent(opts.fileRef, opts.mediaType, opts.Reference, opts.size)
 	if err != nil {
 		return err
 	}
 	defer rc.Close()
 
-	exists, err := repo.Exists(ctx, desc)
+	exists, err := target.Exists(ctx, desc)
 	if err != nil {
 		return err
 	}
@@ -122,7 +121,7 @@ func pushBlob(opts pushBlobOptions) (err error) {
 		if err := display.PrintStatus(desc, "Uploading", verbose); err != nil {
 			return err
 		}
-		if err = repo.Push(ctx, desc, rc); err != nil {
+		if err = target.Push(ctx, desc, rc); err != nil {
 			return err
 		}
 		if err := display.PrintStatus(desc, "Uploaded ", verbose); err != nil {
@@ -139,7 +138,7 @@ func pushBlob(opts pushBlobOptions) (err error) {
 		return opts.Output(os.Stdout, descJSON)
 	}
 
-	fmt.Println("Pushed", opts.targetRef)
+	fmt.Println("Pushed", opts.FullReference())
 	fmt.Println("Digest:", desc.Digest)
 
 	return nil

cmd/oras/cp.go

@@ -30,15 +30,12 @@ import (
 )
 
 type copyOptions struct {
-	src option.Remote
-	dst option.Remote
 	option.Common
 	option.Platform
 	recursive bool
+	option.BinaryTarget
 
 	concurrency int
-	srcRef      string
-	dstRef      string
 	extraRefs   []string
 }
 
@@ -68,18 +65,19 @@ Example - Copy the artifact tagged with 'v1' from repository 'localhost:5000/net
   oras cp --concurrency 6 localhost:5000/net-monitor:v1 localhost:5000/net-monitor-copy:v1,tag2,tag3
 `,
 		Args: cobra.ExactArgs(2),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			opts.srcRef = args[0]
+		PreRunE: func(cmd *cobra.Command, args []string) error {
+			opts.From.FqdnRef = args[0]
 			refs := strings.Split(args[1], ",")
-			opts.dstRef = refs[0]
+			opts.To.FqdnRef = refs[0]
 			opts.extraRefs = refs[1:]
+			return option.Parse(&opts)
+		},
+		RunE: func(cmd *cobra.Command, args []string) error {
 			return runCopy(opts)
 		},
 	}
 
 	cmd.Flags().BoolVarP(&opts.recursive, "recursive", "r", false, "recursively copy the artifact and its referrer artifacts")
-	opts.src.ApplyFlagsWithPrefix(cmd.Flags(), "from", "source")
-	opts.dst.ApplyFlagsWithPrefix(cmd.Flags(), "to", "destination")
 	cmd.Flags().IntVarP(&opts.concurrency, "concurrency", "", 3, "concurrency level")
 	option.ApplyFlags(&opts, cmd.Flags())
 
@@ -88,19 +86,19 @@ Example - Copy the artifact tagged with 'v1' from repository 'localhost:5000/net
 
 func runCopy(opts copyOptions) error {
 	ctx, _ := opts.SetLoggerLevel()
-	targetPlatform, err := opts.Parse()
-	if err != nil {
-		return err
-	}
 
 	// Prepare source
-	src, err := opts.src.NewRepository(opts.srcRef, opts.Common)
+	src, err := opts.From.NewReadonlyTarget(ctx, opts.Common)
 	if err != nil {
 		return err
 	}
+	if opts.From.Reference == "" {
+		return errors.NewErrInvalidReferenceStr(opts.From.FqdnRef)
+	}
 
 	// Prepare destination
-	dst, err := opts.dst.NewRepository(opts.dstRef, opts.Common)
+
+	dst, err := opts.To.NewTarget(opts.Common)
 	if err != nil {
 		return err
 	}
@@ -122,14 +120,10 @@ func runCopy(opts copyOptions) error {
 		return display.PrintStatus(desc, "Exists ", opts.Verbose)
 	}
 
-	if src.Reference.Reference == "" {
-		return errors.NewErrInvalidReference(src.Reference)
-	}
-
 	var desc ocispec.Descriptor
-	if ref := dst.Reference.Reference; ref == "" {
+	if ref := opts.To.Reference; ref == "" {
 		// push to the destination with digest only if no tag specified
-		desc, err = src.Resolve(ctx, src.Reference.Reference)
+		desc, err = src.Resolve(ctx, opts.From.Reference)
 		if err != nil {
 			return err
 		}
@@ -140,27 +134,25 @@ func runCopy(opts copyOptions) error {
 		}
 	} else {
 		if opts.recursive {
-			desc, err = oras.ExtendedCopy(ctx, src, opts.srcRef, dst, opts.dstRef, extendedCopyOptions)
+			desc, err = oras.ExtendedCopy(ctx, src, opts.From.Reference, dst, opts.To.Reference, extendedCopyOptions)
 		} else {
 			copyOptions := oras.CopyOptions{
 				CopyGraphOptions: extendedCopyOptions.CopyGraphOptions,
 			}
-			if targetPlatform != nil {
-				copyOptions.WithTargetPlatform(targetPlatform)
-			}
-			desc, err = oras.Copy(ctx, src, opts.srcRef, dst, opts.dstRef, copyOptions)
+			copyOptions.WithTargetPlatform(opts.OCIPlatform)
+			desc, err = oras.Copy(ctx, src, opts.From.Reference, dst, opts.To.Reference, copyOptions)
 		}
 	}
 	if err != nil {
 		return err
 	}
 
-	fmt.Println("Copied", opts.srcRef, "=>", opts.dstRef)
+	fmt.Printf("Copied %s => %s \n", opts.From.FullReference(), opts.To.FullReference())
 
 	if len(opts.extraRefs) != 0 {
 		tagNOpts := oras.DefaultTagNOptions
 		tagNOpts.Concurrency = opts.concurrency
-		if err = oras.TagN(ctx, &display.TagManifestStatusPrinter{Repository: dst}, opts.dstRef, opts.extraRefs, tagNOpts); err != nil {
+		if err = oras.TagN(ctx, &display.TagManifestStatusPrinter{Target: dst}, opts.To.Reference, opts.extraRefs, tagNOpts); err != nil {
 			return err
 		}
 	}

cmd/oras/discover.go

@@ -63,7 +63,7 @@ Example - Discover referrers with type 'test-artifact' of manifest 'hello:latest
 `,
 		Args: cobra.ExactArgs(1),
 		PreRunE: func(cmd *cobra.Command, args []string) error {
-			return opts.ReadPassword()
+			return option.Parse(&opts)
 		},
 		RunE: func(cmd *cobra.Command, args []string) error {
 			opts.targetRef = args[0]
@@ -86,14 +86,10 @@ func runDiscover(opts discoverOptions) error {
 	if repo.Reference.Reference == "" {
 		return errors.NewErrInvalidReference(repo.Reference)
 	}
-	targetPlatform, err := opts.Parse()
-	if err != nil {
-		return err
-	}
 
 	// discover artifacts
 	resolveOpts := oras.DefaultResolveOptions
-	resolveOpts.TargetPlatform = targetPlatform
+	resolveOpts.TargetPlatform = opts.OCIPlatform
 	desc, err := oras.Resolve(ctx, repo, repo.Reference.Reference, resolveOpts)
 	if err != nil {
 		return err