kelvin/warewulf
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #1738 from anderbubble/fix-1734

Browse Source 
Fix image completion
This commit is contained in:
Christian Goll
2025-02-13 11:00:51 +01:00
committed by GitHub
parent acc1dc3ed0 d968b02153
commit 817c936f26
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/app/wwctl/completions/completions.go
View File

@@ -52,7 +52,7 @@ func ProfileKernelVersion(cmd *cobra.Command, args []string, toComplete string)
}
func Images(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
if sources, err := image.ListSources(); err != nil {
if sources, err := image.ListSources(); err == nil {
return sources, cobra.ShellCompDirectiveNoFileComp
}
return nil, cobra.ShellCompDirectiveNoFileComp

4
internal/app/wwctl/node/add/root.go
View File

@@ -33,7 +33,7 @@ func GetCommand() *cobra.Command {
flags.AddWwinit(baseCmd, &(vars.nodeConf.SystemOverlay))
flags.AddRuntime(baseCmd, &(vars.nodeConf.RuntimeOverlay))
// register the command line completions
if err := baseCmd.RegisterFlagCompletionFunc("image", completions.Images); err != nil { // no limit
if err := baseCmd.RegisterFlagCompletionFunc("image", completions.Images); err != nil {
panic(err)
}
if err := baseCmd.RegisterFlagCompletionFunc("kernelversion", completions.NodeKernelVersion); err != nil {
@@ -51,7 +51,7 @@ func GetCommand() *cobra.Command {
if err := baseCmd.RegisterFlagCompletionFunc("wwinit", completions.OverlayList); err != nil {
panic(err)
}
if err := baseCmd.RegisterFlagCompletionFunc("profile", completions.Profiles); err != nil { // no limit
if err := baseCmd.RegisterFlagCompletionFunc("profile", completions.Profiles); err != nil {
panic(err)
}

4
internal/app/wwctl/node/set/root.go
View File

@@ -40,7 +40,7 @@ func GetCommand() *cobra.Command {
baseCmd.PersistentFlags().BoolVarP(&vars.setYes, "yes", "y", false, "Set 'yes' to all questions asked")
baseCmd.PersistentFlags().BoolVarP(&vars.setForce, "force", "f", false, "Force configuration (even on error)")
// register the command line completions
if err := baseCmd.RegisterFlagCompletionFunc("image", completions.Images); err != nil { // no limit
if err := baseCmd.RegisterFlagCompletionFunc("image", completions.Images); err != nil {
panic(err)
}
if err := baseCmd.RegisterFlagCompletionFunc("kernelversion", completions.NodeKernelVersion); err != nil {
@@ -58,7 +58,7 @@ func GetCommand() *cobra.Command {
if err := baseCmd.RegisterFlagCompletionFunc("wwinit", completions.OverlayList); err != nil {
panic(err)
}
if err := baseCmd.RegisterFlagCompletionFunc("profile", completions.Profiles); err != nil { // no limit
if err := baseCmd.RegisterFlagCompletionFunc("profile", completions.Profiles); err != nil {
panic(err)
}

2
internal/app/wwctl/profile/add/root.go
View File

@@ -31,7 +31,7 @@ func GetCommand() *cobra.Command {
flags.AddWwinit(baseCmd, &(vars.profileConf.SystemOverlay))
flags.AddRuntime(baseCmd, &(vars.profileConf.RuntimeOverlay))
// register the command line completions
if err := baseCmd.RegisterFlagCompletionFunc("image", completions.Images); err != nil { // no limit
if err := baseCmd.RegisterFlagCompletionFunc("image", completions.Images); err != nil {
panic(err)
}
if err := baseCmd.RegisterFlagCompletionFunc("kernelversion", completions.ProfileKernelVersion); err != nil {

2
internal/app/wwctl/profile/set/root.go
View File

@@ -44,7 +44,7 @@ func GetCommand() *cobra.Command {
flags.AddRuntime(baseCmd, &(vars.profileConf.RuntimeOverlay))
baseCmd.PersistentFlags().BoolVarP(&vars.setYes, "yes", "y", false, "Set 'yes' to all questions asked")
// register the command line completions
if err := baseCmd.RegisterFlagCompletionFunc("image", completions.Images); err != nil { // no limit
if err := baseCmd.RegisterFlagCompletionFunc("image", completions.Images); err != nil {
panic(err)
}
if err := baseCmd.RegisterFlagCompletionFunc("kernelversion", completions.ProfileKernelVersion); err != nil {