Skip to content
This repository was archived by the owner on Jan 25, 2023. It is now read-only.

Commit 61db1c3

Browse files
robmorganrobmorgan
authored
Merge pull request #241 from hashicorp/tf14
Terraform v0.14 update
2 parents 2a67b66 + ef97338 commit 61db1c3

File tree

17 files changed

+130
-66
lines changed

17 files changed

+130
-66
lines changed

‎.circleci/config.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
---
21
defaults: &defaults
32
docker:
4-
- image: 087285199408.dkr.ecr.us-east-1.amazonaws.com/circle-ci-test-image-base:tf13.4
5-
3+
- image: 087285199408.dkr.ecr.us-east-1.amazonaws.com/circle-ci-test-image-base:go1.16-go111module
64
version: 2
75
jobs:
86
test:
@@ -31,7 +29,6 @@ jobs:
3129
path: /tmp/logs
3230
- store_test_results:
3331
path: /tmp/logs
34-
3532
deploy:
3633
<<: *defaults
3734
steps:
@@ -40,14 +37,12 @@ jobs:
4037
- run: sudo -E gruntwork-install --module-name "aws-helpers" --repo "https://github.com/gruntwork-io/module-ci" --tag "v0.28.1"
4138
- run: sudo -E gruntwork-install --module-name "git-helpers" --repo "https://github.com/gruntwork-io/module-ci" --tag "v0.28.1"
4239
- run: sudo -E gruntwork-install --module-name "build-helpers" --repo "https://github.com/gruntwork-io/module-ci" --tag "v0.28.1"
43-
4440
# We generally only want to build AMIs on new releases, but when we are setting up AMIs in a new account for the
4541
# first time, we want to build the AMIs but NOT run automated tests, since those tests will fail without an existing
4642
# AMI already in the AWS Account.
4743
- run: _ci/publish-amis.sh "ubuntu16-ami"
4844
- run: _ci/publish-amis.sh "ubuntu18-ami"
4945
- run: _ci/publish-amis.sh "amazon-linux-2-ami"
50-
5146
workflows:
5247
version: 2
5348
build-and-test:

‎.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,7 @@ out/
2222
vendor
2323

2424
# Folder used to store temporary test data by Terratest
25-
.test-data
25+
.test-data
26+
# Ignore Terraform lock files, as we want to test the Terraform code in these repos with the latest provider
27+
# versions.
28+
.terraform.lock.hcl

‎examples/vault-agent/main.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
# REQUIRE A SPECIFIC TERRAFORM VERSION OR HIGHER
33
# ----------------------------------------------------------------------------------------------------------------------
44
terraform {
5-
# This module is now only being tested with Terraform 0.13.x. However, to make upgrading easier, we are setting
5+
# This module is now only being tested with Terraform 0.14.x. However, to make upgrading easier, we are setting
66
# 0.12.26 as the minimum version, as that version added support for required_providers with source URLs, making it
7-
# forwards compatible with 0.13.x code.
7+
# forwards compatible with 0.14.x code.
88
required_version = ">= 0.12.26"
99
}
1010

‎examples/vault-auto-unseal/main.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
# REQUIRE A SPECIFIC TERRAFORM VERSION OR HIGHER
33
# ----------------------------------------------------------------------------------------------------------------------
44
terraform {
5-
# This module is now only being tested with Terraform 0.13.x. However, to make upgrading easier, we are setting
5+
# This module is now only being tested with Terraform 0.14.x. However, to make upgrading easier, we are setting
66
# 0.12.26 as the minimum version, as that version added support for required_providers with source URLs, making it
7-
# forwards compatible with 0.13.x code.
7+
# forwards compatible with 0.14.x code.
88
required_version = ">= 0.12.26"
99
}
1010

‎examples/vault-cluster-private/main.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
# REQUIRE A SPECIFIC TERRAFORM VERSION OR HIGHER
33
# ----------------------------------------------------------------------------------------------------------------------
44
terraform {
5-
# This module is now only being tested with Terraform 0.13.x. However, to make upgrading easier, we are setting
5+
# This module is now only being tested with Terraform 0.14.x. However, to make upgrading easier, we are setting
66
# 0.12.26 as the minimum version, as that version added support for required_providers with source URLs, making it
7-
# forwards compatible with 0.13.x code.
7+
# forwards compatible with 0.14.x code.
88
required_version = ">= 0.12.26"
99
}
1010

‎examples/vault-dynamodb-backend/dynamodb/main.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
terraform {
2-
# This module is now only being tested with Terraform 0.13.x. However, to make upgrading easier, we are setting
2+
# This module is now only being tested with Terraform 0.14.x. However, to make upgrading easier, we are setting
33
# 0.12.26 as the minimum version, as that version added support for required_providers with source URLs, making it
4-
# forwards compatible with 0.13.x code.
4+
# forwards compatible with 0.14.x code.
55
required_version = ">= 0.12.26"
66
}
77

‎examples/vault-dynamodb-backend/main.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
# REQUIRE A SPECIFIC TERRAFORM VERSION OR HIGHER
33
# ----------------------------------------------------------------------------------------------------------------------
44
terraform {
5-
# This module is now only being tested with Terraform 0.13.x. However, to make upgrading easier, we are setting
5+
# This module is now only being tested with Terraform 0.14.x. However, to make upgrading easier, we are setting
66
# 0.12.26 as the minimum version, as that version added support for required_providers with source URLs, making it
7-
# forwards compatible with 0.13.x code.
7+
# forwards compatible with 0.14.x code.
88
required_version = ">= 0.12.26"
99
}
1010

‎examples/vault-ec2-auth/main.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
# REQUIRE A SPECIFIC TERRAFORM VERSION OR HIGHER
33
# ----------------------------------------------------------------------------------------------------------------------
44
terraform {
5-
# This module is now only being tested with Terraform 0.13.x. However, to make upgrading easier, we are setting
5+
# This module is now only being tested with Terraform 0.14.x. However, to make upgrading easier, we are setting
66
# 0.12.26 as the minimum version, as that version added support for required_providers with source URLs, making it
7-
# forwards compatible with 0.13.x code.
7+
# forwards compatible with 0.14.x code.
88
required_version = ">= 0.12.26"
99
}
1010

‎examples/vault-iam-auth/main.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
# REQUIRE A SPECIFIC TERRAFORM VERSION OR HIGHER
33
# ----------------------------------------------------------------------------------------------------------------------
44
terraform {
5-
# This module is now only being tested with Terraform 0.13.x. However, to make upgrading easier, we are setting
5+
# This module is now only being tested with Terraform 0.14.x. However, to make upgrading easier, we are setting
66
# 0.12.26 as the minimum version, as that version added support for required_providers with source URLs, making it
7-
# forwards compatible with 0.13.x code.
7+
# forwards compatible with 0.14.x code.
88
required_version = ">= 0.12.26"
99
}
1010

‎examples/vault-s3-backend/main.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
# REQUIRE A SPECIFIC TERRAFORM VERSION OR HIGHER
33
# ----------------------------------------------------------------------------------------------------------------------
44
terraform {
5-
# This module is now only being tested with Terraform 0.13.x. However, to make upgrading easier, we are setting
5+
# This module is now only being tested with Terraform 0.14.x. However, to make upgrading easier, we are setting
66
# 0.12.26 as the minimum version, as that version added support for required_providers with source URLs, making it
7-
# forwards compatible with 0.13.x code.
7+
# forwards compatible with 0.14.x code.
88
required_version = ">= 0.12.26"
99
}
1010

‎main.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
# REQUIRE A SPECIFIC TERRAFORM VERSION OR HIGHER
1010
# ----------------------------------------------------------------------------------------------------------------------
1111
terraform {
12-
# This module is now only being tested with Terraform 0.13.x. However, to make upgrading easier, we are setting
12+
# This module is now only being tested with Terraform 0.14.x. However, to make upgrading easier, we are setting
1313
# 0.12.26 as the minimum version, as that version added support for required_providers with source URLs, making it
14-
# forwards compatible with 0.13.x code.
14+
# forwards compatible with 0.14.x code.
1515
required_version = ">= 0.12.26"
1616
}
1717

‎modules/private-tls-cert/main.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
terraform {
2-
# This module is now only being tested with Terraform 0.13.x. However, to make upgrading easier, we are setting
2+
# This module is now only being tested with Terraform 0.14.x. However, to make upgrading easier, we are setting
33
# 0.12.26 as the minimum version, as that version added support for required_providers with source URLs, making it
4-
# forwards compatible with 0.13.x code.
4+
# forwards compatible with 0.14.x code.
55
required_version = ">= 0.12.26"
66
}
77

‎modules/vault-cluster/main.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
# REQUIRE A SPECIFIC TERRAFORM VERSION OR HIGHER
33
# ----------------------------------------------------------------------------------------------------------------------
44
terraform {
5-
# This module is now only being tested with Terraform 0.13.x. However, to make upgrading easier, we are setting
5+
# This module is now only being tested with Terraform 0.14.x. However, to make upgrading easier, we are setting
66
# 0.12.26 as the minimum version, as that version added support for required_providers with source URLs, making it
7-
# forwards compatible with 0.13.x code.
7+
# forwards compatible with 0.14.x code.
88
required_version = ">= 0.12.26"
99
}
1010

‎modules/vault-elb/main.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
# REQUIRE A SPECIFIC TERRAFORM VERSION OR HIGHER
33
# ----------------------------------------------------------------------------------------------------------------------
44
terraform {
5-
# This module is now only being tested with Terraform 0.13.x. However, to make upgrading easier, we are setting
5+
# This module is now only being tested with Terraform 0.14.x. However, to make upgrading easier, we are setting
66
# 0.12.26 as the minimum version, as that version added support for required_providers with source URLs, making it
7-
# forwards compatible with 0.13.x code.
7+
# forwards compatible with 0.14.x code.
88
required_version = ">= 0.12.26"
99
}
1010

‎modules/vault-security-group-rules/main.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
terraform {
2-
# This module is now only being tested with Terraform 0.13.x. However, to make upgrading easier, we are setting
2+
# This module is now only being tested with Terraform 0.14.x. However, to make upgrading easier, we are setting
33
# 0.12.26 as the minimum version, as that version added support for required_providers with source URLs, making it
4-
# forwards compatible with 0.13.x code.
4+
# forwards compatible with 0.14.x code.
55
required_version = ">= 0.12.26"
66
}
77

‎test/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/gruntwork-io/terraform-aws-vault/test
33
go 1.13
44

55
require (
6-
github.com/gruntwork-io/terratest v0.28.15
6+
github.com/gruntwork-io/terratest v0.31.3
77
github.com/hashicorp/vault/api v1.0.4
88
github.com/stretchr/testify v1.6.1
99
)

0 commit comments

Comments
 (0)