Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

command/push: local vars override remote ones #1881

Merged
merged 1 commit into from
May 8, 2015
Merged

command/push: local vars override remote ones #1881

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions command/push.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

Expand Down
4 changes: 4 additions & 0 deletions command/push_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down