From b5a00d0b0f950bb51b30eb6ecce3d58733457d5c Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Tue, 3 Dec 2024 12:50:12 +0100 Subject: [PATCH] cli/command/registry: loginWithRegistry: use shallower interface This function only needs the API client, not all of the CLI. Signed-off-by: Sebastiaan van Stijn --- cli/command/registry/login.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cli/command/registry/login.go b/cli/command/registry/login.go index 06b8a6ea95..145922dc98 100644 --- a/cli/command/registry/login.go +++ b/cli/command/registry/login.go @@ -187,7 +187,7 @@ func loginWithUsernameAndPassword(ctx context.Context, dockerCli command.Cli, op return nil, err } - response, err := loginWithRegistry(ctx, dockerCli, authConfig) + response, err := loginWithRegistry(ctx, dockerCli.Client(), authConfig) if err != nil { return nil, err } @@ -210,7 +210,7 @@ func loginWithDeviceCodeFlow(ctx context.Context, dockerCli command.Cli) (*regis return nil, err } - response, err := loginWithRegistry(ctx, dockerCli, registrytypes.AuthConfig(*authConfig)) + response, err := loginWithRegistry(ctx, dockerCli.Client(), registrytypes.AuthConfig(*authConfig)) if err != nil { return nil, err } @@ -231,8 +231,8 @@ func storeCredentials(dockerCli command.Cli, authConfig registrytypes.AuthConfig return nil } -func loginWithRegistry(ctx context.Context, dockerCli command.Cli, authConfig registrytypes.AuthConfig) (*registrytypes.AuthenticateOKBody, error) { - response, err := dockerCli.Client().RegistryLogin(ctx, authConfig) +func loginWithRegistry(ctx context.Context, apiClient client.SystemAPIClient, authConfig registrytypes.AuthConfig) (*registrytypes.AuthenticateOKBody, error) { + response, err := apiClient.RegistryLogin(ctx, authConfig) if err != nil { if client.IsErrConnectionFailed(err) { // daemon isn't responding; attempt to login client side.