Skip to content

cli/trust: GetNotaryRepository: remove intermediate var #5961

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

Merged
vvoland merged 1 commit into from
Mar 31, 2025
Merged

cli/trust: GetNotaryRepository: remove intermediate var #5961

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
5 changes: 2 additions & 3 deletions cli/trust/trust.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,13 +160,12 @@ func GetNotaryRepository(in io.Reader, out io.Writer, userAgent string, repoInfo
Actions: actions,
}
creds := simpleCredentialStore{auth: *authConfig}
tokenHandlerOptions := auth.TokenHandlerOptions{
tokenHandler := auth.NewTokenHandlerWithOptions(auth.TokenHandlerOptions{
Transport: authTransport,
Credentials: creds,
Scopes: []auth.Scope{scope},
ClientID: registry.AuthClientID,
Copy link
Member Author

@thaJeztah thaJeztah Mar 25, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This one made me wonder; I see we're constructing token handlers in different places; for this one, and some paths in docker/docker, we set the ClientID; https://github.com/moby/moby/blob/330857ad0ffbc8114556f7886997fc43d7be4aad/distribution/registry.go#L123

But in cli/registry/client we use auth.NewTokenHandler

cli/cli/registry/client/endpoint.go

Lines 95 to 96 in 2b0631f

creds := registry.NewStaticCredentialStore(&authConfig)
tokenHandler := auth.NewTokenHandler(authTransport, creds, repoName, actions...)

Which means we end up with github.com/docker/distribution picking a default;

cli/vendor/github.com/docker/distribution/registry/client/auth/session.go

Lines 328 to 332 in 2b0631f

clientID := th.clientID
if clientID == "" {
// Use default client, this is a required field
clientID = defaultClientID
}

Which would be registry-client

cli/vendor/github.com/docker/distribution/registry/client/auth/session.go

Line 28 in 2b0631f

const defaultClientID = "registry-client"

}
tokenHandler := auth.NewTokenHandlerWithOptions(tokenHandlerOptions)
})
basicHandler := auth.NewBasicHandler(creds)
modifiers = append(modifiers, auth.NewAuthorizer(challengeManager, tokenHandler, basicHandler))
tr := transport.NewTransport(base, modifiers...)
Expand Down
Loading