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

Update to Terraform 0.15 #873

Merged
merged 5 commits into from
Apr 23, 2021
Merged

Update to Terraform 0.15 #873

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1380946
Update versions
brikis98 Apr 22, 2021
3e5514e
Update tests to use new plan text
brikis98 Apr 23, 2021
8efe359
Add missing build tag to azure test
brikis98 Apr 23, 2021
581eb59
Dynamically pick instance types
brikis98 Apr 23, 2021
cdb010a
Fix compile failure
brikis98 Apr 23, 2021
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: 2 additions & 2 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ env: &env
GRUNTWORK_INSTALLER_VERSION: v0.0.34
MODULE_CI_VERSION: v0.29.2
MODULE_GCP_CI_VERSION: v0.1.1
TERRAFORM_VERSION: 0.14.0
TERRAGRUNT_VERSION: v0.24.2
TERRAFORM_VERSION: 0.15.0
TERRAGRUNT_VERSION: v0.28.24
PACKER_VERSION: 1.6.6
GO_VERSION: 1.14
K8S_VERSION: v1.15.0 # Same as EKS
Expand Down
2 changes: 1 addition & 1 deletion modules/terraform/plan_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ func TestInitAndPlanWithPlanFile(t *testing.T) {
out, err := InitAndPlanE(t, options)
require.NoError(t, err)
assert.Contains(t, out, "1 to add, 0 to change, 0 to destroy.")
assert.Contains(t, out, fmt.Sprintf("This plan was saved to: %s", planFilePath))
assert.Contains(t, out, fmt.Sprintf("Saved the plan to: %s", planFilePath))
assert.FileExists(t, planFilePath, "Plan file was not saved to expected location:", planFilePath)
}

Expand Down
2 changes: 1 addition & 1 deletion modules/terraform/show_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ func TestShowWithInlinePlan(t *testing.T) {
}

out := InitAndPlan(t, options)
require.Contains(t, out, fmt.Sprintf("This plan was saved to: %s", planFilePath))
require.Contains(t, out, fmt.Sprintf("Saved the plan to: %s", planFilePath))
require.FileExists(t, planFilePath, "Plan file was not saved to expected location:", planFilePath)

// show command does not accept Vars
Expand Down
5 changes: 5 additions & 0 deletions test/azure/terraform_azure_postgresql_example_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
// +build azure
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing build tag on our Azure code. Not related to this PR, but was causing test failures.


// NOTE: We use build tags to differentiate azure testing because we currently do not have azure access setup for
// CircleCI.

package test

import (
Expand Down