feat!: add Terraform 0.13 constraint and module attribution (#40)

Author: cloud-foundation-bot

Makefile

@@ -18,7 +18,7 @@
 # Make will use bash instead of sh
 SHELL := /usr/bin/env bash
 
-DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 0
+DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 0.13
 DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools
 REGISTRY_URL := gcr.io/cloud-foundation-cicd
 

README.md

@@ -9,10 +9,10 @@ The resources/services/activations/deletions that this module will create/trigge
 - Create IAM role bindings for owners, encrypters, decrypters
 
 ## Compatibility
-
-This module is meant for use with Terraform 0.12. If you haven't upgraded and need a Terraform 0.11.x-compatible
-version of this module, the last released version intended for Terraform 0.11.x
-is [v0.1.0](https://registry.terraform.io/modules/terraform-google-modules/kms/google/0.1.0).
+This module is meant for use with Terraform 0.13. If you haven't
+[upgraded](https://www.terraform.io/upgrade-guides/0-13.html) and need a Terraform
+0.12.x-compatible version of this module, the last released version
+intended for Terraform 0.12.x is [v1.2.0](https://registry.terraform.io/modules/terraform-google-modules/-kms/google/v1.2.0).
 
 ## Usage
 
@@ -42,22 +42,22 @@ Functional examples are included in the
 ## Inputs
 
 | Name | Description | Type | Default | Required |
-|------|-------------|:----:|:-----:|:-----:|
-| decrypters | List of comma-separated owners for each key declared in set_decrypters_for. | list(string) | `<list>` | no |
-| encrypters | List of comma-separated owners for each key declared in set_encrypters_for. | list(string) | `<list>` | no |
-| key\_algorithm | The algorithm to use when creating a version based on this template. See the https://cloud.google.com/kms/docs/reference/rest/v1/CryptoKeyVersionAlgorithm for possible inputs. | string | `"GOOGLE_SYMMETRIC_ENCRYPTION"` | no |
-| key\_protection\_level | The protection level to use when creating a version based on this template. Default value: "SOFTWARE" Possible values: ["SOFTWARE", "HSM"] | string | `"SOFTWARE"` | no |
-| key\_rotation\_period |  | string | `"100000s"` | no |
-| keyring | Keyring name. | string | n/a | yes |
-| keys | Key names. | list(string) | `<list>` | no |
-| labels | Labels, provided as a map | map(string) | `<map>` | no |
-| location | Location for the keyring. | string | n/a | yes |
-| owners | List of comma-separated owners for each key declared in set_owners_for. | list(string) | `<list>` | no |
-| prevent\_destroy | Set the prevent_destroy lifecycle attribute on keys. | string | `"true"` | no |
-| project\_id | Project id where the keyring will be created. | string | n/a | yes |
-| set\_decrypters\_for | Name of keys for which decrypters will be set. | list(string) | `<list>` | no |
-| set\_encrypters\_for | Name of keys for which encrypters will be set. | list(string) | `<list>` | no |
-| set\_owners\_for | Name of keys for which owners will be set. | list(string) | `<list>` | no |
+|------|-------------|------|---------|:--------:|
+| decrypters | List of comma-separated owners for each key declared in set\_decrypters\_for. | `list(string)` | `[]` | no |
+| encrypters | List of comma-separated owners for each key declared in set\_encrypters\_for. | `list(string)` | `[]` | no |
+| key\_algorithm | The algorithm to use when creating a version based on this template. See the https://cloud.google.com/kms/docs/reference/rest/v1/CryptoKeyVersionAlgorithm for possible inputs. | `string` | `"GOOGLE_SYMMETRIC_ENCRYPTION"` | no |
+| key\_protection\_level | The protection level to use when creating a version based on this template. Default value: "SOFTWARE" Possible values: ["SOFTWARE", "HSM"] | `string` | `"SOFTWARE"` | no |
+| key\_rotation\_period | n/a | `string` | `"100000s"` | no |
+| keyring | Keyring name. | `string` | n/a | yes |
+| keys | Key names. | `list(string)` | `[]` | no |
+| labels | Labels, provided as a map | `map(string)` | `{}` | no |
+| location | Location for the keyring. | `string` | n/a | yes |
+| owners | List of comma-separated owners for each key declared in set\_owners\_for. | `list(string)` | `[]` | no |
+| prevent\_destroy | Set the prevent\_destroy lifecycle attribute on keys. | `bool` | `true` | no |
+| project\_id | Project id where the keyring will be created. | `string` | n/a | yes |
+| set\_decrypters\_for | Name of keys for which decrypters will be set. | `list(string)` | `[]` | no |
+| set\_encrypters\_for | Name of keys for which encrypters will be set. | `list(string)` | `[]` | no |
+| set\_owners\_for | Name of keys for which owners will be set. | `list(string)` | `[]` | no |
 
 ## Outputs
 
@@ -78,7 +78,7 @@ These sections describe requirements for using this module.
 
 The following dependencies must be available:
 
-- [Terraform][terraform] v0.12
+- [Terraform](https://www.terraform.io/downloads.html) >= 0.13.0
 - [Terraform Provider for GCP][terraform-provider-gcp] plugin v3.0
 
 ### Service Account

examples/simple_example/README.md

@@ -6,11 +6,11 @@ This example illustrates how to use the `kms` module.
 ## Inputs
 
 | Name | Description | Type | Default | Required |
-|------|-------------|:----:|:-----:|:-----:|
-| keyring | Keyring name. | string | n/a | yes |
-| keys | Key names. | list(string) | `<list>` | no |
-| location | Location for the keyring. | string | `"global"` | no |
-| project\_id | The ID of the project in which to provision resources. | string | n/a | yes |
+|------|-------------|------|---------|:--------:|
+| keyring | Keyring name. | `string` | n/a | yes |
+| keys | Key names. | `list(string)` | `[]` | no |
+| location | Location for the keyring. | `string` | `"global"` | no |
+| project\_id | The ID of the project in which to provision resources. | `string` | n/a | yes |
 
 ## Outputs
 

examples/simple_example/main.tf

@@ -15,7 +15,7 @@
  */
 
 provider "google" {
-  version = "~> 3.0.0"
+  version = "~> 3.53"
 }
 
 module "kms" {

test/setup/main.tf

@@ -21,7 +21,7 @@ provider "google" {
 
 module "project_ci_kms" {
   source  = "terraform-google-modules/project-factory/google"
-  version = "~> 8.0"
+  version = "~> 10.0"
 
   name              = "ci-kms-module"
   random_project_id = "true"

versions.tf

@@ -1,5 +1,5 @@
 /**
- * Copyright 2018 Google LLC
+ * Copyright 2021 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,5 +15,17 @@
  */
 
 terraform {
-  required_version = ">= 0.12"
+  required_version = ">= 0.13"
+  required_providers {
+
+    google = {
+      source  = "hashicorp/google"
+      version = "~> 3.53"
+    }
+  }
+
+  provider_meta "google" {
+    module_name = "blueprints/terraform/terraform-google-kms/v1.0.0"
+  }
+
 }