remove redundant closures around completion functions

thaJeztah · thaJeztah · commit 1336f51e6a67 · 2025-09-10T11:40:42.000+02:00
These were remnants from some earlier implementation.

Signed-off-by: Sebastiaan van Stijn &lt;github@gone.nl&gt;
diff --git a/cli/command/config/inspect.go b/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,
 	}
 
diff --git a/cli/command/config/remove.go b/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,
 	}
 }
diff --git a/cli/command/secret/inspect.go b/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,
 	}
 
diff --git a/cli/command/secret/ls.go b/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,
 	}
 
diff --git a/cli/command/secret/remove.go b/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,
 	}
 }
diff --git a/cli/command/stack/deploy.go b/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,
 	}
 
diff --git a/cli/command/stack/ps.go b/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()
diff --git a/cli/command/stack/remove.go b/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,
 	}
 
diff --git a/cli/command/stack/services.go b/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()

Original file line number	Diff line number	Diff line change
`@@ -19,9 +19,7 @@ func newConfigRemoveCommand(dockerCLI command.Cli) *cobra.Command {`
`19`	`19`	`RunE: func(cmd *cobra.Command, args []string) error {`
`20`	`20`	`return runRemove(cmd.Context(), dockerCLI, args)`
`21`	`21`	`},`
`22`		`- ValidArgsFunction: func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {`
`23`		`- return completeNames(dockerCLI)(cmd, args, toComplete)`
`24`		`- },`
	`22`	`+ ValidArgsFunction: completeNames(dockerCLI),`
`25`	`23`	`DisableFlagsInUseLine: true,`
`26`	`24`	`}`
`27`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,9 +26,7 @@ func newSecretRemoveCommand(dockerCLI command.Cli) *cobra.Command {`
`26`	`26`	`}`
`27`	`27`	`return runRemove(cmd.Context(), dockerCLI, opts)`
`28`	`28`	`},`
`29`		`- ValidArgsFunction: func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {`
`30`		`- return completeNames(dockerCLI)(cmd, args, toComplete)`
`31`		`- },`
	`29`	`+ ValidArgsFunction: completeNames(dockerCLI),`
`32`	`30`	`DisableFlagsInUseLine: true,`
`33`	`31`	`}`
`34`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,9 +45,7 @@ func newDeployCommand(dockerCLI command.Cli) *cobra.Command {`
`45`	`45`	`}`
`46`	`46`	`return runDeploy(cmd.Context(), dockerCLI, cmd.Flags(), &opts, config)`
`47`	`47`	`},`
`48`		`- ValidArgsFunction: func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {`
`49`		`- return completeNames(dockerCLI)(cmd, args, toComplete)`
`50`		`- },`
	`48`	`+ ValidArgsFunction: completeNames(dockerCLI),`
`51`	`49`	`DisableFlagsInUseLine: true,`
`52`	`50`	`}`
`53`	`51`
Original file line number	Diff line number	Diff line change
`@@ -38,9 +38,7 @@ func newPsCommand(dockerCLI command.Cli) *cobra.Command {`
`38`	`38`	`}`
`39`	`39`	`return runPS(cmd.Context(), dockerCLI, opts)`
`40`	`40`	`},`
`41`		`- ValidArgsFunction: func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {`
`42`		`- return completeNames(dockerCLI)(cmd, args, toComplete)`
`43`		`- },`
	`41`	`+ ValidArgsFunction: completeNames(dockerCLI),`
`44`	`42`	`DisableFlagsInUseLine: true,`
`45`	`43`	`}`
`46`	`44`	`flags := cmd.Flags()`
Original file line number	Diff line number	Diff line change
`@@ -36,9 +36,7 @@ func newRemoveCommand(dockerCLI command.Cli) *cobra.Command {`
`36`	`36`	`}`
`37`	`37`	`return runRemove(cmd.Context(), dockerCLI, opts)`
`38`	`38`	`},`
`39`		`- ValidArgsFunction: func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {`
`40`		`- return completeNames(dockerCLI)(cmd, args, toComplete)`
`41`		`- },`
	`39`	`+ ValidArgsFunction: completeNames(dockerCLI),`
`42`	`40`	`DisableFlagsInUseLine: true,`
`43`	`41`	`}`
`44`	`42`
Original file line number	Diff line number	Diff line change
`@@ -38,9 +38,7 @@ func newServicesCommand(dockerCLI command.Cli) *cobra.Command {`
`38`	`38`	`}`
`39`	`39`	`return runServices(cmd.Context(), dockerCLI, opts)`
`40`	`40`	`},`
`41`		`- ValidArgsFunction: func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {`
`42`		`- return completeNames(dockerCLI)(cmd, args, toComplete)`
`43`		`- },`
	`41`	`+ ValidArgsFunction: completeNames(dockerCLI),`
`44`	`42`	`DisableFlagsInUseLine: true,`
`45`	`43`	`}`
`46`	`44`	`flags := cmd.Flags()`