From 7cb8147e7716ed2d9e4c626710704a249f2ae0c3 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Sun, 24 Aug 2025 15:54:19 +0200 Subject: [PATCH] cli/trust: GetNotaryRepository: inline variables Signed-off-by: Sebastiaan van Stijn --- cli/trust/trust.go | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/cli/trust/trust.go b/cli/trust/trust.go index a70a496669..06fb2c0710 100644 --- a/cli/trust/trust.go +++ b/cli/trust/trust.go @@ -156,26 +156,23 @@ func GetNotaryRepository(in io.Reader, out io.Writer, userAgent string, repoInfo } } - scope := auth.RepositoryScope{ - Repository: repoInfo.Name.Name(), - Actions: actions, - } - creds := simpleCredentialStore{auth: *authConfig} tokenHandler := auth.NewTokenHandlerWithOptions(auth.TokenHandlerOptions{ Transport: authTransport, - Credentials: creds, - Scopes: []auth.Scope{scope}, - ClientID: registry.AuthClientID, + Credentials: simpleCredentialStore{auth: *authConfig}, + Scopes: []auth.Scope{auth.RepositoryScope{ + Repository: repoInfo.Name.Name(), + Actions: actions, + }}, + ClientID: registry.AuthClientID, }) - basicHandler := auth.NewBasicHandler(creds) + basicHandler := auth.NewBasicHandler(simpleCredentialStore{auth: *authConfig}) modifiers = append(modifiers, auth.NewAuthorizer(challengeManager, tokenHandler, basicHandler)) - tr := transport.NewTransport(base, modifiers...) return client.NewFileCachedRepository( GetTrustDirectory(), data.GUN(repoInfo.Name.Name()), server, - tr, + transport.NewTransport(base, modifiers...), GetPassphraseRetriever(in, out), trustpinning.TrustPinConfig{}) } @@ -234,9 +231,9 @@ func NotaryError(repoName string, err error) error { return fmt.Errorf("error: remote trust data does not exist for %s: %v", repoName, err) case signed.ErrInsufficientSignatures: return fmt.Errorf("error: could not produce valid signature for %s. If Yubikey was used, was touch input provided?: %v", repoName, err) + default: + return err } - - return err } // AddToAllSignableRoles attempts to add the image target to all the top level