From b7908d874723eb876c8304555468e3e616d6e105 Mon Sep 17 00:00:00 2001 From: "Cooper, Trevor" Date: Thu, 15 Apr 2021 08:05:28 -0700 Subject: [PATCH] add SetYes to node delete command --- internal/app/wwctl/node/delete/main.go | 25 ++++++++++++++----------- internal/app/wwctl/node/delete/root.go | 2 ++ 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/internal/app/wwctl/node/delete/main.go b/internal/app/wwctl/node/delete/main.go index 5c46327c..1435189e 100644 --- a/internal/app/wwctl/node/delete/main.go +++ b/internal/app/wwctl/node/delete/main.go @@ -31,19 +31,22 @@ func CobraRunE(cmd *cobra.Command, args []string) error { } if count > 0 { - q := fmt.Sprintf("Are you sure you want to delete %d nodes(s)", count) - - prompt := promptui.Prompt{ - Label: q, - IsConfirm: true, - } - - result, _ := prompt.Run() - - if result == "y" || result == "yes" { + if SetYes == true { nodeDB.Persist() - } + } else { + q := fmt.Sprintf("Are you sure you want to delete %d nodes(s)", count) + prompt := promptui.Prompt{ + Label: q, + IsConfirm: true, + } + + result, _ := prompt.Run() + + if result == "y" || result == "yes" { + nodeDB.Persist() + } + } } else { fmt.Printf("No nodes found\n") } diff --git a/internal/app/wwctl/node/delete/root.go b/internal/app/wwctl/node/delete/root.go index 1c4a1e4a..5e8bfd7d 100644 --- a/internal/app/wwctl/node/delete/root.go +++ b/internal/app/wwctl/node/delete/root.go @@ -11,6 +11,7 @@ var ( RunE: CobraRunE, Aliases: []string{"rm", "del"}, } + SetYes bool SetForce string SetGroup string SetController string @@ -20,6 +21,7 @@ func init() { baseCmd.PersistentFlags().StringVarP(&SetForce, "force", "f", "", "Force node delete") baseCmd.PersistentFlags().StringVarP(&SetGroup, "group", "g", "default", "Set group to delete nodes from") baseCmd.PersistentFlags().StringVarP(&SetController, "controller", "c", "default", "Controller to add nodes to") + baseCmd.PersistentFlags().BoolVarP(&SetYes, "yes", "y", false, "Set 'yes' to all questions asked") }