Merge pull request #20 from fabito/0.12-upgrade

Upgrade to Terraform 0.12

terraform-google-{{cookiecutter.module_name}}/CONTRIBUTING.md

@@ -90,7 +90,7 @@ The following dependencies must be installed on the development system:
 - [hadolint]
 - [make]
 - [shellcheck]
-- [Terraform][terraform] v0.11
+- [Terraform][terraform] v0.12
 
 ### Execution
 

terraform-google-{{cookiecutter.module_name}}/Makefile

@@ -21,7 +21,7 @@ SHELL := /usr/bin/env bash
 # Docker build config variables
 CREDENTIALS_PATH 			?= /cft/workdir/credentials.json
 DOCKER_ORG 				:= gcr.io/cloud-foundation-cicd
-DOCKER_TAG_BASE_KITCHEN_TERRAFORM 	?= 1.2.0
+DOCKER_TAG_BASE_KITCHEN_TERRAFORM 	?= 2.0.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

terraform-google-{{cookiecutter.module_name}}/README.md

@@ -35,7 +35,7 @@ These sections describe requirements for using this module.
 
 The following dependencies must be available:
 
-- [Terraform][terraform] v0.11
+- [Terraform][terraform] v0.12
 - [Terraform Provider for GCP][terraform-provider-gcp] plugin v2.0
 
 ### Service Account

terraform-google-{{cookiecutter.module_name}}/examples/simple_example/main.tf

@@ -21,6 +21,6 @@ provider "google" {
 module "{{ cookiecutter.module_name|replace('-', '_') }}" {
   source = "../.."
 
-  project_id  = "${var.project_id}"
-  bucket_name = "${var.bucket_name}"
+  project_id  = var.project_id
+  bucket_name = var.bucket_name
 }

terraform-google-{{cookiecutter.module_name}}/examples/simple_example/outputs.tf

@@ -16,5 +16,5 @@
 
 output "bucket_name" {
   description = "The name of the bucket."
-  value       = "${module.{{ cookiecutter.module_name|replace('-', '_') }}.bucket_name}"
+  value       = module.{{ cookiecutter.module_name|replace('-', '_') }}.bucket_name
 }

terraform-google-{{cookiecutter.module_name}}/examples/simple_example/variables.tf

@@ -16,10 +16,10 @@
 
 variable "project_id" {
   description = "The ID of the project in which to provision resources."
-  type        = "string"
+  type        = string
 }
 
 variable "bucket_name" {
   description = "The name of the bucket to create."
-  type        = "string"
+  type        = string
 }

terraform-google-{{cookiecutter.module_name}}/examples/simple_example/versions.tf

@@ -0,0 +1,19 @@
+/**
+ * Copyright 2018 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.
+ */
+
+terraform {
+  required_version = ">= 0.12"
+}

terraform-google-{{cookiecutter.module_name}}/main.tf

@@ -19,6 +19,6 @@ terraform {
 }
 
 resource "google_storage_bucket" "main" {
-  project = "${var.project_id}"
-  name    = "${var.bucket_name}"
+  project = var.project_id
+  name    = var.bucket_name
 }

terraform-google-{{cookiecutter.module_name}}/outputs.tf

@@ -15,5 +15,5 @@
  */
 
 output "bucket_name" {
-  value = "${google_storage_bucket.main.name}"
+  value = google_storage_bucket.main.name
 }

terraform-google-{{cookiecutter.module_name}}/test/fixtures/simple_example/main.tf

@@ -27,6 +27,6 @@ resource "random_pet" "main" {
 module "example" {
   source = "../../../examples/simple_example"
 
-  project_id  = "${var.project_id}"
-  bucket_name = "${random_pet.main.id}"
+  project_id  = var.project_id
+  bucket_name = random_pet.main.id
 }

terraform-google-{{cookiecutter.module_name}}/test/fixtures/simple_example/outputs.tf

@@ -16,10 +16,10 @@
 
 output "bucket_name" {
   description = "The name of the bucket."
-  value       = "${module.example.bucket_name}"
+  value       = module.example.bucket_name
 }
 
 output "project_id" {
   description = "The ID of the project in which resources are provisioned."
-  value       = "${var.project_id}"
+  value       = var.project_id
 }

terraform-google-{{cookiecutter.module_name}}/test/fixtures/simple_example/variables.tf

@@ -16,5 +16,5 @@
 
 variable "project_id" {
   description = "The ID of the project in which to provision resources."
-  type        = "string"
+  type        = string
 }

terraform-google-{{cookiecutter.module_name}}/test/fixtures/simple_example/versions.tf

@@ -0,0 +1,19 @@
+/**
+ * Copyright 2018 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.
+ */
+
+terraform {
+  required_version = ">= 0.12"
+}

terraform-google-{{cookiecutter.module_name}}/versions.tf

@@ -0,0 +1,19 @@
+/**
+ * Copyright 2018 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.
+ */
+
+terraform {
+  required_version = ">= 0.12"
+}