fix!: bump modules and examples to google provider v7 (#218)

marcos-leal-cit · apeabody · web-flow · commit b528e8d9e1cc · 2026-04-27T21:19:10.000Z
Co-authored-by: Andrew Peabody &lt;andrewpeabody@google.com&gt;
diff --git a/examples/cloud_function2_gcs_source/main.tf b/examples/cloud_function2_gcs_source/main.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2021 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/examples/cloud_function2_pubsub_trigger/main.tf b/examples/cloud_function2_pubsub_trigger/main.tf
@@ -29,7 +29,7 @@ resource "google_storage_bucket_object" "function-source" {
 
 module "pubsub" {
   source  = "terraform-google-modules/pubsub/google"
-  version = "~> 7.0"
+  version = "~> 8.6"
 
   topic      = "function2-topic"
   project_id = var.project_id
diff --git a/examples/secure_cloud_function_bigquery_trigger/main.tf b/examples/secure_cloud_function_bigquery_trigger/main.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2023 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,7 +32,7 @@ resource "random_id" "random_folder_suffix" {
 
 module "secure_harness" {
   source  = "GoogleCloudPlatform/cloud-run/google//modules/secure-serverless-harness"
-  version = "~> 0.23"
+  version = "~> 0.27"
 
   billing_account                             = var.billing_account
   security_project_name                       = "prj-scf-sec-bq"
@@ -74,7 +74,7 @@ module "secure_harness" {
 
 module "cloudfunction_source_bucket" {
   source  = "terraform-google-modules/cloud-storage/google//modules/simple_bucket"
-  version = "~> 10.0"
+  version = "~> 12.3"
 
   project_id    = module.secure_harness.serverless_project_ids[0]
   name          = "bkt-${local.location}-${module.secure_harness.serverless_project_numbers[module.secure_harness.serverless_project_ids[0]]}-cfv2-zip-files"
@@ -333,7 +333,7 @@ module "secure_cloud_function" {
         operator        = "match-path-pattern" # This allows path patterns to be used in the value field
     }]
   }
-  runtime     = "go121"
+  runtime     = "go124"
   entry_point = "HelloCloudFunction"
 
   depends_on = [
diff --git a/examples/secure_cloud_function_internal_server/internal_server.tf b/examples/secure_cloud_function_internal_server/internal_server.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2023 Google LLC
+ * Copyright 2026 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -84,7 +84,7 @@ resource "google_compute_instance" "internal_server" {
 
 module "internal_server_firewall_rule" {
   source  = "terraform-google-modules/network/google//modules/firewall-rules"
-  version = "~> 11.0"
+  version = "~> 18.0"
 
   project_id   = module.secure_harness.network_project_id[0]
   network_name = module.secure_harness.service_vpc[0].network.name
diff --git a/examples/secure_cloud_function_internal_server/main.tf b/examples/secure_cloud_function_internal_server/main.tf
@@ -1,5 +1,5 @@
 # /**
-#  * Copyright 2023 Google LLC
+#  * Copyright 2026 Google LLC
 #  *
 #  * Licensed under the Apache License, Version 2.0 (the "License");
 #  * you may not use this file except in compliance with the License.
@@ -33,7 +33,7 @@ resource "random_id" "random_folder_suffix" {
 
 module "secure_harness" {
   source  = "GoogleCloudPlatform/cloud-run/google//modules/secure-serverless-harness"
-  version = "~> 0.23"
+  version = "~> 0.27"
 
   billing_account                             = var.billing_account
   security_project_name                       = "prj-scf-security-cf"
@@ -102,7 +102,7 @@ resource "time_sleep" "wait_for_secure_harness" {
 
 module "cloudfunction_source_bucket" {
   source  = "terraform-google-modules/cloud-storage/google//modules/simple_bucket"
-  version = "~> 10.0"
+  version = "~> 12.3"
 
   project_id    = module.secure_harness.serverless_project_ids[0]
   name          = "bkt-${local.location}-${module.secure_harness.serverless_project_numbers[module.secure_harness.serverless_project_ids[0]]}-cfv2-zip-files"
@@ -270,7 +270,7 @@ module "secure_cloud_function" {
       attribute_value = module.cloudfunction_source_bucket.name
     }]
   }
-  runtime     = "go121"
+  runtime     = "go124"
   entry_point = "helloHTTP"
 
   depends_on = [
diff --git a/examples/secure_cloud_function_with_sql/main.tf b/examples/secure_cloud_function_with_sql/main.tf
@@ -36,7 +36,7 @@ resource "random_id" "random_folder_suffix" {
 
 module "secure_harness" {
   source  = "GoogleCloudPlatform/cloud-run/google//modules/secure-serverless-harness"
-  version = "~> 0.23"
+  version = "~> 0.27"
 
   billing_account                             = var.billing_account
   security_project_name                       = "prj-scf-sec-sql"
@@ -82,7 +82,7 @@ module "secure_harness" {
 
 module "cloudfunction_source_bucket" {
   source  = "terraform-google-modules/cloud-storage/google//modules/simple_bucket"
-  version = "~> 10.0"
+  version = "~> 12.3"
 
   project_id    = module.secure_harness.serverless_project_ids[0]
   name          = "bkt-${local.location}-${module.secure_harness.serverless_project_numbers[module.secure_harness.serverless_project_ids[0]]}-cfv2-zip-files"
@@ -101,7 +101,7 @@ module "cloudfunction_source_bucket" {
 
 module "cloud_sql_temp_bucket" {
   source  = "terraform-google-modules/cloud-storage/google//modules/simple_bucket"
-  version = "~> 10.0"
+  version = "~> 12.3"
 
   project_id    = module.secure_harness.serverless_project_ids[1]
   name          = "bkt-${local.location}-${module.secure_harness.serverless_project_numbers[module.secure_harness.serverless_project_ids[1]]}-temp-files"
@@ -274,7 +274,7 @@ module "secure_web_proxy" {
 
 module "safer_mysql_db" {
   source  = "GoogleCloudPlatform/sql-db/google//modules/mysql"
-  version = "~> 25.0"
+  version = "~> 28.0"
 
   name                 = "csql-test"
   db_name              = local.db_name
@@ -303,7 +303,7 @@ module "safer_mysql_db" {
 
 module "cloud_sql_firewall_rule" {
   source  = "terraform-google-modules/network/google//modules/firewall-rules"
-  version = "~> 11.0"
+  version = "~> 18.0"
 
   project_id   = module.secure_harness.network_project_id[0]
   network_name = module.secure_harness.service_vpc[0].network.name
@@ -483,7 +483,7 @@ resource "google_cloud_scheduler_job" "job" {
 
 module "pubsub" {
   source  = "terraform-google-modules/pubsub/google"
-  version = "~> 7.0"
+  version = "~> 8.6"
 
   topic              = "tpc-cloud-function-sql"
   project_id         = module.secure_harness.serverless_project_ids[0]
@@ -564,7 +564,7 @@ module "secure_cloud_function" {
     service_account_email = module.secure_harness.service_account_email[module.secure_harness.serverless_project_ids[0]]
   }
 
-  runtime     = "go121"
+  runtime     = "go124"
   entry_point = "HelloCloudFunction"
 
   depends_on = [
diff --git a/metadata.display.yaml b/metadata.display.yaml
@@ -1,4 +1,4 @@
-# Copyright 2025 Google LLC
+# Copyright 2026 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/metadata.yaml b/metadata.yaml
@@ -1,4 +1,4 @@
-# Copyright 2025 Google LLC
+# Copyright 2026 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -142,11 +142,11 @@ spec:
         description: Details of the service
         varType: |-
           object({
-              max_instance_count    = optional(string, "100")
-              min_instance_count    = optional(string, "1")
+              max_instance_count    = optional(string, 100)
+              min_instance_count    = optional(string, 1)
               available_memory      = optional(string, "256M")
-              available_cpu         = optional(string, "1")
-              timeout_seconds       = optional(string, "60")
+              available_cpu         = optional(string, 1)
+              timeout_seconds       = optional(string, 60)
               runtime_env_variables = optional(map(string), null)
               runtime_secret_env_variables = optional(set(object({
                 key_name   = string
@@ -261,6 +261,6 @@ spec:
       - servicenetworking.googleapis.com
     providerVersions:
       - source: hashicorp/google
-        version: ">= 4.48, < 7"
+        version: ">= 4.48, < 8"
       - source: hashicorp/google-beta
-        version: ">= 4.48, < 7"
+        version: ">= 4.48, < 8"
diff --git a/modules/secure-cloud-function-core/main.tf b/modules/secure-cloud-function-core/main.tf
@@ -24,7 +24,7 @@ data "google_project" "project" {
 
 module "cloudfunction_bucket" {
   source  = "terraform-google-modules/cloud-storage/google//modules/simple_bucket"
-  version = "~> 10.0"
+  version = "~> 12.3"
 
   project_id      = var.project_id
   labels          = var.labels
@@ -67,7 +67,7 @@ module "pubsub" {
   for_each = toset(["container-analysis-notes-v1", "container-analysis-notes-v1beta1", "container-analysis-occurrences-v1", "container-analysis-occurrences-v1beta1"])
 
   source  = "terraform-google-modules/pubsub/google"
-  version = "~> 7.0"
+  version = "~> 8.6"
 
   topic              = each.value
   project_id         = var.project_id
diff --git a/modules/secure-cloud-function-core/metadata.display.yaml b/modules/secure-cloud-function-core/metadata.display.yaml
@@ -1,4 +1,4 @@
-# Copyright 2025 Google LLC
+# Copyright 2026 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/modules/secure-cloud-function-core/metadata.yaml b/modules/secure-cloud-function-core/metadata.yaml
@@ -1,4 +1,4 @@
-# Copyright 2025 Google LLC
+# Copyright 2026 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -255,6 +255,6 @@ spec:
       - servicenetworking.googleapis.com
     providerVersions:
       - source: hashicorp/google
-        version: ">= 4.74, < 7.0"
+        version: ">= 4.74, < 8.0"
       - source: hashicorp/google-beta
-        version: < 7.0
+        version: < 8.0
diff --git a/modules/secure-cloud-function-core/versions.tf b/modules/secure-cloud-function-core/versions.tf
@@ -20,11 +20,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.74, < 7.0"
+      version = ">= 4.74, < 8.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = "< 7.0"
+      version = "< 8.0"
     }
   }
   provider_meta "google" {
diff --git a/modules/secure-cloud-function-security/metadata.display.yaml b/modules/secure-cloud-function-security/metadata.display.yaml
@@ -1,4 +1,4 @@
-# Copyright 2025 Google LLC
+# Copyright 2026 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/modules/secure-cloud-function-security/metadata.yaml b/modules/secure-cloud-function-security/metadata.yaml
@@ -1,4 +1,4 @@
-# Copyright 2025 Google LLC
+# Copyright 2026 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -157,6 +157,6 @@ spec:
       - servicenetworking.googleapis.com
     providerVersions:
       - source: hashicorp/google
-        version: ">= 4.74, < 7.0"
+        version: ">= 4.74, < 8.0"
       - source: hashicorp/google-beta
-        version: < 7.0
+        version: < 8.0
diff --git a/modules/secure-cloud-function-security/versions.tf b/modules/secure-cloud-function-security/versions.tf
@@ -20,11 +20,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.74, < 7.0"
+      version = ">= 4.74, < 8.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = "< 7.0"
+      version = "< 8.0"
     }
   }
 
diff --git a/modules/secure-cloud-function/main.tf b/modules/secure-cloud-function/main.tf
@@ -17,7 +17,7 @@
 
 module "cloud_serverless_network" {
   source  = "GoogleCloudPlatform/cloud-run/google//modules/secure-serverless-net"
-  version = "~> 0.21.5"
+  version = "~> 0.27"
 
   connector_name            = var.connector_name
   subnet_name               = var.subnet_name
diff --git a/modules/secure-cloud-function/metadata.display.yaml b/modules/secure-cloud-function/metadata.display.yaml
@@ -1,4 +1,4 @@
-# Copyright 2025 Google LLC
+# Copyright 2026 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/modules/secure-cloud-function/metadata.yaml b/modules/secure-cloud-function/metadata.yaml
@@ -1,4 +1,4 @@
-# Copyright 2025 Google LLC
+# Copyright 2026 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -355,8 +355,8 @@ spec:
       - servicenetworking.googleapis.com
     providerVersions:
       - source: hashicorp/google
-        version: ">= 4.74, < 7.0"
+        version: ">= 4.74, < 8.0"
       - source: hashicorp/google-beta
-        version: < 7.0
+        version: < 8.0
       - source: hashicorp/time
         version: ">= 0.9.1"
diff --git a/modules/secure-cloud-function/versions.tf b/modules/secure-cloud-function/versions.tf
@@ -20,11 +20,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.74, < 7.0"
+      version = ">= 4.74, < 8.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = "< 7.0"
+      version = "< 8.0"
     }
 
     time = {
diff --git a/modules/secure-web-proxy/main.tf b/modules/secure-web-proxy/main.tf
@@ -26,7 +26,7 @@ resource "google_compute_subnetwork" "swp_subnetwork_proxy" {
 
 module "swp_firewall_rule" {
   source       = "terraform-google-modules/network/google//modules/firewall-rules"
-  version      = "~> 11.0"
+  version      = "~> 18.0"
   project_id   = var.project_id
   network_name = var.network_id
 
diff --git a/modules/secure-web-proxy/versions.tf b/modules/secure-web-proxy/versions.tf
@@ -20,12 +20,12 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 5.12, < 7"
+      version = ">= 5.12, < 8.0"
     }
 
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = "< 7"
+      version = "< 8.0"
     }
 
     null = {
diff --git a/test/integration/secure_cloud_function_with_sql/secure_cloud_function_with_sql_test.go b/test/integration/secure_cloud_function_with_sql/secure_cloud_function_with_sql_test.go
@@ -40,6 +40,9 @@ var (
 		// Granting IAM Roles is eventually consistent.
 		".*Error 403.*Permission.*denied on resource.*": "Permission denied on resource.",
 
+		// Error 403: Compute Engine API has not been used in project {} before or it is disabled.
+		".*Error 403.*Compute Engine API has not been used in project.*": "Compute Engine API not enabled",
+
 		// Editing VPC Service Controls is eventually consistent.
 		".*Error 403.*Request is prohibited by organization's policy.*vpcServiceControlsUniqueIdentifier.*":    "Request is prohibited by organization's policy.",
 		".*Error code 7.*Request is prohibited by organization's policy.*vpcServiceControlsUniqueIdentifier.*": "Request is prohibited by organization's policy.",
diff --git a/versions.tf b/versions.tf
@@ -19,11 +19,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.48, < 7"
+      version = ">= 4.48, < 8"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.48, < 7"
+      version = ">= 4.48, < 8"
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/**`
`2`		`- * Copyright 2021 Google LLC`
	`2`	`+ * Copyright 2026 Google LLC`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# Copyright 2025 Google LLC`
	`1`	`+# Copyright 2026 Google LLC`
`2`	`2`	`#`
`3`	`3`	`# Licensed under the Apache License, Version 2.0 (the "License");`
`4`	`4`	`# you may not use this file except in compliance with the License.`