Upgrade to Terraform 0.14 (#40)

infraredgirl · web-flow · commit 3951a26c7548 · 2021-02-23T11:16:43.000+01:00
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -2,20 +2,18 @@ version: 2.0
 defaults: &defaults
   machine:
     image: ubuntu-1604:201903-01
-
 env: &env
   environment:
     MODULE_CI_VERSION: v0.29.5
     TERRATEST_LOG_PARSER_VERSION: v0.30.3
     GRUNTWORK_INSTALLER_VERSION: v0.0.30
-    TERRAFORM_VERSION: 0.13.2
+    TERRAFORM_VERSION: 0.14.4
     TERRAGRUNT_VERSION: NONE
     GO_VERSION: 1.14
-
 jobs:
   test aws:
-    <<: *defaults
-    <<: *env
+    !!merge <<: *defaults
+    !!merge <<: *env
     steps:
       - checkout
       - run: &install_gruntwork_tooling
@@ -65,7 +63,6 @@ jobs:
           command: |
             terratest_log_parser --testlog /tmp/logs/python2/all.log --outputdir /tmp/logs/python2
             terratest_log_parser --testlog /tmp/logs/python3/all.log --outputdir /tmp/logs/python3
-
           when: always
       - store_artifacts:
           path: /tmp/logs
diff --git a/.gitignore b/.gitignore
@@ -25,3 +25,7 @@ __pycache__
 
 # Go best practices dictate that libraries should not include the vendor directory
 vendor
+
+# Ignore Terraform lock files, as we want to test the Terraform code in these repos with the latest provider
+# versions.
+.terraform.lock.hcl
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 [![Maintained by Gruntwork.io](https://img.shields.io/badge/maintained%20by-gruntwork.io-%235849a6.svg)](https://gruntwork.io/?ref=repo_package_terraform_utilities)
 [![GitHub tag (latest SemVer)](https://img.shields.io/github/tag/gruntwork-io/package-terraform-utilities.svg?label=latest)](https://github.com/gruntwork-io/package-terraform-utilities/releases/latest)
-![Terraform Version](https://img.shields.io/badge/tf-%3E%3D0.12.0-blue.svg)
+![Terraform Version](https://img.shields.io/badge/tf-%3E%3D0.14.0-blue.svg)
 
 # Terraform Utility Modules
 
diff --git a/examples/executable-dependency/main.tf b/examples/executable-dependency/main.tf
@@ -1,7 +1,7 @@
 terraform {
-  # This module is now only being tested with Terraform 0.13.x. However, to make upgrading easier, we are setting
+  # This module is now only being tested with Terraform 0.14.x. However, to make upgrading easier, we are setting
   # 0.12.26 as the minimum version, as that version added support for required_providers with source URLs, making it
-  # forwards compatible with 0.13.x code.
+  # forwards compatible with 0.14.x code.
   required_version = ">= 0.12.26"
 }
 
diff --git a/examples/instance-type/main.tf b/examples/instance-type/main.tf
@@ -1,7 +1,7 @@
 terraform {
-  # This module is now only being tested with Terraform 0.13.x. However, to make upgrading easier, we are setting
+  # This module is now only being tested with Terraform 0.14.x. However, to make upgrading easier, we are setting
   # 0.12.26 as the minimum version, as that version added support for required_providers with source URLs, making it
-  # forwards compatible with 0.13.x code.
+  # forwards compatible with 0.14.x code.
   required_version = ">= 0.12.26"
 }
 
diff --git a/examples/join-path/main.tf b/examples/join-path/main.tf
@@ -1,7 +1,7 @@
 terraform {
-  # This module is now only being tested with Terraform 0.13.x. However, to make upgrading easier, we are setting
+  # This module is now only being tested with Terraform 0.14.x. However, to make upgrading easier, we are setting
   # 0.12.26 as the minimum version, as that version added support for required_providers with source URLs, making it
-  # forwards compatible with 0.13.x code.
+  # forwards compatible with 0.14.x code.
   required_version = ">= 0.12.26"
 }
 
diff --git a/examples/list-remove/main.tf b/examples/list-remove/main.tf
@@ -1,7 +1,7 @@
 terraform {
-  # This module is now only being tested with Terraform 0.13.x. However, to make upgrading easier, we are setting
+  # This module is now only being tested with Terraform 0.14.x. However, to make upgrading easier, we are setting
   # 0.12.26 as the minimum version, as that version added support for required_providers with source URLs, making it
-  # forwards compatible with 0.13.x code.
+  # forwards compatible with 0.14.x code.
   required_version = ">= 0.12.26"
 }
 
diff --git a/examples/operating-system/main.tf b/examples/operating-system/main.tf
@@ -1,7 +1,7 @@
 terraform {
-  # This module is now only being tested with Terraform 0.13.x. However, to make upgrading easier, we are setting
+  # This module is now only being tested with Terraform 0.14.x. However, to make upgrading easier, we are setting
   # 0.12.26 as the minimum version, as that version added support for required_providers with source URLs, making it
-  # forwards compatible with 0.13.x code.
+  # forwards compatible with 0.14.x code.
   required_version = ">= 0.12.26"
 }
 
diff --git a/examples/pex/main.tf b/examples/pex/main.tf
@@ -5,9 +5,9 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 terraform {
-  # This module is now only being tested with Terraform 0.13.x. However, to make upgrading easier, we are setting
+  # This module is now only being tested with Terraform 0.14.x. However, to make upgrading easier, we are setting
   # 0.12.26 as the minimum version, as that version added support for required_providers with source URLs, making it
-  # forwards compatible with 0.13.x code.
+  # forwards compatible with 0.14.x code.
   required_version = ">= 0.12.26"
 }
 
diff --git a/examples/request-quota-increase/main.tf b/examples/request-quota-increase/main.tf
@@ -1,7 +1,7 @@
 terraform {
-  # This module is now only being tested with Terraform 0.13.x. However, to make upgrading easier, we are setting
+  # This module is now only being tested with Terraform 0.14.x. However, to make upgrading easier, we are setting
   # 0.12.26 as the minimum version, as that version added support for required_providers with source URLs, making it
-  # forwards compatible with 0.13.x code.
+  # forwards compatible with 0.14.x code.
   required_version = ">= 0.12.26"
 }
 
diff --git a/examples/require-executable/main.tf b/examples/require-executable/main.tf
@@ -1,7 +1,7 @@
 terraform {
-  # This module is now only being tested with Terraform 0.13.x. However, to make upgrading easier, we are setting
+  # This module is now only being tested with Terraform 0.14.x. However, to make upgrading easier, we are setting
   # 0.12.26 as the minimum version, as that version added support for required_providers with source URLs, making it
-  # forwards compatible with 0.13.x code.
+  # forwards compatible with 0.14.x code.
   required_version = ">= 0.12.26"
 }
 
diff --git a/modules/executable-dependency/main.tf b/modules/executable-dependency/main.tf
@@ -1,7 +1,7 @@
 terraform {
-  # This module is now only being tested with Terraform 0.13.x. However, to make upgrading easier, we are setting
+  # This module is now only being tested with Terraform 0.14.x. However, to make upgrading easier, we are setting
   # 0.12.26 as the minimum version, as that version added support for required_providers with source URLs, making it
-  # forwards compatible with 0.13.x code.
+  # forwards compatible with 0.14.x code.
   required_version = ">= 0.12.26"
 }
 
diff --git a/modules/instance-type/main.tf b/modules/instance-type/main.tf
@@ -1,7 +1,7 @@
 terraform {
-  # This module is now only being tested with Terraform 0.13.x. However, to make upgrading easier, we are setting
+  # This module is now only being tested with Terraform 0.14.x. However, to make upgrading easier, we are setting
   # 0.12.26 as the minimum version, as that version added support for required_providers with source URLs, making it
-  # forwards compatible with 0.13.x code.
+  # forwards compatible with 0.14.x code.
   required_version = ">= 0.12.26"
 }
 
diff --git a/modules/instance-type/outputs.tf b/modules/instance-type/outputs.tf
@@ -1,6 +1,6 @@
 locals {
   instance_type_map = { for instance_type in var.instance_types : instance_type => (
-    ! contains([for az, offerings in data.aws_ec2_instance_type_offerings.offerings : contains(offerings.instance_types, instance_type)], false))
+    !contains([for az, offerings in data.aws_ec2_instance_type_offerings.offerings : contains(offerings.instance_types, instance_type)], false))
   }
 
   recommended_instance_type = [for instance_type in var.instance_types : instance_type if local.instance_type_map[instance_type]][0]
diff --git a/modules/join-path/main.tf b/modules/join-path/main.tf
@@ -1,7 +1,7 @@
 terraform {
-  # This module is now only being tested with Terraform 0.13.x. However, to make upgrading easier, we are setting
+  # This module is now only being tested with Terraform 0.14.x. However, to make upgrading easier, we are setting
   # 0.12.26 as the minimum version, as that version added support for required_providers with source URLs, making it
-  # forwards compatible with 0.13.x code.
+  # forwards compatible with 0.14.x code.
   required_version = ">= 0.12.26"
 }
 
diff --git a/modules/list-remove/main.tf b/modules/list-remove/main.tf
@@ -1,7 +1,7 @@
 terraform {
-  # This module is now only being tested with Terraform 0.13.x. However, to make upgrading easier, we are setting
+  # This module is now only being tested with Terraform 0.14.x. However, to make upgrading easier, we are setting
   # 0.12.26 as the minimum version, as that version added support for required_providers with source URLs, making it
-  # forwards compatible with 0.13.x code.
+  # forwards compatible with 0.14.x code.
   required_version = ">= 0.12.26"
 }
 
diff --git a/modules/operating-system/main.tf b/modules/operating-system/main.tf
@@ -1,7 +1,7 @@
 terraform {
-  # This module is now only being tested with Terraform 0.13.x. However, to make upgrading easier, we are setting
+  # This module is now only being tested with Terraform 0.14.x. However, to make upgrading easier, we are setting
   # 0.12.26 as the minimum version, as that version added support for required_providers with source URLs, making it
-  # forwards compatible with 0.13.x code.
+  # forwards compatible with 0.14.x code.
   required_version = ">= 0.12.26"
 }
 
diff --git a/modules/prepare-pex-environment/dependencies.tf b/modules/prepare-pex-environment/dependencies.tf
@@ -4,7 +4,10 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 terraform {
-  required_version = ">= 0.12"
+  # This module is now only being tested with Terraform 0.14.x. However, to make upgrading easier, we are setting
+  # 0.12.26 as the minimum version, as that version added support for required_providers with source URLs, making it
+  # forwards compatible with 0.14.x code.
+  required_version = ">= 0.12.26"
 }
 
 # Figure out the installed and configured python version
diff --git a/modules/prepare-pex-environment/main.tf b/modules/prepare-pex-environment/main.tf
@@ -7,9 +7,9 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 terraform {
-  # This module is now only being tested with Terraform 0.13.x. However, to make upgrading easier, we are setting
+  # This module is now only being tested with Terraform 0.14.x. However, to make upgrading easier, we are setting
   # 0.12.26 as the minimum version, as that version added support for required_providers with source URLs, making it
-  # forwards compatible with 0.13.x code.
+  # forwards compatible with 0.14.x code.
   required_version = ">= 0.12.26"
 }
 
diff --git a/modules/request-quota-increase/main.tf b/modules/request-quota-increase/main.tf
@@ -1,4 +1,7 @@
 terraform {
+  # This module is now only being tested with Terraform 0.14.x. However, to make upgrading easier, we are setting
+  # 0.12.26 as the minimum version, as that version added support for required_providers with source URLs, making it
+  # forwards compatible with 0.14.x code.
   required_version = ">= 0.12.26"
 }
 
diff --git a/modules/require-executable/main.tf b/modules/require-executable/main.tf
@@ -1,7 +1,7 @@
 terraform {
-  # This module is now only being tested with Terraform 0.13.x. However, to make upgrading easier, we are setting
+  # This module is now only being tested with Terraform 0.14.x. However, to make upgrading easier, we are setting
   # 0.12.26 as the minimum version, as that version added support for required_providers with source URLs, making it
-  # forwards compatible with 0.13.x code.
+  # forwards compatible with 0.14.x code.
   required_version = ">= 0.12.26"
 }
 
diff --git a/modules/run-pex-as-data-source/main.tf b/modules/run-pex-as-data-source/main.tf
@@ -6,9 +6,9 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 terraform {
-  # This module is now only being tested with Terraform 0.13.x. However, to make upgrading easier, we are setting
+  # This module is now only being tested with Terraform 0.14.x. However, to make upgrading easier, we are setting
   # 0.12.26 as the minimum version, as that version added support for required_providers with source URLs, making it
-  # forwards compatible with 0.13.x code.
+  # forwards compatible with 0.14.x code.
   required_version = ">= 0.12.26"
 }
 
diff --git a/modules/run-pex-as-resource/main.tf b/modules/run-pex-as-resource/main.tf
@@ -5,9 +5,9 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 terraform {
-  # This module is now only being tested with Terraform 0.13.x. However, to make upgrading easier, we are setting
+  # This module is now only being tested with Terraform 0.14.x. However, to make upgrading easier, we are setting
   # 0.12.26 as the minimum version, as that version added support for required_providers with source URLs, making it
-  # forwards compatible with 0.13.x code.
+  # forwards compatible with 0.14.x code.
   required_version = ">= 0.12.26"
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`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`
`3`	`3`	`# 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.`
`5`	`5`	`required_version = ">= 0.12.26"`
`6`	`6`	`}`
`7`	`7`