Merge pull request #27 from imuqtadir/fix-terminate

Fix terminate
awslabs · Nov 20, 2020 · bab6bf8 · bab6bf8
2 parents 38533f6 + 591f9ce
commit bab6bf8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/cmd/terminate.go b/cmd/terminate.go
@@ -83,7 +83,9 @@ func terminateInteractive(h *ec2helper.EC2Helper) {
 	for {
 		// Ask instance ID
 		instanceIdAnswer, err := question.AskInstanceIds(h, instanceIds)
-		cli.ShowError(err, "Asking instance ID failed")
+		if cli.ShowError(err, "Terminate Error") {
+			return
+		}
 
 		if instanceIdAnswer == nil || *instanceIdAnswer == cli.ResponseNo {
 			break
@@ -92,11 +94,6 @@ func terminateInteractive(h *ec2helper.EC2Helper) {
 		}
 	}
 
-	if len(instanceIds) <= 0 {
-		fmt.Println("No instance available to terminate in this region")
-		return
-	}
-
 	if question.AskTerminationConfirmation(instanceIds) == cli.ResponseYes {
 		cli.ShowError(h.TerminateInstances(instanceIds), "Terminating instances failed")
 	}

diff --git a/pkg/question/question.go b/pkg/question/question.go
@@ -1031,7 +1031,7 @@ func AskInstanceIds(h *ec2helper.EC2Helper, addedInstanceIds []string) (*string,
 
 	// If no instance is available, simply don't ask
 	if len(data) <= 0 {
-		return nil, errors.New("No instance available to terminate")
+		return nil, errors.New("No instance available in selected region for termination")
 	}
 
 	// Add "done" option, if the added instance ids slice is not empty