Skip to content

Commit 7e6bd69

Browse files
committed
cli/command: remove NewAuthRequester as its now unused
Signed-off-by: Sebastiaan van Stijn <[email protected]>
1 parent 202ea0e commit 7e6bd69

File tree

1 file changed

+0
-38
lines changed

1 file changed

+0
-38
lines changed

cli/command/registry.go

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -35,44 +35,6 @@ const (
3535
// [registry.IndexServer]: https://pkg.go.dev/github.com/docker/[email protected]+incompatible/registry#IndexServer
3636
const authConfigKey = "https://index.docker.io/v1/"
3737

38-
// NewAuthRequester returns a RequestPrivilegeFunc for the specified registry
39-
// and the given cmdName (used as informational message to the user).
40-
//
41-
// The returned function is a [registrytypes.RequestAuthConfig] to prompt the user
42-
// for credentials if needed. It is called as fallback if the credentials (if any)
43-
// used for the initial operation did not work.
44-
//
45-
// TODO(thaJeztah): cli Cli could be a Streams if it was not for cli.SetIn to be needed?
46-
// TODO(thaJeztah): ideally, this would accept reposName / imageRef as a regular string (we can parse it if needed!), or .. maybe generics and accept either?
47-
func NewAuthRequester(cli Cli, indexServer string, promptMsg string) registrytypes.RequestAuthConfig {
48-
configKey := getAuthConfigKey(indexServer)
49-
return newPrivilegeFunc(cli, configKey, promptMsg)
50-
}
51-
52-
func newPrivilegeFunc(cli Cli, indexServer string, promptMsg string) registrytypes.RequestAuthConfig {
53-
return func(ctx context.Context) (string, error) {
54-
// TODO(thaJeztah): can we make the prompt an argument? ("prompt func()" or "prompt func()?
55-
_, _ = fmt.Fprint(cli.Out(), "\n"+promptMsg+"\n")
56-
isDefaultRegistry := indexServer == authConfigKey
57-
authConfig, err := GetDefaultAuthConfig(cli.ConfigFile(), true, indexServer, isDefaultRegistry)
58-
if err != nil {
59-
_, _ = fmt.Fprintf(cli.Err(), "Unable to retrieve stored credentials for %s, error: %s.\n", indexServer, err)
60-
}
61-
62-
select {
63-
case <-ctx.Done():
64-
return "", ctx.Err()
65-
default:
66-
}
67-
68-
authConfig, err = PromptUserForCredentials(ctx, cli, "", "", authConfig.Username, indexServer)
69-
if err != nil {
70-
return "", err
71-
}
72-
return registrytypes.EncodeAuthConfig(authConfig)
73-
}
74-
}
75-
7638
// ResolveAuthConfig returns auth-config for the given registry from the
7739
// credential-store. It returns an empty AuthConfig if no credentials were
7840
// found.

0 commit comments

Comments
 (0)