diff --git a/cli/command/config/create.go b/cli/command/config/create.go index 965d2ddc74..ed72e432ba 100644 --- a/cli/command/config/create.go +++ b/cli/command/config/create.go @@ -48,10 +48,10 @@ func newConfigCreateCommand(dockerCli command.Cli) *cobra.Command { } // RunConfigCreate creates a config with the given options. -func RunConfigCreate(ctx context.Context, dockerCli command.Cli, options CreateOptions) error { - client := dockerCli.Client() +func RunConfigCreate(ctx context.Context, dockerCLI command.Cli, options CreateOptions) error { + apiClient := dockerCLI.Client() - var in io.Reader = dockerCli.In() + var in io.Reader = dockerCLI.In() if options.File != "-" { file, err := sequential.Open(options.File) if err != nil { @@ -78,11 +78,11 @@ func RunConfigCreate(ctx context.Context, dockerCli command.Cli, options CreateO Name: options.TemplateDriver, } } - r, err := client.ConfigCreate(ctx, spec) + r, err := apiClient.ConfigCreate(ctx, spec) if err != nil { return err } - fmt.Fprintln(dockerCli.Out(), r.ID) + fmt.Fprintln(dockerCLI.Out(), r.ID) return nil } diff --git a/cli/command/config/inspect.go b/cli/command/config/inspect.go index 7ae4a4c404..41e9a4763c 100644 --- a/cli/command/config/inspect.go +++ b/cli/command/config/inspect.go @@ -43,15 +43,15 @@ func newConfigInspectCommand(dockerCli command.Cli) *cobra.Command { } // RunConfigInspect inspects the given Swarm config. -func RunConfigInspect(ctx context.Context, dockerCli command.Cli, opts InspectOptions) error { - client := dockerCli.Client() +func RunConfigInspect(ctx context.Context, dockerCLI command.Cli, opts InspectOptions) error { + apiClient := dockerCLI.Client() if opts.Pretty { opts.Format = "pretty" } getRef := func(id string) (any, []byte, error) { - return client.ConfigInspectWithRaw(ctx, id) + return apiClient.ConfigInspectWithRaw(ctx, id) } f := opts.Format @@ -62,7 +62,7 @@ func RunConfigInspect(ctx context.Context, dockerCli command.Cli, opts InspectOp } configCtx := formatter.Context{ - Output: dockerCli.Out(), + Output: dockerCLI.Out(), Format: NewFormat(f, false), } diff --git a/cli/command/config/ls.go b/cli/command/config/ls.go index 5498506780..8ffaab4455 100644 --- a/cli/command/config/ls.go +++ b/cli/command/config/ls.go @@ -45,18 +45,18 @@ func newConfigListCommand(dockerCli command.Cli) *cobra.Command { } // RunConfigList lists Swarm configs. -func RunConfigList(ctx context.Context, dockerCli command.Cli, options ListOptions) error { - client := dockerCli.Client() +func RunConfigList(ctx context.Context, dockerCLI command.Cli, options ListOptions) error { + apiClient := dockerCLI.Client() - configs, err := client.ConfigList(ctx, types.ConfigListOptions{Filters: options.Filter.Value()}) + configs, err := apiClient.ConfigList(ctx, types.ConfigListOptions{Filters: options.Filter.Value()}) if err != nil { return err } format := options.Format if len(format) == 0 { - if len(dockerCli.ConfigFile().ConfigFormat) > 0 && !options.Quiet { - format = dockerCli.ConfigFile().ConfigFormat + if len(dockerCLI.ConfigFile().ConfigFormat) > 0 && !options.Quiet { + format = dockerCLI.ConfigFile().ConfigFormat } else { format = formatter.TableFormatKey } @@ -67,7 +67,7 @@ func RunConfigList(ctx context.Context, dockerCli command.Cli, options ListOptio }) configCtx := formatter.Context{ - Output: dockerCli.Out(), + Output: dockerCLI.Out(), Format: NewFormat(format, options.Quiet), } return FormatWrite(configCtx, configs)