Update to Terraform 0.15 (#84)

* Add required_providers block * Update to Terraform 0.15
gruntwork-io · May 25, 2021 · 089112c · 089112c
1 parent f623546
commit 089112c
Show file tree

Hide file tree

Showing 14 changed files with 112 additions and 28 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -8,7 +8,7 @@ env: &env
     GRUNTWORK_INSTALLER_VERSION: v0.0.29
     TERRATEST_LOG_PARSER_VERSION: v0.30.10
     MODULE_CI_VERSION: v0.29.0
-    TERRAFORM_VERSION: 0.14.8
+    TERRAFORM_VERSION: 0.15.1
     TERRAGRUNT_VERSION: NONE
     PACKER_VERSION: 1.6.4
     GOLANG_VERSION: 1.16

diff --git a/README.md b/README.md
@@ -13,7 +13,7 @@
 # Couchbase AWS Module
 
 [![Maintained by Gruntwork.io](https://img.shields.io/badge/maintained%20by-gruntwork.io-%235849a6.svg)](https://gruntwork.io/?ref=repo_aws_couchbase)
-![Terraform Version](https://img.shields.io/badge/tf-%3E%3D0.14.0-blue.svg)
+![Terraform Version](https://img.shields.io/badge/tf-%3E%3D0.15.0-blue.svg)
 
 This repo contains a set of modules for deploying [Couchbase](https://www.couchbase.com/) on 
 [AWS](https://aws.amazon.com/) using [Terraform](https://www.terraform.io/) and [Packer](https://www.packer.io/). 

diff --git a/examples/couchbase-cluster-mds/main.tf b/examples/couchbase-cluster-mds/main.tf
@@ -5,9 +5,9 @@
 # ---------------------------------------------------------------------------------------------------------------------
 
 terraform {
-  # This module is now only being tested with Terraform 0.14.x. However, to make upgrading easier, we are setting
+  # This module is now only being tested with Terraform 0.15.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.
+  # forwards compatible with 0.15.x code.
   required_version = ">= 0.12.26"
 }
 

diff --git a/examples/couchbase-cluster-simple-dns-tls/main.tf b/examples/couchbase-cluster-simple-dns-tls/main.tf
@@ -7,9 +7,9 @@
 # ---------------------------------------------------------------------------------------------------------------------
 
 terraform {
-  # This module is now only being tested with Terraform 0.14.x. However, to make upgrading easier, we are setting
+  # This module is now only being tested with Terraform 0.15.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.
+  # forwards compatible with 0.15.x code.
   required_version = ">= 0.12.26"
 }
 

diff --git a/examples/couchbase-multi-datacenter-replication/main.tf b/examples/couchbase-multi-datacenter-replication/main.tf
@@ -4,9 +4,9 @@
 # ---------------------------------------------------------------------------------------------------------------------
 
 terraform {
-  # This module is now only being tested with Terraform 0.14.x. However, to make upgrading easier, we are setting
+  # This module is now only being tested with Terraform 0.15.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.
+  # forwards compatible with 0.15.x code.
   required_version = ">= 0.12.26"
 }
 

diff --git a/main.tf b/main.tf
@@ -6,9 +6,9 @@
 # ---------------------------------------------------------------------------------------------------------------------
 
 terraform {
-  # This module is now only being tested with Terraform 0.14.x. However, to make upgrading easier, we are setting
+  # This module is now only being tested with Terraform 0.15.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.
+  # forwards compatible with 0.15.x code.
   required_version = ">= 0.12.26"
 }
 

diff --git a/modules/couchbase-cluster/main.tf b/modules/couchbase-cluster/main.tf
@@ -1,8 +1,15 @@
 terraform {
-  # This module is now only being tested with Terraform 0.14.x. However, to make upgrading easier, we are setting
+  # This module is now only being tested with Terraform 0.15.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.
+  # forwards compatible with 0.15.x code.
   required_version = ">= 0.12.26"
+
+  required_providers {
+    aws = {
+      source  = "hashicorp/aws"
+      version = ">= 3.0.0"
+    }
+  }
 }
 
 # ---------------------------------------------------------------------------------------------------------------------

diff --git a/modules/couchbase-iam-policies/main.tf b/modules/couchbase-iam-policies/main.tf
@@ -1,8 +1,15 @@
 terraform {
-  # This module is now only being tested with Terraform 0.14.x. However, to make upgrading easier, we are setting
+  # This module is now only being tested with Terraform 0.15.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.
+  # forwards compatible with 0.15.x code.
   required_version = ">= 0.12.26"
+
+  required_providers {
+    aws = {
+      source  = "hashicorp/aws"
+      version = ">= 3.0.0"
+    }
+  }
 }
 
 # ---------------------------------------------------------------------------------------------------------------------

diff --git a/modules/couchbase-server-security-group-rules/main.tf b/modules/couchbase-server-security-group-rules/main.tf
@@ -1,8 +1,15 @@
 terraform {
-  # This module is now only being tested with Terraform 0.14.x. However, to make upgrading easier, we are setting
+  # This module is now only being tested with Terraform 0.15.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.
+  # forwards compatible with 0.15.x code.
   required_version = ">= 0.12.26"
+
+  required_providers {
+    aws = {
+      source  = "hashicorp/aws"
+      version = ">= 3.0.0"
+    }
+  }
 }
 
 # ---------------------------------------------------------------------------------------------------------------------

diff --git a/modules/load-balancer-target-group/main.tf b/modules/load-balancer-target-group/main.tf
@@ -1,8 +1,15 @@
 terraform {
-  # This module is now only being tested with Terraform 0.14.x. However, to make upgrading easier, we are setting
+  # This module is now only being tested with Terraform 0.15.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.
+  # forwards compatible with 0.15.x code.
   required_version = ">= 0.12.26"
+
+  required_providers {
+    aws = {
+      source  = "hashicorp/aws"
+      version = ">= 3.0.0"
+    }
+  }
 }
 
 # ---------------------------------------------------------------------------------------------------------------------

diff --git a/modules/load-balancer/main.tf b/modules/load-balancer/main.tf
@@ -1,8 +1,15 @@
 terraform {
-  # This module is now only being tested with Terraform 0.14.x. However, to make upgrading easier, we are setting
+  # This module is now only being tested with Terraform 0.15.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.
+  # forwards compatible with 0.15.x code.
   required_version = ">= 0.12.26"
+
+  required_providers {
+    aws = {
+      source  = "hashicorp/aws"
+      version = ">= 3.0.0"
+    }
+  }
 }
 
 # ---------------------------------------------------------------------------------------------------------------------

diff --git a/modules/sync-gateway-security-group-rules/main.tf b/modules/sync-gateway-security-group-rules/main.tf
@@ -1,8 +1,15 @@
 terraform {
-  # This module is now only being tested with Terraform 0.14.x. However, to make upgrading easier, we are setting
+  # This module is now only being tested with Terraform 0.15.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.
+  # forwards compatible with 0.15.x code.
   required_version = ">= 0.12.26"
+
+  required_providers {
+    aws = {
+      source  = "hashicorp/aws"
+      version = ">= 3.0.0"
+    }
+  }
 }
 
 # ---------------------------------------------------------------------------------------------------------------------

diff --git a/test/go.mod b/test/go.mod
@@ -3,6 +3,6 @@ module github.com/gruntwork-io/terraform-aws-couchbase/test
 go 1.14
 
 require (
-	github.com/gruntwork-io/terratest v0.31.3
+	github.com/gruntwork-io/terratest v0.33.0
 	github.com/stretchr/testify v1.6.1
 )