From 6db9e6416766b55ba8566de8bf40e45d9664414c Mon Sep 17 00:00:00 2001 From: Andrew Peabody Date: Fri, 11 Oct 2024 14:45:02 -0700 Subject: [PATCH 1/6] =?UTF-8?q?Revert=20"fix(deps)!:=20Update=20Terraform?= =?UTF-8?q?=20terraform-google-modules/project-factory=E2=80=A6"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 3073b048cb79524aeaaf46ff2835b79a6f7b7f23. --- examples/acm-terraform-blog-part1/terraform/gke.tf | 2 +- examples/acm-terraform-blog-part2/terraform/gke.tf | 2 +- examples/acm-terraform-blog-part3/terraform/gke.tf | 2 +- examples/safer_cluster_iap_bastion/apis.tf | 2 +- modules/binary-authorization/main.tf | 2 +- modules/services/main.tf | 2 +- test/setup/main.tf | 8 ++++---- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/examples/acm-terraform-blog-part1/terraform/gke.tf b/examples/acm-terraform-blog-part1/terraform/gke.tf index e53f3f5026..4cd6bfe1a5 100644 --- a/examples/acm-terraform-blog-part1/terraform/gke.tf +++ b/examples/acm-terraform-blog-part1/terraform/gke.tf @@ -16,7 +16,7 @@ module "enabled_google_apis" { source = "terraform-google-modules/project-factory/google//modules/project_services" - version = "~> 17.0" + version = "~> 16.0" project_id = var.project disable_services_on_destroy = false diff --git a/examples/acm-terraform-blog-part2/terraform/gke.tf b/examples/acm-terraform-blog-part2/terraform/gke.tf index 5b703a338a..98f387dbe5 100644 --- a/examples/acm-terraform-blog-part2/terraform/gke.tf +++ b/examples/acm-terraform-blog-part2/terraform/gke.tf @@ -16,7 +16,7 @@ module "enabled_google_apis" { source = "terraform-google-modules/project-factory/google//modules/project_services" - version = "~> 17.0" + version = "~> 16.0" project_id = var.project disable_services_on_destroy = false diff --git a/examples/acm-terraform-blog-part3/terraform/gke.tf b/examples/acm-terraform-blog-part3/terraform/gke.tf index 6e15206d96..74bcb4c271 100644 --- a/examples/acm-terraform-blog-part3/terraform/gke.tf +++ b/examples/acm-terraform-blog-part3/terraform/gke.tf @@ -16,7 +16,7 @@ module "enabled_google_apis" { source = "terraform-google-modules/project-factory/google//modules/project_services" - version = "~> 17.0" + version = "~> 16.0" project_id = var.project disable_services_on_destroy = false diff --git a/examples/safer_cluster_iap_bastion/apis.tf b/examples/safer_cluster_iap_bastion/apis.tf index 2e8e7d9221..68334b926a 100644 --- a/examples/safer_cluster_iap_bastion/apis.tf +++ b/examples/safer_cluster_iap_bastion/apis.tf @@ -16,7 +16,7 @@ module "enabled_google_apis" { source = "terraform-google-modules/project-factory/google//modules/project_services" - version = "~> 17.0" + version = "~> 16.0" project_id = var.project_id disable_services_on_destroy = false diff --git a/modules/binary-authorization/main.tf b/modules/binary-authorization/main.tf index 11b7c5fa8e..901aecc5b4 100644 --- a/modules/binary-authorization/main.tf +++ b/modules/binary-authorization/main.tf @@ -25,7 +25,7 @@ locals { module "project-services" { source = "terraform-google-modules/project-factory/google//modules/project_services" - version = "~> 17.0" + version = "~> 16.0" project_id = var.project_id activate_apis = local.required_enabled_apis diff --git a/modules/services/main.tf b/modules/services/main.tf index e6cb613f18..25daf441b6 100644 --- a/modules/services/main.tf +++ b/modules/services/main.tf @@ -16,7 +16,7 @@ module "services" { source = "terraform-google-modules/project-factory/google//modules/project_services" - version = "~> 17.0" + version = "~> 16.0" project_id = var.project_id enable_apis = var.enable_apis diff --git a/test/setup/main.tf b/test/setup/main.tf index b94c404385..6f68dbbc02 100644 --- a/test/setup/main.tf +++ b/test/setup/main.tf @@ -45,7 +45,7 @@ locals { module "gke-project-1" { source = "terraform-google-modules/project-factory/google" - version = "~> 17.0" + version = "~> 16.0" name = "ci-gke-${random_id.random_project_id_suffix.hex}" random_project_id = true @@ -69,7 +69,7 @@ module "gke-project-1" { module "gke-project-2" { source = "terraform-google-modules/project-factory/google" - version = "~> 17.0" + version = "~> 16.0" name = "ci-gke-${random_id.random_project_id_suffix.hex}" random_project_id = true @@ -91,7 +91,7 @@ module "gke-project-2" { # apis as documented https://cloud.google.com/service-mesh/docs/scripted-install/reference#setting_up_your_project module "gke-project-asm" { source = "terraform-google-modules/project-factory/google" - version = "~> 17.0" + version = "~> 16.0" name = "ci-gke-asm-${random_id.random_project_id_suffix.hex}" random_project_id = true @@ -106,7 +106,7 @@ module "gke-project-asm" { module "gke-project-fleet" { source = "terraform-google-modules/project-factory/google" - version = "~> 17.0" + version = "~> 16.0" name = "ci-gke-fleet-${random_id.random_project_id_suffix.hex}" random_project_id = true From 6b66fd987532a2cfcb008ee2a2edae7612d7a03b Mon Sep 17 00:00:00 2001 From: Andrew Peabody Date: Fri, 11 Oct 2024 14:45:21 -0700 Subject: [PATCH 2/6] Update gke.tf --- examples/acm-terraform-blog-part1/terraform/gke.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/acm-terraform-blog-part1/terraform/gke.tf b/examples/acm-terraform-blog-part1/terraform/gke.tf index 4cd6bfe1a5..e53f3f5026 100644 --- a/examples/acm-terraform-blog-part1/terraform/gke.tf +++ b/examples/acm-terraform-blog-part1/terraform/gke.tf @@ -16,7 +16,7 @@ module "enabled_google_apis" { source = "terraform-google-modules/project-factory/google//modules/project_services" - version = "~> 16.0" + version = "~> 17.0" project_id = var.project disable_services_on_destroy = false From 9053080d9cce8f6254ccb794075ffacd8f2ca91b Mon Sep 17 00:00:00 2001 From: Andrew Peabody Date: Fri, 11 Oct 2024 14:45:34 -0700 Subject: [PATCH 3/6] Update apis.tf --- examples/safer_cluster_iap_bastion/apis.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/safer_cluster_iap_bastion/apis.tf b/examples/safer_cluster_iap_bastion/apis.tf index 68334b926a..2e8e7d9221 100644 --- a/examples/safer_cluster_iap_bastion/apis.tf +++ b/examples/safer_cluster_iap_bastion/apis.tf @@ -16,7 +16,7 @@ module "enabled_google_apis" { source = "terraform-google-modules/project-factory/google//modules/project_services" - version = "~> 16.0" + version = "~> 17.0" project_id = var.project_id disable_services_on_destroy = false From 9186bca226d7831c8ac5151e4d66532b834a6f18 Mon Sep 17 00:00:00 2001 From: Andrew Peabody Date: Fri, 11 Oct 2024 14:45:43 -0700 Subject: [PATCH 4/6] Update gke.tf --- examples/acm-terraform-blog-part3/terraform/gke.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/acm-terraform-blog-part3/terraform/gke.tf b/examples/acm-terraform-blog-part3/terraform/gke.tf index 74bcb4c271..6e15206d96 100644 --- a/examples/acm-terraform-blog-part3/terraform/gke.tf +++ b/examples/acm-terraform-blog-part3/terraform/gke.tf @@ -16,7 +16,7 @@ module "enabled_google_apis" { source = "terraform-google-modules/project-factory/google//modules/project_services" - version = "~> 16.0" + version = "~> 17.0" project_id = var.project disable_services_on_destroy = false From daa0f1a1a2371974f2946c075431a6552136fa8d Mon Sep 17 00:00:00 2001 From: Andrew Peabody Date: Fri, 11 Oct 2024 14:45:56 -0700 Subject: [PATCH 5/6] Update gke.tf --- examples/acm-terraform-blog-part2/terraform/gke.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/acm-terraform-blog-part2/terraform/gke.tf b/examples/acm-terraform-blog-part2/terraform/gke.tf index 98f387dbe5..5b703a338a 100644 --- a/examples/acm-terraform-blog-part2/terraform/gke.tf +++ b/examples/acm-terraform-blog-part2/terraform/gke.tf @@ -16,7 +16,7 @@ module "enabled_google_apis" { source = "terraform-google-modules/project-factory/google//modules/project_services" - version = "~> 16.0" + version = "~> 17.0" project_id = var.project disable_services_on_destroy = false From b1045b4a212682625e32643a401b206f173fb587 Mon Sep 17 00:00:00 2001 From: Andrew Peabody Date: Fri, 11 Oct 2024 14:46:16 -0700 Subject: [PATCH 6/6] Update main.tf --- test/setup/main.tf | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/setup/main.tf b/test/setup/main.tf index 6f68dbbc02..b94c404385 100644 --- a/test/setup/main.tf +++ b/test/setup/main.tf @@ -45,7 +45,7 @@ locals { module "gke-project-1" { source = "terraform-google-modules/project-factory/google" - version = "~> 16.0" + version = "~> 17.0" name = "ci-gke-${random_id.random_project_id_suffix.hex}" random_project_id = true @@ -69,7 +69,7 @@ module "gke-project-1" { module "gke-project-2" { source = "terraform-google-modules/project-factory/google" - version = "~> 16.0" + version = "~> 17.0" name = "ci-gke-${random_id.random_project_id_suffix.hex}" random_project_id = true @@ -91,7 +91,7 @@ module "gke-project-2" { # apis as documented https://cloud.google.com/service-mesh/docs/scripted-install/reference#setting_up_your_project module "gke-project-asm" { source = "terraform-google-modules/project-factory/google" - version = "~> 16.0" + version = "~> 17.0" name = "ci-gke-asm-${random_id.random_project_id_suffix.hex}" random_project_id = true @@ -106,7 +106,7 @@ module "gke-project-asm" { module "gke-project-fleet" { source = "terraform-google-modules/project-factory/google" - version = "~> 16.0" + version = "~> 17.0" name = "ci-gke-fleet-${random_id.random_project_id_suffix.hex}" random_project_id = true