From f36e4b09497aa50b8e874172ce87e927f0c204a9 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 18 Jan 2023 17:39:35 +0100 Subject: [PATCH] cli/command/container: rename vars that collided - containerConfig collided with the containerConfig type - warning collided with the warning const Signed-off-by: Sebastiaan van Stijn --- cli/command/container/create.go | 18 +++++++++--------- cli/command/container/opts_test.go | 4 ++-- cli/command/container/run.go | 12 ++++++------ 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/cli/command/container/create.go b/cli/command/container/create.go index 119a846089..c7ffcb562d 100644 --- a/cli/command/container/create.go +++ b/cli/command/container/create.go @@ -95,16 +95,16 @@ func runCreate(dockerCli command.Cli, flags *pflag.FlagSet, options *createOptio } } copts.env = *opts.NewListOptsRef(&newEnv, nil) - containerConfig, err := parse(flags, copts, dockerCli.ServerInfo().OSType) + containerCfg, err := parse(flags, copts, dockerCli.ServerInfo().OSType) if err != nil { reportError(dockerCli.Err(), "create", err.Error(), true) return cli.StatusError{StatusCode: 125} } - if err = validateAPIVersion(containerConfig, dockerCli.Client().ClientVersion()); err != nil { + if err = validateAPIVersion(containerCfg, dockerCli.Client().ClientVersion()); err != nil { reportError(dockerCli.Err(), "create", err.Error(), true) return cli.StatusError{StatusCode: 125} } - response, err := createContainer(context.Background(), dockerCli, containerConfig, options) + response, err := createContainer(context.Background(), dockerCli, containerCfg, options) if err != nil { return err } @@ -199,10 +199,10 @@ func newCIDFile(path string) (*cidFile, error) { } //nolint:gocyclo -func createContainer(ctx context.Context, dockerCli command.Cli, containerConfig *containerConfig, opts *createOptions) (*container.CreateResponse, error) { - config := containerConfig.Config - hostConfig := containerConfig.HostConfig - networkingConfig := containerConfig.NetworkingConfig +func createContainer(ctx context.Context, dockerCli command.Cli, containerCfg *containerConfig, opts *createOptions) (*container.CreateResponse, error) { + config := containerCfg.Config + hostConfig := containerCfg.HostConfig + networkingConfig := containerCfg.NetworkingConfig warnOnOomKillDisable(*hostConfig, dockerCli.Err()) warnOnLocalhostDNS(*hostConfig, dockerCli.Err()) @@ -293,8 +293,8 @@ func createContainer(ctx context.Context, dockerCli command.Cli, containerConfig } } - for _, warning := range response.Warnings { - fmt.Fprintf(dockerCli.Err(), "WARNING: %s\n", warning) + for _, w := range response.Warnings { + fmt.Fprintf(dockerCli.Err(), "WARNING: %s\n", w) } err = containerIDFile.Write(response.ID) return &response, err diff --git a/cli/command/container/opts_test.go b/cli/command/container/opts_test.go index 6421f80a70..1d2514e3d0 100644 --- a/cli/command/container/opts_test.go +++ b/cli/command/container/opts_test.go @@ -49,11 +49,11 @@ func parseRun(args []string) (*container.Config, *container.HostConfig, *network return nil, nil, nil, err } // TODO: fix tests to accept ContainerConfig - containerConfig, err := parse(flags, copts, runtime.GOOS) + containerCfg, err := parse(flags, copts, runtime.GOOS) if err != nil { return nil, nil, nil, err } - return containerConfig.Config, containerConfig.HostConfig, containerConfig.NetworkingConfig, err + return containerCfg.Config, containerCfg.HostConfig, containerCfg.NetworkingConfig, err } func setupRunFlags() (*pflag.FlagSet, *containerOptions) { diff --git a/cli/command/container/run.go b/cli/command/container/run.go index fd4dccae0b..c7e680e763 100644 --- a/cli/command/container/run.go +++ b/cli/command/container/run.go @@ -105,22 +105,22 @@ func runRun(dockerCli command.Cli, flags *pflag.FlagSet, ropts *runOptions, copt } } copts.env = *opts.NewListOptsRef(&newEnv, nil) - containerConfig, err := parse(flags, copts, dockerCli.ServerInfo().OSType) + containerCfg, err := parse(flags, copts, dockerCli.ServerInfo().OSType) // just in case the parse does not exit if err != nil { reportError(dockerCli.Err(), "run", err.Error(), true) return cli.StatusError{StatusCode: 125} } - if err = validateAPIVersion(containerConfig, dockerCli.CurrentVersion()); err != nil { + if err = validateAPIVersion(containerCfg, dockerCli.CurrentVersion()); err != nil { reportError(dockerCli.Err(), "run", err.Error(), true) return cli.StatusError{StatusCode: 125} } - return runContainer(dockerCli, ropts, copts, containerConfig) + return runContainer(dockerCli, ropts, copts, containerCfg) } //nolint:gocyclo -func runContainer(dockerCli command.Cli, opts *runOptions, copts *containerOptions, containerConfig *containerConfig) error { - config := containerConfig.Config +func runContainer(dockerCli command.Cli, opts *runOptions, copts *containerOptions, containerCfg *containerConfig) error { + config := containerCfg.Config stdout, stderr := dockerCli.Out(), dockerCli.Err() client := dockerCli.Client() @@ -144,7 +144,7 @@ func runContainer(dockerCli command.Cli, opts *runOptions, copts *containerOptio ctx, cancelFun := context.WithCancel(context.Background()) defer cancelFun() - createResponse, err := createContainer(ctx, dockerCli, containerConfig, &opts.createOptions) + createResponse, err := createContainer(ctx, dockerCli, containerCfg, &opts.createOptions) if err != nil { reportError(stderr, "run", err.Error(), true) return runStartContainerErr(err)