From a422ae8ab4caa70aa996e6901deb3dfa805d2d78 Mon Sep 17 00:00:00 2001 From: Sumit Tembe Date: Wed, 6 Jul 2022 13:04:41 +0530 Subject: [PATCH] Feat: don't ask user confirmation when delete with --force or --yes (#4259) * feature: don't ask user confirmation when delete with --force or --yes Signed-off-by: Sumit Tembe * added a new flag 'yes' * don't skip user confirmation for --force * skip user confirmation for --yes --- references/cli/delete.go | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/references/cli/delete.go b/references/cli/delete.go index 897a17bfa..176ed633e 100644 --- a/references/cli/delete.go +++ b/references/cli/delete.go @@ -78,18 +78,22 @@ func NewDeleteCommand(c common2.Args, order string, ioStreams cmdutil.IOStreams) o.ForceDelete = force userInput := NewUserInput() if svcname == "" { - userConfirmation := userInput.AskBool(fmt.Sprintf("Do you want to delete the application %s from namespace %s", o.AppName, o.Namespace), &UserInputOptions{assumeYes}) - if !userConfirmation { - return fmt.Errorf("stopping Deleting") + if !assumeYes { + userConfirmation := userInput.AskBool(fmt.Sprintf("Do you want to delete the application %s from namespace %s", o.AppName, o.Namespace), &UserInputOptions{assumeYes}) + if !userConfirmation { + return fmt.Errorf("stopping Deleting") + } } if err = o.DeleteApp(ioStreams); err != nil { return err } ioStreams.Info(green.Sprintf("app \"%s\" deleted from namespace \"%s\"", o.AppName, o.Namespace)) } else { - userConfirmation := userInput.AskBool(fmt.Sprintf("Do you want to delete the component %s from application %s in namespace %s", svcname, o.AppName, o.Namespace), &UserInputOptions{assumeYes}) - if !userConfirmation { - return fmt.Errorf("stopping Deleting") + if !assumeYes { + userConfirmation := userInput.AskBool(fmt.Sprintf("Do you want to delete the component %s from application %s in namespace %s", svcname, o.AppName, o.Namespace), &UserInputOptions{assumeYes}) + if !userConfirmation { + return fmt.Errorf("stopping Deleting") + } } o.CompName = svcname if err = o.DeleteComponent(ioStreams); err != nil {