From fd9b4e55fe177c28b8da0e69a38dabb9aa88f672 Mon Sep 17 00:00:00 2001
From: Bob Callaway <bcallaway@google.com>
Date: Mon, 23 Sep 2024 08:41:23 -0400
Subject: [PATCH] bump terraform to 1.9.6 and 6.3.0

Signed-off-by: Bob Callaway <bcallaway@google.com>
---
 .github/workflows/terraform.yml                     | 4 ++--
 terraform/gcp/modules/argocd/versions.tf            | 2 +-
 terraform/gcp/modules/audit/versions.tf             | 4 ++--
 terraform/gcp/modules/bastion/versions.tf           | 6 +++---
 terraform/gcp/modules/ca/versions.tf                | 4 ++--
 terraform/gcp/modules/ctlog/versions.tf             | 4 ++--
 terraform/gcp/modules/dex/versions.tf               | 4 ++--
 terraform/gcp/modules/external_secrets/versions.tf  | 4 ++--
 terraform/gcp/modules/fulcio/versions.tf            | 4 ++--
 terraform/gcp/modules/gke_cluster/versions.tf       | 8 ++++----
 terraform/gcp/modules/monitoring/dex/versions.tf    | 4 ++--
 terraform/gcp/modules/monitoring/fulcio/versions.tf | 4 ++--
 terraform/gcp/modules/monitoring/infra/versions.tf  | 4 ++--
 terraform/gcp/modules/monitoring/prober/versions.tf | 4 ++--
 terraform/gcp/modules/monitoring/rekor/versions.tf  | 4 ++--
 terraform/gcp/modules/monitoring/slo/versions.tf    | 4 ++--
 terraform/gcp/modules/monitoring/versions.tf        | 4 ++--
 terraform/gcp/modules/mysql-shard/mysql.tf          | 2 --
 terraform/gcp/modules/mysql-shard/versions.tf       | 4 ++--
 terraform/gcp/modules/mysql/mysql.tf                | 2 --
 terraform/gcp/modules/mysql/versions.tf             | 6 +++---
 terraform/gcp/modules/network/versions.tf           | 4 ++--
 terraform/gcp/modules/oslogin/versions.tf           | 4 ++--
 terraform/gcp/modules/project_roles/versions.tf     | 4 ++--
 terraform/gcp/modules/redis/versions.tf             | 6 +++---
 terraform/gcp/modules/rekor/versions.tf             | 4 ++--
 terraform/gcp/modules/sigstore/versions.tf          | 6 +++---
 terraform/gcp/modules/timestamp/versions.tf         | 4 ++--
 terraform/gcp/modules/tuf/versions.tf               | 4 ++--
 29 files changed, 59 insertions(+), 63 deletions(-)

diff --git a/.github/workflows/terraform.yml b/.github/workflows/terraform.yml
index 0162ba0bd..e4798b4a8 100644
--- a/.github/workflows/terraform.yml
+++ b/.github/workflows/terraform.yml
@@ -26,7 +26,7 @@ jobs:
       - uses: hashicorp/setup-terraform@b9cd54a3c349d3f38e8881555d616ced269862dd # v2.0.0
         with:
           # TODO: extract terraform from the tf file when we have pinned
-          terraform_version: 1.9.4
+          terraform_version: 1.9.6
 
       - name: Terraform fmt
         id: fmt
@@ -46,7 +46,7 @@ jobs:
       - uses: hashicorp/setup-terraform@b9cd54a3c349d3f38e8881555d616ced269862dd # v2.0.0
         with:
           # TODO: extract terraform from the tf file when we have pinned
-          terraform_version: 1.9.4
+          terraform_version: 1.9.6
 
       - name: Terraform init
         id: init
diff --git a/terraform/gcp/modules/argocd/versions.tf b/terraform/gcp/modules/argocd/versions.tf
index 718c172e3..e88080aa8 100644
--- a/terraform/gcp/modules/argocd/versions.tf
+++ b/terraform/gcp/modules/argocd/versions.tf
@@ -15,7 +15,7 @@
  */
 
 terraform {
-  required_version = "1.9.4"
+  required_version = "1.9.6"
 
   required_providers {
     kubectl = {
diff --git a/terraform/gcp/modules/audit/versions.tf b/terraform/gcp/modules/audit/versions.tf
index fbf4dd4ff..30f04c0ad 100644
--- a/terraform/gcp/modules/audit/versions.tf
+++ b/terraform/gcp/modules/audit/versions.tf
@@ -15,11 +15,11 @@
  */
 
 terraform {
-  required_version = "1.9.4"
+  required_version = "1.9.6"
 
   required_providers {
     google = {
-      version = "5.40.0"
+      version = "6.3.0"
       source  = "hashicorp/google"
     }
   }
diff --git a/terraform/gcp/modules/bastion/versions.tf b/terraform/gcp/modules/bastion/versions.tf
index a384bb256..7f34c0711 100644
--- a/terraform/gcp/modules/bastion/versions.tf
+++ b/terraform/gcp/modules/bastion/versions.tf
@@ -15,15 +15,15 @@
  */
 
 terraform {
-  required_version = "1.9.4"
+  required_version = "1.9.6"
 
   required_providers {
     google = {
-      version = "5.40.0"
+      version = "6.3.0"
       source  = "hashicorp/google"
     }
     random = {
-      version = "3.5.1"
+      version = "3.6.3"
       source  = "hashicorp/random"
     }
   }
diff --git a/terraform/gcp/modules/ca/versions.tf b/terraform/gcp/modules/ca/versions.tf
index fbf4dd4ff..30f04c0ad 100644
--- a/terraform/gcp/modules/ca/versions.tf
+++ b/terraform/gcp/modules/ca/versions.tf
@@ -15,11 +15,11 @@
  */
 
 terraform {
-  required_version = "1.9.4"
+  required_version = "1.9.6"
 
   required_providers {
     google = {
-      version = "5.40.0"
+      version = "6.3.0"
       source  = "hashicorp/google"
     }
   }
diff --git a/terraform/gcp/modules/ctlog/versions.tf b/terraform/gcp/modules/ctlog/versions.tf
index fbf4dd4ff..30f04c0ad 100644
--- a/terraform/gcp/modules/ctlog/versions.tf
+++ b/terraform/gcp/modules/ctlog/versions.tf
@@ -15,11 +15,11 @@
  */
 
 terraform {
-  required_version = "1.9.4"
+  required_version = "1.9.6"
 
   required_providers {
     google = {
-      version = "5.40.0"
+      version = "6.3.0"
       source  = "hashicorp/google"
     }
   }
diff --git a/terraform/gcp/modules/dex/versions.tf b/terraform/gcp/modules/dex/versions.tf
index fbf4dd4ff..30f04c0ad 100644
--- a/terraform/gcp/modules/dex/versions.tf
+++ b/terraform/gcp/modules/dex/versions.tf
@@ -15,11 +15,11 @@
  */
 
 terraform {
-  required_version = "1.9.4"
+  required_version = "1.9.6"
 
   required_providers {
     google = {
-      version = "5.40.0"
+      version = "6.3.0"
       source  = "hashicorp/google"
     }
   }
diff --git a/terraform/gcp/modules/external_secrets/versions.tf b/terraform/gcp/modules/external_secrets/versions.tf
index b33e111f7..51eb90cd0 100644
--- a/terraform/gcp/modules/external_secrets/versions.tf
+++ b/terraform/gcp/modules/external_secrets/versions.tf
@@ -15,11 +15,11 @@
  */
 
 terraform {
-  required_version = "1.9.4"
+  required_version = "1.9.6"
 
   required_providers {
     google = {
-      version = "5.40.0"
+      version = "6.3.0"
       source  = "hashicorp/google"
     }
     kubectl = {
diff --git a/terraform/gcp/modules/fulcio/versions.tf b/terraform/gcp/modules/fulcio/versions.tf
index fbf4dd4ff..30f04c0ad 100644
--- a/terraform/gcp/modules/fulcio/versions.tf
+++ b/terraform/gcp/modules/fulcio/versions.tf
@@ -15,11 +15,11 @@
  */
 
 terraform {
-  required_version = "1.9.4"
+  required_version = "1.9.6"
 
   required_providers {
     google = {
-      version = "5.40.0"
+      version = "6.3.0"
       source  = "hashicorp/google"
     }
   }
diff --git a/terraform/gcp/modules/gke_cluster/versions.tf b/terraform/gcp/modules/gke_cluster/versions.tf
index 2955aa17b..82e0a88b4 100644
--- a/terraform/gcp/modules/gke_cluster/versions.tf
+++ b/terraform/gcp/modules/gke_cluster/versions.tf
@@ -15,19 +15,19 @@
  */
 
 terraform {
-  required_version = "1.9.4"
+  required_version = "1.9.6"
 
   required_providers {
     google = {
-      version = "5.40.0"
+      version = "6.3.0"
       source  = "hashicorp/google"
     }
     google-beta = {
-      version = "5.40.0"
+      version = "6.3.0"
       source  = "hashicorp/google-beta"
     }
     random = {
-      version = "3.5.1"
+      version = "3.6.3"
       source  = "hashicorp/random"
     }
   }
diff --git a/terraform/gcp/modules/monitoring/dex/versions.tf b/terraform/gcp/modules/monitoring/dex/versions.tf
index fbf4dd4ff..30f04c0ad 100644
--- a/terraform/gcp/modules/monitoring/dex/versions.tf
+++ b/terraform/gcp/modules/monitoring/dex/versions.tf
@@ -15,11 +15,11 @@
  */
 
 terraform {
-  required_version = "1.9.4"
+  required_version = "1.9.6"
 
   required_providers {
     google = {
-      version = "5.40.0"
+      version = "6.3.0"
       source  = "hashicorp/google"
     }
   }
diff --git a/terraform/gcp/modules/monitoring/fulcio/versions.tf b/terraform/gcp/modules/monitoring/fulcio/versions.tf
index fbf4dd4ff..30f04c0ad 100644
--- a/terraform/gcp/modules/monitoring/fulcio/versions.tf
+++ b/terraform/gcp/modules/monitoring/fulcio/versions.tf
@@ -15,11 +15,11 @@
  */
 
 terraform {
-  required_version = "1.9.4"
+  required_version = "1.9.6"
 
   required_providers {
     google = {
-      version = "5.40.0"
+      version = "6.3.0"
       source  = "hashicorp/google"
     }
   }
diff --git a/terraform/gcp/modules/monitoring/infra/versions.tf b/terraform/gcp/modules/monitoring/infra/versions.tf
index fbf4dd4ff..30f04c0ad 100644
--- a/terraform/gcp/modules/monitoring/infra/versions.tf
+++ b/terraform/gcp/modules/monitoring/infra/versions.tf
@@ -15,11 +15,11 @@
  */
 
 terraform {
-  required_version = "1.9.4"
+  required_version = "1.9.6"
 
   required_providers {
     google = {
-      version = "5.40.0"
+      version = "6.3.0"
       source  = "hashicorp/google"
     }
   }
diff --git a/terraform/gcp/modules/monitoring/prober/versions.tf b/terraform/gcp/modules/monitoring/prober/versions.tf
index fbf4dd4ff..30f04c0ad 100644
--- a/terraform/gcp/modules/monitoring/prober/versions.tf
+++ b/terraform/gcp/modules/monitoring/prober/versions.tf
@@ -15,11 +15,11 @@
  */
 
 terraform {
-  required_version = "1.9.4"
+  required_version = "1.9.6"
 
   required_providers {
     google = {
-      version = "5.40.0"
+      version = "6.3.0"
       source  = "hashicorp/google"
     }
   }
diff --git a/terraform/gcp/modules/monitoring/rekor/versions.tf b/terraform/gcp/modules/monitoring/rekor/versions.tf
index fbf4dd4ff..30f04c0ad 100644
--- a/terraform/gcp/modules/monitoring/rekor/versions.tf
+++ b/terraform/gcp/modules/monitoring/rekor/versions.tf
@@ -15,11 +15,11 @@
  */
 
 terraform {
-  required_version = "1.9.4"
+  required_version = "1.9.6"
 
   required_providers {
     google = {
-      version = "5.40.0"
+      version = "6.3.0"
       source  = "hashicorp/google"
     }
   }
diff --git a/terraform/gcp/modules/monitoring/slo/versions.tf b/terraform/gcp/modules/monitoring/slo/versions.tf
index fbf4dd4ff..30f04c0ad 100644
--- a/terraform/gcp/modules/monitoring/slo/versions.tf
+++ b/terraform/gcp/modules/monitoring/slo/versions.tf
@@ -15,11 +15,11 @@
  */
 
 terraform {
-  required_version = "1.9.4"
+  required_version = "1.9.6"
 
   required_providers {
     google = {
-      version = "5.40.0"
+      version = "6.3.0"
       source  = "hashicorp/google"
     }
   }
diff --git a/terraform/gcp/modules/monitoring/versions.tf b/terraform/gcp/modules/monitoring/versions.tf
index fbf4dd4ff..30f04c0ad 100644
--- a/terraform/gcp/modules/monitoring/versions.tf
+++ b/terraform/gcp/modules/monitoring/versions.tf
@@ -15,11 +15,11 @@
  */
 
 terraform {
-  required_version = "1.9.4"
+  required_version = "1.9.6"
 
   required_providers {
     google = {
-      version = "5.40.0"
+      version = "6.3.0"
       source  = "hashicorp/google"
     }
   }
diff --git a/terraform/gcp/modules/mysql-shard/mysql.tf b/terraform/gcp/modules/mysql-shard/mysql.tf
index 6d781f3e6..db0d44657 100644
--- a/terraform/gcp/modules/mysql-shard/mysql.tf
+++ b/terraform/gcp/modules/mysql-shard/mysql.tf
@@ -39,7 +39,6 @@ resource "google_sql_database_instance" "trillian" {
     ip_configuration {
       ipv4_enabled    = var.ipv4_enabled
       private_network = var.network
-      require_ssl     = var.require_ssl
       ssl_mode        = var.require_ssl ? "TRUSTED_CLIENT_CERTIFICATE_REQUIRED" : "ALLOW_UNENCRYPTED_AND_ENCRYPTED"
     }
 
@@ -80,7 +79,6 @@ resource "google_sql_database_instance" "read_replica" {
     ip_configuration {
       ipv4_enabled    = var.ipv4_enabled
       private_network = var.network
-      require_ssl     = var.require_ssl
       ssl_mode        = var.require_ssl ? "TRUSTED_CLIENT_CERTIFICATE_REQUIRED" : "ALLOW_UNENCRYPTED_AND_ENCRYPTED"
     }
 
diff --git a/terraform/gcp/modules/mysql-shard/versions.tf b/terraform/gcp/modules/mysql-shard/versions.tf
index fbf4dd4ff..30f04c0ad 100644
--- a/terraform/gcp/modules/mysql-shard/versions.tf
+++ b/terraform/gcp/modules/mysql-shard/versions.tf
@@ -15,11 +15,11 @@
  */
 
 terraform {
-  required_version = "1.9.4"
+  required_version = "1.9.6"
 
   required_providers {
     google = {
-      version = "5.40.0"
+      version = "6.3.0"
       source  = "hashicorp/google"
     }
   }
diff --git a/terraform/gcp/modules/mysql/mysql.tf b/terraform/gcp/modules/mysql/mysql.tf
index 42df96d98..012a5fdcb 100644
--- a/terraform/gcp/modules/mysql/mysql.tf
+++ b/terraform/gcp/modules/mysql/mysql.tf
@@ -125,7 +125,6 @@ resource "google_sql_database_instance" "sigstore" {
     ip_configuration {
       ipv4_enabled    = var.ipv4_enabled
       private_network = var.network
-      require_ssl     = var.require_ssl
       ssl_mode        = var.require_ssl ? "TRUSTED_CLIENT_CERTIFICATE_REQUIRED" : "ALLOW_UNENCRYPTED_AND_ENCRYPTED"
     }
 
@@ -173,7 +172,6 @@ resource "google_sql_database_instance" "read_replica" {
     ip_configuration {
       ipv4_enabled    = var.ipv4_enabled
       private_network = var.network
-      require_ssl     = var.require_ssl
       ssl_mode        = var.require_ssl ? "TRUSTED_CLIENT_CERTIFICATE_REQUIRED" : "ALLOW_UNENCRYPTED_AND_ENCRYPTED"
     }
 
diff --git a/terraform/gcp/modules/mysql/versions.tf b/terraform/gcp/modules/mysql/versions.tf
index a384bb256..7f34c0711 100644
--- a/terraform/gcp/modules/mysql/versions.tf
+++ b/terraform/gcp/modules/mysql/versions.tf
@@ -15,15 +15,15 @@
  */
 
 terraform {
-  required_version = "1.9.4"
+  required_version = "1.9.6"
 
   required_providers {
     google = {
-      version = "5.40.0"
+      version = "6.3.0"
       source  = "hashicorp/google"
     }
     random = {
-      version = "3.5.1"
+      version = "3.6.3"
       source  = "hashicorp/random"
     }
   }
diff --git a/terraform/gcp/modules/network/versions.tf b/terraform/gcp/modules/network/versions.tf
index fbf4dd4ff..30f04c0ad 100644
--- a/terraform/gcp/modules/network/versions.tf
+++ b/terraform/gcp/modules/network/versions.tf
@@ -15,11 +15,11 @@
  */
 
 terraform {
-  required_version = "1.9.4"
+  required_version = "1.9.6"
 
   required_providers {
     google = {
-      version = "5.40.0"
+      version = "6.3.0"
       source  = "hashicorp/google"
     }
   }
diff --git a/terraform/gcp/modules/oslogin/versions.tf b/terraform/gcp/modules/oslogin/versions.tf
index fbf4dd4ff..30f04c0ad 100644
--- a/terraform/gcp/modules/oslogin/versions.tf
+++ b/terraform/gcp/modules/oslogin/versions.tf
@@ -15,11 +15,11 @@
  */
 
 terraform {
-  required_version = "1.9.4"
+  required_version = "1.9.6"
 
   required_providers {
     google = {
-      version = "5.40.0"
+      version = "6.3.0"
       source  = "hashicorp/google"
     }
   }
diff --git a/terraform/gcp/modules/project_roles/versions.tf b/terraform/gcp/modules/project_roles/versions.tf
index fbf4dd4ff..30f04c0ad 100644
--- a/terraform/gcp/modules/project_roles/versions.tf
+++ b/terraform/gcp/modules/project_roles/versions.tf
@@ -15,11 +15,11 @@
  */
 
 terraform {
-  required_version = "1.9.4"
+  required_version = "1.9.6"
 
   required_providers {
     google = {
-      version = "5.40.0"
+      version = "6.3.0"
       source  = "hashicorp/google"
     }
   }
diff --git a/terraform/gcp/modules/redis/versions.tf b/terraform/gcp/modules/redis/versions.tf
index a384bb256..7f34c0711 100644
--- a/terraform/gcp/modules/redis/versions.tf
+++ b/terraform/gcp/modules/redis/versions.tf
@@ -15,15 +15,15 @@
  */
 
 terraform {
-  required_version = "1.9.4"
+  required_version = "1.9.6"
 
   required_providers {
     google = {
-      version = "5.40.0"
+      version = "6.3.0"
       source  = "hashicorp/google"
     }
     random = {
-      version = "3.5.1"
+      version = "3.6.3"
       source  = "hashicorp/random"
     }
   }
diff --git a/terraform/gcp/modules/rekor/versions.tf b/terraform/gcp/modules/rekor/versions.tf
index fbf4dd4ff..30f04c0ad 100644
--- a/terraform/gcp/modules/rekor/versions.tf
+++ b/terraform/gcp/modules/rekor/versions.tf
@@ -15,11 +15,11 @@
  */
 
 terraform {
-  required_version = "1.9.4"
+  required_version = "1.9.6"
 
   required_providers {
     google = {
-      version = "5.40.0"
+      version = "6.3.0"
       source  = "hashicorp/google"
     }
   }
diff --git a/terraform/gcp/modules/sigstore/versions.tf b/terraform/gcp/modules/sigstore/versions.tf
index e690d1055..fbb5386e8 100644
--- a/terraform/gcp/modules/sigstore/versions.tf
+++ b/terraform/gcp/modules/sigstore/versions.tf
@@ -15,15 +15,15 @@
  */
 
 terraform {
-  required_version = "1.9.4"
+  required_version = "1.9.6"
 
   required_providers {
     google = {
-      version = "5.40.0"
+      version = "6.3.0"
       source  = "hashicorp/google"
     }
     google-beta = {
-      version = "5.40.0"
+      version = "6.3.0"
       source  = "hashicorp/google-beta"
     }
   }
diff --git a/terraform/gcp/modules/timestamp/versions.tf b/terraform/gcp/modules/timestamp/versions.tf
index fbf4dd4ff..30f04c0ad 100644
--- a/terraform/gcp/modules/timestamp/versions.tf
+++ b/terraform/gcp/modules/timestamp/versions.tf
@@ -15,11 +15,11 @@
  */
 
 terraform {
-  required_version = "1.9.4"
+  required_version = "1.9.6"
 
   required_providers {
     google = {
-      version = "5.40.0"
+      version = "6.3.0"
       source  = "hashicorp/google"
     }
   }
diff --git a/terraform/gcp/modules/tuf/versions.tf b/terraform/gcp/modules/tuf/versions.tf
index fbf4dd4ff..30f04c0ad 100644
--- a/terraform/gcp/modules/tuf/versions.tf
+++ b/terraform/gcp/modules/tuf/versions.tf
@@ -15,11 +15,11 @@
  */
 
 terraform {
-  required_version = "1.9.4"
+  required_version = "1.9.6"
 
   required_providers {
     google = {
-      version = "5.40.0"
+      version = "6.3.0"
       source  = "hashicorp/google"
     }
   }