diff --git a/cli/command/registry.go b/cli/command/registry.go index be49d85b6bb8..950f55615fea 100644 --- a/cli/command/registry.go +++ b/cli/command/registry.go @@ -97,23 +97,6 @@ func GetDefaultAuthConfig(cfg *configfile.ConfigFile, checkCredStore bool, serve return registrytypes.AuthConfig(authconfig), nil } -// ConfigureAuth handles prompting of user's username and password if needed. -// -// Deprecated: use [PromptUserForCredentials] instead. -func ConfigureAuth(ctx context.Context, cli Cli, flUser, flPassword string, authConfig *registrytypes.AuthConfig, _ bool) error { - defaultUsername := authConfig.Username - serverAddress := authConfig.ServerAddress - - newAuthConfig, err := PromptUserForCredentials(ctx, cli, flUser, flPassword, defaultUsername, serverAddress) - if err != nil { - return err - } - - authConfig.Username = newAuthConfig.Username - authConfig.Password = newAuthConfig.Password - return nil -} - // PromptUserForCredentials handles the CLI prompt for the user to input // credentials. // If argUser is not empty, then the user is only prompted for their password. diff --git a/cli/command/utils.go b/cli/command/utils.go index ab64ef8fc120..f024ffd2789d 100644 --- a/cli/command/utils.go +++ b/cli/command/utils.go @@ -14,24 +14,10 @@ import ( "github.com/docker/cli/cli/streams" "github.com/docker/cli/internal/prompt" "github.com/docker/docker/api/types/filters" - "github.com/moby/sys/atomicwriter" "github.com/pkg/errors" "github.com/spf13/pflag" ) -// CopyToFile writes the content of the reader to the specified file -// -// Deprecated: use [atomicwriter.New]. -func CopyToFile(outfile string, r io.Reader) error { - writer, err := atomicwriter.New(outfile, 0o600) - if err != nil { - return err - } - defer writer.Close() - _, err = io.Copy(writer, r) - return err -} - const ErrPromptTerminated = prompt.ErrTerminated // DisableInputEcho disables input echo on the provided streams.In.