fix(CI): extend wait time for ACM (#1861)

apeabody · web-flow · commit 3d840c04ad33 · 2024-01-31T13:55:16.000-08:00
diff --git a/modules/acm/creds.tf b/modules/acm/creds.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2018 Google LLC
+ * Copyright 2018-2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,7 +35,7 @@ resource "time_sleep" "wait_acm" {
   count      = (var.create_ssh_key == true || var.ssh_auth_key != null || var.enable_policy_controller || var.enable_config_sync) ? 1 : 0
   depends_on = [google_gke_hub_feature_membership.main]
 
-  create_duration = (length(var.policy_bundles) > 0) ? "600s" : "300s"
+  create_duration = "600s"
 }
 
 resource "google_service_account_iam_binding" "ksa_iam" {

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/**`
`2`		`- * Copyright 2018 Google LLC`
	`2`	`+ * Copyright 2018-2024 Google LLC`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`@@ -35,7 +35,7 @@ resource "time_sleep" "wait_acm" {`
`35`	`35`	`count = (var.create_ssh_key == true \|\| var.ssh_auth_key != null \|\| var.enable_policy_controller \|\| var.enable_config_sync) ? 1 : 0`
`36`	`36`	`depends_on = [google_gke_hub_feature_membership.main]`
`37`	`37`
`38`		`- create_duration = (length(var.policy_bundles) > 0) ? "600s" : "300s"`
	`38`	`+ create_duration = "600s"`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`resource "google_service_account_iam_binding" "ksa_iam" {`