Use command.Cli instead of command.DockerCli

Ian Campbell · Ian Campbell · commit 7d0645c5fe81 · 2019-04-26T15:43:03.000+01:00
The linter is complaining:

    cmd/docker/docker.go:72:23:warning: dockerCli can be github.com/docker/cli/cli/command.Cli (interfacer)

Unclear precisely which change in the preceeding commits caused it to notice
this possibility.

Signed-off-by: Ian Campbell &lt;ijc@docker.com&gt;
diff --git a/cmd/docker/docker.go b/cmd/docker/docker.go
@@ -69,7 +69,7 @@ func newDockerCommand(dockerCli *command.DockerCli) *cli.TopLevelCommand {
 	return cli.NewTopLevelCommand(cmd, dockerCli, opts, flags)
 }
 
-func setFlagErrorFunc(dockerCli *command.DockerCli, cmd *cobra.Command) {
+func setFlagErrorFunc(dockerCli command.Cli, cmd *cobra.Command) {
 	// When invoking `docker stack --nonsense`, we need to make sure FlagErrorFunc return appropriate
 	// output if the feature is not supported.
 	// As above cli.SetupRootCommand(cmd) have already setup the FlagErrorFunc, we will add a pre-check before the FlagErrorFunc

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ func newDockerCommand(dockerCli command.DockerCli) cli.TopLevelCommand {`
`69`	`69`	`return cli.NewTopLevelCommand(cmd, dockerCli, opts, flags)`
`70`	`70`	`}`
`71`	`71`
`72`		`-func setFlagErrorFunc(dockerCli command.DockerCli, cmd cobra.Command) {`
	`72`	`+func setFlagErrorFunc(dockerCli command.Cli, cmd *cobra.Command) {`
`73`	`73`	// When invoking `docker stack --nonsense`, we need to make sure FlagErrorFunc return appropriate
`74`	`74`	`// output if the feature is not supported.`
`75`	`75`	`// As above cli.SetupRootCommand(cmd) have already setup the FlagErrorFunc, we will add a pre-check before the FlagErrorFunc`