fix: resolve comment

Signed-off-by: Junjie Gao <[email protected]>
notaryproject · Dec 5, 2022 · 994a564 · 994a564
1 parent c789f57
commit 994a564
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 16 deletions.
diff --git a/cmd/notation/list.go b/cmd/notation/list.go
@@ -44,7 +44,7 @@ func listCommand(opts *listOpts) *cobra.Command {
 func runList(command *cobra.Command, opts *listOpts) error {
 	// initialize
 	reference := opts.reference
-	sigRepo, err := getSignatureRepositoryClient(command.Context(), &opts.SecureFlagOpts, reference)
+	sigRepo, err := getSignatureRepository(command.Context(), &opts.SecureFlagOpts, reference)
 	if err != nil {
 		return err
 	}

diff --git a/cmd/notation/registry.go b/cmd/notation/registry.go
@@ -18,7 +18,7 @@ import (
 	"oras.land/oras-go/v2/registry/remote/auth"
 )
 
-func getSignatureRepositoryClient(ctx context.Context, opts *SecureFlagOpts, reference string) (notationregistry.Repository, error) {
+func getSignatureRepository(ctx context.Context, opts *SecureFlagOpts, reference string) (notationregistry.Repository, error) {
 	ref, err := registry.ParseReference(reference)
 	if err != nil {
 		return nil, err
@@ -28,6 +28,19 @@ func getSignatureRepositoryClient(ctx context.Context, opts *SecureFlagOpts, ref
 	return getRepositoryClient(ctx, opts, ref)
 }
 
+func getRegistryClient(ctx context.Context, opts *SecureFlagOpts, serverAddress string) (*remote.Registry, error) {
+	reg, err := remote.NewRegistry(serverAddress)
+	if err != nil {
+		return nil, err
+	}
+
+	reg.Client, reg.PlainHTTP, err = getAuthClient(ctx, opts, reg.Reference)
+	if err != nil {
+		return nil, err
+	}
+	return reg, nil
+}
+
 func getRepositoryClient(ctx context.Context, opts *SecureFlagOpts, ref registry.Reference) (notationregistry.Repository, error) {
 	authClient, plainHTTP, err := getAuthClient(ctx, opts, ref)
 	if err != nil {
@@ -55,19 +68,6 @@ func setHttpDebugLog(ctx context.Context, authClient *auth.Client) {
 	authClient.Client.Transport = trace.NewTransport(authClient.Client.Transport)
 }
 
-func getRegistryClient(ctx context.Context, opts *SecureFlagOpts, serverAddress string) (*remote.Registry, error) {
-	reg, err := remote.NewRegistry(serverAddress)
-	if err != nil {
-		return nil, err
-	}
-
-	reg.Client, reg.PlainHTTP, err = getAuthClient(ctx, opts, reg.Reference)
-	if err != nil {
-		return nil, err
-	}
-	return reg, nil
-}
-
 func getAuthClient(ctx context.Context, opts *SecureFlagOpts, ref registry.Reference) (*auth.Client, bool, error) {
 	var plainHTTP bool
 

diff --git a/cmd/notation/sign.go b/cmd/notation/sign.go
@@ -83,7 +83,7 @@ func runSign(command *cobra.Command, cmdOpts *signOpts) error {
 	if err != nil {
 		return err
 	}
-	sigRepo, err := getSignatureRepositoryClient(ctx, &cmdOpts.SecureFlagOpts, cmdOpts.reference)
+	sigRepo, err := getSignatureRepository(ctx, &cmdOpts.SecureFlagOpts, cmdOpts.reference)
 	if err != nil {
 		return err
 	}