Merge pull request terraform-google-modules#9 from terraform-google-m…

…odules/ludo-0.12

Update to Terraform 0.12

CHANGELOG.md

@@ -9,6 +9,13 @@ and this project adheres to
 
 ## [Unreleased]
 
+## [1.0.0] - 2019-08-14
+
+### Changed
+
+- Upgraded for usage with terraform-0.12.x [#9]
+- Added support for `force_destroy` attribute [#9]
+
 ## [0.1.0] - 2019-05-22
 
 ### Added

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
@@ -93,56 +93,56 @@ docker_run:
 		-e PROJECT_ID \
 		-e SERVICE_ACCOUNT_JSON \
 		-e GOOGLE_APPLICATION_CREDENTIALS=${CREDENTIALS_PATH} \
-		-v "$(CURDIR)":/cft/workdir \
+		-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:
 	docker run --rm -it \
 		-e PROJECT_ID \
 		-e SERVICE_ACCOUNT_JSON \
 		-e GOOGLE_APPLICATION_CREDENTIALS=${CREDENTIALS_PATH} \
-		-v "$(CURDIR)":/cft/workdir \
+		-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:
 	docker run --rm -it \
 		-e PROJECT_ID \
 		-e SERVICE_ACCOUNT_JSON \
 		-e GOOGLE_APPLICATION_CREDENTIALS=${CREDENTIALS_PATH} \
-		-v "$(CURDIR)":/cft/workdir \
+		-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:
 	docker run --rm -it \
 		-e PROJECT_ID \
 		-e SERVICE_ACCOUNT_JSON \
 		-e GOOGLE_APPLICATION_CREDENTIALS=${CREDENTIALS_PATH} \
-		-v "$(CURDIR)":/cft/workdir \
+		-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:
 	docker run --rm -it \
 		-e PROJECT_ID \
 		-e SERVICE_ACCOUNT_JSON \
 		-e GOOGLE_APPLICATION_CREDENTIALS=${CREDENTIALS_PATH} \
-		-v "$(CURDIR)":/cft/workdir \
+		-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:
 	docker run --rm -it \
 		-e PROJECT_ID \
 		-e SERVICE_ACCOUNT_JSON \
 		-e GOOGLE_APPLICATION_CREDENTIALS=${CREDENTIALS_PATH} \
-		-v "$(CURDIR)":/cft/workdir \
+		-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,12 @@ The resources/services/activations/deletions that this module will create/trigge
 - One or more GCS buckets
 - Zero or more IAM bindings for those buckets
 
+## 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/cloud-storage/google/0.1.0).
+
 ## Usage
 
 Basic usage of this module is as follows:
@@ -32,8 +38,7 @@ module "gcs_buckets" {
 Functional examples are included in the
 [examples](./examples/) directory.
 
-[^]: (autogen_docs_start)
-
+<!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
 ## Inputs
 
 | Name | Description | Type | Default | Required |
@@ -44,9 +49,10 @@ Functional examples are included in the
 | bucket\_policy\_only | Disable ad-hoc ACLs on specified buckets. Defaults to true. Map of lowercase unprefixed name => boolean | map | `<map>` | no |
 | bucket\_viewers | Map of lowercase unprefixed name => comma-delimited IAM-style bucket viewers. | map | `<map>` | no |
 | creators | IAM-style members who will be granted roles/storage.objectCreators on all buckets. | list | `<list>` | no |
+| force\_destroy | Optional map of lowercase unprefixed name => boolean, defaults to false. | map | `<map>` | no |
 | labels | Labels to be attached to the buckets | map | `<map>` | no |
 | location | Bucket location. | string | `"EU"` | no |
-| names | Bucket name suffixes. | list | n/a | yes |
+| names | Bucket name suffixes. | list(string) | n/a | yes |
 | prefix | Prefix used to generate the bucket name. | string | n/a | yes |
 | project\_id | Bucket project id. | string | n/a | yes |
 | set\_admin\_roles | Grant roles/storage.objectAdmin role to admins and bucket_admins. | string | `"false"` | no |
@@ -60,12 +66,16 @@ Functional examples are included in the
 
 | Name | Description |
 |------|-------------|
-| name | Bucket name of the first bucket (for single-use cases). |
-| names | Map of unprefixed names => bucket names. |
-| url | URL of the first bucket (for single-use cases). |
-| urls | Map of unprefixed names => bucket URLs. |
+| bucket | Bucket resource (for single use). |
+| buckets | Bucket resources. |
+| name | Bucket name (for single use). |
+| names | Bucket names. |
+| names\_list | List of bucket names. |
+| url | Bucket URL (for single use). |
+| urls | Bucket URLs. |
+| urls\_list | List of bucket URLs. |
 
-[^]: (autogen_docs_end)
+<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
 
 ## Requirements
 
@@ -107,3 +117,4 @@ information on contributing to this module.
 [project-factory-module]: https://registry.terraform.io/modules/terraform-google-modules/project-factory/google
 [terraform-provider-gcp]: https://www.terraform.io/docs/providers/google/index.html
 [terraform]: https://www.terraform.io/downloads.html
+

examples/simple_example/README.md

@@ -2,24 +2,24 @@
 
 This example illustrates how to use the `cloud-storage` module.
 
-[^]: (autogen_docs_start)
-
+<!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
 ## Inputs
 
 | Name | Description | Type | Default | Required |
 |------|-------------|:----:|:-----:|:-----:|
-| bucket\_policy\_only | Disable ad-hoc ACLs on specified buckets. Defaults to true. Map of lowercase unprefixed name => boolean | map | n/a | yes |
-| names | Names of the buckets to create. | list | n/a | yes |
+| bucket\_policy\_only | Disable ad-hoc ACLs on specified buckets. Defaults to true. Map of lowercase unprefixed name => boolean | map(string) | n/a | yes |
+| names | Names of the buckets to create. | list(string) | n/a | yes |
 | prefix | Prefix used to generate bueckt names. | string | n/a | yes |
 | project\_id | The ID of the project in which to provision resources. | string | n/a | yes |
 
 ## Outputs
 
 | Name | Description |
 |------|-------------|
-| names | Names of the buckets created. |
+| names | Bucket names. |
+| names\_list | List of bucket names. |
 
-[^]: (autogen_docs_end)
+<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
 
 To provision this example, run the following from within this directory:
 - `terraform init` to get the plugins

examples/simple_example/main.tf

@@ -19,10 +19,10 @@ provider "google" {
 }
 
 module "cloud_storage" {
-  source = "../.."
-
-  project_id         = "${var.project_id}"
-  prefix             = "${var.prefix}"
-  names              = "${var.names}"
-  bucket_policy_only = "${var.bucket_policy_only}"
+  source             = "../.."
+  project_id         = var.project_id
+  prefix             = var.prefix
+  names              = var.names
+  bucket_policy_only = var.bucket_policy_only
 }
+

examples/simple_example/outputs.tf

@@ -15,6 +15,11 @@
  */
 
 output "names" {
-  description = "Names of the buckets created."
-  value       = "${values(module.cloud_storage.names)}"
+  description = "Bucket names."
+  value       = module.cloud_storage.names
+}
+
+output "names_list" {
+  description = "List of bucket names."
+  value       = module.cloud_storage.names_list
 }

examples/simple_example/variables.tf

@@ -16,20 +16,21 @@
 
 variable "project_id" {
   description = "The ID of the project in which to provision resources."
-  type        = "string"
+  type        = string
 }
 
 variable "names" {
   description = "Names of the buckets to create."
-  type        = "list"
+  type        = list(string)
 }
 
 variable "prefix" {
   description = "Prefix used to generate bueckt names."
-  type        = "string"
+  type        = string
 }
 
 variable "bucket_policy_only" {
   description = "Disable ad-hoc ACLs on specified buckets. Defaults to true. Map of lowercase unprefixed name => boolean"
-  type        = "map"
+  type        = map(string)
 }
+

examples/simple_example/versions.tf

@@ -0,0 +1,4 @@
+
+terraform {
+  required_version = ">= 0.12"
+}

kitchen.yml

@@ -35,9 +35,4 @@ suites:
         - name: simple_example local
           backend: local
           controls:
-            - gcloud
             - gsutil
-        - name: simple_example gcp
-          backend: gcp
-          controls:
-            - gcp