From db762956d169ac0ba9e0f4a0a5deb73bc924d8e9 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Mon, 8 Sep 2025 13:45:43 +0200 Subject: [PATCH] login: touch-up error for non-TTY Signed-off-by: Sebastiaan van Stijn --- cli/command/registry/login.go | 2 +- cli/command/registry/login_test.go | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cli/command/registry/login.go b/cli/command/registry/login.go index 17d0d883ba1d..913c000c4cc2 100644 --- a/cli/command/registry/login.go +++ b/cli/command/registry/login.go @@ -197,7 +197,7 @@ func loginUser(ctx context.Context, dockerCLI command.Cli, opts loginOptions, de // will hit this if you attempt docker login from mintty where stdin // is a pipe, not a character based console. if (opts.user == "" || opts.password == "") && !dockerCLI.In().IsTerminal() { - return "", errors.New("error: cannot perform an interactive login from a non TTY device") + return "", errors.New("error: cannot perform an interactive login from a non-TTY device") } // If we're logging into the index server and the user didn't provide a username or password, use the device flow diff --git a/cli/command/registry/login_test.go b/cli/command/registry/login_test.go index 41f833483503..9dfb13dfe751 100644 --- a/cli/command/registry/login_test.go +++ b/cli/command/registry/login_test.go @@ -127,7 +127,7 @@ func TestRunLogin(t *testing.T) { input: loginOptions{ serverAddress: "reg1", }, - expectedErr: "error: cannot perform an interactive login from a non TTY device", + expectedErr: "error: cannot perform an interactive login from a non-TTY device", }, { doc: "store valid username and password", @@ -334,19 +334,19 @@ func TestLoginNonInteractive(t *testing.T) { doc: "error - w/o user w/o pass ", username: false, password: false, - expectedErr: "error: cannot perform an interactive login from a non TTY device", + expectedErr: "error: cannot perform an interactive login from a non-TTY device", }, { doc: "error - w/ user w/o pass", username: true, password: false, - expectedErr: "error: cannot perform an interactive login from a non TTY device", + expectedErr: "error: cannot perform an interactive login from a non-TTY device", }, { doc: "error - w/o user w/ pass", username: false, password: true, - expectedErr: "error: cannot perform an interactive login from a non TTY device", + expectedErr: "error: cannot perform an interactive login from a non-TTY device", }, } @@ -403,13 +403,13 @@ func TestLoginNonInteractive(t *testing.T) { doc: "error - w/ user w/o pass", username: true, password: false, - expectedErr: "error: cannot perform an interactive login from a non TTY device", + expectedErr: "error: cannot perform an interactive login from a non-TTY device", }, { doc: "error - w/o user w/ pass", username: false, password: true, - expectedErr: "error: cannot perform an interactive login from a non TTY device", + expectedErr: "error: cannot perform an interactive login from a non-TTY device", }, }