Terraform v0.14 update (#60)

gruntwork-io · Apr 22, 2021 · 7a02a34 · 7a02a34
1 parent ad56d7b
commit 7a02a34
Show file tree

Hide file tree

Showing 18 changed files with 98 additions and 85 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -7,11 +7,12 @@ env: &env
   environment:
     GRUNTWORK_INSTALLER_VERSION: v0.0.30
     TERRATEST_LOG_PARSER_VERSION: v0.30.4
-    MODULE_CI_VERSION: v0.29.1
-    TERRAFORM_VERSION: 0.13.5
+    MODULE_CI_VERSION: v0.33.2
+    TERRAFORM_VERSION: 0.14.8
     TERRAGRUNT_VERSION: NONE
     PACKER_VERSION: NONE
-    GOLANG_VERSION: 1.13.8
+    GOLANG_VERSION: 1.16
+    GO111MODULE: auto
 
 jobs:
   precommit:

diff --git a/.gitignore b/.gitignore
@@ -25,4 +25,7 @@ vendor
 #VIM swap files
 *.swp
 
-.test-data
+.test-data
+# 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
@@ -14,7 +14,7 @@
 
 [![Maintained by Gruntwork.io](https://img.shields.io/badge/maintained%20by-gruntwork.io-%235849a6.svg)](https://gruntwork.io/?ref=repo_google_cloudsql)
 [![GitHub tag (latest SemVer)](https://img.shields.io/github/tag/gruntwork-io/terraform-google-sql.svg?label=latest)](http://github.com/gruntwork-io/terraform-google-sql/releases/latest)
-![Terraform Version](https://img.shields.io/badge/tf-%3E%3D0.13.0-blue.svg)
+![Terraform Version](https://img.shields.io/badge/tf-%3E%3D0.14.0-blue.svg)
 
 This repo contains modules for running relational databases such as MySQL and PostgreSQL on
 [Google Cloud Platform (GCP)](https://cloud.google.com/) using [Cloud SQL](https://cloud.google.com/sql/).

diff --git a/examples/client-certificate/main.tf b/examples/client-certificate/main.tf
@@ -7,16 +7,22 @@
 # ------------------------------------------------------------------------------
 
 provider "google-beta" {
-  version = "~> 3.57.0"
   project = var.project
   region  = var.region
 }
 
 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"
+
+  required_providers {
+    google-beta = {
+      source  = "hashicorp/google-beta"
+      version = "~> 3.57.0"
+    }
+  }
 }
 
 # ------------------------------------------------------------------------------

diff --git a/examples/mysql-private-ip/main.tf b/examples/mysql-private-ip/main.tf
@@ -7,16 +7,22 @@
 # ------------------------------------------------------------------------------
 
 provider "google-beta" {
-  version = "~> 3.57.0"
   project = var.project
   region  = var.region
 }
 
 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"
+
+  required_providers {
+    google-beta = {
+      source  = "hashicorp/google-beta"
+      version = "~> 3.57.0"
+    }
+  }
 }
 
 # ------------------------------------------------------------------------------

diff --git a/examples/mysql-public-ip/main.tf b/examples/mysql-public-ip/main.tf
@@ -7,16 +7,22 @@
 # ------------------------------------------------------------------------------
 
 provider "google-beta" {
-  version = "~> 3.57.0"
   project = var.project
   region  = var.region
 }
 
 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"
+
+  required_providers {
+    google-beta = {
+      source  = "hashicorp/google-beta"
+      version = "~> 3.57.0"
+    }
+  }
 }
 
 # ------------------------------------------------------------------------------

diff --git a/examples/mysql-replicas/main.tf b/examples/mysql-replicas/main.tf
@@ -7,16 +7,22 @@
 # ------------------------------------------------------------------------------
 
 provider "google-beta" {
-  version = "~> 3.57.0"
   project = var.project
   region  = var.region
 }
 
 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"
+
+  required_providers {
+    google-beta = {
+      source  = "hashicorp/google-beta"
+      version = "~> 3.57.0"
+    }
+  }
 }
 
 # ------------------------------------------------------------------------------

diff --git a/examples/postgres-private-ip/main.tf b/examples/postgres-private-ip/main.tf
@@ -7,16 +7,22 @@
 # ------------------------------------------------------------------------------
 
 provider "google-beta" {
-  version = "~> 3.57.0"
   project = var.project
   region  = var.region
 }
 
 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"
+
+  required_providers {
+    google-beta = {
+      source  = "hashicorp/google-beta"
+      version = "~> 3.57.0"
+    }
+  }
 }
 
 # ------------------------------------------------------------------------------

diff --git a/examples/postgres-public-ip/main.tf b/examples/postgres-public-ip/main.tf
@@ -7,16 +7,22 @@
 # ------------------------------------------------------------------------------
 
 provider "google-beta" {
-  version = "~> 3.57.0"
   project = var.project
   region  = var.region
 }
 
 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"
+
+  required_providers {
+    google-beta = {
+      source  = "hashicorp/google-beta"
+      version = "~> 3.57.0"
+    }
+  }
 }
 
 # ------------------------------------------------------------------------------

diff --git a/examples/postgres-replicas/main.tf b/examples/postgres-replicas/main.tf
@@ -7,16 +7,22 @@
 # ------------------------------------------------------------------------------
 
 provider "google-beta" {
-  version = "~> 3.57.0"
   project = var.project
   region  = var.region
 }
 
 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"
+
+  required_providers {
+    google-beta = {
+      source  = "hashicorp/google-beta"
+      version = "~> 3.57.0"
+    }
+  }
 }
 
 # ------------------------------------------------------------------------------

diff --git a/main.tf b/main.tf
@@ -7,16 +7,22 @@
 # ------------------------------------------------------------------------------
 
 provider "google-beta" {
-  version = "~> 3.57.0"
   project = var.project
   region  = var.region
 }
 
 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"
+
+  required_providers {
+    google-beta = {
+      source  = "hashicorp/google-beta"
+      version = "~> 3.57.0"
+    }
+  }
 }
 
 # ------------------------------------------------------------------------------

diff --git a/modules/cloud-sql/README-MySQL.md b/modules/cloud-sql/README-MySQL.md
@@ -12,7 +12,7 @@
 # MySQL
 [![Maintained by Gruntwork.io](https://img.shields.io/badge/maintained%20by-gruntwork.io-%235849a6.svg)](https://gruntwork.io/?ref=repo_google_cloudsql)
 [![GitHub tag (latest SemVer)](https://img.shields.io/github/tag/gruntwork-io/terraform-google-sql.svg?label=latest)](http://github.com/gruntwork-io/terraform-google-sql/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)
 
 This module deploys MySQL on top of Google's Cloud SQL Service. The cluster is managed by GCP and automatically handles 
 standby failover, read replicas, backups, patching, and encryption.

diff --git a/modules/cloud-sql/README-PostgreSQL.md b/modules/cloud-sql/README-PostgreSQL.md
@@ -12,7 +12,7 @@
 # PostgreSQL
 [![Maintained by Gruntwork.io](https://img.shields.io/badge/maintained%20by-gruntwork.io-%235849a6.svg)](https://gruntwork.io/?ref=repo_google_cloudsql)
 [![GitHub tag (latest SemVer)](https://img.shields.io/github/tag/gruntwork-io/terraform-google-sql.svg?label=latest)](http://github.com/gruntwork-io/terraform-google-sql/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)
 
 This module deploys PostgreSQL on top of Google's Cloud SQL Service. The cluster is managed by GCP and automatically handles 
 standby failover, read replicas, backups, patching, and encryption.

diff --git a/modules/cloud-sql/README.md b/modules/cloud-sql/README.md
@@ -2,7 +2,7 @@
 
 [![Maintained by Gruntwork.io](https://img.shields.io/badge/maintained%20by-gruntwork.io-%235849a6.svg)](https://gruntwork.io/?ref=repo_google_cloudsql)
 [![GitHub tag (latest SemVer)](https://img.shields.io/github/tag/gruntwork-io/terraform-google-sql.svg?label=latest)](http://github.com/gruntwork-io/terraform-google-sql/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)
 
 
 <!-- NOTE: We use absolute linking here instead of relative linking, because the terraform registry does not support

diff --git a/modules/cloud-sql/main.tf b/modules/cloud-sql/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/outputs.tf b/outputs.tf
@@ -4,27 +4,27 @@
 
 output "master_instance_name" {
   description = "The name of the database instance"
-  value       = "${module.postgres.master_instance_name}"
+  value       = module.postgres.master_instance_name
 }
 
 output "master_ip_addresses" {
   description = "All IP addresses of the instance as list of maps, see https://www.terraform.io/docs/providers/google/r/sql_database_instance.html#ip_address-0-ip_address"
-  value       = "${module.postgres.master_ip_addresses}"
+  value       = module.postgres.master_ip_addresses
 }
 
 output "master_private_ip" {
   description = "The private IPv4 address of the master instance"
-  value       = "${module.postgres.master_private_ip_address}"
+  value       = module.postgres.master_private_ip_address
 }
 
 output "master_instance" {
   description = "Self link to the master instance"
-  value       = "${module.postgres.master_instance}"
+  value       = module.postgres.master_instance
 }
 
 output "master_proxy_connection" {
   description = "Instance path for connecting with Cloud SQL Proxy. Read more at https://cloud.google.com/sql/docs/mysql/sql-proxy"
-  value       = "${module.postgres.master_proxy_connection}"
+  value       = module.postgres.master_proxy_connection
 }
 
 # ------------------------------------------------------------------------------
@@ -33,10 +33,10 @@ output "master_proxy_connection" {
 
 output "db_name" {
   description = "Name of the default database"
-  value       = "${module.postgres.db_name}"
+  value       = module.postgres.db_name
 }
 
 output "db" {
   description = "Self link to the default database"
-  value       = "${module.postgres.db}"
+  value       = module.postgres.db
 }
diff --git a/test/go.mod b/test/go.mod
@@ -5,7 +5,7 @@ go 1.14
 require (
 	github.com/GoogleCloudPlatform/cloudsql-proxy v0.0.0-20200504171905-7e668d9ad0ba
 	github.com/go-sql-driver/mysql v1.5.0
-	github.com/gruntwork-io/terratest v0.30.23
+	github.com/gruntwork-io/terratest v0.31.3
 	github.com/lib/pq v1.5.1
 	github.com/stretchr/testify v1.5.1
 )