Rename completion.ShellCompleteX methods to completion.X

apostasie · apostasie · commit d2741bafca3c · 2024-09-02T08:38:41.000-07:00
Signed-off-by: apostasie &lt;spam_blackhole@farcloser.world&gt;
diff --git a/cmd/nerdctl/apparmor_unload_linux.go b/cmd/nerdctl/apparmor_unload_linux.go
@@ -48,5 +48,5 @@ func apparmorUnloadAction(cmd *cobra.Command, args []string) error {
 }
 
 func apparmorUnloadShellComplete(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
-	return completion.ShellCompleteApparmorProfiles(cmd)
+	return completion.ApparmorProfiles(cmd)
 }
diff --git a/cmd/nerdctl/builder_build.go b/cmd/nerdctl/builder_build.go
@@ -73,7 +73,7 @@ If Dockerfile is not present and -f is not specified, it will look for Container
 	// #region platform flags
 	// platform is defined as StringSlice, not StringArray, to allow specifying "--platform=amd64,arm64"
 	buildCommand.Flags().StringSlice("platform", []string{}, "Set target platform for build (e.g., \"amd64\", \"arm64\")")
-	buildCommand.RegisterFlagCompletionFunc("platform", completion.ShellCompletePlatforms)
+	buildCommand.RegisterFlagCompletionFunc("platform", completion.Platforms)
 	buildCommand.Flags().StringArray("build-context", []string{}, "Additional build contexts (e.g., name=path)")
 	// #endregion
 
diff --git a/cmd/nerdctl/completion/completion.go b/cmd/nerdctl/completion/completion.go
@@ -33,7 +33,7 @@ import (
 	"github.com/containerd/nerdctl/v2/pkg/netutil"
 )
 
-func ShellCompleteImageNames(cmd *cobra.Command) ([]string, cobra.ShellCompDirective) {
+func ImageNames(cmd *cobra.Command) ([]string, cobra.ShellCompDirective) {
 	globalOptions, err := helpers.ProcessRootCmdFlags(cmd)
 	if err != nil {
 		return nil, cobra.ShellCompDirectiveError
@@ -56,7 +56,7 @@ func ShellCompleteImageNames(cmd *cobra.Command) ([]string, cobra.ShellCompDirec
 	return candidates, cobra.ShellCompDirectiveNoFileComp
 }
 
-func ShellCompleteContainerNames(cmd *cobra.Command, filterFunc func(containerd.ProcessStatus) bool) ([]string, cobra.ShellCompDirective) {
+func ContainerNames(cmd *cobra.Command, filterFunc func(containerd.ProcessStatus) bool) ([]string, cobra.ShellCompDirective) {
 	globalOptions, err := helpers.ProcessRootCmdFlags(cmd)
 	if err != nil {
 		return nil, cobra.ShellCompDirectiveError
@@ -104,8 +104,8 @@ func ShellCompleteContainerNames(cmd *cobra.Command, filterFunc func(containerd.
 	return candidates, cobra.ShellCompDirectiveNoFileComp
 }
 
-// ShellCompleteNetworkNames includes {"bridge","host","none"}
-func ShellCompleteNetworkNames(cmd *cobra.Command, exclude []string) ([]string, cobra.ShellCompDirective) {
+// NetworkNames includes {"bridge","host","none"}
+func NetworkNames(cmd *cobra.Command, exclude []string) ([]string, cobra.ShellCompDirective) {
 	globalOptions, err := helpers.ProcessRootCmdFlags(cmd)
 	if err != nil {
 		return nil, cobra.ShellCompDirectiveError
@@ -137,7 +137,7 @@ func ShellCompleteNetworkNames(cmd *cobra.Command, exclude []string) ([]string,
 	return candidates, cobra.ShellCompDirectiveNoFileComp
 }
 
-func ShellCompleteVolumeNames(cmd *cobra.Command) ([]string, cobra.ShellCompDirective) {
+func VolumeNames(cmd *cobra.Command) ([]string, cobra.ShellCompDirective) {
 	globalOptions, err := helpers.ProcessRootCmdFlags(cmd)
 	if err != nil {
 		return nil, cobra.ShellCompDirectiveError
@@ -153,7 +153,7 @@ func ShellCompleteVolumeNames(cmd *cobra.Command) ([]string, cobra.ShellCompDire
 	return candidates, cobra.ShellCompDirectiveNoFileComp
 }
 
-func ShellCompletePlatforms(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
+func Platforms(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
 	candidates := []string{
 		"amd64",
 		"arm64",
diff --git a/cmd/nerdctl/completion/completion_freebsd.go b/cmd/nerdctl/completion/completion_freebsd.go
@@ -18,6 +18,6 @@ package completion
 
 import "github.com/spf13/cobra"
 
-func ShellCompleteCgroupManagerNames(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
+func CgroupManagerNames(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
 	return nil, cobra.ShellCompDirectiveNoFileComp
 }
diff --git a/cmd/nerdctl/completion/completion_linux.go b/cmd/nerdctl/completion/completion_linux.go
@@ -24,7 +24,7 @@ import (
 	"github.com/containerd/nerdctl/v2/pkg/rootlessutil"
 )
 
-func ShellCompleteApparmorProfiles(cmd *cobra.Command) ([]string, cobra.ShellCompDirective) {
+func ApparmorProfiles(cmd *cobra.Command) ([]string, cobra.ShellCompDirective) {
 	profiles, err := apparmorutil.Profiles()
 	if err != nil {
 		return nil, cobra.ShellCompDirectiveError
@@ -36,7 +36,7 @@ func ShellCompleteApparmorProfiles(cmd *cobra.Command) ([]string, cobra.ShellCom
 	return names, cobra.ShellCompDirectiveNoFileComp
 }
 
-func ShellCompleteCgroupManagerNames(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
+func CgroupManagerNames(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
 	candidates := []string{"cgroupfs"}
 	if ncdefaults.IsSystemdAvailable() {
 		candidates = append(candidates, "systemd")
diff --git a/cmd/nerdctl/completion/completion_unix.go b/cmd/nerdctl/completion/completion_unix.go
@@ -29,16 +29,16 @@ import (
 	"github.com/containerd/nerdctl/v2/pkg/rootlessutil"
 )
 
-func ShellCompleteNetworkDrivers(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
+func NetworkDrivers(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
 	candidates := []string{"bridge", "macvlan", "ipvlan"}
 	return candidates, cobra.ShellCompDirectiveNoFileComp
 }
 
-func ShellCompleteIPAMDrivers(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
+func IPAMDrivers(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
 	return []string{"default", "host-local", "dhcp"}, cobra.ShellCompDirectiveNoFileComp
 }
 
-func ShellCompleteNamespaceNames(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
+func NamespaceNames(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
 	globalOptions, err := helpers.ProcessRootCmdFlags(cmd)
 	if err != nil {
 		return nil, cobra.ShellCompDirectiveError
@@ -64,7 +64,7 @@ func ShellCompleteNamespaceNames(cmd *cobra.Command, args []string, toComplete s
 	return candidates, cobra.ShellCompDirectiveNoFileComp
 }
 
-func ShellCompleteSnapshotterNames(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
+func SnapshotterNames(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
 	globalOptions, err := helpers.ProcessRootCmdFlags(cmd)
 	if err != nil {
 		return nil, cobra.ShellCompDirectiveError
diff --git a/cmd/nerdctl/completion/completion_windows.go b/cmd/nerdctl/completion/completion_windows.go
@@ -18,23 +18,23 @@ package completion
 
 import "github.com/spf13/cobra"
 
-func ShellCompleteNamespaceNames(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
+func NamespaceNames(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
 	return nil, cobra.ShellCompDirectiveNoFileComp
 }
 
-func ShellCompleteSnapshotterNames(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
+func SnapshotterNames(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
 	return nil, cobra.ShellCompDirectiveNoFileComp
 }
 
-func ShellCompleteCgroupManagerNames(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
+func CgroupManagerNames(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
 	return nil, cobra.ShellCompDirectiveNoFileComp
 }
 
-func ShellCompleteNetworkDrivers(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
+func NetworkDrivers(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
 	candidates := []string{"nat"}
 	return candidates, cobra.ShellCompDirectiveNoFileComp
 }
 
-func ShellCompleteIPAMDrivers(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
+func IPAMDrivers(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
 	return []string{"default"}, cobra.ShellCompDirectiveNoFileComp
 }
diff --git a/cmd/nerdctl/container_attach.go b/cmd/nerdctl/container_attach.go
@@ -96,5 +96,5 @@ func attachShellComplete(cmd *cobra.Command, args []string, toComplete string) (
 	statusFilterFn := func(st containerd.ProcessStatus) bool {
 		return st == containerd.Running
 	}
-	return completion.ShellCompleteContainerNames(cmd, statusFilterFn)
+	return completion.ContainerNames(cmd, statusFilterFn)
 }
diff --git a/cmd/nerdctl/container_commit.go b/cmd/nerdctl/container_commit.go
@@ -94,7 +94,7 @@ func commitAction(cmd *cobra.Command, args []string) error {
 
 func commitShellComplete(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
 	if len(args) == 0 {
-		return completion.ShellCompleteContainerNames(cmd, nil)
+		return completion.ContainerNames(cmd, nil)
 	}
 	return nil, cobra.ShellCompDirectiveNoFileComp
 }
diff --git a/cmd/nerdctl/container_diff.go b/cmd/nerdctl/container_diff.go
@@ -227,5 +227,5 @@ func appendChanges(changes []fs.Change, new fs.Change) []fs.Change {
 
 func diffShellComplete(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
 	// show container names
-	return completion.ShellCompleteContainerNames(cmd, nil)
+	return completion.ContainerNames(cmd, nil)
 }
diff --git a/cmd/nerdctl/container_exec.go b/cmd/nerdctl/container_exec.go
@@ -158,7 +158,7 @@ func execShellComplete(cmd *cobra.Command, args []string, toComplete string) ([]
 		statusFilterFn := func(st containerd.ProcessStatus) bool {
 			return st == containerd.Running
 		}
-		return completion.ShellCompleteContainerNames(cmd, statusFilterFn)
+		return completion.ContainerNames(cmd, statusFilterFn)
 	}
 	return nil, cobra.ShellCompDirectiveNoFileComp
 }
diff --git a/cmd/nerdctl/container_inspect.go b/cmd/nerdctl/container_inspect.go
@@ -105,5 +105,5 @@ func containerInspectAction(cmd *cobra.Command, args []string) error {
 
 func containerInspectShellComplete(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
 	// show container names
-	return completion.ShellCompleteContainerNames(cmd, nil)
+	return completion.ContainerNames(cmd, nil)
 }
diff --git a/cmd/nerdctl/container_kill.go b/cmd/nerdctl/container_kill.go
@@ -72,5 +72,5 @@ func killShellComplete(cmd *cobra.Command, _ []string, _ string) ([]string, cobr
 	statusFilterFn := func(st containerd.ProcessStatus) bool {
 		return st != containerd.Stopped && st != containerd.Created && st != containerd.Unknown
 	}
-	return completion.ShellCompleteContainerNames(cmd, statusFilterFn)
+	return completion.ContainerNames(cmd, statusFilterFn)
 }
diff --git a/cmd/nerdctl/container_logs.go b/cmd/nerdctl/container_logs.go
@@ -117,7 +117,7 @@ func logsAction(cmd *cobra.Command, args []string) error {
 
 func logsShellComplete(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
 	// show container names (TODO: only show containers with logs)
-	return completion.ShellCompleteContainerNames(cmd, nil)
+	return completion.ContainerNames(cmd, nil)
 }
 
 // Attempts to parse the argument given to `-n/--tail` as a uint.
diff --git a/cmd/nerdctl/container_pause.go b/cmd/nerdctl/container_pause.go
@@ -72,5 +72,5 @@ func pauseShellComplete(cmd *cobra.Command, args []string, toComplete string) ([
 	statusFilterFn := func(st containerd.ProcessStatus) bool {
 		return st == containerd.Running
 	}
-	return completion.ShellCompleteContainerNames(cmd, statusFilterFn)
+	return completion.ContainerNames(cmd, statusFilterFn)
 }
diff --git a/cmd/nerdctl/container_port.go b/cmd/nerdctl/container_port.go
@@ -101,5 +101,5 @@ func portAction(cmd *cobra.Command, args []string) error {
 }
 
 func portShellComplete(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
-	return completion.ShellCompleteContainerNames(cmd, nil)
+	return completion.ContainerNames(cmd, nil)
 }
diff --git a/cmd/nerdctl/container_remove.go b/cmd/nerdctl/container_remove.go
@@ -73,5 +73,5 @@ func rmAction(cmd *cobra.Command, args []string) error {
 
 func rmShellComplete(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
 	// show container names
-	return completion.ShellCompleteContainerNames(cmd, nil)
+	return completion.ContainerNames(cmd, nil)
 }
diff --git a/cmd/nerdctl/container_rename.go b/cmd/nerdctl/container_rename.go
@@ -63,5 +63,5 @@ func renameAction(cmd *cobra.Command, args []string) error {
 	return container.Rename(ctx, client, args[0], args[1], options)
 }
 func renameShellComplete(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
-	return completion.ShellCompleteContainerNames(cmd, nil)
+	return completion.ContainerNames(cmd, nil)
 }
diff --git a/cmd/nerdctl/container_run.go b/cmd/nerdctl/container_run.go
@@ -106,18 +106,18 @@ func setCreateFlags(cmd *cobra.Command) {
 
 	// #region platform flags
 	cmd.Flags().String("platform", "", "Set platform (e.g. \"amd64\", \"arm64\")") // not a slice, and there is no --all-platforms
-	cmd.RegisterFlagCompletionFunc("platform", completion.ShellCompletePlatforms)
+	cmd.RegisterFlagCompletionFunc("platform", completion.Platforms)
 	// #endregion
 
 	// #region network flags
 	// network (net) is defined as StringSlice, not StringArray, to allow specifying "--network=cni1,cni2"
 	cmd.Flags().StringSlice("network", []string{netutil.DefaultNetworkName}, `Connect a container to a network ("bridge"|"host"|"none"|"container:<container>"|<CNI>)`)
 	cmd.RegisterFlagCompletionFunc("network", func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
-		return completion.ShellCompleteNetworkNames(cmd, []string{})
+		return completion.NetworkNames(cmd, []string{})
 	})
 	cmd.Flags().StringSlice("net", []string{netutil.DefaultNetworkName}, `Connect a container to a network ("bridge"|"host"|"none"|<CNI>)`)
 	cmd.RegisterFlagCompletionFunc("net", func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
-		return completion.ShellCompleteNetworkNames(cmd, []string{})
+		return completion.NetworkNames(cmd, []string{})
 	})
 	// dns is defined as StringSlice, not StringArray, to allow specifying "--dns=1.1.1.1,8.8.8.8" (compatible with Podman)
 	cmd.Flags().StringSlice("dns", nil, "Set custom DNS servers")
diff --git a/cmd/nerdctl/container_run_linux.go b/cmd/nerdctl/container_run_linux.go
@@ -38,7 +38,7 @@ func capShellComplete(cmd *cobra.Command, args []string, toComplete string) ([]s
 
 func runShellComplete(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
 	if len(args) == 0 {
-		return completion.ShellCompleteImageNames(cmd)
+		return completion.ImageNames(cmd)
 	}
 	return nil, cobra.ShellCompDirectiveNoFileComp
 }
diff --git a/cmd/nerdctl/container_start.go b/cmd/nerdctl/container_start.go
@@ -88,5 +88,5 @@ func startShellComplete(cmd *cobra.Command, args []string, toComplete string) ([
 	statusFilterFn := func(st containerd.ProcessStatus) bool {
 		return st != containerd.Running && st != containerd.Unknown
 	}
-	return completion.ShellCompleteContainerNames(cmd, statusFilterFn)
+	return completion.ContainerNames(cmd, statusFilterFn)
 }
diff --git a/cmd/nerdctl/container_stats.go b/cmd/nerdctl/container_stats.go
@@ -107,5 +107,5 @@ func statsShellComplete(cmd *cobra.Command, args []string, toComplete string) ([
 	statusFilterFn := func(st containerd.ProcessStatus) bool {
 		return st == containerd.Running
 	}
-	return completion.ShellCompleteContainerNames(cmd, statusFilterFn)
+	return completion.ContainerNames(cmd, statusFilterFn)
 }
diff --git a/cmd/nerdctl/container_stop.go b/cmd/nerdctl/container_stop.go
@@ -86,5 +86,5 @@ func stopShellComplete(cmd *cobra.Command, args []string, toComplete string) ([]
 	statusFilterFn := func(st containerd.ProcessStatus) bool {
 		return st != containerd.Stopped && st != containerd.Created && st != containerd.Unknown
 	}
-	return completion.ShellCompleteContainerNames(cmd, statusFilterFn)
+	return completion.ContainerNames(cmd, statusFilterFn)
 }
diff --git a/cmd/nerdctl/container_top.go b/cmd/nerdctl/container_top.go
@@ -78,5 +78,5 @@ func topShellComplete(cmd *cobra.Command, args []string, toComplete string) ([]s
 	statusFilterFn := func(st containerd.ProcessStatus) bool {
 		return st == containerd.Running
 	}
-	return completion.ShellCompleteContainerNames(cmd, statusFilterFn)
+	return completion.ContainerNames(cmd, statusFilterFn)
 }
diff --git a/cmd/nerdctl/container_unpause.go b/cmd/nerdctl/container_unpause.go
@@ -72,5 +72,5 @@ func unpauseShellComplete(cmd *cobra.Command, args []string, toComplete string)
 	statusFilterFn := func(st containerd.ProcessStatus) bool {
 		return st == containerd.Paused
 	}
-	return completion.ShellCompleteContainerNames(cmd, statusFilterFn)
+	return completion.ContainerNames(cmd, statusFilterFn)
 }
diff --git a/cmd/nerdctl/container_update.go b/cmd/nerdctl/container_update.go
@@ -399,5 +399,5 @@ func copySpec(spec *runtimespec.Spec) (*runtimespec.Spec, error) {
 }
 
 func updateShellComplete(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
-	return completion.ShellCompleteContainerNames(cmd, nil)
+	return completion.ContainerNames(cmd, nil)
 }
diff --git a/cmd/nerdctl/container_wait.go b/cmd/nerdctl/container_wait.go
@@ -72,5 +72,5 @@ func waitShellComplete(cmd *cobra.Command, args []string, toComplete string) ([]
 	statusFilterFn := func(st containerd.ProcessStatus) bool {
 		return st == containerd.Running
 	}
-	return completion.ShellCompleteContainerNames(cmd, statusFilterFn)
+	return completion.ContainerNames(cmd, statusFilterFn)
 }
diff --git a/cmd/nerdctl/image_convert.go b/cmd/nerdctl/image_convert.go
@@ -97,7 +97,7 @@ func newImageConvertCommand() *cobra.Command {
 	// #region platform flags
 	// platform is defined as StringSlice, not StringArray, to allow specifying "--platform=amd64,arm64"
 	imageConvertCommand.Flags().StringSlice("platform", []string{}, "Convert content for a specific platform")
-	imageConvertCommand.RegisterFlagCompletionFunc("platform", completion.ShellCompletePlatforms)
+	imageConvertCommand.RegisterFlagCompletionFunc("platform", completion.Platforms)
 	imageConvertCommand.Flags().Bool("all-platforms", false, "Convert content for all platforms")
 	// #endregion
 
@@ -299,5 +299,5 @@ func imageConvertAction(cmd *cobra.Command, args []string) error {
 
 func imageConvertShellComplete(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
 	// show image names
-	return completion.ShellCompleteImageNames(cmd)
+	return completion.ImageNames(cmd)
 }
diff --git a/cmd/nerdctl/image_cryptutil.go b/cmd/nerdctl/image_cryptutil.go
@@ -38,7 +38,7 @@ func registerImgcryptFlags(cmd *cobra.Command, encrypt bool) {
 	// #region platform flags
 	// platform is defined as StringSlice, not StringArray, to allow specifying "--platform=amd64,arm64"
 	flags.StringSlice("platform", []string{}, "Convert content for a specific platform")
-	cmd.RegisterFlagCompletionFunc("platform", completion.ShellCompletePlatforms)
+	cmd.RegisterFlagCompletionFunc("platform", completion.Platforms)
 	flags.Bool("all-platforms", false, "Convert content for all platforms")
 	// #endregion
 
@@ -125,5 +125,5 @@ func getImgcryptAction(encrypt bool) func(cmd *cobra.Command, args []string) err
 
 func imgcryptShellComplete(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
 	// show image names
-	return completion.ShellCompleteImageNames(cmd)
+	return completion.ImageNames(cmd)
 }
diff --git a/cmd/nerdctl/image_history.go b/cmd/nerdctl/image_history.go
@@ -272,5 +272,5 @@ func (x *historyPrinter) printHistory(printable historyPrintable) error {
 
 func historyShellComplete(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
 	// show image names
-	return completion.ShellCompleteImageNames(cmd)
+	return completion.ImageNames(cmd)
 }
diff --git a/cmd/nerdctl/image_inspect.go b/cmd/nerdctl/image_inspect.go
@@ -48,7 +48,7 @@ func newImageInspectCommand() *cobra.Command {
 
 	// #region platform flags
 	imageInspectCommand.Flags().String("platform", "", "Inspect a specific platform") // not a slice, and there is no --all-platforms
-	imageInspectCommand.RegisterFlagCompletionFunc("platform", completion.ShellCompletePlatforms)
+	imageInspectCommand.RegisterFlagCompletionFunc("platform", completion.Platforms)
 	// #endregion
 
 	return imageInspectCommand
@@ -100,5 +100,5 @@ func imageInspectAction(cmd *cobra.Command, args []string) error {
 
 func imageInspectShellComplete(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
 	// show image names
-	return completion.ShellCompleteImageNames(cmd)
+	return completion.ImageNames(cmd)
 }
diff --git a/cmd/nerdctl/image_list.go b/cmd/nerdctl/image_list.go
@@ -148,7 +148,7 @@ func imagesAction(cmd *cobra.Command, args []string) error {
 func imagesShellComplete(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
 	if len(args) == 0 {
 		// show image names
-		return completion.ShellCompleteImageNames(cmd)
+		return completion.ImageNames(cmd)
 	}
 	return nil, cobra.ShellCompDirectiveNoFileComp
 }
diff --git a/cmd/nerdctl/image_load.go b/cmd/nerdctl/image_load.go
@@ -42,7 +42,7 @@ func newLoadCommand() *cobra.Command {
 	// #region platform flags
 	// platform is defined as StringSlice, not StringArray, to allow specifying "--platform=amd64,arm64"
 	loadCommand.Flags().StringSlice("platform", []string{}, "Import content for a specific platform")
-	loadCommand.RegisterFlagCompletionFunc("platform", completion.ShellCompletePlatforms)
+	loadCommand.RegisterFlagCompletionFunc("platform", completion.Platforms)
 	loadCommand.Flags().Bool("all-platforms", false, "Import content for all platforms")
 	// #endregion
 
diff --git a/cmd/nerdctl/image_pull.go b/cmd/nerdctl/image_pull.go
diff --git a/cmd/nerdctl/image_push.go b/cmd/nerdctl/image_push.go
diff --git a/cmd/nerdctl/image_remove.go b/cmd/nerdctl/image_remove.go
diff --git a/cmd/nerdctl/image_save.go b/cmd/nerdctl/image_save.go
diff --git a/cmd/nerdctl/image_tag.go b/cmd/nerdctl/image_tag.go
diff --git a/cmd/nerdctl/inspect.go b/cmd/nerdctl/inspect.go
diff --git a/cmd/nerdctl/main.go b/cmd/nerdctl/main.go
diff --git a/cmd/nerdctl/network_create.go b/cmd/nerdctl/network_create.go
diff --git a/cmd/nerdctl/network_inspect.go b/cmd/nerdctl/network_inspect.go
diff --git a/cmd/nerdctl/network_remove.go b/cmd/nerdctl/network_remove.go
diff --git a/cmd/nerdctl/volume/volume_inspect.go b/cmd/nerdctl/volume/volume_inspect.go
diff --git a/cmd/nerdctl/volume/volume_remove.go b/cmd/nerdctl/volume/volume_remove.go

Original file line number	Diff line number	Diff line change
`@@ -48,5 +48,5 @@ func apparmorUnloadAction(cmd *cobra.Command, args []string) error {`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`func apparmorUnloadShellComplete(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {`
`51`		`- return completion.ShellCompleteApparmorProfiles(cmd)`
	`51`	`+ return completion.ApparmorProfiles(cmd)`
`52`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,6 @@ package completion`
`18`	`18`
`19`	`19`	`import "github.com/spf13/cobra"`
`20`	`20`
`21`		`-func ShellCompleteCgroupManagerNames(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {`
	`21`	`+func CgroupManagerNames(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {`
`22`	`22`	`return nil, cobra.ShellCompDirectiveNoFileComp`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,16 +29,16 @@ import (`
`29`	`29`	`"github.com/containerd/nerdctl/v2/pkg/rootlessutil"`
`30`	`30`	`)`
`31`	`31`
`32`		`-func ShellCompleteNetworkDrivers(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {`
	`32`	`+func NetworkDrivers(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {`
`33`	`33`	`candidates := []string{"bridge", "macvlan", "ipvlan"}`
`34`	`34`	`return candidates, cobra.ShellCompDirectiveNoFileComp`
`35`	`35`	`}`
`36`	`36`
`37`		`-func ShellCompleteIPAMDrivers(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {`
	`37`	`+func IPAMDrivers(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {`
`38`	`38`	`return []string{"default", "host-local", "dhcp"}, cobra.ShellCompDirectiveNoFileComp`
`39`	`39`	`}`
`40`	`40`
`41`		`-func ShellCompleteNamespaceNames(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {`
	`41`	`+func NamespaceNames(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {`
`42`	`42`	`globalOptions, err := helpers.ProcessRootCmdFlags(cmd)`
`43`	`43`	`if err != nil {`
`44`	`44`	`return nil, cobra.ShellCompDirectiveError`
`@@ -64,7 +64,7 @@ func ShellCompleteNamespaceNames(cmd *cobra.Command, args []string, toComplete s`
`64`	`64`	`return candidates, cobra.ShellCompDirectiveNoFileComp`
`65`	`65`	`}`
`66`	`66`
`67`		`-func ShellCompleteSnapshotterNames(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {`
	`67`	`+func SnapshotterNames(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {`
`68`	`68`	`globalOptions, err := helpers.ProcessRootCmdFlags(cmd)`
`69`	`69`	`if err != nil {`
`70`	`70`	`return nil, cobra.ShellCompDirectiveError`
Original file line number	Diff line number	Diff line change
`@@ -18,23 +18,23 @@ package completion`
`18`	`18`
`19`	`19`	`import "github.com/spf13/cobra"`
`20`	`20`
`21`		`-func ShellCompleteNamespaceNames(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {`
	`21`	`+func NamespaceNames(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {`
`22`	`22`	`return nil, cobra.ShellCompDirectiveNoFileComp`
`23`	`23`	`}`
`24`	`24`
`25`		`-func ShellCompleteSnapshotterNames(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {`
	`25`	`+func SnapshotterNames(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {`
`26`	`26`	`return nil, cobra.ShellCompDirectiveNoFileComp`
`27`	`27`	`}`
`28`	`28`
`29`		`-func ShellCompleteCgroupManagerNames(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {`
	`29`	`+func CgroupManagerNames(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {`
`30`	`30`	`return nil, cobra.ShellCompDirectiveNoFileComp`
`31`	`31`	`}`
`32`	`32`
`33`		`-func ShellCompleteNetworkDrivers(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {`
	`33`	`+func NetworkDrivers(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {`
`34`	`34`	`candidates := []string{"nat"}`
`35`	`35`	`return candidates, cobra.ShellCompDirectiveNoFileComp`
`36`	`36`	`}`
`37`	`37`
`38`		`-func ShellCompleteIPAMDrivers(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {`
	`38`	`+func IPAMDrivers(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {`
`39`	`39`	`return []string{"default"}, cobra.ShellCompDirectiveNoFileComp`
`40`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -96,5 +96,5 @@ func attachShellComplete(cmd *cobra.Command, args []string, toComplete string) (`
`96`	`96`	`statusFilterFn := func(st containerd.ProcessStatus) bool {`
`97`	`97`	`return st == containerd.Running`
`98`	`98`	`}`
`99`		`- return completion.ShellCompleteContainerNames(cmd, statusFilterFn)`
	`99`	`+ return completion.ContainerNames(cmd, statusFilterFn)`
`100`	`100`	`}`
Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ func commitAction(cmd *cobra.Command, args []string) error {`
`94`	`94`
`95`	`95`	`func commitShellComplete(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {`
`96`	`96`	`if len(args) == 0 {`
`97`		`- return completion.ShellCompleteContainerNames(cmd, nil)`
	`97`	`+ return completion.ContainerNames(cmd, nil)`
`98`	`98`	`}`
`99`	`99`	`return nil, cobra.ShellCompDirectiveNoFileComp`
`100`	`100`	`}`
Original file line number	Diff line number	Diff line change
`@@ -227,5 +227,5 @@ func appendChanges(changes []fs.Change, new fs.Change) []fs.Change {`
`227`	`227`
`228`	`228`	`func diffShellComplete(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {`
`229`	`229`	`// show container names`
`230`		`- return completion.ShellCompleteContainerNames(cmd, nil)`
	`230`	`+ return completion.ContainerNames(cmd, nil)`
`231`	`231`	`}`