Merge pull request #1881 from hashicorp/b-push-var-override

command/push: local vars override remote ones
hashicorp · May 8, 2015 · 6607755 · 6607755
2 parents a268cc3 + 8ce3e1d
commit 6607755
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/command/push.go b/command/push.go
@@ -132,6 +132,10 @@ func (c *PushCommand) Run(args []string) int {
 		return 1
 	}
 	for k, v := range vars {
+		// Local variables override remote ones
+		if _, exists := ctx.Variables()[k]; exists {
+			continue
+		}
 		ctx.SetVariable(k, v)
 	}
 

diff --git a/command/push_test.go b/command/push_test.go
@@ -205,6 +205,10 @@ func TestPush_inputTfvars(t *testing.T) {
 	defer os.Remove(archivePath)
 
 	client := &mockPushClient{File: archivePath}
+	// Provided vars should override existing ones
+	client.GetResult = map[string]string{
+		"foo": "old",
+	}
 	ui := new(cli.MockUi)
 	c := &PushCommand{
 		Meta: Meta{