@@ -34,44 +34,6 @@ const (
3434// [registry.IndexServer]: https://pkg.go.dev/github.com/docker/docker/registry#IndexServer
3535const authConfigKey = "https://index.docker.io/v1/"
3636
37- // RegistryAuthenticationPrivilegedFunc returns a RequestPrivilegeFunc from the specified registry index info
38- // for the given command to prompt the user for username and password.
39- //
40- // Deprecated: this function is no longer used and will be removed in the next release.
41- func RegistryAuthenticationPrivilegedFunc (cli Cli , index * registrytypes.IndexInfo , cmdName string ) registrytypes.RequestAuthConfig {
42- indexServer := index .Name
43- configKey := getAuthConfigKey (indexServer )
44- if index .Official {
45- configKey = authConfigKey
46- }
47- promptMsg := fmt .Sprintf ("Login prior to %s:" , cmdName )
48- return newPrivilegeFunc (cli , configKey , promptMsg )
49- }
50-
51- func newPrivilegeFunc (cli Cli , indexServer string , promptMsg string ) registrytypes.RequestAuthConfig {
52- return func (ctx context.Context ) (string , error ) {
53- // TODO(thaJeztah): can we make the prompt an argument? ("prompt func()" or "prompt func()?
54- _ , _ = fmt .Fprint (cli .Out (), "\n " + promptMsg + "\n " )
55- isDefaultRegistry := indexServer == authConfigKey
56- authConfig , err := GetDefaultAuthConfig (cli .ConfigFile (), true , indexServer , isDefaultRegistry )
57- if err != nil {
58- _ , _ = fmt .Fprintf (cli .Err (), "Unable to retrieve stored credentials for %s, error: %s.\n " , indexServer , err )
59- }
60-
61- select {
62- case <- ctx .Done ():
63- return "" , ctx .Err ()
64- default :
65- }
66-
67- authConfig , err = PromptUserForCredentials (ctx , cli , "" , "" , authConfig .Username , indexServer )
68- if err != nil {
69- return "" , err
70- }
71- return registrytypes .EncodeAuthConfig (authConfig )
72- }
73- }
74-
7537// ResolveAuthConfig returns auth-config for the given registry from the
7638// credential-store. It returns an empty AuthConfig if no credentials were
7739// found.
0 commit comments