diff --git a/.ruby-version b/.ruby-version
deleted file mode 100644
index aedc15bb..00000000
--- a/.ruby-version
+++ /dev/null
@@ -1 +0,0 @@
-2.5.3
diff --git a/CHANGELOG.md b/CHANGELOG.md
index bfbc4928..b880a9ea 100644
--- a/CHANGELOG.md
+++ b/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
diff --git a/Gemfile b/Gemfile
index 4dbdea25..6dc7c95f 100644
--- a/Gemfile
+++ b/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
diff --git a/Makefile b/Makefile
index 7f127c0e..bd31e8ac 100644
--- a/Makefile
+++ b/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,9 +93,9 @@ 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:
@@ -103,9 +103,9 @@ docker_create:
 		-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:
@@ -113,9 +113,9 @@ docker_converge:
 		-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:
@@ -123,9 +123,9 @@ docker_verify:
 		-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:
@@ -133,9 +133,9 @@ docker_destroy:
 		-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:
@@ -143,6 +143,6 @@ test_integration_docker:
 		-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"
diff --git a/README.md b/README.md
index 3129e86c..b01e75a7 100644
--- a/README.md
+++ b/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
+
diff --git a/examples/simple_example/README.md b/examples/simple_example/README.md
index e88fafaa..ca6d4a35 100644
--- a/examples/simple_example/README.md
+++ b/examples/simple_example/README.md
@@ -2,14 +2,13 @@
 
 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 |
 
@@ -17,9 +16,10 @@ This example illustrates how to use the `cloud-storage` module.
 
 | 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
diff --git a/examples/simple_example/main.tf b/examples/simple_example/main.tf
index 4737a024..540ec043 100644
--- a/examples/simple_example/main.tf
+++ b/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
 }
+
diff --git a/examples/simple_example/outputs.tf b/examples/simple_example/outputs.tf
index d050853d..18a0211d 100644
--- a/examples/simple_example/outputs.tf
+++ b/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
 }
diff --git a/examples/simple_example/variables.tf b/examples/simple_example/variables.tf
index 40784e91..e6d05d54 100644
--- a/examples/simple_example/variables.tf
+++ b/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)
 }
+
diff --git a/examples/simple_example/versions.tf b/examples/simple_example/versions.tf
new file mode 100644
index 00000000..ac97c6ac
--- /dev/null
+++ b/examples/simple_example/versions.tf
@@ -0,0 +1,4 @@
+
+terraform {
+  required_version = ">= 0.12"
+}
diff --git a/kitchen.yml b/kitchen.yml
index f3c9c354..8b65aa90 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -35,9 +35,4 @@ suites:
         - name: simple_example local
           backend: local
           controls:
-            - gcloud
             - gsutil
-        - name: simple_example gcp
-          backend: gcp
-          controls:
-            - gcp
diff --git a/main.tf b/main.tf
index 71a3b8db..dd9f8d71 100644
--- a/main.tf
+++ b/main.tf
@@ -1,5 +1,5 @@
 /**
- * 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.
@@ -14,65 +14,77 @@
  * limitations under the License.
  */
 
-terraform {
-  required_version = "~> 0.11.0"
-}
-
 locals {
-  prefix = "${var.prefix == "" ? "" : "${var.prefix}-"}${lower(var.location)}"
+  prefix = var.prefix == "" ? "" : join("-", list(var.prefix, lower(var.location), ""))
 }
 
 resource "google_storage_bucket" "buckets" {
-  count              = "${length(var.names)}"
-  name               = "${var.prefix}-${lower(element(var.names, count.index))}"
-  project            = "${var.project_id}"
-  bucket_policy_only = "${lookup(var.bucket_policy_only, lower(element(var.names, count.index)), true)}"
-  location           = "${var.location}"
-  storage_class      = "${var.storage_class}"
-  labels             = "${var.labels}"
-
+  count         = length(var.names)
+  name          = "${local.prefix}${lower(element(var.names, count.index))}"
+  project       = var.project_id
+  location      = var.location
+  storage_class = var.storage_class
+  labels        = var.labels
+  force_destroy = lookup(
+    var.force_destroy,
+    lower(element(var.names, count.index)),
+    false,
+  )
+  bucket_policy_only = lookup(
+    var.bucket_policy_only,
+    lower(element(var.names, count.index)),
+    true,
+  )
   versioning {
-    enabled = "${
-      lookup(var.versioning, lower(element(var.names, count.index)), false)
-    }"
+    enabled = lookup(
+      var.versioning,
+      lower(element(var.names, count.index)),
+      false,
+    )
   }
 }
 
 resource "google_storage_bucket_iam_binding" "admins" {
-  count  = "${var.set_admin_roles ? length(var.names) : 0}"
-  bucket = "${element(google_storage_bucket.buckets.*.name, count.index)}"
+  count  = var.set_admin_roles ? length(var.names) : 0
+  bucket = element(google_storage_bucket.buckets.*.name, count.index)
   role   = "roles/storage.objectAdmin"
-
-  members = ["${compact(concat(
-    var.admins,
-    split(",",
-      lookup(var.bucket_admins, element(var.names, count.index), "")
-    )
-  ))}"]
+  members = compact(
+    concat(
+      var.admins,
+      split(
+        ",",
+        lookup(var.bucket_admins, element(var.names, count.index), ""),
+      ),
+    ),
+  )
 }
 
 resource "google_storage_bucket_iam_binding" "creators" {
-  count  = "${var.set_creator_roles ? length(var.names) : 0}"
-  bucket = "${element(google_storage_bucket.buckets.*.name, count.index)}"
+  count  = var.set_creator_roles ? length(var.names) : 0
+  bucket = element(google_storage_bucket.buckets.*.name, count.index)
   role   = "roles/storage.objectCreator"
-
-  members = ["${compact(concat(
-    var.creators,
-    split(",",
-      lookup(var.bucket_creators, element(var.names, count.index), "")
-    )
-  ))}"]
+  members = compact(
+    concat(
+      var.creators,
+      split(
+        ",",
+        lookup(var.bucket_creators, element(var.names, count.index), ""),
+      ),
+    ),
+  )
 }
 
 resource "google_storage_bucket_iam_binding" "viewers" {
-  count  = "${var.set_viewer_roles ? length(var.names) : 0}"
-  bucket = "${element(google_storage_bucket.buckets.*.name, count.index)}"
+  count  = var.set_viewer_roles ? length(var.names) : 0
+  bucket = element(google_storage_bucket.buckets.*.name, count.index)
   role   = "roles/storage.objectViewer"
-
-  members = ["${compact(concat(
-    var.viewers,
-    split(",",
-      lookup(var.bucket_viewers, element(var.names, count.index), "")
-    )
-  ))}"]
+  members = compact(
+    concat(
+      var.viewers,
+      split(
+        ",",
+        lookup(var.bucket_viewers, element(var.names, count.index), ""),
+      ),
+    ),
+  )
 }
diff --git a/outputs.tf b/outputs.tf
index 96a21b43..e548fbaf 100644
--- a/outputs.tf
+++ b/outputs.tf
@@ -14,22 +14,42 @@
  * limitations under the License.
  */
 
+output "bucket" {
+  description = "Bucket resource (for single use)."
+  value       = google_storage_bucket.buckets[0]
+}
+
 output "name" {
-  description = "Bucket name of the first bucket (for single-use cases)."
-  value       = "${element(google_storage_bucket.buckets.*.name, 0)}"
+  description = "Bucket name (for single use)."
+  value       = google_storage_bucket.buckets[0].name
 }
 
 output "url" {
-  description = "URL of the first bucket (for single-use cases)."
-  value       = "${element(google_storage_bucket.buckets.*.url, 0)}"
+  description = "Bucket URL (for single use)."
+  value       = google_storage_bucket.buckets[0].url
+}
+
+output "buckets" {
+  description = "Bucket resources."
+  value       = google_storage_bucket.buckets
 }
 
 output "names" {
-  description = "Map of unprefixed names => bucket names."
-  value       = "${zipmap(var.names, google_storage_bucket.buckets.*.name)}"
+  description = "Bucket names."
+  value       = zipmap(var.names, google_storage_bucket.buckets[*].name)
 }
 
 output "urls" {
-  description = "Map of unprefixed names => bucket URLs."
-  value       = "${zipmap(var.names, google_storage_bucket.buckets.*.url)}"
+  description = "Bucket URLs."
+  value       = zipmap(var.names, google_storage_bucket.buckets[*].url)
+}
+
+output "names_list" {
+  description = "List of bucket names."
+  value       = google_storage_bucket.buckets[*].name
+}
+
+output "urls_list" {
+  description = "List of bucket URLs."
+  value       = google_storage_bucket.buckets[*].url
 }
diff --git a/test/boilerplate/boilerplate.Dockerfile.txt b/test/boilerplate/boilerplate.Dockerfile.txt
index b0c7da3d..1b991897 100644
--- a/test/boilerplate/boilerplate.Dockerfile.txt
+++ b/test/boilerplate/boilerplate.Dockerfile.txt
@@ -1,4 +1,4 @@
-# Copyright 2018 Google LLC
+# Copyright YEAR Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/test/boilerplate/boilerplate.Makefile.txt b/test/boilerplate/boilerplate.Makefile.txt
index b0c7da3d..1b991897 100644
--- a/test/boilerplate/boilerplate.Makefile.txt
+++ b/test/boilerplate/boilerplate.Makefile.txt
@@ -1,4 +1,4 @@
-# Copyright 2018 Google LLC
+# Copyright YEAR Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/test/boilerplate/boilerplate.go.txt b/test/boilerplate/boilerplate.go.txt
index 557e16f0..1af96609 100644
--- a/test/boilerplate/boilerplate.go.txt
+++ b/test/boilerplate/boilerplate.go.txt
@@ -1,5 +1,5 @@
 /*
-Copyright 2018 Google LLC
+Copyright YEAR Google LLC
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/test/boilerplate/boilerplate.py.txt b/test/boilerplate/boilerplate.py.txt
index b0c7da3d..1b991897 100644
--- a/test/boilerplate/boilerplate.py.txt
+++ b/test/boilerplate/boilerplate.py.txt
@@ -1,4 +1,4 @@
-# Copyright 2018 Google LLC
+# Copyright YEAR Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/test/integration/simple_example/controls/gcp.rb b/test/boilerplate/boilerplate.rb.txt
similarity index 66%
rename from test/integration/simple_example/controls/gcp.rb
rename to test/boilerplate/boilerplate.rb.txt
index 95f2b763..1b991897 100644
--- a/test/integration/simple_example/controls/gcp.rb
+++ b/test/boilerplate/boilerplate.rb.txt
@@ -1,24 +1,13 @@
-# Copyright 2018 Google LLC
+# Copyright YEAR 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
+#     https://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.
-
-control "gcp" do
-  title "GCP Resources"
-
-  attribute("names").each do |name|
-    describe google_storage_bucket(name: name) do
-      it { should exist }
-    end
-  end
-
-end
diff --git a/test/boilerplate/boilerplate.sh.txt b/test/boilerplate/boilerplate.sh.txt
index 2e94f3e5..9f9c9af5 100644
--- a/test/boilerplate/boilerplate.sh.txt
+++ b/test/boilerplate/boilerplate.sh.txt
@@ -1,4 +1,4 @@
-# Copyright 2018 Google LLC
+# Copyright YEAR Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/test/boilerplate/boilerplate.tf.txt b/test/boilerplate/boilerplate.tf.txt
index cfccff84..b8eae40e 100644
--- a/test/boilerplate/boilerplate.tf.txt
+++ b/test/boilerplate/boilerplate.tf.txt
@@ -1,5 +1,5 @@
 /**
- * Copyright 2018 Google LLC
+ * Copyright YEAR Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/test/boilerplate/boilerplate.xml.txt b/test/boilerplate/boilerplate.xml.txt
index 3d98cdc6..00a2856a 100644
--- a/test/boilerplate/boilerplate.xml.txt
+++ b/test/boilerplate/boilerplate.xml.txt
@@ -1,5 +1,5 @@
 <!--
- Copyright 2018 Google LLC
+ Copyright YEAR Google LLC
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/test/boilerplate/boilerplate.yaml.txt b/test/boilerplate/boilerplate.yaml.txt
index b0c7da3d..1b991897 100644
--- a/test/boilerplate/boilerplate.yaml.txt
+++ b/test/boilerplate/boilerplate.yaml.txt
@@ -1,4 +1,4 @@
-# Copyright 2018 Google LLC
+# Copyright YEAR Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/test/fixtures/simple_example/main.tf b/test/fixtures/simple_example/main.tf
index 0e5c9846..c464176f 100644
--- a/test/fixtures/simple_example/main.tf
+++ b/test/fixtures/simple_example/main.tf
@@ -26,8 +26,8 @@ resource "random_pet" "main" {
 
 module "example" {
   source     = "../../../examples/simple_example"
-  project_id = "${var.project_id}"
-  prefix     = "${random_pet.main.id}"
+  project_id = var.project_id
+  prefix     = random_pet.main.id
   names      = ["one", "two"]
 
   bucket_policy_only = {
@@ -35,3 +35,4 @@ module "example" {
     "two" = false
   }
 }
+
diff --git a/test/fixtures/simple_example/outputs.tf b/test/fixtures/simple_example/outputs.tf
index eff0997e..4982ce4a 100644
--- a/test/fixtures/simple_example/outputs.tf
+++ b/test/fixtures/simple_example/outputs.tf
@@ -15,11 +15,17 @@
  */
 
 output "names" {
-  description = "The names of the buckets."
-  value       = "${module.example.names}"
+  description = "Bucket names."
+  value       = module.example.names
+}
+
+output "names_list" {
+  description = "List of bucket names."
+  value       = module.example.names_list
 }
 
 output "project_id" {
   description = "The ID of the project in which resources are provisioned."
-  value       = "${var.project_id}"
+  value       = var.project_id
 }
+
diff --git a/test/fixtures/simple_example/variables.tf b/test/fixtures/simple_example/variables.tf
index 093f6b11..1f95eaaf 100644
--- a/test/fixtures/simple_example/variables.tf
+++ b/test/fixtures/simple_example/variables.tf
@@ -16,5 +16,6 @@
 
 variable "project_id" {
   description = "The ID of the project in which to provision resources."
-  type        = "string"
+  type        = string
 }
+
diff --git a/test/fixtures/simple_example/versions.tf b/test/fixtures/simple_example/versions.tf
new file mode 100644
index 00000000..ac97c6ac
--- /dev/null
+++ b/test/fixtures/simple_example/versions.tf
@@ -0,0 +1,4 @@
+
+terraform {
+  required_version = ">= 0.12"
+}
diff --git a/test/integration/simple_example/controls/gcloud.rb b/test/integration/simple_example/controls/gcloud.rb
deleted file mode 100644
index 8b7da404..00000000
--- a/test/integration/simple_example/controls/gcloud.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-# 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.
-
-control "gcloud" do
-  title "gcloud"
-
-  describe command("gcloud --project=#{attribute("project_id")} services list --enabled") do
-    its(:exit_status) { should eq 0 }
-    its(:stderr) { should eq "" }
-    its(:stdout) { should match "storage-api.googleapis.com" }
-  end
-end
diff --git a/test/integration/simple_example/controls/gsutil.rb b/test/integration/simple_example/controls/gsutil.rb
index 1fbb18fd..9699c8ca 100644
--- a/test/integration/simple_example/controls/gsutil.rb
+++ b/test/integration/simple_example/controls/gsutil.rb
@@ -18,17 +18,17 @@
   describe command("gsutil ls -p #{attribute("project_id")}") do
     its(:exit_status) { should eq 0 }
     its(:stderr) { should eq "" }
-    its(:stdout) { should include "#{attribute("names")[0]}" }
-    its(:stdout) { should include "#{attribute("names")[1]}" }
+    its(:stdout) { should include attribute('names').values[0] }
+    its(:stdout) { should include attribute('names').values[1] }
   end
 
-  describe command("gsutil bucketpolicyonly get gs://#{attribute("names")[0]}") do
+  describe command("gsutil bucketpolicyonly get gs://#{attribute("names_list")[0]}") do
     its(:exit_status) { should eq 0 }
     its(:stderr) { should eq "" }
     its(:stdout) { should include "Enabled: True" }
   end
 
-  describe command("gsutil bucketpolicyonly get gs://#{attribute("names")[1]}") do
+  describe command("gsutil bucketpolicyonly get gs://#{attribute("names_list")[1]}") do
     its(:exit_status) { should eq 0 }
     its(:stderr) { should eq "" }
     its(:stdout) { should include "Enabled: False" }
diff --git a/test/integration/simple_example/inspec.yml b/test/integration/simple_example/inspec.yml
index 5891f760..809ff3af 100644
--- a/test/integration/simple_example/inspec.yml
+++ b/test/integration/simple_example/inspec.yml
@@ -1,12 +1,10 @@
 name: simple_example
-depends:
-  - name: inspec-gcp
-    git: https://github.com/inspec/inspec-gcp.git
-    tag: v0.10.0
 attributes:
   - name: project_id
     required: true
     type: string
   - name: names
     required: true
+    type: hash
+  - name: names_list
     type: array
diff --git a/test/make.sh b/test/make.sh
index a5b3aeba..9c0292ab 100755
--- a/test/make.sh
+++ b/test/make.sh
@@ -62,23 +62,12 @@ function basefiles() {
   done
 }
 
-# This function runs the hadolint linter on
-# every file named 'Dockerfile'
-function docker() {
-  echo "Running hadolint on Dockerfiles"
-  find_files . -name "Dockerfile" -print0 \
-    | compat_xargs -0 hadolint
-}
-
 # This function runs 'terraform validate' and 'terraform fmt'
 # against all directory paths which contain *.tf files.
 function check_terraform() {
   set -e
   echo "Running terraform validate"
-  find_files . -name "*.tf" -print0 \
-    | compat_xargs -0 -n1 dirname \
-    | sort -u \
-    | compat_xargs -t -n1 terraform validate --check-variables=false
+  find . -name "*.tf" -not -path "./test/fixtures/shared/*" -not -path "./test/fixtures/all_examples/*" -exec bash -c 'cd $(dirname "{}") && terraform init && terraform validate ' \;
   echo "Running terraform fmt"
   find_files . -name "*.tf" -print0 \
     | compat_xargs -0 -n1 dirname \
@@ -106,7 +95,7 @@ function check_python() {
 # file ending in '.sh'
 function check_shell() {
   echo "Running shellcheck"
-  find_files . -name "*.sh" -print0 | compat_xargs -0 shellcheck -x
+  find . -name "*.sh" -exec shellcheck -x {} \;
 }
 
 # This function makes sure that there is no trailing whitespace
diff --git a/test/test_verify_boilerplate.py b/test/test_verify_boilerplate.py
index dd870ba5..e3832dfa 100755
--- a/test/test_verify_boilerplate.py
+++ b/test/test_verify_boilerplate.py
@@ -14,10 +14,6 @@
 # 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!
-
 ''' A simple test for the verify_boilerplate python script.
 This will create a set of test files, both valid and invalid,
 and confirm that the has_valid_header call returns the correct
@@ -82,17 +78,15 @@ def create_test_files(self, tmp_path, extension, header):
         if extension not in special_cases:
             # Invalid test cases for non-*file files (.tf|.py|.sh|.yaml|.xml..)
             invalid_header = []
-            for line in header_template:
-                if "2018" in line:
-                    invalid_header.append(line.replace('2018', 'YEAR'))
-                else:
-                    invalid_header.append(line)
             invalid_header.append(content)
             invalid_content = invalid_header
             invalid_filename = tmp_path + "invalid." + extension
             self.write_file(invalid_filename, invalid_content, False)
             valid_filename = tmp_path + "testfile." + extension
 
+        for i, line in enumerate(header_template):
+            if "YEAR" in line:
+                header_template[i] = line.replace('YEAR', '2018')
         valid_content = header_template
         self.write_file(valid_filename, valid_content, True)
 
diff --git a/test/verify_boilerplate.py b/test/verify_boilerplate.py
index 21bc83f3..c27a7d82 100644
--- a/test/verify_boilerplate.py
+++ b/test/verify_boilerplate.py
@@ -19,15 +19,21 @@
 # https://github.com/kubernetes/test-infra/blob/master/hack
 # /verify_boilerplate.py
 
-# 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!
 from __future__ import print_function
+
 import argparse
 import glob
 import os
 import re
 import sys
+import time
+
+
+# These directories will be omitted from header checks
+SKIPPED_DIRS = [
+    'Godeps', 'third_party', '_gopath', '_output',
+    '.git', 'vendor', '__init__.py', 'node_modules'
+]
 
 
 def get_args():
@@ -112,28 +118,36 @@ def has_valid_header(filename, refs, regexs):
         ref = refs[extension]
     else:
         ref = refs[basename]
+
     # remove build tags from the top of Go files
     if extension == "go":
-        con = regexs["go_build_constraints"]
-        (data, found) = con.subn("", data, 1)
+        data = regexs["go_build_constraints"].sub("", data)
     # remove shebang
     elif extension == "sh" or extension == "py":
-        she = regexs["shebang"]
-        (data, found) = she.subn("", data, 1)
+        data = regexs["shebang"].sub("", data)
+    # normalize cloud-init files
+    elif basename in ("cloud-init.yaml", "cloud-config.yaml"):
+        data = regexs["cloud-init"].sub("", data)
+
+    # look for 'YEAR' string, and fail if found
+    if regexs["year"].match(data):
+        return False
+
+    # replace actual year with 'YEAR' string
+    data = regexs["years"].sub("YEAR", data)
+
     data = data.splitlines()
     # if our test file is smaller than the reference it surely fails!
     if len(ref) > len(data):
         return False
+
     # trim our file to the same number of lines as the reference file
     data = data[:len(ref)]
-    year = regexs["year"]
-    for datum in data:
-        if year.search(datum):
-            return False
 
     # if we don't match the reference at this point, fail
     if ref != data:
         return False
+
     return True
 
 
@@ -151,13 +165,6 @@ def get_file_extension(filename):
     return os.path.splitext(filename)[1].split(".")[-1].lower()
 
 
-# These directories will be omitted from header checks
-SKIPPED_DIRS = [
-    'Godeps', 'third_party', '_gopath', '_output',
-    '.git', 'vendor', '__init__.py', 'node_modules'
-]
-
-
 def normalize_files(files):
     """Extracts the files that require boilerplate checking from the files
     argument.
@@ -243,15 +250,18 @@ def get_regexs():
     regexs = {}
     # Search for "YEAR" which exists in the boilerplate, but shouldn't in the
     # real thing
-    regexs["year"] = re.compile('YEAR')
+    regexs["year"] = re.compile('^# Copyright YEAR')
     # dates can be 2014, 2015, 2016 or 2017, company holder names can be
     # anything
-    regexs["date"] = re.compile('(2014|2015|2016|2017|2018)')
+    regexs["years"] = re.compile(r"(%s)" % "|".join(
+        str(s) for s in range(2014, int(time.strftime("%Y")) + 1)))
     # strip // +build \n\n build constraints
     regexs["go_build_constraints"] = re.compile(r"^(// \+build.*\n)+\n",
                                                 re.MULTILINE)
     # strip #!.* from shell/python scripts
     regexs["shebang"] = re.compile(r"^(#!.*\n)\n*", re.MULTILINE)
+    # remove top-level cloud-config comment from cloud-init yaml files
+    regexs["cloud-init"] = re.compile(r"^#cloud-config\s*", re.DOTALL)
     return regexs
 
 
diff --git a/variables.tf b/variables.tf
index b2b46459..5a001968 100644
--- a/variables.tf
+++ b/variables.tf
@@ -24,7 +24,7 @@ variable "prefix" {
 
 variable "names" {
   description = "Bucket name suffixes."
-  type        = "list"
+  type        = list(string)
 }
 
 variable "location" {
@@ -37,6 +37,11 @@ variable "storage_class" {
   default     = "MULTI_REGIONAL"
 }
 
+variable "force_destroy" {
+  description = "Optional map of lowercase unprefixed name => boolean, defaults to false."
+  default     = {}
+}
+
 variable "versioning" {
   description = "Optional map of lowercase unprefixed name => boolean, defaults to false."
   default     = {}
@@ -98,3 +103,4 @@ variable "set_viewer_roles" {
   description = "Grant roles/storage.objectViewer role to viewers and bucket_viewers."
   default     = false
 }
+
diff --git a/versions.tf b/versions.tf
new file mode 100644
index 00000000..ac97c6ac
--- /dev/null
+++ b/versions.tf
@@ -0,0 +1,4 @@
+
+terraform {
+  required_version = ">= 0.12"
+}