resolve comments

Signed-off-by: Billy Zha <[email protected]>

cmd/oras/internal/option/remote.go

@@ -42,6 +42,7 @@ import (
 
 // Remote options struct.
 type Remote struct {
+	DistributionSpec
 	CACertFilePath    string
 	Insecure          bool
 	Configs           []string
@@ -51,11 +52,10 @@ type Remote struct {
 
 	resolveFlag           []string
 	applyDistributionSpec bool
-	DistributionSpec
-	headerFlags []string
-	headers     http.Header
-	warned      map[string]*sync.Map
-	plainHTTP   func() (plainHTTP bool, enforced bool)
+	headerFlags           []string
+	headers               http.Header
+	warned                map[string]*sync.Map
+	plainHTTP             func() (plainHTTP bool, enforced bool)
 }
 
 // EnableDistributionSpecFlag set distribution specification flag as applicable.

cmd/oras/root/attach.go

@@ -120,7 +120,7 @@ func runAttach(ctx context.Context, opts attachOptions) error {
 	}
 	// add both pull and push scope hints for dst repository
 	// to save potential push-scope token requests during copy
-	ctx = registryutil.WithScopeHint(dst, ctx, auth.ActionPull, auth.ActionPush)
+	ctx = registryutil.WithScopeHint(ctx, dst, auth.ActionPull, auth.ActionPush)
 	subject, err := dst.Resolve(ctx, opts.Reference)
 	if err != nil {
 		return err

cmd/oras/root/blob/delete.go

@@ -84,7 +84,7 @@ func deleteBlob(ctx context.Context, opts deleteBlobOptions) (err error) {
 	}
 
 	// add both pull and delete scope hints for dst repository to save potential delete-scope token requests during deleting
-	ctx = registryutil.WithScopeHint(repo, ctx, auth.ActionPull, auth.ActionDelete)
+	ctx = registryutil.WithScopeHint(ctx, repo, auth.ActionPull, auth.ActionDelete)
 	blobs := repo.Blobs()
 	desc, err := blobs.Resolve(ctx, opts.targetRef)
 	if err != nil {

cmd/oras/root/manifest/delete.go

@@ -88,13 +88,13 @@ func deleteManifest(ctx context.Context, opts deleteOptions) error {
 		return oerrors.NewErrInvalidReference(repo.Reference)
 	}
 
-	// add both pull, push and delete scope hints for dst repository to save potential delete-scope token requests during deleting
-	hints := []string{auth.ActionPull, auth.ActionPush, auth.ActionDelete}
+	// add both pull and delete scope hints for dst repository to save potential delete-scope token requests during deleting
+	hints := []string{auth.ActionPull, auth.ActionDelete}
 	if opts.ReferrersAPI == nil || !*opts.ReferrersAPI {
 		// possiblely need pushing to add a new referrers index
 		hints = append(hints, auth.ActionPush)
 	}
-	ctx = registryutil.WithScopeHint(repo, ctx, hints...)
+	ctx = registryutil.WithScopeHint(ctx, repo, hints...)
 	manifests := repo.Manifests()
 	desc, err := manifests.Resolve(ctx, opts.targetRef)
 	if err != nil {

cmd/oras/root/push.go

@@ -189,7 +189,7 @@ func runPush(ctx context.Context, opts pushOptions) error {
 	copy := func(root ocispec.Descriptor) error {
 		// add both pull and push scope hints for dst repository
 		// to save potential push-scope token requests during copy
-		ctx = registryutil.WithScopeHint(dst, ctx, auth.ActionPull, auth.ActionPush)
+		ctx = registryutil.WithScopeHint(ctx, dst, auth.ActionPull, auth.ActionPush)
 
 		if tag := opts.Reference; tag == "" {
 			err = oras.CopyGraph(ctx, union, dst, root, copyOptions.CopyGraphOptions)

internal/registryutil/auth.go

@@ -24,11 +24,10 @@ import (
 )
 
 // WithScopeHint adds a hinted scope to the context.
-func WithScopeHint(target oras.Target, ctx context.Context, actions ...string) context.Context {
+func WithScopeHint(ctx context.Context, target oras.Target, actions ...string) context.Context {
 	if repo, ok := target.(*remote.Repository); ok {
 		scope := auth.ScopeRepository(repo.Reference.Repository, actions...)
 		return auth.AppendScopes(ctx, scope)
-	} else {
-		return ctx
 	}
+	return ctx
 }