From de543475180cca011872b174b333b9663e59f112 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Tue, 5 Aug 2025 21:11:47 +0200 Subject: [PATCH 1/2] cli/command: remove deprecated CopyToFile utility It was deprecated in 7cc6b8ebf4aa1754ac9309027f315b270ea47c34, which is part of v28.x Signed-off-by: Sebastiaan van Stijn --- cli/command/utils.go | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/cli/command/utils.go b/cli/command/utils.go index ccb05c02ae..e10956c0d5 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/moby/moby/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. From 22cc0e90aea26150835c04fd833ed7061dd0102c Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Tue, 5 Aug 2025 21:15:53 +0200 Subject: [PATCH 2/2] cli/command: remove deprecated ConfigureAuth utility It was deprecated in 6e4818e7d6d006f14ebac4c06fbe6ed958237408, which is part of v28.x and backported to v27.x. Signed-off-by: Sebastiaan van Stijn --- cli/command/registry.go | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/cli/command/registry.go b/cli/command/registry.go index ee4b0c8039..a716ad5729 100644 --- a/cli/command/registry.go +++ b/cli/command/registry.go @@ -99,23 +99,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.