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

Commit d3d9b96

Browse files
robmorganrobmorgan
authored
Terraform v0.14 update (#216)
1 parent 1a4aa85 commit d3d9b96

File tree

11 files changed

+119
-45
lines changed

11 files changed

+119
-45
lines changed

‎.circleci/config.yml

+1-6
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
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:
@@ -29,7 +27,6 @@ jobs:
2927
path: /tmp/logs
3028
- store_test_results:
3129
path: /tmp/logs
32-
3330
deploy:
3431
<<: *defaults
3532
steps:
@@ -38,14 +35,12 @@ jobs:
3835
- run: sudo -E gruntwork-install --module-name "aws-helpers" --repo "https://github.com/gruntwork-io/module-ci" --tag "v0.12.2"
3936
- run: sudo -E gruntwork-install --module-name "git-helpers" --repo "https://github.com/gruntwork-io/module-ci" --tag "v0.12.2"
4037
- run: sudo -E gruntwork-install --module-name "build-helpers" --repo "https://github.com/gruntwork-io/module-ci" --tag "v0.12.2"
41-
4238
# We generally only want to build AMIs on new releases, but when we are setting up AMIs in a new account for the
4339
# first time, we want to build the AMIs but NOT run automated tests, since those tests will fail without an existing
4440
# AMI already in the AWS Account.
4541
- run: _ci/publish-amis.sh "ubuntu16-ami"
4642
- run: _ci/publish-amis.sh "ubuntu18-ami"
4743
- run: _ci/publish-amis.sh "amazon-linux-2-ami"
48-
4944
workflows:
5045
version: 2
5146
build-and-test:

‎.gitignore

+4-1
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,7 @@ out/
2424
vendor
2525

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

‎examples/example-with-custom-asg-role/main.tf

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

‎examples/example-with-encryption/main.tf

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

‎main.tf

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

‎modules/consul-client-security-group-rules/main.tf

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
# ---------------------------------------------------------------------------------------------------------------------
44

55
terraform {
6-
# This module is now only being tested with Terraform 0.13.x. However, to make upgrading easier, we are setting
6+
# This module is now only being tested with Terraform 0.14.x. However, to make upgrading easier, we are setting
77
# 0.12.26 as the minimum version, as that version added support for required_providers with source URLs, making it
8-
# forwards compatible with 0.13.x code.
8+
# forwards compatible with 0.14.x code.
99
required_version = ">= 0.12.26"
1010
}
1111

‎modules/consul-cluster/main.tf

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
# ----------------------------------------------------------------------------------------------------------------------
44

55
terraform {
6-
# This module is now only being tested with Terraform 0.13.x. However, to make upgrading easier, we are setting
6+
# This module is now only being tested with Terraform 0.14.x. However, to make upgrading easier, we are setting
77
# 0.12.26 as the minimum version, as that version added support for required_providers with source URLs, making it
8-
# forwards compatible with 0.13.x code.
8+
# forwards compatible with 0.14.x code.
99
required_version = ">= 0.12.26"
1010
}
1111

‎modules/consul-iam-policies/main.tf

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
# ---------------------------------------------------------------------------------------------------------------------
44

55
terraform {
6-
# This module is now only being tested with Terraform 0.13.x. However, to make upgrading easier, we are setting
6+
# This module is now only being tested with Terraform 0.14.x. However, to make upgrading easier, we are setting
77
# 0.12.26 as the minimum version, as that version added support for required_providers with source URLs, making it
8-
# forwards compatible with 0.13.x code.
8+
# forwards compatible with 0.14.x code.
99
required_version = ">= 0.12.26"
1010
}
1111

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

+2-2
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

‎test/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ module github.com/hashicorp/terraform-aws-consul/test
33
go 1.14
44

55
require (
6-
github.com/gruntwork-io/terratest v0.27.2
6+
github.com/gruntwork-io/terratest v0.31.3
77
github.com/hashicorp/consul/api v1.4.0
88
)

0 commit comments

Comments
 (0)