Merge branch 'main' into main

imrannayer · web-flow · commit 157017f17e5d · 2025-10-30T17:41:38.000-05:00
diff --git a/modules/airflow_storage/versions.tf b/modules/airflow_storage/versions.tf
@@ -20,7 +20,7 @@ terraform {
 
     google = {
       source  = "hashicorp/google"
-      version = ">= 3.53, < 7"
+      version = ">= 3.53, < 8"
     }
   }
 
diff --git a/modules/composer_net/versions.tf b/modules/composer_net/versions.tf
@@ -20,11 +20,11 @@ terraform {
 
     google = {
       source  = "hashicorp/google"
-      version = ">= 3.53, < 7"
+      version = ">= 3.53, < 8"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 3.53, < 7"
+      version = ">= 3.53, < 8"
     }
   }
 
diff --git a/modules/create_environment_v1/versions.tf b/modules/create_environment_v1/versions.tf
@@ -20,12 +20,12 @@ terraform {
 
     google = {
       source  = "hashicorp/google"
-      version = ">= 3.53, < 7"
+      version = ">= 3.53, < 8"
     }
 
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 3.53, < 7"
+      version = ">= 3.53, < 8"
     }
   }
 
diff --git a/modules/create_environment_v2/versions.tf b/modules/create_environment_v2/versions.tf
@@ -20,12 +20,12 @@ terraform {
 
     google = {
       source  = "hashicorp/google"
-      version = ">= 5.14, < 7"
+      version = ">= 5.14, < 8"
     }
 
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 5.14, < 7"
+      version = ">= 5.14, < 8"
     }
   }
 
diff --git a/modules/create_environment_v3/versions.tf b/modules/create_environment_v3/versions.tf
@@ -20,12 +20,12 @@ terraform {
 
     google = {
       source  = "hashicorp/google"
-      version = ">= 6.0, < 7"
+      version = ">= 6.0, < 8"
     }
 
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 6.0, < 7"
+      version = ">= 6.0, < 8"
     }
   }
 
diff --git a/test/setup/iam.tf b/test/setup/iam.tf
@@ -21,7 +21,8 @@ locals {
     "roles/compute.instanceAdmin.v1",
     "roles/iam.serviceAccountUser",
     "roles/composer.worker",
-    "roles/resourcemanager.projectIamAdmin"
+    "roles/resourcemanager.projectIamAdmin",
+    "roles/cloudbuild.builds.builder",
   ]
 }
 
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 = "~> 17.0"
+  version = "~> 18.0"
 
   name              = "ci-composer"
   random_project_id = "true"
@@ -32,7 +32,8 @@ module "project" {
     "dns.googleapis.com",
     "compute.googleapis.com",
     "iam.googleapis.com",
-    "container.googleapis.com"
+    "container.googleapis.com",
+    "cloudbuild.googleapis.com",
   ]
   activate_api_identities = [
     {
@@ -61,7 +62,8 @@ module "service_project" {
     "composer.googleapis.com",
     "compute.googleapis.com",
     "iam.googleapis.com",
-    "container.googleapis.com"
+    "container.googleapis.com",
+    "cloudbuild.googleapis.com",
   ]
   activate_api_identities = [
     {
diff --git a/test/setup/versions.tf b/test/setup/versions.tf
@@ -19,11 +19,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 3.53, < 7"
+      version = ">= 3.53, < 8"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 3.53, < 7"
+      version = ">= 3.53, < 8"
     }
   }
 }
diff --git a/versions.tf b/versions.tf
@@ -20,12 +20,12 @@ terraform {
 
     google = {
       source  = "hashicorp/google"
-      version = ">= 3.53, < 7"
+      version = ">= 3.53, < 8"
     }
 
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 3.53, < 7"
+      version = ">= 3.53, < 8"
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ terraform {`
`20`	`20`
`21`	`21`	`google = {`
`22`	`22`	`source = "hashicorp/google"`
`23`		`- version = ">= 3.53, < 7"`
	`23`	`+ version = ">= 3.53, < 8"`
`24`	`24`	`}`
`25`	`25`	`}`
`26`	`26`
Original file line number	Diff line number	Diff line change
`@@ -20,11 +20,11 @@ terraform {`
`20`	`20`
`21`	`21`	`google = {`
`22`	`22`	`source = "hashicorp/google"`
`23`		`- version = ">= 3.53, < 7"`
	`23`	`+ version = ">= 3.53, < 8"`
`24`	`24`	`}`
`25`	`25`	`google-beta = {`
`26`	`26`	`source = "hashicorp/google-beta"`
`27`		`- version = ">= 3.53, < 7"`
	`27`	`+ version = ">= 3.53, < 8"`
`28`	`28`	`}`
`29`	`29`	`}`
`30`	`30`
Original file line number	Diff line number	Diff line change
`@@ -20,12 +20,12 @@ terraform {`
`20`	`20`
`21`	`21`	`google = {`
`22`	`22`	`source = "hashicorp/google"`
`23`		`- version = ">= 3.53, < 7"`
	`23`	`+ version = ">= 3.53, < 8"`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`google-beta = {`
`27`	`27`	`source = "hashicorp/google-beta"`
`28`		`- version = ">= 3.53, < 7"`
	`28`	`+ version = ">= 3.53, < 8"`
`29`	`29`	`}`
`30`	`30`	`}`
`31`	`31`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,8 @@ locals {`
`21`	`21`	`"roles/compute.instanceAdmin.v1",`
`22`	`22`	`"roles/iam.serviceAccountUser",`
`23`	`23`	`"roles/composer.worker",`
`24`		`- "roles/resourcemanager.projectIamAdmin"`
	`24`	`+ "roles/resourcemanager.projectIamAdmin",`
	`25`	`+ "roles/cloudbuild.builds.builder",`
`25`	`26`	`]`
`26`	`27`	`}`
`27`	`28`
Original file line number	Diff line number	Diff line change
`@@ -19,11 +19,11 @@ terraform {`
`19`	`19`	`required_providers {`
`20`	`20`	`google = {`
`21`	`21`	`source = "hashicorp/google"`
`22`		`- version = ">= 3.53, < 7"`
	`22`	`+ version = ">= 3.53, < 8"`
`23`	`23`	`}`
`24`	`24`	`google-beta = {`
`25`	`25`	`source = "hashicorp/google-beta"`
`26`		`- version = ">= 3.53, < 7"`
	`26`	`+ version = ">= 3.53, < 8"`
`27`	`27`	`}`
`28`	`28`	`}`
`29`	`29`	`}`