Merge pull request #53 from ingwarr/master

Add support for Terraform 0.12 #52

Author: aaron-lane

CHANGELOG.md

@@ -14,6 +14,7 @@ project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Changed
 
+- Added support for Terraform 0.12 [#53]
 - the root module has been deprecated [#56]
 
 ### Fixed
@@ -42,4 +43,5 @@ project adheres to [Semantic Versioning](http://semver.org/).
 
 [#61]: https://github.com/terraform-google-modules/terraform-google-sql-db/pull/61
 [#56]: https://github.com/terraform-google-modules/terraform-google-sql-db/pull/56
+[#53]: https://github.com/terraform-google-modules/terraform-google-sql-db/pull/53
 [#43]: https://github.com/terraform-google-modules/terraform-google-sql-db/pull/43

Gemfile

@@ -1,5 +1,5 @@
 source "https://rubygems.org/"
 
-gem "kitchen-terraform", "~> 4.0"
+gem "kitchen-terraform", "~> 4.9"
 gem "test-kitchen"
 gem 'kitchen-inspec'

Makefile

@@ -1,4 +1,4 @@
-# Copyright 2018 Google LLC
+# Copyright 2019 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,26 +12,20 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Please note that this file was generated from [terraform-google-module-template](https://github.com/terraform-google-modules/terraform-google-module-template).
-# Please make sure to contribute relevant changes upstream!
-
-# Make will use bash instead of sh
 SHELL := /usr/bin/env bash
 
-# Docker build config variables
-CREDENTIALS_PATH ?= /cft/workdir/credentials.json
-
-
-# Docker build config variables
+CREDENTIALS_PATH 			?= /cft/workdir/credentials.json
 DOCKER_ORG 				:= gcr.io/cloud-foundation-cicd
-DOCKER_TAG_BASE_KITCHEN_TERRAFORM 	?= 1.0.1
+DOCKER_TAG_BASE_KITCHEN_TERRAFORM 	?= 2.3.0
 DOCKER_REPO_BASE_KITCHEN_TERRAFORM 	:= ${DOCKER_ORG}/cft/kitchen-terraform:${DOCKER_TAG_BASE_KITCHEN_TERRAFORM}
 
 # All is the first target in the file so it will get picked up when you just run 'make' on its own
+.PHONY: all
 all: check generate_docs
 
 # Run all available linters
-check: check_shell check_python check_golang check_terraform check_docker check_base_files test_check_headers check_headers check_trailing_whitespace
+.PHONY: check
+check: check_shell check_python check_golang check_terraform check_base_files test_check_headers check_headers check_trailing_whitespace
 
 # The .PHONY directive tells make that this isn't a real target and so
 # the presence of a file named 'check_shell' won't cause this target to stop
@@ -146,4 +140,4 @@ test_integration_docker:
 		-e GOOGLE_APPLICATION_CREDENTIALS=${CREDENTIALS_PATH} \
 		-v $(CURDIR):/cft/workdir \
 		${DOCKER_REPO_BASE_KITCHEN_TERRAFORM} \
-		make test_integration
+		/bin/bash -c "source test/ci_integration.sh && setup_environment && make test_integration"

README.md

@@ -8,6 +8,14 @@ This module consists of the following submodules:
 
 See more details in each module's README.
 
+## Compatibility
+
+This module is meant for use with Terraform 0.12. If you haven't
+[upgraded](https://www.terraform.io/upgrade-guides/0-12.html)
+and need a Terraform 0.11.x-compatible version of this module, the last
+released version intended for Terraform 0.11.x is
+[v1.2.0](https://registry.terraform.io/modules/GoogleCloudPlatform/sql-db/google/1.2.0).
+
 ## Root module
 
 The root module has been deprecated. Please switch to using one of the submodules.
@@ -16,8 +24,8 @@ The root module has been deprecated. Please switch to using one of the submodule
 
 ### Installation Dependencies
 
-- [terraform](https://www.terraform.io/downloads.html) 0.11.x
-- [terraform-provider-google](https://github.com/terraform-providers/terraform-provider-google) plugin v1.12.x
+- [terraform](https://www.terraform.io/downloads.html) 0.12.x
+- [terraform-provider-google](https://github.com/terraform-providers/terraform-provider-google) plugin v2.5.x
 
 ### Configure a Service Account
 
@@ -123,7 +131,6 @@ Running flake8
 Running go fmt and go vet
 Running terraform validate
 Running terraform fmt
-Running hadolint on Dockerfiles
 Checking for required files
 The following lines have trailing whitespace
 Generating markdown docs with terraform-docs

examples/mysql-and-postgres/main.tf

@@ -1,11 +1,11 @@
-/*
- * Copyright 2017 Google Inc.
+/**
+ * Copyright 2019 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -14,54 +14,29 @@
  * limitations under the License.
  */
 
-variable "region" {
-  default = "us-central1"
-}
-
-variable "network" {
-  default = "default"
-}
-
-variable "zone" {
-  default = "us-central1-b"
-}
-
-variable "mysql_version" {
-  default = "MYSQL_5_6"
-}
-
-variable "postgresql_version" {
-  default = "POSTGRES_9_6"
-}
-
 provider "google" {
-  region = "${var.region}"
+  region = var.region
 }
 
 provider "google-beta" {
-  region = "${var.region}"
+  region = var.region
 }
 
-variable "network_name" {
-  default = "mysql-psql-example"
+data "google_client_config" "current" {
 }
 
-data "google_client_config" "current" {}
-
-variable "project_id" {}
-
 resource "google_compute_network" "default" {
-  project                 = "${var.project_id}"
-  name                    = "${var.network_name}"
+  project                 = var.project_id
+  name                    = var.network_name
   auto_create_subnetworks = false
 }
 
 resource "google_compute_subnetwork" "default" {
-  project                  = "${var.project_id}"
-  name                     = "${var.network_name}"
+  project                  = var.project_id
+  name                     = var.network_name
   ip_cidr_range            = "10.127.0.0/20"
-  network                  = "${google_compute_network.default.self_link}"
-  region                   = "${var.region}"
+  network                  = google_compute_network.default.self_link
+  region                   = var.region
   private_ip_google_access = true
 }
 
@@ -72,18 +47,22 @@ resource "random_id" "name" {
 module "mysql-db" {
   source           = "../../modules/mysql"
   name             = "example-mysql-${random_id.name.hex}"
-  database_version = "${var.mysql_version}"
-  project_id       = "${var.project_id}"
+  database_version = var.mysql_version
+  project_id       = var.project_id
   zone             = "c"
 
-  ip_configuration = [{
-    ipv4_enabled = true
+  ip_configuration = {
+    ipv4_enabled    = true
+    private_network = null
+    require_ssl     = true
+    authorized_networks = [
+      {
+        name  = var.network_name
+        value = google_compute_subnetwork.default.ip_cidr_range
+      },
+    ]
+  }
 
-    authorized_networks = [{
-      name  = "${var.network_name}"
-      value = "${google_compute_subnetwork.default.ip_cidr_range}"
-    }]
-  }]
 
   database_flags = [
     {
@@ -96,72 +75,62 @@ module "mysql-db" {
 module "postgresql-db" {
   source           = "../../modules/postgresql"
   name             = "example-postgresql-${random_id.name.hex}"
-  database_version = "${var.postgresql_version}"
-  project_id       = "${var.project_id}"
+  database_version = var.postgresql_version
+  project_id       = var.project_id
   zone             = "c"
 
-  ip_configuration = [{
-    ipv4_enabled = true
-
-    authorized_networks = [{
-      name  = "${var.network_name}"
-      value = "${google_compute_subnetwork.default.ip_cidr_range}"
-    }]
-  }]
+  ip_configuration = {
+    ipv4_enabled    = true
+    private_network = null
+    require_ssl     = true
+    authorized_networks = [
+      {
+        name  = var.network_name
+        value = google_compute_subnetwork.default.ip_cidr_range
+      },
+    ]
+  }
 }
 
 // We define a connection with the VPC of the Cloud SQL instance.
 module "private-service-access" {
   source      = "../../modules/private_service_access"
-  project_id  = "${var.project_id}"
-  vpc_network = "${google_compute_network.default.name}"
+  project_id  = var.project_id
+  vpc_network = google_compute_network.default.name
 }
 
 module "safer-mysql-db" {
   source           = "../../modules/safer_mysql"
   name             = "example-safer-mysql-${random_id.name.hex}"
-  database_version = "${var.mysql_version}"
-  project_id       = "${var.project_id}"
-  region           = "${var.region}"
+  database_version = var.mysql_version
+  project_id       = var.project_id
+  region           = var.region
   zone             = "c"
 
   # By default, all users will be permitted to connect only via the
   # Cloud SQL proxy.
-  additional_users = [{
-    name = "app"
-  },
+  additional_users = [
     {
-      name = "readonly"
+      project  = var.project_id
+      name     = "app"
+      password = "PaSsWoRd"
+      host     = "localhost"
+      instance = module.safer-mysql-db.instance_name
+    },
+    {
+      project  = var.project_id
+      name     = "readonly"
+      password = "PaSsWoRd"
+      host     = "localhost"
+      instance = module.safer-mysql-db.instance_name
     },
   ]
 
   assign_public_ip = true
-  vpc_network      = "${google_compute_network.default.self_link}"
+  vpc_network      = google_compute_network.default.self_link
 
   // Used to enforce ordering in the creation of resources.
-  peering_completed = "${module.private-service-access.peering_completed}"
-}
-
-output "mysql_conn" {
-  value = "${module.mysql-db.instance_connection_name}"
-}
-
-output "mysql_user_pass" {
-  value = "${module.mysql-db.generated_user_password}"
+  peering_completed = module.private-service-access.peering_completed
 }
 
-output "psql_conn" {
-  value = "${module.postgresql-db.instance_connection_name}"
-}
-
-output "psql_user_pass" {
-  value = "${module.postgresql-db.generated_user_password}"
-}
 
-output "safer_mysql_conn" {
-  value = "${module.safer-mysql-db.instance_connection_name}"
-}
-
-output "safer_mysql_user_pass" {
-  value = "${module.safer-mysql-db.generated_user_password}"
-}

examples/mysql-and-postgres/outputs.tf

@@ -0,0 +1,45 @@
+/**
+ * Copyright 2019 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+output "mysql_conn" {
+  value       = module.mysql-db.instance_connection_name
+  description = "The connection name of the master instance to be used in connection strings"
+}
+
+output "mysql_user_pass" {
+  value       = module.mysql-db.generated_user_password
+  description = "The password for the default user. If not set, a random one will be generated and available in the generated_user_password output variable."
+}
+
+output "psql_conn" {
+  value       = module.postgresql-db.instance_connection_name
+  description = "The connection name of the master instance to be used in connection strings"
+}
+
+output "psql_user_pass" {
+  value       = module.postgresql-db.generated_user_password
+  description = "The password for the default user. If not set, a random one will be generated and available in the generated_user_password output variable."
+}
+
+output "safer_mysql_conn" {
+  value       = module.safer-mysql-db.instance_connection_name
+  description = "The connection name of the master instance to be used in connection strings"
+}
+
+output "safer_mysql_user_pass" {
+  value       = module.safer-mysql-db.generated_user_password
+  description = "The password for the default user. If not set, a random one will be generated and available in the generated_user_password output variable."
+}