Skip to content

fix: use %w instead of %v for error wrapping in login and logout #1349

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ogulcanaydogan wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: use %w instead of %v for error wrapping in login and logout #1349

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions cmd/notation/login.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,16 +112,16 @@ func runLogin(ctx context.Context, opts *loginOpts) error {
cred := opts.Credential()
credsStore, err := auth.NewCredentialsStore()
if err != nil {
return fmt.Errorf("failed to get credentials store: %v", err)
return fmt.Errorf("failed to get credentials store: %w", err)
}
registry, err := getRegistryLoginClient(ctx, &opts.SecureFlagOpts, serverAddress)
if err != nil {
return fmt.Errorf("failed to get registry client: %v", err)
return fmt.Errorf("failed to get registry client: %w", err)
}
if err := credentials.Login(ctx, credsStore, registry, cred); err != nil {
registryName := registry.Reference.Registry
if !errors.Is(err, credentials.ErrPlaintextPutDisabled) {
return fmt.Errorf("failed to log in to %s: %v", registryName, err)
return fmt.Errorf("failed to log in to %s: %w", registryName, err)
}

// ErrPlaintextPutDisabled returned by Login() indicates that the
Expand Down
4 changes: 2 additions & 2 deletions cmd/notation/logout.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,10 @@ func runLogout(ctx context.Context, opts *logoutOpts) error {
ctx = opts.LoggingFlagOpts.InitializeLogger(ctx)
credsStore, err := auth.NewCredentialsStore()
if err != nil {
return fmt.Errorf("failed to get credentials store: %v", err)
return fmt.Errorf("failed to get credentials store: %w", err)
}
if err := credentials.Logout(ctx, credsStore, opts.server); err != nil {
return fmt.Errorf("failed to log out of %s: %v", opts.server, err)
return fmt.Errorf("failed to log out of %s: %w", opts.server, err)
}

fmt.Println("Logout Succeeded")
Expand Down
Loading