Merge pull request #37 from GoogleCloudPlatform/fix/minor-output-updates

pattishin · web-flow · commit f950824e70bc · 2023-04-25T09:04:22.000-07:00
fix: minor output updates and load balancer timeout
diff --git a/infra/apis.tf b/infra/apis.tf
@@ -51,3 +51,11 @@ resource "time_sleep" "cloud_run_v2_service" {
   
   create_duration = "45s"
 }
+
+resource "time_sleep" "load_balancer_warm_up_time" {
+  depends_on = [
+    google_compute_global_forwarding_rule.http
+  ]
+  
+  create_duration = "370s"
+}
diff --git a/infra/main.tf b/infra/main.tf
@@ -287,6 +287,7 @@ resource "google_firestore_database" "database" {
   concurrency_mode            = "PESSIMISTIC"
   app_engine_integration_mode = "DISABLED"
   depends_on = [
-    time_sleep.project_services
+    time_sleep.project_services,
+    time_sleep.load_balancer_warm_up_time
   ]
 }
diff --git a/infra/outputs.tf b/infra/outputs.tf
@@ -16,7 +16,7 @@
 
 output "frontend_url" {
   description = "IP address to site. Load balancer expected to take ~5 minutes for it to warm up."
-  value = "http://${google_compute_global_address.default.address}/ (Wait ~5 minutes for it to warm up.)"
+  value = "http://${google_compute_global_address.default.address}/"
 }
 
 output "neos_toc_url" {

Original file line number	Diff line number	Diff line change
`@@ -287,6 +287,7 @@ resource "google_firestore_database" "database" {`
`287`	`287`	`concurrency_mode = "PESSIMISTIC"`
`288`	`288`	`app_engine_integration_mode = "DISABLED"`
`289`	`289`	`depends_on = [`
`290`		`- time_sleep.project_services`
	`290`	`+ time_sleep.project_services,`
	`291`	`+ time_sleep.load_balancer_warm_up_time`
`291`	`292`	`]`
`292`	`293`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`
`17`	`17`	`output "frontend_url" {`
`18`	`18`	`description = "IP address to site. Load balancer expected to take ~5 minutes for it to warm up."`
`19`		`- value = "http://${google_compute_global_address.default.address}/ (Wait ~5 minutes for it to warm up.)"`
	`19`	`+ value = "http://${google_compute_global_address.default.address}/"`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`output "neos_toc_url" {`