ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

command/apply: if with plan, don't ask for input [GH-346]

This commit is contained in:
Mitchell Hashimoto 2014-10-01 08:43:00 -07:00
parent 817f0d9f30
commit 95f43d8230
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
command/apply.go
View File

@ -132,11 +132,13 @@ func (c *ApplyCommand) Run(args []string) int {
} }
} }
if !planned {
if err := ctx.Input(); err != nil { if err := ctx.Input(); err != nil {
c.Ui.Error(fmt.Sprintf("Error configuring: %s", err)) c.Ui.Error(fmt.Sprintf("Error configuring: %s", err))
return 1 return 1
} }
} }
}
if !validateContext(ctx, c.Ui) { if !validateContext(ctx, c.Ui) {
return 1 return 1
} }

13
command/apply_test.go
View File

@ -1,6 +1,7 @@
package command package command
import ( import (
"bytes"
"fmt" "fmt"
"io/ioutil" "io/ioutil"
"net" "net"
@ -314,6 +315,14 @@ func TestApply_noArgs(t *testing.T) {
} }
func TestApply_plan(t *testing.T) { func TestApply_plan(t *testing.T) {
// Disable test mode so input would be asked
test = false
defer func() { test = true }()
// Set some default reader/writers for the inputs
defaultInputReader = new(bytes.Buffer)
defaultInputWriter = new(bytes.Buffer)
planPath := testPlanFile(t, &terraform.Plan{ planPath := testPlanFile(t, &terraform.Plan{
Module: testModule(t, "apply"), Module: testModule(t, "apply"),
}) })
@ -336,6 +345,10 @@ func TestApply_plan(t *testing.T) {
t.Fatalf("bad: %d\n\n%s", code, ui.ErrorWriter.String()) t.Fatalf("bad: %d\n\n%s", code, ui.ErrorWriter.String())
} }
if p.InputCalled {
t.Fatalf("input should not be called for plans")
}
if _, err := os.Stat(statePath); err != nil { if _, err := os.Stat(statePath); err != nil {
t.Fatalf("err: %s", err) t.Fatalf("err: %s", err)
} }