fix(TF>=1.3)!: update provider and metadata (#966)

terraform-google-modules · Dec 30, 2024 · 0bab52d · 0bab52d
1 parent 940e523
commit 0bab52d
Show file tree

Hide file tree

Showing 22 changed files with 98 additions and 107 deletions.
diff --git a/README.md b/README.md
@@ -12,7 +12,7 @@ To include G Suite integration for creating groups and adding Service Accounts i
 
 ## Compatibility
 
-This module is meant for use with Terraform 0.13+ and tested using Terraform 1.3+. If you find incompatibilities using Terraform >=0.13, please open an issue.
+This module is meant for use with Terraform 1.3+ and tested using Terraform 1.10+. If you find incompatibilities using Terraform >= 1.3, please open an issue.
  If you haven't
 [upgraded][terraform-0.13-upgrade] and need a Terraform
 0.12.x-compatible version of this module, the last released version
@@ -200,9 +200,9 @@ determining that location is as follows:
 
 -   [gcloud sdk](https://cloud.google.com/sdk/install) >= 269.0.0
 -   [jq](https://stedolan.github.io/jq/) >= 1.6
--   [Terraform](https://www.terraform.io/downloads.html) >= 0.13.0
--   [terraform-provider-google] plugin >= 5.33
--   [terraform-provider-google-beta] plugin >= 5.33
+-   [Terraform](https://www.terraform.io/downloads.html) >= 1.3
+-   [terraform-provider-google] plugin >= 5.41
+-   [terraform-provider-google-beta] plugin >= 5.41
 -   [terraform-provider-gsuite] plugin ~> 0.1.x if GSuite functionality is desired
 
 ### Permissions
@@ -338,7 +338,7 @@ The core Project Factory solely deals with GCP APIs and does not integrate G Sui
 ## Install
 ### Terraform
 
-Be sure you have the correct Terraform version (0.13.0+), you can choose the
+Be sure you have the correct Terraform version (1.3+), you can choose the
 binary here:
 
 - https://releases.hashicorp.com/terraform/

diff --git a/metadata.yaml b/metadata.yaml
@@ -23,11 +23,10 @@ spec:
     title: Google Cloud Project Factory Terraform Module
     source:
       repo: https://github.com/terraform-google-modules/terraform-google-project-factory.git
-      sourceType: git
     version: 17.1.0
     actuationTool:
       flavor: Terraform
-      version: ">=0.13.0"
+      version: ">= 1.3"
     description: {}
   content:
     subBlueprints:
@@ -356,13 +355,10 @@ spec:
     roles:
       - level: Project
         roles:
-          - roles/owner
-          - roles/compute.admin
-          - roles/iam.serviceAccountAdmin
-          - roles/resourcemanager.projectIamAdmin
-          - roles/storage.admin
-          - roles/iam.serviceAccountUser
-          - roles/billing.projectManager
+          - roles/accesscontextmanager.policyAdmin
+          - roles/resourcemanager.organizationViewer
+          - roles/resourcemanager.tagAdmin
+          - roles/resourcemanager.tagUser
       - level: Project
         roles:
           - roles/owner
@@ -373,10 +369,13 @@ spec:
           - roles/compute.xpnAdmin
       - level: Project
         roles:
-          - roles/accesscontextmanager.policyAdmin
-          - roles/resourcemanager.organizationViewer
-          - roles/resourcemanager.tagAdmin
-          - roles/resourcemanager.tagUser
+          - roles/owner
+          - roles/compute.admin
+          - roles/iam.serviceAccountAdmin
+          - roles/resourcemanager.projectIamAdmin
+          - roles/storage.admin
+          - roles/iam.serviceAccountUser
+          - roles/billing.projectManager
     services:
       - admin.googleapis.com
       - appengine.googleapis.com

diff --git a/modules/app_engine/versions.tf b/modules/app_engine/versions.tf
@@ -15,7 +15,7 @@
  */
 
 terraform {
-  required_version = ">= 0.13"
+  required_version = ">= 1.3"
 
   required_providers {
     google = {

diff --git a/modules/budget/metadata.yaml b/modules/budget/metadata.yaml
@@ -23,12 +23,11 @@ spec:
     title: Budget configuration for a project
     source:
       repo: https://github.com/terraform-google-modules/terraform-google-project-factory.git
-      sourceType: git
       dir: /modules/budget
     version: 17.1.0
     actuationTool:
       flavor: Terraform
-      version: ">= 0.13"
+      version: ">= 1.3"
     description: {}
   content:
     examples:
@@ -120,6 +119,12 @@ spec:
         description: Resource name of the budget. Values are of the form `billingAccounts/{billingAccountId}/budgets/{budgetId}.`
   requirements:
     roles:
+      - level: Project
+        roles:
+          - roles/accesscontextmanager.policyAdmin
+          - roles/resourcemanager.organizationViewer
+          - roles/resourcemanager.tagAdmin
+          - roles/resourcemanager.tagUser
       - level: Project
         roles:
           - roles/owner
@@ -128,12 +133,6 @@ spec:
           - roles/resourcemanager.folderIamAdmin
           - roles/billing.projectManager
           - roles/compute.xpnAdmin
-      - level: Project
-        roles:
-          - roles/accesscontextmanager.policyAdmin
-          - roles/resourcemanager.organizationViewer
-          - roles/resourcemanager.tagAdmin
-          - roles/resourcemanager.tagUser
       - level: Project
         roles:
           - roles/owner

diff --git a/modules/budget/versions.tf b/modules/budget/versions.tf
@@ -15,7 +15,7 @@
  */
 
 terraform {
-  required_version = ">= 0.13"
+  required_version = ">= 1.3"
 
   required_providers {
     google = {

diff --git a/modules/core_project_factory/versions.tf b/modules/core_project_factory/versions.tf
@@ -15,7 +15,7 @@
  */
 
 terraform {
-  required_version = ">= 0.13"
+  required_version = ">= 1.3"
 
   required_providers {
     google = {

diff --git a/modules/essential_contacts/metadata.yaml b/modules/essential_contacts/metadata.yaml
@@ -23,12 +23,11 @@ spec:
     title: Essential Contacts configuration
     source:
       repo: https://github.com/terraform-google-modules/terraform-google-project-factory.git
-      sourceType: git
       dir: /modules/essential_contacts
     version: 17.1.0
     actuationTool:
       flavor: Terraform
-      version: ">= 0.13"
+      version: ">= 1.3"
     description: {}
   content:
     examples:
@@ -77,6 +76,12 @@ spec:
         description: The GCP project you want to enable APIs on
   requirements:
     roles:
+      - level: Project
+        roles:
+          - roles/accesscontextmanager.policyAdmin
+          - roles/resourcemanager.organizationViewer
+          - roles/resourcemanager.tagAdmin
+          - roles/resourcemanager.tagUser
       - level: Project
         roles:
           - roles/owner
@@ -85,12 +90,6 @@ spec:
           - roles/resourcemanager.folderIamAdmin
           - roles/billing.projectManager
           - roles/compute.xpnAdmin
-      - level: Project
-        roles:
-          - roles/accesscontextmanager.policyAdmin
-          - roles/resourcemanager.organizationViewer
-          - roles/resourcemanager.tagAdmin
-          - roles/resourcemanager.tagUser
       - level: Project
         roles:
           - roles/owner

diff --git a/modules/essential_contacts/versions.tf b/modules/essential_contacts/versions.tf
@@ -15,7 +15,7 @@
  */
 
 terraform {
-  required_version = ">= 0.13"
+  required_version = ">= 1.3"
   required_providers {
     google = {
       source  = "hashicorp/google"

diff --git a/modules/fabric-project/metadata.yaml b/modules/fabric-project/metadata.yaml
@@ -23,12 +23,11 @@ spec:
     title: Google Cloud Simple Project Creation
     source:
       repo: https://github.com/terraform-google-modules/terraform-google-project-factory.git
-      sourceType: git
       dir: /modules/fabric-project
     version: 17.1.0
     actuationTool:
       flavor: Terraform
-      version: ">= 0.13"
+      version: ">= 1.3"
     description: {}
   content:
     examples:
@@ -157,6 +156,14 @@ spec:
           - roles/resourcemanager.organizationViewer
           - roles/resourcemanager.tagAdmin
           - roles/resourcemanager.tagUser
+      - level: Project
+        roles:
+          - roles/owner
+          - roles/resourcemanager.projectCreator
+          - roles/resourcemanager.folderAdmin
+          - roles/resourcemanager.folderIamAdmin
+          - roles/billing.projectManager
+          - roles/compute.xpnAdmin
       - level: Project
         roles:
           - roles/owner
@@ -166,14 +173,6 @@ spec:
           - roles/storage.admin
           - roles/iam.serviceAccountUser
           - roles/billing.projectManager
-      - level: Project
-        roles:
-          - roles/owner
-          - roles/resourcemanager.projectCreator
-          - roles/resourcemanager.folderAdmin
-          - roles/resourcemanager.folderIamAdmin
-          - roles/billing.projectManager
-          - roles/compute.xpnAdmin
     services:
       - admin.googleapis.com
       - appengine.googleapis.com

diff --git a/modules/fabric-project/versions.tf b/modules/fabric-project/versions.tf
@@ -15,7 +15,7 @@
  */
 
 terraform {
-  required_version = ">= 0.13"
+  required_version = ">= 1.3"
 
   required_providers {
     google = {

diff --git a/modules/gsuite_enabled/metadata.yaml b/modules/gsuite_enabled/metadata.yaml
@@ -23,12 +23,11 @@ spec:
     title: Google Cloud Project Factory with G Suite Terraform Module
     source:
       repo: https://github.com/terraform-google-modules/terraform-google-project-factory.git
-      sourceType: git
       dir: /modules/gsuite_enabled
     version: 17.1.0
     actuationTool:
       flavor: Terraform
-      version: ">= 0.13"
+      version: ">= 1.3"
     description: {}
   content:
     examples:
@@ -250,13 +249,10 @@ spec:
     roles:
       - level: Project
         roles:
-          - roles/owner
-          - roles/compute.admin
-          - roles/iam.serviceAccountAdmin
-          - roles/resourcemanager.projectIamAdmin
-          - roles/storage.admin
-          - roles/iam.serviceAccountUser
-          - roles/billing.projectManager
+          - roles/accesscontextmanager.policyAdmin
+          - roles/resourcemanager.organizationViewer
+          - roles/resourcemanager.tagAdmin
+          - roles/resourcemanager.tagUser
       - level: Project
         roles:
           - roles/owner
@@ -267,10 +263,13 @@ spec:
           - roles/compute.xpnAdmin
       - level: Project
         roles:
-          - roles/accesscontextmanager.policyAdmin
-          - roles/resourcemanager.organizationViewer
-          - roles/resourcemanager.tagAdmin
-          - roles/resourcemanager.tagUser
+          - roles/owner
+          - roles/compute.admin
+          - roles/iam.serviceAccountAdmin
+          - roles/resourcemanager.projectIamAdmin
+          - roles/storage.admin
+          - roles/iam.serviceAccountUser
+          - roles/billing.projectManager
     services:
       - admin.googleapis.com
       - appengine.googleapis.com

diff --git a/modules/gsuite_enabled/versions.tf b/modules/gsuite_enabled/versions.tf
@@ -15,7 +15,7 @@
  */
 
 terraform {
-  required_version = ">= 0.13"
+  required_version = ">= 1.3"
   required_providers {
     google = {
       source  = "hashicorp/google"

diff --git a/modules/gsuite_group/versions.tf b/modules/gsuite_group/versions.tf
@@ -15,7 +15,7 @@
  */
 
 terraform {
-  required_version = ">= 0.13"
+  required_version = ">= 1.3"
   required_providers {
     google = {
       source  = "hashicorp/google"

diff --git a/modules/project_services/metadata.yaml b/modules/project_services/metadata.yaml
@@ -1,4 +1,4 @@
-# Copyright 2022 Google LLC
+# Copyright 2024 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -23,12 +23,11 @@ spec:
     title: Project API Activation
     source:
       repo: https://github.com/terraform-google-modules/terraform-google-project-factory.git
-      sourceType: git
       dir: /modules/project_services
     version: 17.1.0
     actuationTool:
       flavor: Terraform
-      version: ">= 0.13"
+      version: ">= 1.3"
     description: {}
   content:
     examples:
@@ -102,6 +101,12 @@ spec:
         type: string
   requirements:
     roles:
+      - level: Project
+        roles:
+          - roles/accesscontextmanager.policyAdmin
+          - roles/resourcemanager.organizationViewer
+          - roles/resourcemanager.tagAdmin
+          - roles/resourcemanager.tagUser
       - level: Project
         roles:
           - roles/owner
@@ -110,12 +115,6 @@ spec:
           - roles/resourcemanager.folderIamAdmin
           - roles/billing.projectManager
           - roles/compute.xpnAdmin
-      - level: Project
-        roles:
-          - roles/accesscontextmanager.policyAdmin
-          - roles/resourcemanager.organizationViewer
-          - roles/resourcemanager.tagAdmin
-          - roles/resourcemanager.tagUser
       - level: Project
         roles:
           - roles/owner

diff --git a/modules/project_services/versions.tf b/modules/project_services/versions.tf
@@ -15,7 +15,7 @@
  */
 
 terraform {
-  required_version = ">= 0.13"
+  required_version = ">= 1.3"
   required_providers {
     google = {
       source  = "hashicorp/google"