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

Co-authored-by: Morgante Pell <[email protected]>
terraform-google-modules · Sep 29, 2021 · f3559b4 · f3559b4
1 parent 5d4d6ad
commit f3559b4
Show file tree

Hide file tree

Showing 17 changed files with 103 additions and 55 deletions.
diff --git a/Makefile b/Makefile
@@ -18,7 +18,7 @@
 # Make will use bash instead of sh
 SHELL := /usr/bin/env bash
 
-DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 0.12.0
+DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 0.13
 DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools
 REGISTRY_URL := gcr.io/cloud-foundation-cicd
 

diff --git a/README.md b/README.md
@@ -14,10 +14,10 @@ configures a function sourced from a Cloud Source Repositories
 repository.
 
 ## 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/event-function/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.5.0](https://registry.terraform.io/modules/terraform-google-modules/-event-function/google/v1.5.0).
 
 ## Usage
 
@@ -96,7 +96,7 @@ order to invoke this module.
 The following software dependencies must be installed on the system
 from which this module will be invoked:
 
-- [Terraform][terraform-site] v0.12
+- [Terraform](https://www.terraform.io/downloads.html) >= 0.13.0
 - [Terraform Provider for Archive][terraform-provider-archive-site]
   v1.2
 - [Terraform Provider for Google Cloud Platform][terraform-provider-gcp-site] v2.5

diff --git a/build/int.cloudbuild.yaml b/build/int.cloudbuild.yaml
@@ -38,4 +38,4 @@ tags:
 - 'integration'
 substitutions:
   _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'
-  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0.12.0'
+  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0.13'
diff --git a/build/lint.cloudbuild.yaml b/build/lint.cloudbuild.yaml
@@ -21,4 +21,4 @@ tags:
 - 'lint'
 substitutions:
   _DOCKER_IMAGE_DEVELOPER_TOOLS: 'cft/developer-tools'
-  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0.12.0'
+  _DOCKER_TAG_VERSION_DEVELOPER_TOOLS: '0.13'
diff --git a/examples/automatic-labelling-folder/README.md b/examples/automatic-labelling-folder/README.md
@@ -20,10 +20,10 @@ this directory:
 ## Inputs
 
 | Name | Description | Type | Default | Required |
-|------|-------------|:----:|:-----:|:-----:|
-| folder\_id | The ID of the folder to look for changes. | string | n/a | yes |
-| project\_id | The ID of the project to which resources will be applied. | string | n/a | yes |
-| region | The region in which resources will be applied. | string | n/a | yes |
+|------|-------------|------|---------|:--------:|
+| folder\_id | The ID of the folder to look for changes. | `string` | n/a | yes |
+| project\_id | The ID of the project to which resources will be applied. | `string` | n/a | yes |
+| region | The region in which resources will be applied. | `string` | n/a | yes |
 
 ## Outputs
 

diff --git a/examples/automatic-labelling-from-localhost/README.md b/examples/automatic-labelling-from-localhost/README.md
@@ -21,11 +21,11 @@ this directory:
 ## Inputs
 
 | Name | Description | Type | Default | Required |
-|------|-------------|:----:|:-----:|:-----:|
-| project\_id | The ID of the project to which resources will be applied. | string | n/a | yes |
-| region | The region in which resources will be applied. | string | n/a | yes |
-| subnetwork | The name or self_link of the subnetwork to create compute instance in. | string | `"default"` | no |
-| zone | The zone in which resources will be applied. | string | n/a | yes |
+|------|-------------|------|---------|:--------:|
+| project\_id | The ID of the project to which resources will be applied. | `string` | n/a | yes |
+| region | The region in which resources will be applied. | `string` | n/a | yes |
+| subnetwork | The name or self\_link of the subnetwork to create compute instance in. | `string` | `"default"` | no |
+| zone | The zone in which resources will be applied. | `string` | n/a | yes |
 
 ## Outputs
 

diff --git a/examples/automatic-labelling-from-repository/README.md b/examples/automatic-labelling-from-repository/README.md
@@ -21,11 +21,11 @@ this directory:
 ## Inputs
 
 | Name | Description | Type | Default | Required |
-|------|-------------|:----:|:-----:|:-----:|
-| project\_id | The ID of the project to which resources will be applied. | string | n/a | yes |
-| region | The region in which resources will be applied. | string | n/a | yes |
-| subnetwork | The name or self_link of the subnetwork to create compute instance in. | string | `"default"` | no |
-| zone | The zone in which resources will be applied. | string | n/a | yes |
+|------|-------------|------|---------|:--------:|
+| project\_id | The ID of the project to which resources will be applied. | `string` | n/a | yes |
+| region | The region in which resources will be applied. | `string` | n/a | yes |
+| subnetwork | The name or self\_link of the subnetwork to create compute instance in. | `string` | `"default"` | no |
+| zone | The zone in which resources will be applied. | `string` | n/a | yes |
 
 ## Outputs
 

diff --git a/examples/delete-vms-without-cmek/README.md b/examples/delete-vms-without-cmek/README.md
@@ -20,9 +20,13 @@ this directory:
 ## Inputs
 
 | Name | Description | Type | Default | Required |
-|------|-------------|:----:|:-----:|:-----:|
-| project\_id | The ID of the project to which resources will be applied. | string | n/a | yes |
-| region | The region in which resources will be applied. | string | n/a | yes |
+|------|-------------|------|---------|:--------:|
+| project\_id | The ID of the project to which resources will be applied. | `string` | n/a | yes |
+| region | The region in which resources will be applied. | `string` | n/a | yes |
+
+## Outputs
+
+No output.
 
 <!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
 

diff --git a/examples/dynamic-files/README.md b/examples/dynamic-files/README.md
@@ -18,9 +18,9 @@ this directory:
 ## Inputs
 
 | Name | Description | Type | Default | Required |
-|------|-------------|:----:|:-----:|:-----:|
-| project\_id | The ID of the project to which resources will be applied. | string | n/a | yes |
-| region | The region in which resources will be applied. | string | n/a | yes |
+|------|-------------|------|---------|:--------:|
+| project\_id | The ID of the project to which resources will be applied. | `string` | n/a | yes |
+| region | The region in which resources will be applied. | `string` | n/a | yes |
 
 ## Outputs
 

diff --git a/modules/event-folder-log-entry/README.md b/modules/event-folder-log-entry/README.md
@@ -20,13 +20,13 @@ The
 ## Inputs
 
 | Name | Description | Type | Default | Required |
-|------|-------------|:----:|:-----:|:-----:|
-| filter | The filter to apply when exporting logs. | string | n/a | yes |
-| folder\_id | The ID of the folder to look for changes. | string | n/a | yes |
-| include\_children | Determines whether or not to include folder's children in the sink export. If true, logs associated with child projects are also exported; otherwise only logs relating to the provided folder are included. | bool | `"false"` | no |
-| labels | A set of key/value label pairs to assign to any labelable resources. | map(string) | `<map>` | no |
-| name | The name to apply to any nameable resources. | string | n/a | yes |
-| project\_id | The ID of the project to which resources will be applied. | string | n/a | yes |
+|------|-------------|------|---------|:--------:|
+| filter | The filter to apply when exporting logs. | `string` | n/a | yes |
+| folder\_id | The ID of the folder to look for changes. | `string` | n/a | yes |
+| include\_children | Determines whether or not to include folder's children in the sink export. If true, logs associated with child projects are also exported; otherwise only logs relating to the provided folder are included. | `bool` | `false` | no |
+| labels | A set of key/value label pairs to assign to any labelable resources. | `map(string)` | `{}` | no |
+| name | The name to apply to any nameable resources. | `string` | n/a | yes |
+| project\_id | The ID of the project to which resources will be applied. | `string` | n/a | yes |
 
 ## Outputs
 

diff --git a/modules/event-folder-log-entry/versions.tf b/modules/event-folder-log-entry/versions.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2019 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-event-function:event-folder-log-entry/v1.0.0"
+  }
+
 }
diff --git a/modules/event-project-log-entry/README.md b/modules/event-project-log-entry/README.md
@@ -20,12 +20,12 @@ The
 ## Inputs
 
 | Name | Description | Type | Default | Required |
-|------|-------------|:----:|:-----:|:-----:|
-| filter | The filter to apply when exporting logs. | string | n/a | yes |
-| labels | A set of key/value label pairs to assign to any labelable resources. | map(string) | `<map>` | no |
-| name | The name to apply to any nameable resources. | string | n/a | yes |
-| parent\_resource\_type | The GCP resource in which you create the log sink. The value must not be computed, and must be one of the following: 'project', 'folder', 'billing_account', or 'organization'. | string | `"project"` | no |
-| project\_id | The ID of the project to which resources will be applied. | string | n/a | yes |
+|------|-------------|------|---------|:--------:|
+| filter | The filter to apply when exporting logs. | `string` | n/a | yes |
+| labels | A set of key/value label pairs to assign to any labelable resources. | `map(string)` | `{}` | no |
+| name | The name to apply to any nameable resources. | `string` | n/a | yes |
+| parent\_resource\_type | The GCP resource in which you create the log sink. The value must not be computed, and must be one of the following: 'project', 'folder', 'billing\_account', or 'organization'. | `string` | `"project"` | no |
+| project\_id | The ID of the project to which resources will be applied. | `string` | n/a | yes |
 
 ## Outputs
 

diff --git a/modules/event-project-log-entry/versions.tf b/modules/event-project-log-entry/versions.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2019 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-event-function:event-project-log-entry/v1.0.0"
+  }
+
 }
diff --git a/modules/repository-function/versions.tf b/modules/repository-function/versions.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2019 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-event-function:repository-function/v1.0.0"
+  }
+
 }
diff --git a/test/setup/main.tf b/test/setup/main.tf
@@ -30,7 +30,7 @@ resource "google_folder" "ci_event_func_subfolder" {
 
 module "project" {
   source  = "terraform-google-modules/project-factory/google"
-  version = "~> 9.0"
+  version = "~> 10.0"
 
   name              = local.project_name
   random_project_id = true
@@ -52,7 +52,7 @@ module "project" {
 
 module "network" {
   source  = "terraform-google-modules/network/google"
-  version = "~> 2.5"
+  version = "~> 3.0"
 
   project_id   = module.project.project_id
   network_name = "test-network"

diff --git a/test/setup/versions.tf b/test/setup/versions.tf
@@ -19,9 +19,9 @@ terraform {
 }
 
 provider "google" {
-  version = "~> 3.39.0"
+  version = "~> 3.53.0"
 }
 
 provider "google-beta" {
-  version = "~> 3.39.0"
+  version = "~> 3.53.0"
 }
diff --git a/versions.tf b/versions.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2019 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,9 +15,17 @@
  */
 
 terraform {
-  required_version = ">= 0.12"
-
+  required_version = ">= 0.13"
   required_providers {
-    google = ">= 3.38.0"
+
+    google = {
+      source  = "hashicorp/google"
+      version = "~> 3.53"
+    }
   }
+
+  provider_meta "google" {
+    module_name = "blueprints/terraform/terraform-google-event-function/v1.0.0"
+  }
+
 }