resolve comments

Signed-off-by: Billy Zha <[email protected]>
oras-project · Apr 6, 2023 · cb0bbd3 · cb0bbd3
1 parent 808b52e
commit cb0bbd3
Show file tree

Hide file tree

Showing 17 changed files with 62 additions and 51 deletions.
diff --git a/cmd/oras/root/attach.go b/cmd/oras/root/attach.go
@@ -85,7 +85,7 @@ Example - Attach file to the manifest tagged 'v1' in an OCI layout folder 'layou
 			return nil
 		},
 		RunE: func(cmd *cobra.Command, args []string) error {
-			return runAttach(cmd, opts)
+			return runAttach(cmd.Context(), opts)
 		},
 	}
 
@@ -97,8 +97,8 @@ Example - Attach file to the manifest tagged 'v1' in an OCI layout folder 'layou
 	return cmd
 }
 
-func runAttach(cmd *cobra.Command, opts attachOptions) error {
-	ctx, _ := opts.WithContext(cmd.Context())
+func runAttach(ctx context.Context, opts attachOptions) error {
+	ctx, _ = opts.WithContext(ctx)
 	annotations, err := opts.LoadManifestAnnotations()
 	if err != nil {
 		return err

diff --git a/cmd/oras/root/blob/delete.go b/cmd/oras/root/blob/delete.go
@@ -16,6 +16,7 @@ limitations under the License.
 package blob
 
 import (
+	"context"
 	"errors"
 	"fmt"
 	"os"
@@ -61,16 +62,16 @@ Example - Delete a blob and print its descriptor:
 		},
 		RunE: func(cmd *cobra.Command, args []string) error {
 			opts.targetRef = args[0]
-			return deleteBlob(cmd, opts)
+			return deleteBlob(cmd.Context(), opts)
 		},
 	}
 
 	option.ApplyFlags(&opts, cmd.Flags())
 	return cmd
 }
 
-func deleteBlob(cmd *cobra.Command, opts deleteBlobOptions) (err error) {
-	ctx, _ := opts.WithContext(cmd.Context())
+func deleteBlob(ctx context.Context, opts deleteBlobOptions) (err error) {
+	ctx, _ = opts.WithContext(ctx)
 	repo, err := opts.NewRepository(opts.targetRef, opts.Common)
 	if err != nil {
 		return err

diff --git a/cmd/oras/root/blob/fetch.go b/cmd/oras/root/blob/fetch.go
@@ -16,6 +16,7 @@ limitations under the License.
 package blob
 
 import (
+	"context"
 	"errors"
 	"fmt"
 	"io"
@@ -79,7 +80,7 @@ Example - Fetch and print a blob from OCI image layout archive file 'layout.tar'
 		},
 		Aliases: []string{"get"},
 		RunE: func(cmd *cobra.Command, args []string) error {
-			return fetchBlob(cmd, opts)
+			return fetchBlob(cmd.Context(), opts)
 		},
 	}
 
@@ -88,8 +89,8 @@ Example - Fetch and print a blob from OCI image layout archive file 'layout.tar'
 	return cmd
 }
 
-func fetchBlob(cmd *cobra.Command, opts fetchBlobOptions) (fetchErr error) {
-	ctx, _ := opts.WithContext(cmd.Context())
+func fetchBlob(ctx context.Context, opts fetchBlobOptions) (fetchErr error) {
+	ctx, _ = opts.WithContext(ctx)
 	var target oras.ReadOnlyTarget
 	target, err := opts.NewReadonlyTarget(ctx, opts.Common)
 	if err != nil {

diff --git a/cmd/oras/root/blob/push.go b/cmd/oras/root/blob/push.go
@@ -16,6 +16,7 @@ limitations under the License.
 package blob
 
 import (
+	"context"
 	"errors"
 	"fmt"
 	"os"
@@ -84,7 +85,7 @@ Example - Push blob 'hi.txt' into an OCI layout folder 'layout-dir':
 			return option.Parse(&opts)
 		},
 		RunE: func(cmd *cobra.Command, args []string) error {
-			return pushBlob(cmd, opts)
+			return pushBlob(cmd.Context(), opts)
 		},
 	}
 
@@ -94,8 +95,8 @@ Example - Push blob 'hi.txt' into an OCI layout folder 'layout-dir':
 	return cmd
 }
 
-func pushBlob(cmd *cobra.Command, opts pushBlobOptions) (err error) {
-	ctx, _ := opts.WithContext(cmd.Context())
+func pushBlob(ctx context.Context, opts pushBlobOptions) (err error) {
+	ctx, _ = opts.WithContext(ctx)
 
 	repo, err := opts.NewTarget(opts.Common)
 	if err != nil {

diff --git a/cmd/oras/root/cp.go b/cmd/oras/root/cp.go
@@ -85,7 +85,7 @@ Example - Copy an artifact with multiple tags with concurrency tuned:
 			return option.Parse(&opts)
 		},
 		RunE: func(cmd *cobra.Command, args []string) error {
-			return runCopy(cmd, opts)
+			return runCopy(cmd.Context(), opts)
 		},
 	}
 	cmd.Flags().BoolVarP(&opts.recursive, "recursive", "r", false, "[Preview] recursively copy the artifact and its referrer artifacts")
@@ -95,8 +95,8 @@ Example - Copy an artifact with multiple tags with concurrency tuned:
 	return cmd
 }
 
-func runCopy(cmd *cobra.Command, opts copyOptions) error {
-	ctx, _ := opts.WithContext(cmd.Context())
+func runCopy(ctx context.Context, opts copyOptions) error {
+	ctx, _ = opts.WithContext(ctx)
 
 	// Prepare source
 	src, err := opts.From.NewReadonlyTarget(ctx, opts.Common)

diff --git a/cmd/oras/root/discover.go b/cmd/oras/root/discover.go
@@ -79,7 +79,7 @@ Example - Discover referrers of the manifest tagged 'v1' in an OCI layout folder
 			return option.Parse(&opts)
 		},
 		RunE: func(cmd *cobra.Command, args []string) error {
-			return runDiscover(cmd, opts)
+			return runDiscover(cmd.Context(), opts)
 		},
 	}
 
@@ -90,8 +90,8 @@ Example - Discover referrers of the manifest tagged 'v1' in an OCI layout folder
 	return cmd
 }
 
-func runDiscover(cmd *cobra.Command, opts discoverOptions) error {
-	ctx, _ := opts.WithContext(cmd.Context())
+func runDiscover(ctx context.Context, opts discoverOptions) error {
+	ctx, _ = opts.WithContext(ctx)
 	repo, err := opts.NewReadonlyTarget(ctx, opts.Common)
 	if err != nil {
 		return err

diff --git a/cmd/oras/root/login.go b/cmd/oras/root/login.go
@@ -17,6 +17,7 @@ package root
 
 import (
 	"bufio"
+	"context"
 	"errors"
 	"fmt"
 	"os"
@@ -65,15 +66,15 @@ Example - Log in with username and password in an interactive terminal and no TL
 		},
 		RunE: func(cmd *cobra.Command, args []string) error {
 			opts.Hostname = args[0]
-			return runLogin(cmd, opts)
+			return runLogin(cmd.Context(), opts)
 		},
 	}
 	option.ApplyFlags(&opts, cmd.Flags())
 	return cmd
 }
 
-func runLogin(cmd *cobra.Command, opts loginOptions) (err error) {
-	ctx, _ := opts.WithContext(cmd.Context())
+func runLogin(ctx context.Context, opts loginOptions) (err error) {
+	ctx, _ = opts.WithContext(ctx)
 
 	// prompt for credential
 	if opts.Password == "" {

diff --git a/cmd/oras/root/logout.go b/cmd/oras/root/logout.go
@@ -16,6 +16,8 @@ limitations under the License.
 package root
 
 import (
+	"context"
+
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 	"oras.land/oras/internal/credential"
@@ -41,7 +43,7 @@ Example - Logout:
 		Args: cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			opts.hostname = args[0]
-			return runLogout(cmd, opts)
+			return runLogout(cmd.Context(), opts)
 		},
 	}
 
@@ -50,7 +52,7 @@ Example - Logout:
 	return cmd
 }
 
-func runLogout(cmd *cobra.Command, opts logoutOptions) error {
+func runLogout(ctx context.Context, opts logoutOptions) error {
 	if opts.debug {
 		logrus.SetLevel(logrus.DebugLevel)
 	}

diff --git a/cmd/oras/root/manifest/delete.go b/cmd/oras/root/manifest/delete.go
@@ -16,6 +16,7 @@ limitations under the License.
 package manifest
 
 import (
+	"context"
 	"errors"
 	"fmt"
 	"os"
@@ -65,7 +66,7 @@ Example - Delete a manifest by digest 'sha256:99e4703fbf30916f549cd6bfa9cdbab614
 		},
 		RunE: func(cmd *cobra.Command, args []string) error {
 			opts.targetRef = args[0]
-			return deleteManifest(cmd, opts)
+			return deleteManifest(cmd.Context(), opts)
 		},
 	}
 
@@ -74,8 +75,8 @@ Example - Delete a manifest by digest 'sha256:99e4703fbf30916f549cd6bfa9cdbab614
 	return cmd
 }
 
-func deleteManifest(cmd *cobra.Command, opts deleteOptions) error {
-	ctx, _ := opts.WithContext(cmd.Context())
+func deleteManifest(ctx context.Context, opts deleteOptions) error {
+	ctx, _ = opts.WithContext(ctx)
 	repo, err := opts.NewRepository(opts.targetRef, opts.Common)
 	if err != nil {
 		return err

diff --git a/cmd/oras/root/manifest/fetch.go b/cmd/oras/root/manifest/fetch.go
@@ -16,6 +16,7 @@ limitations under the License.
 package manifest
 
 import (
+	"context"
 	"encoding/json"
 	"errors"
 	"fmt"
@@ -78,7 +79,7 @@ Example - Fetch raw manifest from an OCI layout archive file 'layout.tar':
 		},
 		Aliases: []string{"get"},
 		RunE: func(cmd *cobra.Command, args []string) error {
-			return fetchManifest(cmd, opts)
+			return fetchManifest(cmd.Context(), opts)
 		},
 	}
 
@@ -88,8 +89,8 @@ Example - Fetch raw manifest from an OCI layout archive file 'layout.tar':
 	return cmd
 }
 
-func fetchManifest(cmd *cobra.Command, opts fetchOptions) (fetchErr error) {
-	ctx, _ := opts.WithContext(cmd.Context())
+func fetchManifest(ctx context.Context, opts fetchOptions) (fetchErr error) {
+	ctx, _ = opts.WithContext(ctx)
 
 	target, err := opts.NewReadonlyTarget(ctx, opts.Common)
 	if err != nil {

diff --git a/cmd/oras/root/manifest/fetch_config.go b/cmd/oras/root/manifest/fetch_config.go
@@ -76,7 +76,7 @@ Example - Fetch and print the prettified descriptor of the config:
 			return option.Parse(&opts)
 		},
 		RunE: func(cmd *cobra.Command, args []string) error {
-			return fetchConfig(cmd, opts)
+			return fetchConfig(cmd.Context(), opts)
 		},
 	}
 
@@ -85,8 +85,8 @@ Example - Fetch and print the prettified descriptor of the config:
 	return cmd
 }
 
-func fetchConfig(cmd *cobra.Command, opts fetchConfigOptions) (fetchErr error) {
-	ctx, _ := opts.WithContext(cmd.Context())
+func fetchConfig(ctx context.Context, opts fetchConfigOptions) (fetchErr error) {
+	ctx, _ = opts.WithContext(ctx)
 
 	repo, err := opts.NewReadonlyTarget(ctx, opts.Common)
 	if err != nil {

diff --git a/cmd/oras/root/manifest/push.go b/cmd/oras/root/manifest/push.go
@@ -92,7 +92,7 @@ Example - Push a manifest to an OCI layout folder 'layout-dir' and tag with 'v1'
 			return option.Parse(&opts)
 		},
 		RunE: func(cmd *cobra.Command, args []string) error {
-			return pushManifest(cmd, opts)
+			return pushManifest(cmd.Context(), opts)
 		},
 	}
 
@@ -103,8 +103,8 @@ Example - Push a manifest to an OCI layout folder 'layout-dir' and tag with 'v1'
 	return cmd
 }
 
-func pushManifest(cmd *cobra.Command, opts pushOptions) error {
-	ctx, _ := opts.WithContext(cmd.Context())
+func pushManifest(ctx context.Context, opts pushOptions) error {
+	ctx, _ = opts.WithContext(ctx)
 	var target oras.Target
 	var err error
 	target, err = opts.NewTarget(opts.Common)

diff --git a/cmd/oras/root/pull.go b/cmd/oras/root/pull.go
@@ -87,7 +87,7 @@ Example - Pull artifact files from an OCI layout archive 'layout.tar':
 			return option.Parse(&opts)
 		},
 		RunE: func(cmd *cobra.Command, args []string) error {
-			return runPull(cmd, opts)
+			return runPull(cmd.Context(), opts)
 		},
 	}
 
@@ -101,8 +101,8 @@ Example - Pull artifact files from an OCI layout archive 'layout.tar':
 	return cmd
 }
 
-func runPull(cmd *cobra.Command, opts pullOptions) error {
-	ctx, _ := opts.WithContext(cmd.Context())
+func runPull(ctx context.Context, opts pullOptions) error {
+	ctx, _ = opts.WithContext(ctx)
 	// Copy Options
 	var printed sync.Map
 	copyOptions := oras.DefaultCopyOptions

diff --git a/cmd/oras/root/push.go b/cmd/oras/root/push.go
@@ -111,7 +111,7 @@ Example - Push file "hi.txt" into an OCI layout folder 'layout-dir' with tag 'te
 			return option.Parse(&opts)
 		},
 		RunE: func(cmd *cobra.Command, args []string) error {
-			return runPush(cmd, opts)
+			return runPush(cmd.Context(), opts)
 		},
 	}
 	cmd.Flags().StringVarP(&opts.manifestConfigRef, "config", "", "", "`path` of image config file")
@@ -122,8 +122,8 @@ Example - Push file "hi.txt" into an OCI layout folder 'layout-dir' with tag 'te
 	return cmd
 }
 
-func runPush(cmd *cobra.Command, opts pushOptions) error {
-	ctx, _ := opts.WithContext(cmd.Context())
+func runPush(ctx context.Context, opts pushOptions) error {
+	ctx, _ = opts.WithContext(ctx)
 	annotations, err := opts.LoadManifestAnnotations()
 	if err != nil {
 		return err
@@ -213,7 +213,7 @@ func runPush(cmd *cobra.Command, opts pushOptions) error {
 	return opts.ExportManifest(ctx, store, root)
 }
 
-func updateDisplayOption(cmd *cobra.Command, *oras.CopyGraphOptions, store content.Fetcher, verbose bool) {
+func updateDisplayOption(opts *oras.CopyGraphOptions, store content.Fetcher, verbose bool) {
 	committed := &sync.Map{}
 	opts.PreCopy = display.StatusPrinter("Uploading", verbose)
 	opts.OnCopySkipped = func(ctx context.Context, desc ocispec.Descriptor) error {

diff --git a/cmd/oras/root/repo/ls.go b/cmd/oras/root/repo/ls.go
@@ -16,6 +16,7 @@ limitations under the License.
 package repo
 
 import (
+	"context"
 	"fmt"
 	"strings"
 
@@ -58,7 +59,7 @@ Example - List the repositories under the registry that include values lexically
 			if opts.hostname, opts.namespace, err = repository.ParseRepoPath(args[0]); err != nil {
 				return fmt.Errorf("could not parse repository path: %w", err)
 			}
-			return listRepository(cmd, opts)
+			return listRepository(cmd.Context(), opts)
 		},
 	}
 
@@ -67,8 +68,8 @@ Example - List the repositories under the registry that include values lexically
 	return cmd
 }
 
-func listRepository(cmd *cobra.Command, opts repositoryOptions) error {
-	ctx, _ := opts.WithContext(cmd.Context())
+func listRepository(ctx context.Context, opts repositoryOptions) error {
+	ctx, _ = opts.WithContext(ctx)
 	reg, err := opts.Remote.NewRegistry(opts.hostname, opts.Common)
 	if err != nil {
 		return err

diff --git a/cmd/oras/root/repo/tags.go b/cmd/oras/root/repo/tags.go
@@ -16,6 +16,7 @@ limitations under the License.
 package repo
 
 import (
+	"context"
 	"fmt"
 	"strings"
 
@@ -67,7 +68,7 @@ Example - Show tags associated with a digest:
 			return option.Parse(&opts)
 		},
 		RunE: func(cmd *cobra.Command, args []string) error {
-			return showTags(cmd, opts)
+			return showTags(cmd.Context(), opts)
 		},
 	}
 	cmd.Flags().StringVar(&opts.last, "last", "", "start after the tag specified by `last`")
@@ -76,8 +77,8 @@ Example - Show tags associated with a digest:
 	return cmd
 }
 
-func showTags(cmd *cobra.Command, opts showTagsOptions) error {
-	ctx, logger := opts.WithContext(cmd.Context())
+func showTags(ctx context.Context, opts showTagsOptions) error {
+	ctx, logger := opts.WithContext(ctx)
 	finder, err := opts.NewReadonlyTarget(ctx, opts.Common)
 	if err != nil {
 		return err