From 32bee7104ea153feb2c6d08e27b41d8f6fd69ff4 Mon Sep 17 00:00:00 2001
From: Israel Herraiz <ihr@google.com>
Date: Thu, 22 Dec 2022 21:04:42 +0100
Subject: [PATCH 1/6] Add gc_policy to Bigtable module.

Column families have now a new property, to specify the garbage collection
policy. A new option also allows to set a default policy if none is specified.

This changes the previous syntax for column families, that was helpful since the
policy is column-family specific, the new syntax makes it easier to specify a
policy per column family.
---
 default-versions.tf                    |  4 +-
 modules/bigtable-instance/README.md    | 94 ++++++++++++++++++++++----
 modules/bigtable-instance/main.tf      | 38 ++++++++++-
 modules/bigtable-instance/variables.tf | 28 +++++++-
 modules/bigtable-instance/versions.tf  |  4 +-
 5 files changed, 145 insertions(+), 23 deletions(-)

diff --git a/default-versions.tf b/default-versions.tf
index 286536a65e..90b632f6d4 100644
--- a/default-versions.tf
+++ b/default-versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
   }
 }
diff --git a/modules/bigtable-instance/README.md b/modules/bigtable-instance/README.md
index edabb13e04..b3ed627963 100644
--- a/modules/bigtable-instance/README.md
+++ b/modules/bigtable-instance/README.md
@@ -4,7 +4,6 @@ This module allows managing a single BigTable instance, including access configu
 
 ## TODO
 
-- [ ] support bigtable_gc_policy
 - [ ] support bigtable_app_profile
 - [ ] support cluster replicas
 - [ ] support IAM for tables
@@ -47,11 +46,75 @@ module "bigtable-instance" {
   tables = {
     test1 = {},
     test2 = {
-      split_keys      = ["a", "b", "c"]
-      column_families = ["cf1", "cf2", "cf3"]
+      split_keys = ["a", "b", "c"]
+      column_families = {
+        cf1 = {}
+        cf2 = {}
+        cf3 = {}
+      }
     }
     test3 = {
-      column_families = ["cf1"]
+      column_families = {
+        cf1 = {}
+      }
+    }
+  }
+}
+# tftest modules=1 resources=4
+```
+
+### Instance with garbage collection policy
+
+```hcl
+
+module "bigtable-instance" {
+  source     = "./fabric/modules/bigtable-instance"
+  project_id = "my-project"
+  name       = "instance"
+  cluster_id = "instance"
+  zone       = "europe-west1-b"
+  tables = {
+    test1 = {
+      column_families = {
+        cf1 = {
+          gc_policy = {
+            deletion_policy = "ABANDON"
+            max_age         = "18h"
+          }
+        }
+        cf2 = {}
+      }
+    }
+  }
+}
+# tftest modules=1 resources=3
+```
+
+### Instance with default garbage collection policy
+
+The default garbage collection policy is applied to any column family that does
+not specify a `gc_policy`. If a column family specifies a `gc_policy`, the
+default garbage collection policy is ignored for that column family.
+
+```hcl
+
+module "bigtable-instance" {
+  source     = "./fabric/modules/bigtable-instance"
+  project_id = "my-project"
+  name       = "instance"
+  cluster_id = "instance"
+  zone       = "europe-west1-b"
+  default_gc_policy = {
+    deletion_policy = "ABANDON"
+    max_age         = "18h"
+    max_version     = 7
+  }
+  tables = {
+    test1 = {
+      column_families = {
+        cf1 = {}
+        cf2 = {}
+      }
     }
   }
 }
@@ -122,18 +185,19 @@ module "bigtable-instance" {
 
 | name | description | type | required | default |
 |---|---|:---:|:---:|:---:|
-| [name](variables.tf#L56) | The name of the Cloud Bigtable instance. | <code>string</code> | ✓ |  |
-| [project_id](variables.tf#L67) | Id of the project where datasets will be created. | <code>string</code> | ✓ |  |
-| [zone](variables.tf#L88) | The zone to create the Cloud Bigtable cluster in. | <code>string</code> | ✓ |  |
-| [autoscaling_config](variables.tf#L17) | Settings for autoscaling of the instance. If you set this variable, the variable num_nodes is ignored. | <code title="object&#40;&#123;&#10;  min_nodes      &#61; number&#10;  max_nodes      &#61; number&#10;  cpu_target     &#61; number,&#10;  storage_target &#61; optional&#40;number, null&#41;&#10;&#125;&#41;">object&#40;&#123;&#8230;&#125;&#41;</code> |  | <code>null</code> |
+| [name](variables.tf#L69) | The name of the Cloud Bigtable instance. | <code>string</code> | ✓ |  |
+| [project_id](variables.tf#L80) | Id of the project where datasets will be created. | <code>string</code> | ✓ |  |
+| [zone](variables.tf#L110) | The zone to create the Cloud Bigtable cluster in. | <code>string</code> | ✓ |  |
+| [autoscaling_config](variables.tf#L17) | Settings for autoscaling of the instance. If you set this variable, the variable num_nodes is ignored. | <code title="object&#40;&#123;&#10;  min_nodes      &#61; number&#10;  max_nodes      &#61; number&#10;  cpu_target     &#61; number&#10;  storage_target &#61; optional&#40;number, null&#41;&#10;&#125;&#41;">object&#40;&#123;&#8230;&#125;&#41;</code> |  | <code>null</code> |
 | [cluster_id](variables.tf#L28) | The ID of the Cloud Bigtable cluster. | <code>string</code> |  | <code>&#34;europe-west1&#34;</code> |
-| [deletion_protection](variables.tf#L34) | Whether or not to allow Terraform to destroy the instance. Unless this field is set to false in Terraform state, a terraform destroy or terraform apply that would delete the instance will fail. | <code></code> |  | <code>true</code> |
-| [display_name](variables.tf#L39) | The human-readable display name of the Bigtable instance. | <code></code> |  | <code>null</code> |
-| [iam](variables.tf#L44) | IAM bindings for topic in {ROLE => [MEMBERS]} format. | <code>map&#40;list&#40;string&#41;&#41;</code> |  | <code>&#123;&#125;</code> |
-| [instance_type](variables.tf#L50) | (deprecated) The instance type to create. One of 'DEVELOPMENT' or 'PRODUCTION'. | <code>string</code> |  | <code>null</code> |
-| [num_nodes](variables.tf#L61) | The number of nodes in your Cloud Bigtable cluster. This value is ignored if you are using autoscaling. | <code>number</code> |  | <code>1</code> |
-| [storage_type](variables.tf#L72) | The storage type to use. | <code>string</code> |  | <code>&#34;SSD&#34;</code> |
-| [tables](variables.tf#L78) | Tables to be created in the BigTable instance. | <code title="map&#40;object&#40;&#123;&#10;  split_keys      &#61; optional&#40;list&#40;string&#41;, &#91;&#93;&#41;&#10;  column_families &#61; optional&#40;list&#40;string&#41;, &#91;&#93;&#41;&#10;&#125;&#41;&#41;">map&#40;object&#40;&#123;&#8230;&#125;&#41;&#41;</code> |  | <code>&#123;&#125;</code> |
+| [default_gc_policy](variables.tf#L34) | Default garbage collection policy, to be applied to all column families and all tables. Can be override in the tables variable for specific column families. | <code title="object&#40;&#123;&#10;  deletion_policy &#61; optional&#40;string&#41;&#10;  gc_rules        &#61; optional&#40;string&#41;&#10;  mode            &#61; optional&#40;string&#41;&#10;  max_age         &#61; optional&#40;string&#41;&#10;  max_version     &#61; optional&#40;string&#41;&#10;&#125;&#41;">object&#40;&#123;&#8230;&#125;&#41;</code> |  | <code>null</code> |
+| [deletion_protection](variables.tf#L46) | Whether or not to allow Terraform to destroy the instance. Unless this field is set to false in Terraform state, a terraform destroy or terraform apply that would delete the instance will fail. | <code></code> |  | <code>true</code> |
+| [display_name](variables.tf#L51) | The human-readable display name of the Bigtable instance. | <code></code> |  | <code>null</code> |
+| [iam](variables.tf#L57) | IAM bindings for topic in {ROLE => [MEMBERS]} format. | <code>map&#40;list&#40;string&#41;&#41;</code> |  | <code>&#123;&#125;</code> |
+| [instance_type](variables.tf#L63) | (deprecated) The instance type to create. One of 'DEVELOPMENT' or 'PRODUCTION'. | <code>string</code> |  | <code>null</code> |
+| [num_nodes](variables.tf#L74) | The number of nodes in your Cloud Bigtable cluster. This value is ignored if you are using autoscaling. | <code>number</code> |  | <code>1</code> |
+| [storage_type](variables.tf#L85) | The storage type to use. | <code>string</code> |  | <code>&#34;SSD&#34;</code> |
+| [tables](variables.tf#L91) | Tables to be created in the BigTable instance. | <code title="map&#40;object&#40;&#123;&#10;  split_keys &#61; optional&#40;list&#40;string&#41;, &#91;&#93;&#41;&#10;  column_families &#61; optional&#40;map&#40;object&#40;&#10;    &#123;&#10;      gc_policy &#61; optional&#40;object&#40;&#123;&#10;        deletion_policy &#61; optional&#40;string&#41;&#10;        gc_rules        &#61; optional&#40;string&#41;&#10;        mode            &#61; optional&#40;string&#41;&#10;        max_age         &#61; optional&#40;string&#41;&#10;        max_version     &#61; optional&#40;string&#41;&#10;      &#125;&#41;, null&#41;&#10;  &#125;&#41;&#41;, &#123;&#125;&#41;&#10;&#125;&#41;&#41;">map&#40;object&#40;&#123;&#8230;&#125;&#41;&#41;</code> |  | <code>&#123;&#125;</code> |
 
 ## Outputs
 
diff --git a/modules/bigtable-instance/main.tf b/modules/bigtable-instance/main.tf
index ce56c15f76..e1ab9cf36b 100644
--- a/modules/bigtable-instance/main.tf
+++ b/modules/bigtable-instance/main.tf
@@ -16,6 +16,15 @@
 
 locals {
   num_nodes = var.autoscaling_config == null ? var.num_nodes : null
+  gc_pairs = flatten([
+    for table, table_obj in var.tables : [
+      for cf, cf_obj in table_obj.column_families : {
+        table         = table
+        column_family = cf
+        gc_policy     = cf_obj.gc_policy == null ? var.default_gc_policy : cf_obj.gc_policy
+      }
+    ]
+  ])
 }
 
 resource "google_bigtable_instance" "default" {
@@ -61,7 +70,34 @@ resource "google_bigtable_table" "default" {
     for_each = each.value.column_families
 
     content {
-      family = column_family.value
+      family = column_family.key
+    }
+  }
+}
+
+resource "google_bigtable_gc_policy" "default" {
+  for_each = { for k, v in local.gc_pairs : k => v if v.gc_policy != null }
+
+  table         = each.value.table
+  column_family = each.value.column_family
+  instance_name = google_bigtable_instance.default.name
+  project       = var.project_id
+
+  gc_rules        = try(each.value.gc_policy.gc_rules, null)
+  mode            = try(each.value.gc_policy.mode, null)
+  deletion_policy = try(each.value.gc_policy.deletion_policy, null)
+
+  dynamic "max_age" {
+    for_each = try(each.value.gc_policy.max_age, null) != null ? [""] : []
+    content {
+      duration = each.value.gc_policy.max_age
+    }
+  }
+
+  dynamic "max_version" {
+    for_each = try(each.value.gc_policy.max_version, null) != null ? [""] : []
+    content {
+      number = each.value.gc_policy.max_version
     }
   }
 }
diff --git a/modules/bigtable-instance/variables.tf b/modules/bigtable-instance/variables.tf
index ac92c32625..66e0b8ff09 100644
--- a/modules/bigtable-instance/variables.tf
+++ b/modules/bigtable-instance/variables.tf
@@ -19,7 +19,7 @@ variable "autoscaling_config" {
   type = object({
     min_nodes      = number
     max_nodes      = number
-    cpu_target     = number,
+    cpu_target     = number
     storage_target = optional(number, null)
   })
   default = null
@@ -31,6 +31,18 @@ variable "cluster_id" {
   default     = "europe-west1"
 }
 
+variable "default_gc_policy" {
+  description = "Default garbage collection policy, to be applied to all column families and all tables. Can be override in the tables variable for specific column families."
+  type = object({
+    deletion_policy = optional(string)
+    gc_rules        = optional(string)
+    mode            = optional(string)
+    max_age         = optional(string)
+    max_version     = optional(string)
+  })
+  default = null
+}
+
 variable "deletion_protection" {
   description = "Whether or not to allow Terraform to destroy the instance. Unless this field is set to false in Terraform state, a terraform destroy or terraform apply that would delete the instance will fail."
   default     = true
@@ -41,6 +53,7 @@ variable "display_name" {
   default     = null
 }
 
+
 variable "iam" {
   description = "IAM bindings for topic in {ROLE => [MEMBERS]} format."
   type        = map(list(string))
@@ -79,8 +92,17 @@ variable "tables" {
   description = "Tables to be created in the BigTable instance."
   nullable    = false
   type = map(object({
-    split_keys      = optional(list(string), [])
-    column_families = optional(list(string), [])
+    split_keys = optional(list(string), [])
+    column_families = optional(map(object(
+      {
+        gc_policy = optional(object({
+          deletion_policy = optional(string)
+          gc_rules        = optional(string)
+          mode            = optional(string)
+          max_age         = optional(string)
+          max_version     = optional(string)
+        }), null)
+    })), {})
   }))
   default = {}
 }
diff --git a/modules/bigtable-instance/versions.tf b/modules/bigtable-instance/versions.tf
index 286536a65e..90b632f6d4 100644
--- a/modules/bigtable-instance/versions.tf
+++ b/modules/bigtable-instance/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
   }
 }

From 7df527e1ef943853c6ac0b7a5a41a0a08af7aa3d Mon Sep 17 00:00:00 2001
From: Israel Herraiz <ihr@google.com>
Date: Fri, 23 Dec 2022 00:06:42 +0100
Subject: [PATCH 2/6] Bump versions EVERYWHERE

---
 blueprints/cloud-operations/adfs/versions.tf         |  4 ++--
 blueprints/cloud-operations/apigee/versions.tf       |  4 ++--
 .../asset-inventory-feed-remediation/versions.tf     |  4 ++--
 .../dns-fine-grained-iam/versions.tf                 |  4 ++--
 .../cloud-operations/dns-shared-vpc/versions.tf      |  4 ++--
 .../iam-delegated-role-grants/versions.tf            |  4 ++--
 .../onprem-sa-key-management/versions.tf             |  4 ++--
 .../packer-image-builder/versions.tf                 |  4 ++--
 .../cloud-operations/quota-monitoring/versions.tf    |  4 ++--
 .../scheduled-asset-inventory-export-bq/versions.tf  |  4 ++--
 .../tfc-workflow-using-wif/tfc-oidc/versions.tf      | 12 ++++++++++++
 .../cmek-via-centralized-kms/versions.tf             |  4 ++--
 .../data-solutions/data-playground/versions.tf       |  4 ++--
 .../gcs-to-bq-with-least-privileges/versions.tf      |  4 ++--
 .../factories/net-vpc-firewall-yaml/versions.tf      |  4 ++--
 .../nginx-reverse-proxy-cluster/versions.tf          |  4 ++--
 .../onprem-google-access-dns/versions.tf             |  4 ++--
 .../networking/decentralized-firewall/versions.tf    |  4 ++--
 .../networking/filtering-proxy-psc/versions.tf       |  4 ++--
 blueprints/networking/filtering-proxy/versions.tf    |  4 ++--
 .../networking/hub-and-spoke-peering/versions.tf     |  4 ++--
 blueprints/networking/hub-and-spoke-vpn/versions.tf  |  4 ++--
 blueprints/networking/ilb-next-hop/versions.tf       |  4 ++--
 .../private-cloud-function-from-onprem/versions.tf   |  4 ++--
 blueprints/networking/shared-vpc-gke/versions.tf     |  4 ++--
 .../third-party-solutions/openshift/tf/versions.tf   |  4 ++--
 modules/__experimental/net-neg/versions.tf           |  4 ++--
 modules/api-gateway/versions.tf                      |  4 ++--
 modules/apigee/versions.tf                           |  4 ++--
 modules/artifact-registry/versions.tf                |  4 ++--
 modules/bigquery-dataset/versions.tf                 |  4 ++--
 modules/billing-budget/versions.tf                   |  4 ++--
 modules/binauthz/versions.tf                         |  4 ++--
 .../__need_fixing/onprem/versions.tf                 |  4 ++--
 modules/cloud-config-container/coredns/versions.tf   |  4 ++--
 .../cos-generic-metadata/versions.tf                 |  4 ++--
 .../envoy-traffic-director/versions.tf               |  4 ++--
 modules/cloud-config-container/mysql/versions.tf     |  4 ++--
 modules/cloud-config-container/nginx-tls/versions.tf |  4 ++--
 modules/cloud-config-container/nginx/versions.tf     |  4 ++--
 .../cloud-config-container/simple-nva/versions.tf    |  4 ++--
 modules/cloud-config-container/squid/versions.tf     |  4 ++--
 modules/cloud-function/versions.tf                   |  4 ++--
 modules/cloud-identity-group/versions.tf             |  4 ++--
 modules/cloud-run/versions.tf                        |  4 ++--
 modules/cloudsql-instance/versions.tf                |  4 ++--
 modules/compute-mig/versions.tf                      |  4 ++--
 modules/compute-vm/versions.tf                       |  4 ++--
 modules/container-registry/versions.tf               |  4 ++--
 modules/data-catalog-policy-tag/versions.tf          |  4 ++--
 modules/datafusion/versions.tf                       |  4 ++--
 modules/dns/versions.tf                              |  4 ++--
 modules/endpoints/versions.tf                        |  4 ++--
 modules/folder/versions.tf                           |  4 ++--
 modules/gcs/versions.tf                              |  4 ++--
 modules/gke-cluster/versions.tf                      |  4 ++--
 modules/gke-hub/versions.tf                          |  4 ++--
 modules/gke-nodepool/versions.tf                     |  4 ++--
 modules/iam-service-account/versions.tf              |  4 ++--
 modules/kms/versions.tf                              |  4 ++--
 modules/logging-bucket/versions.tf                   |  4 ++--
 modules/net-address/versions.tf                      |  4 ++--
 modules/net-cloudnat/versions.tf                     |  4 ++--
 modules/net-glb/versions.tf                          |  4 ++--
 modules/net-ilb-l7/versions.tf                       |  4 ++--
 modules/net-ilb/versions.tf                          |  4 ++--
 .../net-interconnect-attachment-direct/versions.tf   |  4 ++--
 modules/net-vpc-firewall/versions.tf                 |  4 ++--
 modules/net-vpc-peering/versions.tf                  |  4 ++--
 modules/net-vpc/versions.tf                          |  4 ++--
 modules/net-vpn-dynamic/versions.tf                  |  4 ++--
 modules/net-vpn-ha/versions.tf                       |  4 ++--
 modules/net-vpn-static/versions.tf                   |  4 ++--
 modules/organization/versions.tf                     |  4 ++--
 modules/project/versions.tf                          |  4 ++--
 modules/projects-data-source/versions.tf             |  4 ++--
 modules/pubsub/versions.tf                           |  4 ++--
 modules/secret-manager/versions.tf                   |  4 ++--
 modules/service-directory/versions.tf                |  4 ++--
 modules/source-repository/versions.tf                |  4 ++--
 modules/vpc-sc/versions.tf                           |  4 ++--
 81 files changed, 172 insertions(+), 160 deletions(-)

diff --git a/blueprints/cloud-operations/adfs/versions.tf b/blueprints/cloud-operations/adfs/versions.tf
index 286536a65e..90b632f6d4 100644
--- a/blueprints/cloud-operations/adfs/versions.tf
+++ b/blueprints/cloud-operations/adfs/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
   }
 }
diff --git a/blueprints/cloud-operations/apigee/versions.tf b/blueprints/cloud-operations/apigee/versions.tf
index 286536a65e..90b632f6d4 100644
--- a/blueprints/cloud-operations/apigee/versions.tf
+++ b/blueprints/cloud-operations/apigee/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
   }
 }
diff --git a/blueprints/cloud-operations/asset-inventory-feed-remediation/versions.tf b/blueprints/cloud-operations/asset-inventory-feed-remediation/versions.tf
index 286536a65e..90b632f6d4 100644
--- a/blueprints/cloud-operations/asset-inventory-feed-remediation/versions.tf
+++ b/blueprints/cloud-operations/asset-inventory-feed-remediation/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
   }
 }
diff --git a/blueprints/cloud-operations/dns-fine-grained-iam/versions.tf b/blueprints/cloud-operations/dns-fine-grained-iam/versions.tf
index 286536a65e..90b632f6d4 100644
--- a/blueprints/cloud-operations/dns-fine-grained-iam/versions.tf
+++ b/blueprints/cloud-operations/dns-fine-grained-iam/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
   }
 }
diff --git a/blueprints/cloud-operations/dns-shared-vpc/versions.tf b/blueprints/cloud-operations/dns-shared-vpc/versions.tf
index 286536a65e..90b632f6d4 100644
--- a/blueprints/cloud-operations/dns-shared-vpc/versions.tf
+++ b/blueprints/cloud-operations/dns-shared-vpc/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
   }
 }
diff --git a/blueprints/cloud-operations/iam-delegated-role-grants/versions.tf b/blueprints/cloud-operations/iam-delegated-role-grants/versions.tf
index 286536a65e..90b632f6d4 100644
--- a/blueprints/cloud-operations/iam-delegated-role-grants/versions.tf
+++ b/blueprints/cloud-operations/iam-delegated-role-grants/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
   }
 }
diff --git a/blueprints/cloud-operations/onprem-sa-key-management/versions.tf b/blueprints/cloud-operations/onprem-sa-key-management/versions.tf
index 286536a65e..90b632f6d4 100644
--- a/blueprints/cloud-operations/onprem-sa-key-management/versions.tf
+++ b/blueprints/cloud-operations/onprem-sa-key-management/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
   }
 }
diff --git a/blueprints/cloud-operations/packer-image-builder/versions.tf b/blueprints/cloud-operations/packer-image-builder/versions.tf
index 286536a65e..90b632f6d4 100644
--- a/blueprints/cloud-operations/packer-image-builder/versions.tf
+++ b/blueprints/cloud-operations/packer-image-builder/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
   }
 }
diff --git a/blueprints/cloud-operations/quota-monitoring/versions.tf b/blueprints/cloud-operations/quota-monitoring/versions.tf
index 286536a65e..90b632f6d4 100644
--- a/blueprints/cloud-operations/quota-monitoring/versions.tf
+++ b/blueprints/cloud-operations/quota-monitoring/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
   }
 }
diff --git a/blueprints/cloud-operations/scheduled-asset-inventory-export-bq/versions.tf b/blueprints/cloud-operations/scheduled-asset-inventory-export-bq/versions.tf
index 286536a65e..90b632f6d4 100644
--- a/blueprints/cloud-operations/scheduled-asset-inventory-export-bq/versions.tf
+++ b/blueprints/cloud-operations/scheduled-asset-inventory-export-bq/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
   }
 }
diff --git a/blueprints/cloud-operations/terraform-enterprise-wif/tfc-workflow-using-wif/tfc-oidc/versions.tf b/blueprints/cloud-operations/terraform-enterprise-wif/tfc-workflow-using-wif/tfc-oidc/versions.tf
index a079e99c4f..90b632f6d4 100644
--- a/blueprints/cloud-operations/terraform-enterprise-wif/tfc-workflow-using-wif/tfc-oidc/versions.tf
+++ b/blueprints/cloud-operations/terraform-enterprise-wif/tfc-workflow-using-wif/tfc-oidc/versions.tf
@@ -14,4 +14,16 @@
 
 terraform {
   required_version = ">= 1.3.1"
+  required_providers {
+    google = {
+      source  = "hashicorp/google"
+      version = ">= 4.47.0" # tftest
+    }
+    google-beta = {
+      source  = "hashicorp/google-beta"
+      version = ">= 4.47.0" # tftest
+    }
+  }
 }
+
+
diff --git a/blueprints/data-solutions/cmek-via-centralized-kms/versions.tf b/blueprints/data-solutions/cmek-via-centralized-kms/versions.tf
index 286536a65e..90b632f6d4 100644
--- a/blueprints/data-solutions/cmek-via-centralized-kms/versions.tf
+++ b/blueprints/data-solutions/cmek-via-centralized-kms/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
   }
 }
diff --git a/blueprints/data-solutions/data-playground/versions.tf b/blueprints/data-solutions/data-playground/versions.tf
index 286536a65e..90b632f6d4 100644
--- a/blueprints/data-solutions/data-playground/versions.tf
+++ b/blueprints/data-solutions/data-playground/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
   }
 }
diff --git a/blueprints/data-solutions/gcs-to-bq-with-least-privileges/versions.tf b/blueprints/data-solutions/gcs-to-bq-with-least-privileges/versions.tf
index 286536a65e..90b632f6d4 100644
--- a/blueprints/data-solutions/gcs-to-bq-with-least-privileges/versions.tf
+++ b/blueprints/data-solutions/gcs-to-bq-with-least-privileges/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
   }
 }
diff --git a/blueprints/factories/net-vpc-firewall-yaml/versions.tf b/blueprints/factories/net-vpc-firewall-yaml/versions.tf
index 286536a65e..90b632f6d4 100644
--- a/blueprints/factories/net-vpc-firewall-yaml/versions.tf
+++ b/blueprints/factories/net-vpc-firewall-yaml/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
   }
 }
diff --git a/blueprints/networking/__need_fixing/nginx-reverse-proxy-cluster/versions.tf b/blueprints/networking/__need_fixing/nginx-reverse-proxy-cluster/versions.tf
index 286536a65e..90b632f6d4 100644
--- a/blueprints/networking/__need_fixing/nginx-reverse-proxy-cluster/versions.tf
+++ b/blueprints/networking/__need_fixing/nginx-reverse-proxy-cluster/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
   }
 }
diff --git a/blueprints/networking/__need_fixing/onprem-google-access-dns/versions.tf b/blueprints/networking/__need_fixing/onprem-google-access-dns/versions.tf
index 286536a65e..90b632f6d4 100644
--- a/blueprints/networking/__need_fixing/onprem-google-access-dns/versions.tf
+++ b/blueprints/networking/__need_fixing/onprem-google-access-dns/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
   }
 }
diff --git a/blueprints/networking/decentralized-firewall/versions.tf b/blueprints/networking/decentralized-firewall/versions.tf
index 286536a65e..90b632f6d4 100644
--- a/blueprints/networking/decentralized-firewall/versions.tf
+++ b/blueprints/networking/decentralized-firewall/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
   }
 }
diff --git a/blueprints/networking/filtering-proxy-psc/versions.tf b/blueprints/networking/filtering-proxy-psc/versions.tf
index 286536a65e..90b632f6d4 100644
--- a/blueprints/networking/filtering-proxy-psc/versions.tf
+++ b/blueprints/networking/filtering-proxy-psc/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
   }
 }
diff --git a/blueprints/networking/filtering-proxy/versions.tf b/blueprints/networking/filtering-proxy/versions.tf
index 286536a65e..90b632f6d4 100644
--- a/blueprints/networking/filtering-proxy/versions.tf
+++ b/blueprints/networking/filtering-proxy/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
   }
 }
diff --git a/blueprints/networking/hub-and-spoke-peering/versions.tf b/blueprints/networking/hub-and-spoke-peering/versions.tf
index 286536a65e..90b632f6d4 100644
--- a/blueprints/networking/hub-and-spoke-peering/versions.tf
+++ b/blueprints/networking/hub-and-spoke-peering/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
   }
 }
diff --git a/blueprints/networking/hub-and-spoke-vpn/versions.tf b/blueprints/networking/hub-and-spoke-vpn/versions.tf
index 286536a65e..90b632f6d4 100644
--- a/blueprints/networking/hub-and-spoke-vpn/versions.tf
+++ b/blueprints/networking/hub-and-spoke-vpn/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
   }
 }
diff --git a/blueprints/networking/ilb-next-hop/versions.tf b/blueprints/networking/ilb-next-hop/versions.tf
index 286536a65e..90b632f6d4 100644
--- a/blueprints/networking/ilb-next-hop/versions.tf
+++ b/blueprints/networking/ilb-next-hop/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
   }
 }
diff --git a/blueprints/networking/private-cloud-function-from-onprem/versions.tf b/blueprints/networking/private-cloud-function-from-onprem/versions.tf
index 286536a65e..90b632f6d4 100644
--- a/blueprints/networking/private-cloud-function-from-onprem/versions.tf
+++ b/blueprints/networking/private-cloud-function-from-onprem/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
   }
 }
diff --git a/blueprints/networking/shared-vpc-gke/versions.tf b/blueprints/networking/shared-vpc-gke/versions.tf
index 286536a65e..90b632f6d4 100644
--- a/blueprints/networking/shared-vpc-gke/versions.tf
+++ b/blueprints/networking/shared-vpc-gke/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
   }
 }
diff --git a/blueprints/third-party-solutions/openshift/tf/versions.tf b/blueprints/third-party-solutions/openshift/tf/versions.tf
index 286536a65e..90b632f6d4 100644
--- a/blueprints/third-party-solutions/openshift/tf/versions.tf
+++ b/blueprints/third-party-solutions/openshift/tf/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
   }
 }
diff --git a/modules/__experimental/net-neg/versions.tf b/modules/__experimental/net-neg/versions.tf
index 286536a65e..90b632f6d4 100644
--- a/modules/__experimental/net-neg/versions.tf
+++ b/modules/__experimental/net-neg/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
   }
 }
diff --git a/modules/api-gateway/versions.tf b/modules/api-gateway/versions.tf
index 286536a65e..90b632f6d4 100644
--- a/modules/api-gateway/versions.tf
+++ b/modules/api-gateway/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
   }
 }
diff --git a/modules/apigee/versions.tf b/modules/apigee/versions.tf
index 286536a65e..90b632f6d4 100644
--- a/modules/apigee/versions.tf
+++ b/modules/apigee/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
   }
 }
diff --git a/modules/artifact-registry/versions.tf b/modules/artifact-registry/versions.tf
index 286536a65e..90b632f6d4 100644
--- a/modules/artifact-registry/versions.tf
+++ b/modules/artifact-registry/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
   }
 }
diff --git a/modules/bigquery-dataset/versions.tf b/modules/bigquery-dataset/versions.tf
index 286536a65e..90b632f6d4 100644
--- a/modules/bigquery-dataset/versions.tf
+++ b/modules/bigquery-dataset/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
   }
 }
diff --git a/modules/billing-budget/versions.tf b/modules/billing-budget/versions.tf
index 286536a65e..90b632f6d4 100644
--- a/modules/billing-budget/versions.tf
+++ b/modules/billing-budget/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
   }
 }
diff --git a/modules/binauthz/versions.tf b/modules/binauthz/versions.tf
index 286536a65e..90b632f6d4 100644
--- a/modules/binauthz/versions.tf
+++ b/modules/binauthz/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
   }
 }
diff --git a/modules/cloud-config-container/__need_fixing/onprem/versions.tf b/modules/cloud-config-container/__need_fixing/onprem/versions.tf
index 286536a65e..90b632f6d4 100644
--- a/modules/cloud-config-container/__need_fixing/onprem/versions.tf
+++ b/modules/cloud-config-container/__need_fixing/onprem/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
   }
 }
diff --git a/modules/cloud-config-container/coredns/versions.tf b/modules/cloud-config-container/coredns/versions.tf
index 286536a65e..90b632f6d4 100644
--- a/modules/cloud-config-container/coredns/versions.tf
+++ b/modules/cloud-config-container/coredns/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
   }
 }
diff --git a/modules/cloud-config-container/cos-generic-metadata/versions.tf b/modules/cloud-config-container/cos-generic-metadata/versions.tf
index 286536a65e..90b632f6d4 100644
--- a/modules/cloud-config-container/cos-generic-metadata/versions.tf
+++ b/modules/cloud-config-container/cos-generic-metadata/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
   }
 }
diff --git a/modules/cloud-config-container/envoy-traffic-director/versions.tf b/modules/cloud-config-container/envoy-traffic-director/versions.tf
index 286536a65e..90b632f6d4 100644
--- a/modules/cloud-config-container/envoy-traffic-director/versions.tf
+++ b/modules/cloud-config-container/envoy-traffic-director/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
   }
 }
diff --git a/modules/cloud-config-container/mysql/versions.tf b/modules/cloud-config-container/mysql/versions.tf
index 286536a65e..90b632f6d4 100644
--- a/modules/cloud-config-container/mysql/versions.tf
+++ b/modules/cloud-config-container/mysql/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
   }
 }
diff --git a/modules/cloud-config-container/nginx-tls/versions.tf b/modules/cloud-config-container/nginx-tls/versions.tf
index 286536a65e..90b632f6d4 100644
--- a/modules/cloud-config-container/nginx-tls/versions.tf
+++ b/modules/cloud-config-container/nginx-tls/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
   }
 }
diff --git a/modules/cloud-config-container/nginx/versions.tf b/modules/cloud-config-container/nginx/versions.tf
index 286536a65e..90b632f6d4 100644
--- a/modules/cloud-config-container/nginx/versions.tf
+++ b/modules/cloud-config-container/nginx/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
   }
 }
diff --git a/modules/cloud-config-container/simple-nva/versions.tf b/modules/cloud-config-container/simple-nva/versions.tf
index 286536a65e..90b632f6d4 100644
--- a/modules/cloud-config-container/simple-nva/versions.tf
+++ b/modules/cloud-config-container/simple-nva/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
   }
 }
diff --git a/modules/cloud-config-container/squid/versions.tf b/modules/cloud-config-container/squid/versions.tf
index 286536a65e..90b632f6d4 100644
--- a/modules/cloud-config-container/squid/versions.tf
+++ b/modules/cloud-config-container/squid/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
   }
 }
diff --git a/modules/cloud-function/versions.tf b/modules/cloud-function/versions.tf
index 286536a65e..90b632f6d4 100644
--- a/modules/cloud-function/versions.tf
+++ b/modules/cloud-function/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
   }
 }
diff --git a/modules/cloud-identity-group/versions.tf b/modules/cloud-identity-group/versions.tf
index 286536a65e..90b632f6d4 100644
--- a/modules/cloud-identity-group/versions.tf
+++ b/modules/cloud-identity-group/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
   }
 }
diff --git a/modules/cloud-run/versions.tf b/modules/cloud-run/versions.tf
index 286536a65e..90b632f6d4 100644
--- a/modules/cloud-run/versions.tf
+++ b/modules/cloud-run/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
   }
 }
diff --git a/modules/cloudsql-instance/versions.tf b/modules/cloudsql-instance/versions.tf
index 286536a65e..90b632f6d4 100644
--- a/modules/cloudsql-instance/versions.tf
+++ b/modules/cloudsql-instance/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
   }
 }
diff --git a/modules/compute-mig/versions.tf b/modules/compute-mig/versions.tf
index 286536a65e..90b632f6d4 100644
--- a/modules/compute-mig/versions.tf
+++ b/modules/compute-mig/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
   }
 }
diff --git a/modules/compute-vm/versions.tf b/modules/compute-vm/versions.tf
index 286536a65e..90b632f6d4 100644
--- a/modules/compute-vm/versions.tf
+++ b/modules/compute-vm/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
   }
 }
diff --git a/modules/container-registry/versions.tf b/modules/container-registry/versions.tf
index 286536a65e..90b632f6d4 100644
--- a/modules/container-registry/versions.tf
+++ b/modules/container-registry/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
   }
 }
diff --git a/modules/data-catalog-policy-tag/versions.tf b/modules/data-catalog-policy-tag/versions.tf
index 286536a65e..90b632f6d4 100644
--- a/modules/data-catalog-policy-tag/versions.tf
+++ b/modules/data-catalog-policy-tag/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
   }
 }
diff --git a/modules/datafusion/versions.tf b/modules/datafusion/versions.tf
index 286536a65e..90b632f6d4 100644
--- a/modules/datafusion/versions.tf
+++ b/modules/datafusion/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
   }
 }
diff --git a/modules/dns/versions.tf b/modules/dns/versions.tf
index 286536a65e..90b632f6d4 100644
--- a/modules/dns/versions.tf
+++ b/modules/dns/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
   }
 }
diff --git a/modules/endpoints/versions.tf b/modules/endpoints/versions.tf
index 286536a65e..90b632f6d4 100644
--- a/modules/endpoints/versions.tf
+++ b/modules/endpoints/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
   }
 }
diff --git a/modules/folder/versions.tf b/modules/folder/versions.tf
index 286536a65e..90b632f6d4 100644
--- a/modules/folder/versions.tf
+++ b/modules/folder/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
   }
 }
diff --git a/modules/gcs/versions.tf b/modules/gcs/versions.tf
index 286536a65e..90b632f6d4 100644
--- a/modules/gcs/versions.tf
+++ b/modules/gcs/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
   }
 }
diff --git a/modules/gke-cluster/versions.tf b/modules/gke-cluster/versions.tf
index 286536a65e..90b632f6d4 100644
--- a/modules/gke-cluster/versions.tf
+++ b/modules/gke-cluster/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
   }
 }
diff --git a/modules/gke-hub/versions.tf b/modules/gke-hub/versions.tf
index 286536a65e..90b632f6d4 100644
--- a/modules/gke-hub/versions.tf
+++ b/modules/gke-hub/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
   }
 }
diff --git a/modules/gke-nodepool/versions.tf b/modules/gke-nodepool/versions.tf
index 286536a65e..90b632f6d4 100644
--- a/modules/gke-nodepool/versions.tf
+++ b/modules/gke-nodepool/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
   }
 }
diff --git a/modules/iam-service-account/versions.tf b/modules/iam-service-account/versions.tf
index 286536a65e..90b632f6d4 100644
--- a/modules/iam-service-account/versions.tf
+++ b/modules/iam-service-account/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
   }
 }
diff --git a/modules/kms/versions.tf b/modules/kms/versions.tf
index 286536a65e..90b632f6d4 100644
--- a/modules/kms/versions.tf
+++ b/modules/kms/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
   }
 }
diff --git a/modules/logging-bucket/versions.tf b/modules/logging-bucket/versions.tf
index 286536a65e..90b632f6d4 100644
--- a/modules/logging-bucket/versions.tf
+++ b/modules/logging-bucket/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
   }
 }
diff --git a/modules/net-address/versions.tf b/modules/net-address/versions.tf
index 286536a65e..90b632f6d4 100644
--- a/modules/net-address/versions.tf
+++ b/modules/net-address/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
   }
 }
diff --git a/modules/net-cloudnat/versions.tf b/modules/net-cloudnat/versions.tf
index 286536a65e..90b632f6d4 100644
--- a/modules/net-cloudnat/versions.tf
+++ b/modules/net-cloudnat/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
   }
 }
diff --git a/modules/net-glb/versions.tf b/modules/net-glb/versions.tf
index 286536a65e..90b632f6d4 100644
--- a/modules/net-glb/versions.tf
+++ b/modules/net-glb/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
   }
 }
diff --git a/modules/net-ilb-l7/versions.tf b/modules/net-ilb-l7/versions.tf
index 286536a65e..90b632f6d4 100644
--- a/modules/net-ilb-l7/versions.tf
+++ b/modules/net-ilb-l7/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
   }
 }
diff --git a/modules/net-ilb/versions.tf b/modules/net-ilb/versions.tf
index 286536a65e..90b632f6d4 100644
--- a/modules/net-ilb/versions.tf
+++ b/modules/net-ilb/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
   }
 }
diff --git a/modules/net-interconnect-attachment-direct/versions.tf b/modules/net-interconnect-attachment-direct/versions.tf
index 286536a65e..90b632f6d4 100644
--- a/modules/net-interconnect-attachment-direct/versions.tf
+++ b/modules/net-interconnect-attachment-direct/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
   }
 }
diff --git a/modules/net-vpc-firewall/versions.tf b/modules/net-vpc-firewall/versions.tf
index 286536a65e..90b632f6d4 100644
--- a/modules/net-vpc-firewall/versions.tf
+++ b/modules/net-vpc-firewall/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
   }
 }
diff --git a/modules/net-vpc-peering/versions.tf b/modules/net-vpc-peering/versions.tf
index 286536a65e..90b632f6d4 100644
--- a/modules/net-vpc-peering/versions.tf
+++ b/modules/net-vpc-peering/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
   }
 }
diff --git a/modules/net-vpc/versions.tf b/modules/net-vpc/versions.tf
index 286536a65e..90b632f6d4 100644
--- a/modules/net-vpc/versions.tf
+++ b/modules/net-vpc/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
   }
 }
diff --git a/modules/net-vpn-dynamic/versions.tf b/modules/net-vpn-dynamic/versions.tf
index 286536a65e..90b632f6d4 100644
--- a/modules/net-vpn-dynamic/versions.tf
+++ b/modules/net-vpn-dynamic/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
   }
 }
diff --git a/modules/net-vpn-ha/versions.tf b/modules/net-vpn-ha/versions.tf
index 286536a65e..90b632f6d4 100644
--- a/modules/net-vpn-ha/versions.tf
+++ b/modules/net-vpn-ha/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
   }
 }
diff --git a/modules/net-vpn-static/versions.tf b/modules/net-vpn-static/versions.tf
index 286536a65e..90b632f6d4 100644
--- a/modules/net-vpn-static/versions.tf
+++ b/modules/net-vpn-static/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
   }
 }
diff --git a/modules/organization/versions.tf b/modules/organization/versions.tf
index 286536a65e..90b632f6d4 100644
--- a/modules/organization/versions.tf
+++ b/modules/organization/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
   }
 }
diff --git a/modules/project/versions.tf b/modules/project/versions.tf
index 286536a65e..90b632f6d4 100644
--- a/modules/project/versions.tf
+++ b/modules/project/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
   }
 }
diff --git a/modules/projects-data-source/versions.tf b/modules/projects-data-source/versions.tf
index 286536a65e..90b632f6d4 100644
--- a/modules/projects-data-source/versions.tf
+++ b/modules/projects-data-source/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
   }
 }
diff --git a/modules/pubsub/versions.tf b/modules/pubsub/versions.tf
index 286536a65e..90b632f6d4 100644
--- a/modules/pubsub/versions.tf
+++ b/modules/pubsub/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
   }
 }
diff --git a/modules/secret-manager/versions.tf b/modules/secret-manager/versions.tf
index 286536a65e..90b632f6d4 100644
--- a/modules/secret-manager/versions.tf
+++ b/modules/secret-manager/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
   }
 }
diff --git a/modules/service-directory/versions.tf b/modules/service-directory/versions.tf
index 286536a65e..90b632f6d4 100644
--- a/modules/service-directory/versions.tf
+++ b/modules/service-directory/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
   }
 }
diff --git a/modules/source-repository/versions.tf b/modules/source-repository/versions.tf
index 286536a65e..90b632f6d4 100644
--- a/modules/source-repository/versions.tf
+++ b/modules/source-repository/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
   }
 }
diff --git a/modules/vpc-sc/versions.tf b/modules/vpc-sc/versions.tf
index 286536a65e..90b632f6d4 100644
--- a/modules/vpc-sc/versions.tf
+++ b/modules/vpc-sc/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 4.40.0" # tftest
+      version = ">= 4.47.0" # tftest
     }
   }
 }

From 36135405c4c8875bd68f74a73ca9a92a70e7e6b5 Mon Sep 17 00:00:00 2001
From: Israel Herraiz <ihr@google.com>
Date: Fri, 23 Dec 2022 00:13:30 +0100
Subject: [PATCH 3/6] Remove extra blank line

---
 modules/bigtable-instance/variables.tf | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/bigtable-instance/variables.tf b/modules/bigtable-instance/variables.tf
index 66e0b8ff09..1ccd969bb9 100644
--- a/modules/bigtable-instance/variables.tf
+++ b/modules/bigtable-instance/variables.tf
@@ -53,7 +53,6 @@ variable "display_name" {
   default     = null
 }
 
-
 variable "iam" {
   description = "IAM bindings for topic in {ROLE => [MEMBERS]} format."
   type        = map(list(string))

From a544a9d32daedb53ba5cbbd8dc7ac4f84adc8b64 Mon Sep 17 00:00:00 2001
From: Israel Herraiz <ihr@google.com>
Date: Fri, 23 Dec 2022 00:17:05 +0100
Subject: [PATCH 4/6] Update README.md after changing variables.tf

---
 modules/bigtable-instance/README.md | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/modules/bigtable-instance/README.md b/modules/bigtable-instance/README.md
index b3ed627963..b72f8fec65 100644
--- a/modules/bigtable-instance/README.md
+++ b/modules/bigtable-instance/README.md
@@ -185,19 +185,19 @@ module "bigtable-instance" {
 
 | name | description | type | required | default |
 |---|---|:---:|:---:|:---:|
-| [name](variables.tf#L69) | The name of the Cloud Bigtable instance. | <code>string</code> | ✓ |  |
-| [project_id](variables.tf#L80) | Id of the project where datasets will be created. | <code>string</code> | ✓ |  |
-| [zone](variables.tf#L110) | The zone to create the Cloud Bigtable cluster in. | <code>string</code> | ✓ |  |
+| [name](variables.tf#L68) | The name of the Cloud Bigtable instance. | <code>string</code> | ✓ |  |
+| [project_id](variables.tf#L79) | Id of the project where datasets will be created. | <code>string</code> | ✓ |  |
+| [zone](variables.tf#L109) | The zone to create the Cloud Bigtable cluster in. | <code>string</code> | ✓ |  |
 | [autoscaling_config](variables.tf#L17) | Settings for autoscaling of the instance. If you set this variable, the variable num_nodes is ignored. | <code title="object&#40;&#123;&#10;  min_nodes      &#61; number&#10;  max_nodes      &#61; number&#10;  cpu_target     &#61; number&#10;  storage_target &#61; optional&#40;number, null&#41;&#10;&#125;&#41;">object&#40;&#123;&#8230;&#125;&#41;</code> |  | <code>null</code> |
 | [cluster_id](variables.tf#L28) | The ID of the Cloud Bigtable cluster. | <code>string</code> |  | <code>&#34;europe-west1&#34;</code> |
 | [default_gc_policy](variables.tf#L34) | Default garbage collection policy, to be applied to all column families and all tables. Can be override in the tables variable for specific column families. | <code title="object&#40;&#123;&#10;  deletion_policy &#61; optional&#40;string&#41;&#10;  gc_rules        &#61; optional&#40;string&#41;&#10;  mode            &#61; optional&#40;string&#41;&#10;  max_age         &#61; optional&#40;string&#41;&#10;  max_version     &#61; optional&#40;string&#41;&#10;&#125;&#41;">object&#40;&#123;&#8230;&#125;&#41;</code> |  | <code>null</code> |
 | [deletion_protection](variables.tf#L46) | Whether or not to allow Terraform to destroy the instance. Unless this field is set to false in Terraform state, a terraform destroy or terraform apply that would delete the instance will fail. | <code></code> |  | <code>true</code> |
 | [display_name](variables.tf#L51) | The human-readable display name of the Bigtable instance. | <code></code> |  | <code>null</code> |
-| [iam](variables.tf#L57) | IAM bindings for topic in {ROLE => [MEMBERS]} format. | <code>map&#40;list&#40;string&#41;&#41;</code> |  | <code>&#123;&#125;</code> |
-| [instance_type](variables.tf#L63) | (deprecated) The instance type to create. One of 'DEVELOPMENT' or 'PRODUCTION'. | <code>string</code> |  | <code>null</code> |
-| [num_nodes](variables.tf#L74) | The number of nodes in your Cloud Bigtable cluster. This value is ignored if you are using autoscaling. | <code>number</code> |  | <code>1</code> |
-| [storage_type](variables.tf#L85) | The storage type to use. | <code>string</code> |  | <code>&#34;SSD&#34;</code> |
-| [tables](variables.tf#L91) | Tables to be created in the BigTable instance. | <code title="map&#40;object&#40;&#123;&#10;  split_keys &#61; optional&#40;list&#40;string&#41;, &#91;&#93;&#41;&#10;  column_families &#61; optional&#40;map&#40;object&#40;&#10;    &#123;&#10;      gc_policy &#61; optional&#40;object&#40;&#123;&#10;        deletion_policy &#61; optional&#40;string&#41;&#10;        gc_rules        &#61; optional&#40;string&#41;&#10;        mode            &#61; optional&#40;string&#41;&#10;        max_age         &#61; optional&#40;string&#41;&#10;        max_version     &#61; optional&#40;string&#41;&#10;      &#125;&#41;, null&#41;&#10;  &#125;&#41;&#41;, &#123;&#125;&#41;&#10;&#125;&#41;&#41;">map&#40;object&#40;&#123;&#8230;&#125;&#41;&#41;</code> |  | <code>&#123;&#125;</code> |
+| [iam](variables.tf#L56) | IAM bindings for topic in {ROLE => [MEMBERS]} format. | <code>map&#40;list&#40;string&#41;&#41;</code> |  | <code>&#123;&#125;</code> |
+| [instance_type](variables.tf#L62) | (deprecated) The instance type to create. One of 'DEVELOPMENT' or 'PRODUCTION'. | <code>string</code> |  | <code>null</code> |
+| [num_nodes](variables.tf#L73) | The number of nodes in your Cloud Bigtable cluster. This value is ignored if you are using autoscaling. | <code>number</code> |  | <code>1</code> |
+| [storage_type](variables.tf#L84) | The storage type to use. | <code>string</code> |  | <code>&#34;SSD&#34;</code> |
+| [tables](variables.tf#L90) | Tables to be created in the BigTable instance. | <code title="map&#40;object&#40;&#123;&#10;  split_keys &#61; optional&#40;list&#40;string&#41;, &#91;&#93;&#41;&#10;  column_families &#61; optional&#40;map&#40;object&#40;&#10;    &#123;&#10;      gc_policy &#61; optional&#40;object&#40;&#123;&#10;        deletion_policy &#61; optional&#40;string&#41;&#10;        gc_rules        &#61; optional&#40;string&#41;&#10;        mode            &#61; optional&#40;string&#41;&#10;        max_age         &#61; optional&#40;string&#41;&#10;        max_version     &#61; optional&#40;string&#41;&#10;      &#125;&#41;, null&#41;&#10;  &#125;&#41;&#41;, &#123;&#125;&#41;&#10;&#125;&#41;&#41;">map&#40;object&#40;&#123;&#8230;&#125;&#41;&#41;</code> |  | <code>&#123;&#125;</code> |
 
 ## Outputs
 

From 5fc5165adfb5572a5bd7bcb6df50e93b0716ee3d Mon Sep 17 00:00:00 2001
From: Israel Herraiz <ihr@google.com>
Date: Fri, 23 Dec 2022 00:33:53 +0100
Subject: [PATCH 5/6] Fix modules tests after version bump

---
 tests/modules/logging_bucket/test_plan.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/modules/logging_bucket/test_plan.py b/tests/modules/logging_bucket/test_plan.py
index 6c309e340a..e3cf159ff6 100644
--- a/tests/modules/logging_bucket/test_plan.py
+++ b/tests/modules/logging_bucket/test_plan.py
@@ -22,6 +22,7 @@ def test_project_logging_bucket(plan_runner):
   assert resource["type"] == "google_logging_project_bucket_config"
   assert resource["values"] == {
       "bucket_id": "mybucket",
+      "cmek_settings": [],
       "project": "myproject",
       "location": "global",
       "retention_days": 30,
@@ -39,6 +40,7 @@ def test_folder_logging_bucket(plan_runner):
   assert resource["type"] == "google_logging_folder_bucket_config"
   assert resource["values"] == {
       "bucket_id": "mybucket",
+      "cmek_settings": [],
       "folder": "folders/0123456789",
       "location": "global",
       "retention_days": 30,
@@ -56,6 +58,7 @@ def test_organization_logging_bucket(plan_runner):
   assert resource["type"] == "google_logging_organization_bucket_config"
   assert resource["values"] == {
       "bucket_id": "mybucket",
+      "cmek_settings": [],
       "organization": "organizations/0123456789",
       "location": "global",
       "retention_days": 30,
@@ -73,6 +76,7 @@ def test_billing_account_logging_bucket(plan_runner):
   assert resource["type"] == "google_logging_billing_account_bucket_config"
   assert resource["values"] == {
       "bucket_id": "mybucket",
+      "cmek_settings": [],
       "billing_account": "0123456789",
       "location": "global",
       "retention_days": 30,

From 8718fedcab1ff4b185fc5e2d878abd08355f9482 Mon Sep 17 00:00:00 2001
From: Israel Herraiz <ihr@google.com>
Date: Fri, 23 Dec 2022 00:45:37 +0100
Subject: [PATCH 6/6] Fix service account prefix after provider version bump

---
 modules/net-vpc/README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/net-vpc/README.md b/modules/net-vpc/README.md
index c26e5fb5ea..53361009ee 100644
--- a/modules/net-vpc/README.md
+++ b/modules/net-vpc/README.md
@@ -76,8 +76,8 @@ module "vpc-spoke-1" {
 locals {
   service_project_1 = {
     project_id                     = "project1"
-    gke_service_account            = "gke"
-    cloud_services_service_account = "cloudsvc"
+    gke_service_account            = "serviceAccount:gke"
+    cloud_services_service_account = "serviceAccount:cloudsvc"
   }
   service_project_2 = {
     project_id = "project2"