feat!: Restrict to Terraform 0.13+ and add module attribution (#38)

terraform-google-modules · Mar 15, 2021 · c423601 · c423601
1 parent 152f063
commit c423601
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -11,10 +11,10 @@ The resources/services/activations/deletions that this module will create/trigge
 - one optional service account key per service account
 
 ## 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.1](https://registry.terraform.io/modules/terraform-google-modules/service-accounts/google/0.1.1).
+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 [v3.0.1](https://registry.terraform.io/modules/terraform-google-modules/-service-accounts/google/v3.0.1).
 
 ## Usage
 
@@ -80,7 +80,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 >= v2.0
 
 ### IAM

diff --git a/examples/multiple_service_accounts/main.tf b/examples/multiple_service_accounts/main.tf
@@ -15,7 +15,7 @@
  */
 
 provider "google" {
-  version = "~> 3.17.0"
+  version = "~> 3.53"
 }
 
 module "service_accounts" {

diff --git a/examples/single_service_account/main.tf b/examples/single_service_account/main.tf
@@ -15,7 +15,7 @@
  */
 
 provider "google" {
-  version = "~> 3.17.0"
+  version = "~> 3.53"
 }
 
 module "service_accounts" {

diff --git a/modules/key-distributor/versions.tf b/modules/key-distributor/versions.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2020 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.
@@ -13,6 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 terraform {
-  required_version = ">= 0.12.6"
+  required_version = ">= 0.13"
+  required_providers {
+
+    google = {
+      source  = "hashicorp/google"
+      version = "~> 3.53"
+    }
+  }
+
+  provider_meta "google" {
+    module_name = "blueprints/terraform/terraform-google-service-accounts:key-distributor/v1.0.0"
+  }
+
 }
diff --git a/test/setup/main.tf b/test/setup/main.tf
@@ -16,7 +16,7 @@
 
 module "project" {
   source  = "terraform-google-modules/project-factory/google"
-  version = "~> 9.2"
+  version = "~> 10.0"
 
   name              = "ci-service-accounts"
   random_project_id = "true"

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,5 +15,17 @@
  */
 
 terraform {
-  required_version = ">= 0.12.6"
+  required_version = ">= 0.13"
+  required_providers {
+
+    google = {
+      source  = "hashicorp/google"
+      version = "~> 3.53"
+    }
+  }
+
+  provider_meta "google" {
+    module_name = "blueprints/terraform/terraform-google-service-accounts/v1.0.0"
+  }
+
 }