remove redundant closures around completion functions

These were remnants from some earlier implementation.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

cli/command/config/inspect.go

@@ -32,9 +32,7 @@ func newConfigInspectCommand(dockerCLI command.Cli) *cobra.Command {
 			opts.names = args
 			return runInspect(cmd.Context(), dockerCLI, opts)
 		},
-		ValidArgsFunction: func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
-			return completeNames(dockerCLI)(cmd, args, toComplete)
-		},
+		ValidArgsFunction:     completeNames(dockerCLI),
 		DisableFlagsInUseLine: true,
 	}
 

cli/command/config/remove.go

@@ -19,9 +19,7 @@ func newConfigRemoveCommand(dockerCLI command.Cli) *cobra.Command {
 		RunE: func(cmd *cobra.Command, args []string) error {
 			return runRemove(cmd.Context(), dockerCLI, args)
 		},
-		ValidArgsFunction: func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
-			return completeNames(dockerCLI)(cmd, args, toComplete)
-		},
+		ValidArgsFunction:     completeNames(dockerCLI),
 		DisableFlagsInUseLine: true,
 	}
 }

cli/command/secret/inspect.go

@@ -31,9 +31,7 @@ func newSecretInspectCommand(dockerCLI command.Cli) *cobra.Command {
 			opts.names = args
 			return runSecretInspect(cmd.Context(), dockerCLI, opts)
 		},
-		ValidArgsFunction: func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
-			return completeNames(dockerCLI)(cmd, args, toComplete)
-		},
+		ValidArgsFunction:     completeNames(dockerCLI),
 		DisableFlagsInUseLine: true,
 	}
 

cli/command/secret/ls.go

@@ -31,9 +31,7 @@ func newSecretListCommand(dockerCLI command.Cli) *cobra.Command {
 		RunE: func(cmd *cobra.Command, args []string) error {
 			return runSecretList(cmd.Context(), dockerCLI, options)
 		},
-		ValidArgsFunction: func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
-			return completeNames(dockerCLI)(cmd, args, toComplete)
-		},
+		ValidArgsFunction:     completeNames(dockerCLI),
 		DisableFlagsInUseLine: true,
 	}
 

cli/command/secret/remove.go

@@ -26,9 +26,7 @@ func newSecretRemoveCommand(dockerCLI command.Cli) *cobra.Command {
 			}
 			return runRemove(cmd.Context(), dockerCLI, opts)
 		},
-		ValidArgsFunction: func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
-			return completeNames(dockerCLI)(cmd, args, toComplete)
-		},
+		ValidArgsFunction:     completeNames(dockerCLI),
 		DisableFlagsInUseLine: true,
 	}
 }

cli/command/stack/deploy.go

@@ -45,9 +45,7 @@ func newDeployCommand(dockerCLI command.Cli) *cobra.Command {
 			}
 			return runDeploy(cmd.Context(), dockerCLI, cmd.Flags(), &opts, config)
 		},
-		ValidArgsFunction: func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
-			return completeNames(dockerCLI)(cmd, args, toComplete)
-		},
+		ValidArgsFunction:     completeNames(dockerCLI),
 		DisableFlagsInUseLine: true,
 	}
 

cli/command/stack/ps.go

@@ -38,9 +38,7 @@ func newPsCommand(dockerCLI command.Cli) *cobra.Command {
 			}
 			return runPS(cmd.Context(), dockerCLI, opts)
 		},
-		ValidArgsFunction: func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
-			return completeNames(dockerCLI)(cmd, args, toComplete)
-		},
+		ValidArgsFunction:     completeNames(dockerCLI),
 		DisableFlagsInUseLine: true,
 	}
 	flags := cmd.Flags()

cli/command/stack/remove.go

@@ -36,9 +36,7 @@ func newRemoveCommand(dockerCLI command.Cli) *cobra.Command {
 			}
 			return runRemove(cmd.Context(), dockerCLI, opts)
 		},
-		ValidArgsFunction: func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
-			return completeNames(dockerCLI)(cmd, args, toComplete)
-		},
+		ValidArgsFunction:     completeNames(dockerCLI),
 		DisableFlagsInUseLine: true,
 	}
 

cli/command/stack/services.go

@@ -38,9 +38,7 @@ func newServicesCommand(dockerCLI command.Cli) *cobra.Command {
 			}
 			return runServices(cmd.Context(), dockerCLI, opts)
 		},
-		ValidArgsFunction: func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
-			return completeNames(dockerCLI)(cmd, args, toComplete)
-		},
+		ValidArgsFunction:     completeNames(dockerCLI),
 		DisableFlagsInUseLine: true,
 	}
 	flags := cmd.Flags()