From 091e5f8ae528d02db635b42e40905b37991b296d Mon Sep 17 00:00:00 2001
From: Bob Callaway <bobcallaway@users.noreply.github.com>
Date: Mon, 17 Jun 2024 17:31:52 -0400
Subject: [PATCH] bump terraform to 1.8.5 (#1116)

* bump terraform to 1.8.4

Signed-off-by: Bob Callaway <bcallaway@google.com>

* bump to 1.8.5

Signed-off-by: Bob Callaway <bcallaway@google.com>

* fix gh workflow to use 1.8.5

Signed-off-by: Bob Callaway <bcallaway@google.com>

---------

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             | 2 +-
 terraform/gcp/modules/bastion/versions.tf           | 2 +-
 terraform/gcp/modules/ca/versions.tf                | 2 +-
 terraform/gcp/modules/ctlog/versions.tf             | 2 +-
 terraform/gcp/modules/dex/versions.tf               | 2 +-
 terraform/gcp/modules/external_secrets/versions.tf  | 2 +-
 terraform/gcp/modules/fulcio/versions.tf            | 2 +-
 terraform/gcp/modules/gke_cluster/versions.tf       | 2 +-
 terraform/gcp/modules/monitoring/dex/versions.tf    | 2 +-
 terraform/gcp/modules/monitoring/fulcio/versions.tf | 2 +-
 terraform/gcp/modules/monitoring/infra/versions.tf  | 2 +-
 terraform/gcp/modules/monitoring/prober/versions.tf | 2 +-
 terraform/gcp/modules/monitoring/rekor/versions.tf  | 2 +-
 terraform/gcp/modules/monitoring/slo/versions.tf    | 2 +-
 terraform/gcp/modules/monitoring/versions.tf        | 2 +-
 terraform/gcp/modules/mysql-shard/versions.tf       | 2 +-
 terraform/gcp/modules/mysql/versions.tf             | 2 +-
 terraform/gcp/modules/network/versions.tf           | 2 +-
 terraform/gcp/modules/oslogin/versions.tf           | 2 +-
 terraform/gcp/modules/project_roles/versions.tf     | 2 +-
 terraform/gcp/modules/redis/versions.tf             | 2 +-
 terraform/gcp/modules/rekor/versions.tf             | 2 +-
 terraform/gcp/modules/sigstore/versions.tf          | 2 +-
 terraform/gcp/modules/timestamp/versions.tf         | 2 +-
 terraform/gcp/modules/tuf/versions.tf               | 2 +-
 27 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/.github/workflows/terraform.yml b/.github/workflows/terraform.yml
index 0941f4537..662349e75 100644
--- a/.github/workflows/terraform.yml
+++ b/.github/workflows/terraform.yml
@@ -26,7 +26,7 @@ jobs:
       - uses: hashicorp/setup-terraform@651471c36a6092792c552e8b1bef71e592b462d8 # v2.0.0
         with:
           # TODO: extract terraform from the tf file when we have pinned
-          terraform_version: 1.8.0
+          terraform_version: 1.8.5
 
       - name: Terraform fmt
         id: fmt
@@ -46,7 +46,7 @@ jobs:
       - uses: hashicorp/setup-terraform@651471c36a6092792c552e8b1bef71e592b462d8 # v2.0.0
         with:
           # TODO: extract terraform from the tf file when we have pinned
-          terraform_version: 1.8.0
+          terraform_version: 1.8.5
 
       - name: Terraform init
         id: init
diff --git a/terraform/gcp/modules/argocd/versions.tf b/terraform/gcp/modules/argocd/versions.tf
index 834e53841..9217d11f8 100644
--- a/terraform/gcp/modules/argocd/versions.tf
+++ b/terraform/gcp/modules/argocd/versions.tf
@@ -15,7 +15,7 @@
  */
 
 terraform {
-  required_version = "1.8.0"
+  required_version = "1.8.5"
 
   required_providers {
     kubectl = {
diff --git a/terraform/gcp/modules/audit/versions.tf b/terraform/gcp/modules/audit/versions.tf
index 720ef1c4b..e7249fc7b 100644
--- a/terraform/gcp/modules/audit/versions.tf
+++ b/terraform/gcp/modules/audit/versions.tf
@@ -15,7 +15,7 @@
  */
 
 terraform {
-  required_version = "1.8.0"
+  required_version = "1.8.5"
 
   required_providers {
     google = {
diff --git a/terraform/gcp/modules/bastion/versions.tf b/terraform/gcp/modules/bastion/versions.tf
index ecf2936a9..9fc7b3c19 100644
--- a/terraform/gcp/modules/bastion/versions.tf
+++ b/terraform/gcp/modules/bastion/versions.tf
@@ -15,7 +15,7 @@
  */
 
 terraform {
-  required_version = "1.8.0"
+  required_version = "1.8.5"
 
   required_providers {
     google = {
diff --git a/terraform/gcp/modules/ca/versions.tf b/terraform/gcp/modules/ca/versions.tf
index 720ef1c4b..e7249fc7b 100644
--- a/terraform/gcp/modules/ca/versions.tf
+++ b/terraform/gcp/modules/ca/versions.tf
@@ -15,7 +15,7 @@
  */
 
 terraform {
-  required_version = "1.8.0"
+  required_version = "1.8.5"
 
   required_providers {
     google = {
diff --git a/terraform/gcp/modules/ctlog/versions.tf b/terraform/gcp/modules/ctlog/versions.tf
index 720ef1c4b..e7249fc7b 100644
--- a/terraform/gcp/modules/ctlog/versions.tf
+++ b/terraform/gcp/modules/ctlog/versions.tf
@@ -15,7 +15,7 @@
  */
 
 terraform {
-  required_version = "1.8.0"
+  required_version = "1.8.5"
 
   required_providers {
     google = {
diff --git a/terraform/gcp/modules/dex/versions.tf b/terraform/gcp/modules/dex/versions.tf
index 720ef1c4b..e7249fc7b 100644
--- a/terraform/gcp/modules/dex/versions.tf
+++ b/terraform/gcp/modules/dex/versions.tf
@@ -15,7 +15,7 @@
  */
 
 terraform {
-  required_version = "1.8.0"
+  required_version = "1.8.5"
 
   required_providers {
     google = {
diff --git a/terraform/gcp/modules/external_secrets/versions.tf b/terraform/gcp/modules/external_secrets/versions.tf
index 86ca3dabe..4558452e5 100644
--- a/terraform/gcp/modules/external_secrets/versions.tf
+++ b/terraform/gcp/modules/external_secrets/versions.tf
@@ -15,7 +15,7 @@
  */
 
 terraform {
-  required_version = "1.8.0"
+  required_version = "1.8.5"
 
   required_providers {
     google = {
diff --git a/terraform/gcp/modules/fulcio/versions.tf b/terraform/gcp/modules/fulcio/versions.tf
index 720ef1c4b..e7249fc7b 100644
--- a/terraform/gcp/modules/fulcio/versions.tf
+++ b/terraform/gcp/modules/fulcio/versions.tf
@@ -15,7 +15,7 @@
  */
 
 terraform {
-  required_version = "1.8.0"
+  required_version = "1.8.5"
 
   required_providers {
     google = {
diff --git a/terraform/gcp/modules/gke_cluster/versions.tf b/terraform/gcp/modules/gke_cluster/versions.tf
index d22ff76dc..030bfb6b2 100644
--- a/terraform/gcp/modules/gke_cluster/versions.tf
+++ b/terraform/gcp/modules/gke_cluster/versions.tf
@@ -15,7 +15,7 @@
  */
 
 terraform {
-  required_version = "1.8.0"
+  required_version = "1.8.5"
 
   required_providers {
     google = {
diff --git a/terraform/gcp/modules/monitoring/dex/versions.tf b/terraform/gcp/modules/monitoring/dex/versions.tf
index 720ef1c4b..e7249fc7b 100644
--- a/terraform/gcp/modules/monitoring/dex/versions.tf
+++ b/terraform/gcp/modules/monitoring/dex/versions.tf
@@ -15,7 +15,7 @@
  */
 
 terraform {
-  required_version = "1.8.0"
+  required_version = "1.8.5"
 
   required_providers {
     google = {
diff --git a/terraform/gcp/modules/monitoring/fulcio/versions.tf b/terraform/gcp/modules/monitoring/fulcio/versions.tf
index 720ef1c4b..e7249fc7b 100644
--- a/terraform/gcp/modules/monitoring/fulcio/versions.tf
+++ b/terraform/gcp/modules/monitoring/fulcio/versions.tf
@@ -15,7 +15,7 @@
  */
 
 terraform {
-  required_version = "1.8.0"
+  required_version = "1.8.5"
 
   required_providers {
     google = {
diff --git a/terraform/gcp/modules/monitoring/infra/versions.tf b/terraform/gcp/modules/monitoring/infra/versions.tf
index 720ef1c4b..e7249fc7b 100644
--- a/terraform/gcp/modules/monitoring/infra/versions.tf
+++ b/terraform/gcp/modules/monitoring/infra/versions.tf
@@ -15,7 +15,7 @@
  */
 
 terraform {
-  required_version = "1.8.0"
+  required_version = "1.8.5"
 
   required_providers {
     google = {
diff --git a/terraform/gcp/modules/monitoring/prober/versions.tf b/terraform/gcp/modules/monitoring/prober/versions.tf
index 720ef1c4b..e7249fc7b 100644
--- a/terraform/gcp/modules/monitoring/prober/versions.tf
+++ b/terraform/gcp/modules/monitoring/prober/versions.tf
@@ -15,7 +15,7 @@
  */
 
 terraform {
-  required_version = "1.8.0"
+  required_version = "1.8.5"
 
   required_providers {
     google = {
diff --git a/terraform/gcp/modules/monitoring/rekor/versions.tf b/terraform/gcp/modules/monitoring/rekor/versions.tf
index 720ef1c4b..e7249fc7b 100644
--- a/terraform/gcp/modules/monitoring/rekor/versions.tf
+++ b/terraform/gcp/modules/monitoring/rekor/versions.tf
@@ -15,7 +15,7 @@
  */
 
 terraform {
-  required_version = "1.8.0"
+  required_version = "1.8.5"
 
   required_providers {
     google = {
diff --git a/terraform/gcp/modules/monitoring/slo/versions.tf b/terraform/gcp/modules/monitoring/slo/versions.tf
index 720ef1c4b..e7249fc7b 100644
--- a/terraform/gcp/modules/monitoring/slo/versions.tf
+++ b/terraform/gcp/modules/monitoring/slo/versions.tf
@@ -15,7 +15,7 @@
  */
 
 terraform {
-  required_version = "1.8.0"
+  required_version = "1.8.5"
 
   required_providers {
     google = {
diff --git a/terraform/gcp/modules/monitoring/versions.tf b/terraform/gcp/modules/monitoring/versions.tf
index 720ef1c4b..e7249fc7b 100644
--- a/terraform/gcp/modules/monitoring/versions.tf
+++ b/terraform/gcp/modules/monitoring/versions.tf
@@ -15,7 +15,7 @@
  */
 
 terraform {
-  required_version = "1.8.0"
+  required_version = "1.8.5"
 
   required_providers {
     google = {
diff --git a/terraform/gcp/modules/mysql-shard/versions.tf b/terraform/gcp/modules/mysql-shard/versions.tf
index 720ef1c4b..e7249fc7b 100644
--- a/terraform/gcp/modules/mysql-shard/versions.tf
+++ b/terraform/gcp/modules/mysql-shard/versions.tf
@@ -15,7 +15,7 @@
  */
 
 terraform {
-  required_version = "1.8.0"
+  required_version = "1.8.5"
 
   required_providers {
     google = {
diff --git a/terraform/gcp/modules/mysql/versions.tf b/terraform/gcp/modules/mysql/versions.tf
index ecf2936a9..9fc7b3c19 100644
--- a/terraform/gcp/modules/mysql/versions.tf
+++ b/terraform/gcp/modules/mysql/versions.tf
@@ -15,7 +15,7 @@
  */
 
 terraform {
-  required_version = "1.8.0"
+  required_version = "1.8.5"
 
   required_providers {
     google = {
diff --git a/terraform/gcp/modules/network/versions.tf b/terraform/gcp/modules/network/versions.tf
index 720ef1c4b..e7249fc7b 100644
--- a/terraform/gcp/modules/network/versions.tf
+++ b/terraform/gcp/modules/network/versions.tf
@@ -15,7 +15,7 @@
  */
 
 terraform {
-  required_version = "1.8.0"
+  required_version = "1.8.5"
 
   required_providers {
     google = {
diff --git a/terraform/gcp/modules/oslogin/versions.tf b/terraform/gcp/modules/oslogin/versions.tf
index 720ef1c4b..e7249fc7b 100644
--- a/terraform/gcp/modules/oslogin/versions.tf
+++ b/terraform/gcp/modules/oslogin/versions.tf
@@ -15,7 +15,7 @@
  */
 
 terraform {
-  required_version = "1.8.0"
+  required_version = "1.8.5"
 
   required_providers {
     google = {
diff --git a/terraform/gcp/modules/project_roles/versions.tf b/terraform/gcp/modules/project_roles/versions.tf
index 720ef1c4b..e7249fc7b 100644
--- a/terraform/gcp/modules/project_roles/versions.tf
+++ b/terraform/gcp/modules/project_roles/versions.tf
@@ -15,7 +15,7 @@
  */
 
 terraform {
-  required_version = "1.8.0"
+  required_version = "1.8.5"
 
   required_providers {
     google = {
diff --git a/terraform/gcp/modules/redis/versions.tf b/terraform/gcp/modules/redis/versions.tf
index ecf2936a9..9fc7b3c19 100644
--- a/terraform/gcp/modules/redis/versions.tf
+++ b/terraform/gcp/modules/redis/versions.tf
@@ -15,7 +15,7 @@
  */
 
 terraform {
-  required_version = "1.8.0"
+  required_version = "1.8.5"
 
   required_providers {
     google = {
diff --git a/terraform/gcp/modules/rekor/versions.tf b/terraform/gcp/modules/rekor/versions.tf
index 720ef1c4b..e7249fc7b 100644
--- a/terraform/gcp/modules/rekor/versions.tf
+++ b/terraform/gcp/modules/rekor/versions.tf
@@ -15,7 +15,7 @@
  */
 
 terraform {
-  required_version = "1.8.0"
+  required_version = "1.8.5"
 
   required_providers {
     google = {
diff --git a/terraform/gcp/modules/sigstore/versions.tf b/terraform/gcp/modules/sigstore/versions.tf
index 54095fac5..e2ebdf2b1 100644
--- a/terraform/gcp/modules/sigstore/versions.tf
+++ b/terraform/gcp/modules/sigstore/versions.tf
@@ -15,7 +15,7 @@
  */
 
 terraform {
-  required_version = "1.8.0"
+  required_version = "1.8.5"
 
   required_providers {
     google = {
diff --git a/terraform/gcp/modules/timestamp/versions.tf b/terraform/gcp/modules/timestamp/versions.tf
index 720ef1c4b..e7249fc7b 100644
--- a/terraform/gcp/modules/timestamp/versions.tf
+++ b/terraform/gcp/modules/timestamp/versions.tf
@@ -15,7 +15,7 @@
  */
 
 terraform {
-  required_version = "1.8.0"
+  required_version = "1.8.5"
 
   required_providers {
     google = {
diff --git a/terraform/gcp/modules/tuf/versions.tf b/terraform/gcp/modules/tuf/versions.tf
index 720ef1c4b..e7249fc7b 100644
--- a/terraform/gcp/modules/tuf/versions.tf
+++ b/terraform/gcp/modules/tuf/versions.tf
@@ -15,7 +15,7 @@
  */
 
 terraform {
-  required_version = "1.8.0"
+  required_version = "1.8.5"
 
   required_providers {
     google = {