clean up prompt logic

Author: dexhorthy

cli/cmd/app_delete.go

@@ -6,7 +6,6 @@ import (
 	"github.com/replicatedhq/replicated/cli/print"
 	"github.com/replicatedhq/replicated/pkg/types"
 	"github.com/spf13/cobra"
-	"os"
 )
 
 func (r *runners) InitAppDelete(parent *cobra.Command) *cobra.Command {
@@ -82,23 +81,19 @@ func promptConfirmDelete() (string, error) {
 		Templates: templates,
 		Default:   "",
 		Validate: func(input string) error {
-			if input == "no" {
+			// "no" will exit with a "prompt declined" error, just in case they don't think to ctrl+c
+			if input == "no" || input == "yes" {
 				return nil
 			}
-
-			if input != "yes" {
-				return errors.New(`only "yes" will be accepted`)
-			}
-
-			return nil
+			return errors.New(`only "yes" will be accepted`)
 		},
 	}
 
 	for {
 		result, err := prompt.Run()
 		if err != nil {
 			if err == promptui.ErrInterrupt {
-				os.Exit(-1)
+				return "", errors.New("interrupted")
 			}
 			continue
 		}

cli/cmd/release_create.go

@@ -426,7 +426,7 @@ func promptForConfirm() (string, error) {
 		result, err := prompt.Run()
 		if err != nil {
 			if err == promptui.ErrInterrupt {
-				os.Exit(-1)
+				return "", errors.New("interrupted")
 			}
 			continue
 		}