From a4caf8e89df6aef2f676223cb3556eadac3661f6 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 13 Jul 2022 10:49:00 +0200 Subject: [PATCH] remove uses of client.IsErrUnauthorized() This function is scheduled to be deprecated, so replacing its use. Signed-off-by: Sebastiaan van Stijn --- cli/command/registry/login.go | 3 ++- cli/command/registry/login_test.go | 2 -- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/cli/command/registry/login.go b/cli/command/registry/login.go index cbff392174..c60e60b8f8 100644 --- a/cli/command/registry/login.go +++ b/cli/command/registry/login.go @@ -13,6 +13,7 @@ import ( "github.com/docker/docker/api/types" registrytypes "github.com/docker/docker/api/types/registry" "github.com/docker/docker/client" + "github.com/docker/docker/errdefs" "github.com/docker/docker/registry" "github.com/pkg/errors" "github.com/spf13/cobra" @@ -168,7 +169,7 @@ func loginWithCredStoreCreds(ctx context.Context, dockerCli command.Cli, authCon cliClient := dockerCli.Client() response, err := cliClient.RegistryLogin(ctx, *authConfig) if err != nil { - if client.IsErrUnauthorized(err) { + if errdefs.IsUnauthorized(err) { fmt.Fprintf(dockerCli.Err(), "Stored credentials invalid or expired\n") } else { fmt.Fprintf(dockerCli.Err(), "Login did not succeed, error: %s\n", err) diff --git a/cli/command/registry/login_test.go b/cli/command/registry/login_test.go index f523c2eedc..480faeef38 100644 --- a/cli/command/registry/login_test.go +++ b/cli/command/registry/login_test.go @@ -64,8 +64,6 @@ func TestLoginWithCredStoreCreds(t *testing.T) { expectedMsg: "Authenticating with existing credentials...\n", expectedErr: fmt.Sprintf("Login did not succeed, error: %s\n", testAuthErrMsg), }, - // can't easily test the 401 case because client.IsErrUnauthorized(err) involving - // creating an error of a private type } ctx := context.Background() for _, tc := range testCases {