From 740d260cd22dc144f905a33eb4db5da04fbbd8bb Mon Sep 17 00:00:00 2001 From: Vincent Demeester Date: Mon, 23 Apr 2018 14:57:29 +0200 Subject: [PATCH] Remove more TODOs - Some of them don't make sense anymore - Some are deprecated and removed from the engine since a few versions already. Signed-off-by: Vincent Demeester --- cli/command/container/run.go | 7 ++----- cli/command/plugin/install.go | 5 ++--- cli/command/plugin/remove.go | 1 - cli/command/system/info.go | 15 --------------- 4 files changed, 4 insertions(+), 24 deletions(-) diff --git a/cli/command/container/run.go b/cli/command/container/run.go index 10b7ab8d9a..5458f58f1a 100644 --- a/cli/command/container/run.go +++ b/cli/command/container/run.go @@ -124,9 +124,6 @@ func runContainer(dockerCli command.Cli, opts *runOptions, copts *containerOptio stdout, stderr := dockerCli.Out(), dockerCli.Err() client := dockerCli.Client() - // TODO: pass this as an argument - cmdPath := "run" - warnOnOomKillDisable(*hostConfig, stderr) warnOnLocalhostDNS(*hostConfig, stderr) @@ -163,7 +160,7 @@ func runContainer(dockerCli command.Cli, opts *runOptions, copts *containerOptio createResponse, err := createContainer(ctx, dockerCli, containerConfig, &opts.createOptions) if err != nil { - reportError(stderr, cmdPath, err.Error(), true) + reportError(stderr, "run", err.Error(), true) return runStartContainerErr(err) } if opts.sigProxy { @@ -209,7 +206,7 @@ func runContainer(dockerCli command.Cli, opts *runOptions, copts *containerOptio <-errCh } - reportError(stderr, cmdPath, err.Error(), false) + reportError(stderr, "run", err.Error(), false) if copts.autoRemove { // wait container to be removed <-statusChan diff --git a/cli/command/plugin/install.go b/cli/command/plugin/install.go index 40be773bc3..88fecbfda0 100644 --- a/cli/command/plugin/install.go +++ b/cli/command/plugin/install.go @@ -124,9 +124,8 @@ func buildPullConfig(ctx context.Context, dockerCli command.Cli, opts pluginOpti Disabled: opts.disable, AcceptAllPermissions: opts.grantPerms, AcceptPermissionsFunc: acceptPrivileges(dockerCli, opts.remote), - // TODO: Rename PrivilegeFunc, it has nothing to do with privileges - PrivilegeFunc: registryAuthFunc, - Args: opts.args, + PrivilegeFunc: registryAuthFunc, + Args: opts.args, } return options, nil } diff --git a/cli/command/plugin/remove.go b/cli/command/plugin/remove.go index 3513004211..e701baa850 100644 --- a/cli/command/plugin/remove.go +++ b/cli/command/plugin/remove.go @@ -40,7 +40,6 @@ func runRemove(dockerCli command.Cli, opts *rmOptions) error { var errs cli.Errors for _, name := range opts.plugins { - // TODO: pass names to api instead of making multiple api calls if err := dockerCli.Client().PluginRemove(ctx, name, types.PluginRemoveOptions{Force: opts.force}); err != nil { errs = append(errs, err) continue diff --git a/cli/command/system/info.go b/cli/command/system/info.go index 022bd881a0..5e6171db7d 100644 --- a/cli/command/system/info.go +++ b/cli/command/system/info.go @@ -176,21 +176,6 @@ func prettyPrintInfo(dockerCli command.Cli, info types.Info) error { for _, lbl := range info.Labels { fmt.Fprintln(dockerCli.Out(), " "+lbl) } - // TODO: Engine labels with duplicate keys has been deprecated in 1.13 and will be error out - // after 3 release cycles (17.12). For now, a WARNING will be generated. The following will - // be removed eventually. - labelMap := map[string]string{} - for _, label := range info.Labels { - stringSlice := strings.SplitN(label, "=", 2) - if len(stringSlice) > 1 { - // If there is a conflict we will throw out a warning - if v, ok := labelMap[stringSlice[0]]; ok && v != stringSlice[1] { - fmt.Fprintln(dockerCli.Err(), "WARNING: labels with duplicate keys and conflicting values have been deprecated") - break - } - labelMap[stringSlice[0]] = stringSlice[1] - } - } } fmt.Fprintln(dockerCli.Out(), "Experimental:", info.ExperimentalBuild)