Merge pull request #10 from terraform-google-modules/aaron-lane-0.12

0.12 support

Author: morgante

.gitignore

@@ -0,0 +1,4 @@
+.terraform
+terraform.tfstate.d
+*.pyc
+.kitchen

CHANGELOG.md

@@ -9,11 +9,20 @@ and this project adheres to
 
 ## [Unreleased]
 
+## [1.0.0] - 2019-07-19
+
+### Changed
+
+- Supported version of Terraform is 0.12. [#3]
+
 ## [0.1.0] - 2019-05-16
 
 ### Added
 
 - Initial release
 
-[Unreleased]: https://github.com/terraform-google-modules/terraform-google-kms/compare/v0.1.0...HEAD
+[Unreleased]: https://github.com/terraform-google-modules/terraform-google-kms/compare/v1.0.0...HEAD
 [0.1.0]: https://github.com/terraform-google-modules/terraform-google-kms/releases/tag/v0.1.0
+[1.0.0]: https://github.com/terraform-google-modules/terraform-google-kms/releases/tag/v1.0.0
+
+[#3]: https://github.com/terraform-google-modules/terraform-google-kms/pull/3

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

README.md

@@ -1,4 +1,4 @@
-# terraform-google-kms
+# Google KMS Terraform Module
 
 Simple Cloud KMS module that allows managing a keyring, zero or more keys in the keyring, and IAM role bindings on individual keys.
 
@@ -8,6 +8,13 @@ The resources/services/activations/deletions that this module will create/trigge
 - Create zero or more keys in the keyring
 - Create IAM role bindings for owners, encrypters, decrypters
 
+## Compatibility
+
+This module is meant for use with Terraform 0.12. If you haven't
+[upgraded][terraform-0.12-upgrade] 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][v0.1.0].
+
 ## Usage
 
 Basic usage of this module is as follows:
@@ -44,7 +51,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

@@ -21,6 +21,8 @@ provider "google" {
 module "kms" {
   source = "../.."
 
-  project_id  = "${var.project_id}"
-  bucket_name = "${var.bucket_name}"
+  project_id = var.project_id
+  keyring    = var.keyring
+  location   = "global"
 }
+

examples/simple_example/outputs.tf

@@ -14,7 +14,8 @@
  * limitations under the License.
  */
 
-output "bucket_name" {
-  description = "The name of the bucket."
-  value       = "${module.kms.bucket_name}"
+output "keyring" {
+  description = "The name of the keyring."
+  value       = module.kms.keyring_name
 }
+

examples/simple_example/variables.tf

@@ -15,11 +15,18 @@
  */
 
 variable "project_id" {
+  type        = string
   description = "The ID of the project in which to provision resources."
-  type        = "string"
 }
 
-variable "bucket_name" {
-  description = "The name of the bucket to create."
-  type        = "string"
+variable "location" {
+  type        = string
+  description = "Location for the keyring."
+
+  default = "global"
+}
+
+variable "keyring" {
+  type        = string
+  description = "Keyring name."
 }