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

Commit 4427d4f

Browse files
brikis98brikis98
authored
Merge pull request #69 from gruntwork-io/tf13
Update repo to work with TF 0.13
2 parents dcc8340 + f644bd6 commit 4427d4f

File tree

13 files changed

+56
-35
lines changed

13 files changed

+56
-35
lines changed

‎.circleci/config.yml‎

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ defaults: &defaults
55
image: circleci/classic:201711-01
66
environment:
77
GRUNTWORK_INSTALLER_VERSION: v0.0.29
8-
TERRATEST_LOG_PARSER_VERSION: v0.29.0
9-
MODULE_CI_VERSION: v0.28.1
10-
TERRAFORM_VERSION: 0.12.29
8+
TERRATEST_LOG_PARSER_VERSION: v0.30.10
9+
MODULE_CI_VERSION: v0.29.0
10+
TERRAFORM_VERSION: 0.13.4
1111
TERRAGRUNT_VERSION: NONE
12-
PACKER_VERSION: 1.4.1
12+
PACKER_VERSION: 1.6.4
1313
GOLANG_VERSION: 1.14
1414

1515
version: 2
@@ -23,19 +23,10 @@ jobs:
2323
- run: echo 'export PATH=$HOME/.local/bin:$HOME/terraform:$HOME/packer:$PATH' >> $BASH_ENV
2424

2525
# Install Gruntwork and HashiCorp dependencies
26-
- restore_cache:
27-
keys:
28-
- v2-external-dep
29-
# Use the Gruntwork Installer to install the gruntwork-module-circleci-helpers
3026
- run: curl -Ls https://raw.githubusercontent.com/gruntwork-io/gruntwork-installer/master/bootstrap-gruntwork-installer.sh | bash /dev/stdin --version "${GRUNTWORK_INSTALLER_VERSION}"
3127
- run: gruntwork-install --module-name "gruntwork-module-circleci-helpers" --repo "https://github.com/gruntwork-io/module-ci" --tag "${MODULE_CI_VERSION}"
3228
- run: gruntwork-install --binary-name "terratest_log_parser" --repo "https://github.com/gruntwork-io/terratest" --tag "${TERRATEST_LOG_PARSER_VERSION}"
3329
- run: configure-environment-for-gruntwork-module --terraform-version ${TERRAFORM_VERSION} --terragrunt-version ${TERRAGRUNT_VERSION} --packer-version ${PACKER_VERSION} --go-version ${GOLANG_VERSION}
34-
- save_cache:
35-
key: v2-external-dep
36-
paths:
37-
- $HOME/terraform
38-
- $HOME/packer
3930

4031
# Install external dependencies
4132
- run: DEBIAN_FRONTEND=noninteractive sudo apt-get update && sudo apt-get install -y python-pip

‎.pre-commit-config.yaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
repos:
22
- repo: https://github.com/gruntwork-io/pre-commit
3-
rev: v0.0.2
3+
rev: v0.1.10
44
hooks:
55
- id: terraform-fmt
6+
- id: gofmt

‎examples/couchbase-cluster-mds/main.tf‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,10 @@
1010
# ----------------------------------------------------------------------------------------------------------------------
1111

1212
terraform {
13-
required_version = ">= 0.12"
13+
# This module is now only being tested with Terraform 0.13.x. However, to make upgrading easier, we are setting
14+
# 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.
16+
required_version = ">= 0.12.26"
1417
}
1518

1619
# ---------------------------------------------------------------------------------------------------------------------

‎examples/couchbase-cluster-simple-dns-tls/main.tf‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,10 @@
1212
# ----------------------------------------------------------------------------------------------------------------------
1313

1414
terraform {
15-
required_version = ">= 0.12"
15+
# This module is now only being tested with Terraform 0.13.x. However, to make upgrading easier, we are setting
16+
# 0.12.26 as the minimum version, as that version added support for required_providers with source URLs, making it
17+
# forwards compatible with 0.13.x code.
18+
required_version = ">= 0.12.26"
1619
}
1720

1821
# ---------------------------------------------------------------------------------------------------------------------

‎examples/couchbase-multi-datacenter-replication/main.tf‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@
99
# ----------------------------------------------------------------------------------------------------------------------
1010

1111
terraform {
12-
required_version = ">= 0.12"
12+
# This module is now only being tested with Terraform 0.13.x. However, to make upgrading easier, we are setting
13+
# 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.
15+
required_version = ">= 0.12.26"
1316
}
1417

1518
provider "aws" {

‎main.tf‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,10 @@
1111
# ----------------------------------------------------------------------------------------------------------------------
1212

1313
terraform {
14-
required_version = ">= 0.12"
14+
# This module is now only being tested with Terraform 0.13.x. However, to make upgrading easier, we are setting
15+
# 0.12.26 as the minimum version, as that version added support for required_providers with source URLs, making it
16+
# forwards compatible with 0.13.x code.
17+
required_version = ">= 0.12.26"
1518
}
1619

1720
# ---------------------------------------------------------------------------------------------------------------------

‎modules/couchbase-cluster/main.tf‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,10 @@
44
# ----------------------------------------------------------------------------------------------------------------------
55

66
terraform {
7-
required_version = ">= 0.12"
7+
# This module is now only being tested with Terraform 0.13.x. However, to make upgrading easier, we are setting
8+
# 0.12.26 as the minimum version, as that version added support for required_providers with source URLs, making it
9+
# forwards compatible with 0.13.x code.
10+
required_version = ">= 0.12.26"
811
}
912

1013
# ---------------------------------------------------------------------------------------------------------------------

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,10 @@
44
# ----------------------------------------------------------------------------------------------------------------------
55

66
terraform {
7-
required_version = ">= 0.12"
7+
# This module is now only being tested with Terraform 0.13.x. However, to make upgrading easier, we are setting
8+
# 0.12.26 as the minimum version, as that version added support for required_providers with source URLs, making it
9+
# forwards compatible with 0.13.x code.
10+
required_version = ">= 0.12.26"
811
}
912

1013
# ---------------------------------------------------------------------------------------------------------------------

‎modules/couchbase-server-security-group-rules/main.tf‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,10 @@
44
# ----------------------------------------------------------------------------------------------------------------------
55

66
terraform {
7-
required_version = ">= 0.12"
7+
# This module is now only being tested with Terraform 0.13.x. However, to make upgrading easier, we are setting
8+
# 0.12.26 as the minimum version, as that version added support for required_providers with source URLs, making it
9+
# forwards compatible with 0.13.x code.
10+
required_version = ">= 0.12.26"
811
}
912

1013
# ---------------------------------------------------------------------------------------------------------------------

‎modules/load-balancer-target-group/main.tf‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,10 @@
44
# ----------------------------------------------------------------------------------------------------------------------
55

66
terraform {
7-
required_version = ">= 0.12"
7+
# This module is now only being tested with Terraform 0.13.x. However, to make upgrading easier, we are setting
8+
# 0.12.26 as the minimum version, as that version added support for required_providers with source URLs, making it
9+
# forwards compatible with 0.13.x code.
10+
required_version = ">= 0.12.26"
811
}
912

1013
# ---------------------------------------------------------------------------------------------------------------------

0 commit comments

Comments
 (0)