From 72dd1791e8f60712919db591dfd60e4d65df7c05 Mon Sep 17 00:00:00 2001 From: Sylvain Rabot Date: Tue, 21 Nov 2023 08:31:26 +0100 Subject: [PATCH] Add missing error handling for --load-restrictor completion Signed-off-by: Sylvain Rabot --- kustomize/commands/build/build.go | 6 +++++- kustomize/commands/build/flagloadrestrictor.go | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/kustomize/commands/build/build.go b/kustomize/commands/build/build.go index e3eef7fe5e9..3fec4b5e11d 100644 --- a/kustomize/commands/build/build.go +++ b/kustomize/commands/build/build.go @@ -100,14 +100,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 '--load-restrictor': %v", 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 index 389819ab8ab..5a88efef8b3 100644 --- a/kustomize/commands/build/flagloadrestrictor.go +++ b/kustomize/commands/build/flagloadrestrictor.go @@ -24,8 +24,8 @@ 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 { + return cmd.RegisterFlagCompletionFunc(flagLoadRestrictorName, func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) { return []string{ types.LoadRestrictionsNone.String(), types.LoadRestrictionsRootOnly.String(),