Merge pull request #38 from gruntwork-io/tf12

Upgrade to Terraform 0.12

Author: robmorgan

.circleci/config.yml

@@ -4,7 +4,7 @@ defaults: &defaults
     GRUNTWORK_INSTALLER_VERSION: v0.0.21
     TERRATEST_LOG_PARSER_VERSION: v0.13.24
     MODULE_CI_VERSION: v0.13.3
-    TERRAFORM_VERSION: 0.11.8
+    TERRAFORM_VERSION: 0.12.2
     TERRAGRUNT_VERSION: NONE
     PACKER_VERSION: NONE
     GOLANG_VERSION: 1.11.2
@@ -99,4 +99,4 @@ workflows:
       - build
       - test:
           requires:
-            - build
+            - build

README.md

@@ -1,5 +1,6 @@
 [![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)
 
 # Cloud SQL Modules
 
@@ -20,33 +21,33 @@ for instructions.
 
 This repo has the following folder structure:
 
-* [root](https://github.com/gruntwork-io/terraform-google-sql/tree/master): The root folder contains an example of how
+- [root](https://github.com/gruntwork-io/terraform-google-sql/tree/master): The root folder contains an example of how
   to deploy a private PostgreSQL instance in Cloud SQL. See [postgres-private-ip](https://github.com/gruntwork-io/terraform-google-sql/blob/master/examples/postgres-private-ip)
   for the documentation.
 
-* [modules](https://github.com/gruntwork-io/terraform-google-sql/tree/master/modules): This folder contains the
+- [modules](https://github.com/gruntwork-io/terraform-google-sql/tree/master/modules): This folder contains the
   main implementation code for this Module, broken down into multiple standalone submodules.
 
   The primary module is:
 
-    * [cloud-sql](https://github.com/gruntwork-io/terraform-google-sql/tree/master/modules/cloud-sql): Deploy a Cloud SQL [MySQL](https://cloud.google.com/sql/docs/mysql/) or
+  - [cloud-sql](https://github.com/gruntwork-io/terraform-google-sql/tree/master/modules/cloud-sql): Deploy a Cloud SQL [MySQL](https://cloud.google.com/sql/docs/mysql/) or
     [PostgreSQL](https://cloud.google.com/sql/docs/postgres/) database.
 
-* [examples](https://github.com/gruntwork-io/terraform-google-sql/tree/master/examples): This folder contains
+- [examples](https://github.com/gruntwork-io/terraform-google-sql/tree/master/examples): This folder contains
   examples of how to use the submodules.
 
-* [test](https://github.com/gruntwork-io/terraform-google-sql/tree/master/test): Automated tests for the submodules
+- [test](https://github.com/gruntwork-io/terraform-google-sql/tree/master/test): Automated tests for the submodules
   and examples.
 
 ## What is Cloud SQL?
 
-Cloud SQL is Google's fully-managed database service that makes it easy to set up, maintain, manage, and administer 
-your relational databases on Google Cloud Platform. Cloud SQL automatically includes: 
+Cloud SQL is Google's fully-managed database service that makes it easy to set up, maintain, manage, and administer
+your relational databases on Google Cloud Platform. Cloud SQL automatically includes:
 
-* Data replication between multiple zones with automatic failover.
-* Automated and on-demand backups, and point-in-time recovery.
-* Data encryption on networks, database tables, temporary files, and backups.
-* Secure external connections with the [Cloud SQL Proxy](https://cloud.google.com/sql/docs/mysql/sql-proxy) or with the SSL/TLS protocol.
+- Data replication between multiple zones with automatic failover.
+- Automated and on-demand backups, and point-in-time recovery.
+- Data encryption on networks, database tables, temporary files, and backups.
+- Secure external connections with the [Cloud SQL Proxy](https://cloud.google.com/sql/docs/mysql/sql-proxy) or with the SSL/TLS protocol.
 
 You can learn more about Cloud SQL from [the official documentation](https://cloud.google.com/sql/docs/).
 
@@ -70,18 +71,16 @@ commercial support, send an email to
 
 Gruntwork can help with:
 
-* Setup, customization, and support for this Module.
-* Modules and submodules for other types of infrastructure, such as VPCs, Docker clusters, databases, and continuous
+- Setup, customization, and support for this Module.
+- Modules and submodules for other types of infrastructure, such as VPCs, Docker clusters, databases, and continuous
   integration.
-* Modules and Submodules that meet compliance requirements, such as HIPAA.
-* Consulting & Training on GCP, AWS, Terraform, and DevOps.
-
+- Modules and Submodules that meet compliance requirements, such as HIPAA.
+- Consulting & Training on GCP, AWS, Terraform, and DevOps.
 
 ## How do I contribute to this Module?
 
 Contributions are very welcome! Check out the [Contribution Guidelines](https://github.com/gruntwork-io/terraform-google-sql/blob/master/CONTRIBUTING.md) for instructions.
 
-
 ## How is this Module versioned?
 
 This Module follows the principles of [Semantic Versioning](http://semver.org/). You can find each new release, along
@@ -91,7 +90,6 @@ During initial development, the major version will be 0 (e.g., `0.x.y`), which i
 stable API. Once we hit `1.0.0`, we will make every effort to maintain a backwards compatible API and use the MAJOR,
 MINOR, and PATCH versions on each release to indicate any incompatibilities.
 
-
 ## License
 
 Please see [LICENSE](https://github.com/gruntwork-io/terraform-google-sql/blob/master/LICENSE.txt) for how the code in this repo is licensed.

examples/client-certificate/main.tf

@@ -8,14 +8,14 @@
 
 provider "google-beta" {
   version = "~> 2.7.0"
-  region  = "${var.region}"
-  project = "${var.project}"
+  project = var.project
+  region  = var.region
 }
 
-# Use Terraform 0.10.x so that we can take advantage of Terraform GCP functionality as a separate provider via
-# https://github.com/terraform-providers/terraform-provider-google
 terraform {
-  required_version = ">= 0.10.3"
+  # The modules used in this example have been updated with 0.12 syntax, which means the example is no longer
+  # compatible with any versions below 0.12.
+  required_version = ">= 0.12"
 }
 
 # ------------------------------------------------------------------------------
@@ -24,6 +24,6 @@ terraform {
 
 resource "google_sql_ssl_cert" "client_cert" {
   provider    = "google-beta"
-  common_name = "${var.common_name}"
-  instance    = "${var.database_instance_name}"
+  common_name = var.common_name
+  instance    = var.database_instance_name
 }

examples/client-certificate/outputs.tf

@@ -4,11 +4,11 @@
 
 output "client_ca_cert" {
   description = "Certificate data for the client certificate."
-  value       = "${google_sql_ssl_cert.client_cert.cert}"
+  value       = google_sql_ssl_cert.client_cert.cert
 }
 
 # In real-world cases, the output for the private key should always be encrypted
 output "client_private_key" {
   description = "Private key associated with the client certificate."
-  value       = "${google_sql_ssl_cert.client_cert.private_key}"
+  value       = google_sql_ssl_cert.client_cert.private_key
 }

examples/client-certificate/variables.tf

@@ -5,17 +5,21 @@
 
 variable "project" {
   description = "The project ID to host the database in."
+  type        = string
 }
 
 variable "region" {
   description = "The region to host the database in."
+  type        = string
 }
 
 # Note, after a name db instance is used, it cannot be reused for up to one week.
 variable "common_name" {
   description = "The common name to be used in the certificate to identify the client. Constrained to [a-zA-Z.-_ ]+. Changing this forces a new resource to be created."
+  type        = string
 }
 
 variable "database_instance_name" {
   description = "The name of the Cloud SQL instance. Changing this forces a new resource to be created."
+  type        = string
 }

examples/mysql-private-ip/main.tf

@@ -8,14 +8,14 @@
 
 provider "google-beta" {
   version = "~> 2.7.0"
-  region  = "${var.region}"
-  project = "${var.project}"
+  project = var.project
+  region  = var.region
 }
 
-# Use Terraform 0.10.x so that we can take advantage of Terraform GCP functionality as a separate provider via
-# https://github.com/terraform-providers/terraform-provider-google
 terraform {
-  required_version = ">= 0.10.3"
+  # The modules used in this example have been updated with 0.12 syntax, which means the example is no longer
+  # compatible with any versions below 0.12.
+  required_version = ">= 0.12"
 }
 
 # ------------------------------------------------------------------------------
@@ -28,7 +28,7 @@ resource "random_id" "name" {
 
 locals {
   # If name_override is specified, use that - otherwise use the name_prefix with a random string
-  instance_name        = "${length(var.name_override) == 0 ? format("%s-%s", var.name_prefix, random_id.name.hex) : var.name_override}"
+  instance_name        = var.name_override == null ? format("%s-%s", var.name_prefix, random_id.name.hex) : var.name_override
   private_network_name = "private-network-${random_id.name.hex}"
   private_ip_name      = "private-ip-${random_id.name.hex}"
 }
@@ -40,25 +40,25 @@ locals {
 # Simple network, auto-creates subnetworks
 resource "google_compute_network" "private_network" {
   provider = "google-beta"
-  name     = "${local.private_network_name}"
+  name     = local.private_network_name
 }
 
 # Reserve global internal address range for the peering
 resource "google_compute_global_address" "private_ip_address" {
   provider      = "google-beta"
-  name          = "${local.private_ip_name}"
+  name          = local.private_ip_name
   purpose       = "VPC_PEERING"
   address_type  = "INTERNAL"
   prefix_length = 16
-  network       = "${google_compute_network.private_network.self_link}"
+  network       = google_compute_network.private_network.self_link
 }
 
 # Establish VPC network peering connection using the reserved address range
 resource "google_service_networking_connection" "private_vpc_connection" {
   provider                = "google-beta"
-  network                 = "${google_compute_network.private_network.self_link}"
+  network                 = google_compute_network.private_network.self_link
   service                 = "servicenetworking.googleapis.com"
-  reserved_peering_ranges = ["${google_compute_global_address.private_ip_address.name}"]
+  reserved_peering_ranges = [google_compute_global_address.private_ip_address.name]
 }
 
 # ------------------------------------------------------------------------------
@@ -68,31 +68,31 @@ resource "google_service_networking_connection" "private_vpc_connection" {
 module "mysql" {
   # When using these modules in your own templates, you will need to use a Git URL with a ref attribute that pins you
   # to a specific version of the modules, such as the following example:
-  # source = "github.com/gruntwork-io/terraform-google-sql.git//modules/cloud-sql?ref=v0.1.1"
+  # source = "github.com/gruntwork-io/terraform-google-sql.git//modules/cloud-sql?ref=v0.2.0"
   source = "../../modules/cloud-sql"
 
-  project = "${var.project}"
-  region  = "${var.region}"
-  name    = "${local.instance_name}"
-  db_name = "${var.db_name}"
+  project = var.project
+  region  = var.region
+  name    = local.instance_name
+  db_name = var.db_name
 
-  engine       = "${var.mysql_version}"
-  machine_type = "${var.machine_type}"
+  engine       = var.mysql_version
+  machine_type = var.machine_type
 
   # These together will construct the master_user privileges, i.e.
   # 'master_user_name'@'master_user_host' IDENTIFIED BY 'master_user_password'.
   # These should typically be set as the environment variable TF_VAR_master_user_password, etc.
   # so you don't check these into source control."
-  master_user_password = "${var.master_user_password}"
+  master_user_password = var.master_user_password
 
-  master_user_name = "${var.master_user_name}"
+  master_user_name = var.master_user_name
   master_user_host = "%"
 
   # Pass the private network link to the module
-  private_network = "${google_compute_network.private_network.self_link}"
+  private_network = google_compute_network.private_network.self_link
 
   # Wait for the vpc connection to complete
-  dependencies = ["${google_service_networking_connection.private_vpc_connection.network}"]
+  dependencies = [google_service_networking_connection.private_vpc_connection.network]
 
   # Set auto-increment flags to test the
   # feature during automated testing

examples/mysql-private-ip/outputs.tf

@@ -4,27 +4,27 @@
 
 output "master_instance_name" {
   description = "The name of the database instance"
-  value       = "${module.mysql.master_instance_name}"
+  value       = module.mysql.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.mysql.master_ip_addresses}"
+  value       = module.mysql.master_ip_addresses
 }
 
 output "master_private_ip" {
   description = "The private IPv4 address of the master instance."
-  value       = "${module.mysql.master_private_ip_address}"
+  value       = module.mysql.master_private_ip_address
 }
 
 output "master_instance" {
   description = "Self link to the master instance"
-  value       = "${module.mysql.master_instance}"
+  value       = module.mysql.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.mysql.master_proxy_connection}"
+  value       = module.mysql.master_proxy_connection
 }
 
 # ------------------------------------------------------------------------------
@@ -33,10 +33,10 @@ output "master_proxy_connection" {
 
 output "db_name" {
   description = "Name of the default database"
-  value       = "${module.mysql.db_name}"
+  value       = module.mysql.db_name
 }
 
 output "db" {
   description = "Self link to the default database"
-  value       = "${module.mysql.db}"
+  value       = module.mysql.db
 }

examples/mysql-private-ip/variables.tf

@@ -5,45 +5,55 @@
 
 variable "project" {
   description = "The project ID to host the database in."
+  type        = string
 }
 
 variable "region" {
   description = "The region to host the database in."
+  type        = string
 }
 
 # Note, after a name db instance is used, it cannot be reused for up to one week.
 variable "name_prefix" {
   description = "The name prefix for the database instance. Will be appended with a random string. Use lowercase letters, numbers, and hyphens. Start with a letter."
+  type        = string
 }
 
 variable "master_user_name" {
   description = "The username part for the default user credentials, i.e. 'master_user_name'@'master_user_host' IDENTIFIED BY 'master_user_password'. This should typically be set as the environment variable TF_VAR_master_user_name so you don't check it into source control."
+  type        = string
 }
 
 variable "master_user_password" {
   description = "The password part for the default user credentials, i.e. 'master_user_name'@'master_user_host' IDENTIFIED BY 'master_user_password'. This should typically be set as the environment variable TF_VAR_master_user_password so you don't check it into source control."
+  type        = string
 }
 
 # ---------------------------------------------------------------------------------------------------------------------
 # OPTIONAL PARAMETERS
 # Generally, these values won't need to be changed.
 # ---------------------------------------------------------------------------------------------------------------------
+
 variable "mysql_version" {
   description = "The engine version of the database, e.g. `MYSQL_5_6` or `MYSQL_5_7`. See https://cloud.google.com/sql/docs/features for supported versions."
+  type        = string
   default     = "MYSQL_5_7"
 }
 
 variable "machine_type" {
   description = "The machine type to use, see https://cloud.google.com/sql/pricing for more details"
+  type        = string
   default     = "db-f1-micro"
 }
 
 variable "db_name" {
   description = "Name for the db"
+  type        = string
   default     = "default"
 }
 
 variable "name_override" {
   description = "You may optionally override the name_prefix + random string by specifying an override"
-  default     = ""
+  type        = string
+  default     = null
 }