kubernetes-sigs/kustomize
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kustomize.git synced 2026-06-12 01:14:22 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Add missing error handling for --load-restrictor completion

Browse Source 
Signed-off-by: Sylvain Rabot <sylvain@abstraction.fr>
This commit is contained in:
Sylvain Rabot
2023-11-21 08:31:26 +01:00
parent e3031f3a7b
commit 82bd395289
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
kustomize/commands/build/build.go
View File

@@ -102,14 +102,18 @@ func NewCmdBuild(
return err return err
}, },
} }
AddFlagOutputPath(cmd.Flags()) AddFlagOutputPath(cmd.Flags())
AddFunctionBasicsFlags(cmd.Flags()) AddFunctionBasicsFlags(cmd.Flags())
AddFlagLoadRestrictor(cmd.Flags()) AddFlagLoadRestrictor(cmd.Flags())
AddFlagLoadRestrictorCompletion(cmd)
AddFlagEnablePlugins(cmd.Flags()) AddFlagEnablePlugins(cmd.Flags())
AddFlagReorderOutput(cmd.Flags()) AddFlagReorderOutput(cmd.Flags())
AddFlagEnableManagedbyLabel(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" msg := "Error marking flag '%s' as deprecated: %v"
err := cmd.Flags().MarkDeprecated(flagReorderOutputName, err := cmd.Flags().MarkDeprecated(flagReorderOutputName,
"use the new 'sortOptions' field in kustomization.yaml instead.") "use the new 'sortOptions' field in kustomization.yaml instead.")

10
kustomize/commands/build/flagloadrestrictor.go
View File

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