From ee3ac172a02768a643700907470cf3754316682c Mon Sep 17 00:00:00 2001 From: Jonathon Anderson Date: Sun, 9 Feb 2025 15:35:36 -0700 Subject: [PATCH] wwctl ssh args and completions Signed-off-by: Jonathon Anderson --- internal/app/wwctl/ssh/root.go | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/internal/app/wwctl/ssh/root.go b/internal/app/wwctl/ssh/root.go index fc36838c..ef7c1f32 100644 --- a/internal/app/wwctl/ssh/root.go +++ b/internal/app/wwctl/ssh/root.go @@ -2,7 +2,7 @@ package ssh import ( "github.com/spf13/cobra" - "github.com/warewulf/warewulf/internal/pkg/node" + "github.com/warewulf/warewulf/internal/app/wwctl/completions" ) var ( @@ -14,17 +14,10 @@ var ( RunE: CobraRunE, Args: cobra.MinimumNArgs(2), ValidArgsFunction: func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) { - if len(args) != 0 { - return nil, cobra.ShellCompDirectiveNoFileComp + if len(args) == 0 { + return completions.Nodes(1)(cmd, args, toComplete) } - - nodeDB, _ := node.New() - nodes, _ := nodeDB.FindAllNodes() - var node_names []string - for _, node := range nodes { - node_names = append(node_names, node.Id()) - } - return node_names, cobra.ShellCompDirectiveNoFileComp + return completions.None(cmd, args, toComplete) }, } DryRun bool