Add missing error handling for --load-restrictor completion

Signed-off-by: Sylvain Rabot <sylvain@abstraction.fr>
kubernetes-sigs · Dec 6, 2023 · 82bd395 · 82bd395
1 parent e3031f3
commit 82bd395
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/kustomize/commands/build/build.go b/kustomize/commands/build/build.go
@@ -102,14 +102,18 @@ func NewCmdBuild(
 			return err
 		},
 	}
+
 	AddFlagOutputPath(cmd.Flags())
 	AddFunctionBasicsFlags(cmd.Flags())
 	AddFlagLoadRestrictor(cmd.Flags())
-	AddFlagLoadRestrictorCompletion(cmd)
 	AddFlagEnablePlugins(cmd.Flags())
 	AddFlagReorderOutput(cmd.Flags())
 	AddFlagEnableManagedbyLabel(cmd.Flags())
 
+	if err := AddFlagLoadRestrictorCompletion(cmd); err != nil {
+		log.Fatalf("Error adding completion for flag '--%s': %v", flagLoadRestrictorName, err)
+	}
+
 	msg := "Error marking flag '%s' as deprecated: %v"
 	err := cmd.Flags().MarkDeprecated(flagReorderOutputName,
 		"use the new 'sortOptions' field in kustomization.yaml instead.")

diff --git a/kustomize/commands/build/flagloadrestrictor.go b/kustomize/commands/build/flagloadrestrictor.go
@@ -24,13 +24,19 @@ func AddFlagLoadRestrictor(set *pflag.FlagSet) {
 			"relocatability of the kustomization.")
 }
 
-func AddFlagLoadRestrictorCompletion(cmd *cobra.Command) {
-	cmd.RegisterFlagCompletionFunc(flagLoadRestrictorName, func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
+func AddFlagLoadRestrictorCompletion(cmd *cobra.Command) error {
+	err := cmd.RegisterFlagCompletionFunc(flagLoadRestrictorName, func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
 		return []string{
 			types.LoadRestrictionsNone.String(),
 			types.LoadRestrictionsRootOnly.String(),
 		}, cobra.ShellCompDirectiveNoFileComp
 	})
+
+	if err != nil {
+		return fmt.Errorf("unable to add completion for --%s flag: %w", flagLoadRestrictorName, err)
+	}
+
+	return nil
 }
 
 func validateFlagLoadRestrictor() error {