Add support for Terraform v0.12 #2

Author: ingwarr

CHANGELOG.md

@@ -9,6 +9,10 @@ and this project adheres to
 
 ## [Unreleased]
 
+### CHANGED
+
+- Upgraded for usage with terraform-0.12.x [#3]
+
 ## [0.1.0] - 2019-05-28
 
 ### Added
@@ -17,3 +21,4 @@ and this project adheres to
 
 [Unreleased]: https://github.com/terraform-google-modules/terraform-google-folders/compare/v0.1.0...HEAD
 [0.1.0]: https://github.com/terraform-google-modules/terraform-google-folders/releases/tag/v0.1.0
+[#3]: https://github.com/terraform-google-modules/terraform-google-folders/pull/3

Gemfile

@@ -15,5 +15,5 @@
 ruby '2.5.3'
 
 source 'https://rubygems.org/' do
-  gem 'kitchen-terraform', '~> 4.8'
+  gem 'kitchen-terraform', '~> 4.9'
 end

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.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
@@ -30,7 +30,7 @@ all: check generate_docs
 
 # Run all available linters
 .PHONY: check
-check: check_shell check_python check_golang check_terraform check_docker check_base_files test_check_headers check_headers check_trailing_whitespace
+check: 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
@@ -95,7 +95,7 @@ docker_run:
 		-e GOOGLE_APPLICATION_CREDENTIALS=${CREDENTIALS_PATH} \
 		-v $(CURDIR):/cft/workdir \
 		${DOCKER_REPO_BASE_KITCHEN_TERRAFORM} \
-		/bin/bash -c "source test/ci_integration.sh && setup_environment && exec /bin/bash"
+		/bin/bash -c "cd /cft/workdir && source test/ci_integration.sh && setup_environment && exec /bin/bash"
 
 .PHONY: docker_create
 docker_create:
@@ -105,7 +105,7 @@ docker_create:
 		-e GOOGLE_APPLICATION_CREDENTIALS=${CREDENTIALS_PATH} \
 		-v $(CURDIR):/cft/workdir \
 		${DOCKER_REPO_BASE_KITCHEN_TERRAFORM} \
-		/bin/bash -c "source test/ci_integration.sh && setup_environment && kitchen create"
+		/bin/bash -c "cd /cft/workdir && source test/ci_integration.sh && setup_environment && kitchen create"
 
 .PHONY: docker_converge
 docker_converge:
@@ -115,7 +115,7 @@ docker_converge:
 		-e GOOGLE_APPLICATION_CREDENTIALS=${CREDENTIALS_PATH} \
 		-v $(CURDIR):/cft/workdir \
 		${DOCKER_REPO_BASE_KITCHEN_TERRAFORM} \
-		/bin/bash -c "source test/ci_integration.sh && setup_environment && kitchen converge"
+		/bin/bash -c "cd /cft/workdir && source test/ci_integration.sh && setup_environment && kitchen converge"
 
 .PHONY: docker_verify
 docker_verify:
@@ -125,7 +125,7 @@ docker_verify:
 		-e GOOGLE_APPLICATION_CREDENTIALS=${CREDENTIALS_PATH} \
 		-v $(CURDIR):/cft/workdir \
 		${DOCKER_REPO_BASE_KITCHEN_TERRAFORM} \
-		/bin/bash -c "source test/ci_integration.sh && setup_environment && kitchen verify"
+		/bin/bash -c "cd /cft/workdir && source test/ci_integration.sh && setup_environment && kitchen verify"
 
 .PHONY: docker_destroy
 docker_destroy:
@@ -135,7 +135,7 @@ docker_destroy:
 		-e GOOGLE_APPLICATION_CREDENTIALS=${CREDENTIALS_PATH} \
 		-v $(CURDIR):/cft/workdir \
 		${DOCKER_REPO_BASE_KITCHEN_TERRAFORM} \
-		/bin/bash -c "source test/ci_integration.sh && setup_environment && kitchen destroy"
+		/bin/bash -c "cd /cft/workdir && source test/ci_integration.sh && setup_environment && kitchen destroy"
 
 .PHONY: test_integration_docker
 test_integration_docker:
@@ -145,4 +145,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 "cd /cft/workdir && source test/ci_integration.sh && setup_environment && make test_integration"

README.md

@@ -7,6 +7,13 @@ The resources/services/activations/deletions that this module will create/trigge
 - Create folders with the provided names
 - Assign the defined permissions to the provided list of users or groups.
 
+## 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 [0.1.0](https://registry.terraform.io/modules/terraform-google-modules/folders/google/0.1.0).
+
+
 ## Usage
 
 Basic usage of this module is as follows:
@@ -75,7 +82,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

examples/simple_example/main.tf

@@ -15,16 +15,17 @@
  */
 
 provider "google" {
-  version = "~> 2.0"
+  version = "~> 2.7"
 }
 
 module "folders" {
   source = "../.."
 
-  parent_id   = "${var.parent_id}"
-  parent_type = "${var.parent_type}"
-  names       = "${var.names}"
-  set_roles   = true
-  per_folder_admins = "${var.per_folder_admins}"
-  all_folder_admins = "${var.all_folder_admins}"
-}
+  parent_id         = var.parent_id
+  parent_type       = var.parent_type
+  names             = var.names
+  set_roles         = true
+  per_folder_admins = var.per_folder_admins
+  all_folder_admins = var.all_folder_admins
+}
+

examples/simple_example/outputs.tf

@@ -16,5 +16,6 @@
 
 output "names_and_ids" {
   description = "Map of name => folder resource id."
-  value       = "${module.folders.names_and_ids}"
-}
+  value       = module.folders.names_and_ids
+}
+

examples/simple_example/variables.tf

@@ -15,25 +15,31 @@
  */
 
 variable "parent_id" {
+  type        = string
   description = "Id of the resource under which the folder will be placed."
 }
 
 variable "parent_type" {
+  type        = string
   description = "Type of the parent reosurce, defaults to organization."
   default     = "folder"
 }
 
 variable "names" {
+  type        = list(string)
   description = "Folder names."
   default     = []
 }
 
 variable "per_folder_admins" {
+  type        = list(string)
   description = "List of IAM-style members per folder who will get extended permissions."
   default     = []
 }
 
 variable "all_folder_admins" {
+  type        = list(string)
   description = "List of IAM-style members that will get the extended permissions across all the folders."
   default     = []
-}
+}
+

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"
+}

main.tf

@@ -15,15 +15,15 @@
  */
 
 terraform {
-  required_version = "~> 0.11.0"
+  required_version = ">= 0.12"
 }
 
 locals {
-  prefix    = "${var.prefix == "" ? "" : "${var.prefix}-"}"
+  prefix = var.prefix == "" ? "" : "${var.prefix}-"
 }
 
 resource "google_folder" "folders" {
-  count        = "${length(var.names)}"
+  count        = length(var.names)
   display_name = "${local.prefix}${element(var.names, count.index)}"
   parent       = "${var.parent_type}s/${var.parent_id}"
 }
@@ -32,14 +32,16 @@ resource "google_folder" "folders" {
 # https://cloud.google.com/resource-manager/docs/access-control-folders#granting_folder-specific_roles_to_enable_project_creation
 
 resource "google_folder_iam_binding" "owners" {
-  count  = "${var.set_roles ? length(var.names) * length(var.folder_admin_roles) : 0}"
-  folder = "${element(google_folder.folders.*.name, count.index / length(var.folder_admin_roles))}"
-  role   = "${element(var.folder_admin_roles, count.index % length(var.folder_admin_roles))}"
+  count = var.set_roles ? length(var.names) * length(var.folder_admin_roles) : 0
+  folder = google_folder.folders[floor(count.index / length(var.folder_admin_roles))].name
+  role = var.folder_admin_roles[count.index % length(var.folder_admin_roles)]
+
+  members = compact(
+              concat(
+                split(",",
+                  concat(var.per_folder_admins, [""])[floor(count.index / length(var.folder_admin_roles))],
+                ), var.all_folder_admins,
+              ),
+            )
+}
 
-  members = ["${
-    compact(concat(
-      split(",", element(concat(var.per_folder_admins, list("")), count.index / length(var.folder_admin_roles))),
-      var.all_folder_admins
-    ))
-  }"]
-}

outputs.tf

@@ -16,10 +16,11 @@
 
 output "names_and_display_names" {
   description = "Map of name => folder resource name."
-  value       = "${zipmap(var.names, google_folder.folders.*.display_name)}"
+  value       = zipmap(var.names, google_folder.folders.*.display_name)
 }
 
 output "names_and_ids" {
   description = "Map of name => folder resource id."
-  value       = "${zipmap(var.names, google_folder.folders.*.name)}"
-}
+  value       = zipmap(var.names, google_folder.folders.*.name)
+}
+