command: Run validation before asking for input. Fixes #602

hashicorp · Dec 9, 2014 · 5b745e5 · 5b745e5
1 parent 57fd308
commit 5b745e5
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/command/apply.go b/command/apply.go
@@ -133,15 +133,15 @@ func (c *ApplyCommand) Run(args []string) int {
 			return 1
 		}
 	}
+	if !validateContext(ctx, c.Ui) {
+		return 1
+	}
 	if !planned {
 		if err := ctx.Input(c.InputMode()); err != nil {
 			c.Ui.Error(fmt.Sprintf("Error configuring: %s", err))
 			return 1
 		}
 	}
-	if !validateContext(ctx, c.Ui) {
-		return 1
-	}
 
 	// Create a backup of the state before updating
 	if backupPath != "-" && c.state != nil {

diff --git a/command/plan.go b/command/plan.go
@@ -75,11 +75,11 @@ func (c *PlanCommand) Run(args []string) int {
 		c.Ui.Error(err.Error())
 		return 1
 	}
-	if err := ctx.Input(c.InputMode()); err != nil {
-		c.Ui.Error(fmt.Sprintf("Error configuring: %s", err))
+	if !validateContext(ctx, c.Ui) {
 		return 1
 	}
-	if !validateContext(ctx, c.Ui) {
+	if err := ctx.Input(c.InputMode()); err != nil {
+		c.Ui.Error(fmt.Sprintf("Error configuring: %s", err))
 		return 1
 	}
 

diff --git a/command/refresh.go b/command/refresh.go
@@ -92,11 +92,11 @@ func (c *RefreshCommand) Run(args []string) int {
 		c.Ui.Error(err.Error())
 		return 1
 	}
-	if err := ctx.Input(c.InputMode()); err != nil {
-		c.Ui.Error(fmt.Sprintf("Error configuring: %s", err))
+	if !validateContext(ctx, c.Ui) {
 		return 1
 	}
-	if !validateContext(ctx, c.Ui) {
+	if err := ctx.Input(c.InputMode()); err != nil {
+		c.Ui.Error(fmt.Sprintf("Error configuring: %s", err))
 		return 1
 	}