Merge branch 'main' into fix/cloud-run-v2-timeouts

iennae · web-flow · commit e423d59ba641 · 2023-04-21T14:09:45.000-07:00
diff --git a/README.md b/README.md
@@ -21,7 +21,7 @@ Upon successful provisioning, you should see an output similar to:
 
 ```bash
 frontend_url = "http://11.222.333.444/"
-neos_toc_url = "http://console.cloud.google.com/welcome?walkthrough_id=panels--sic--dynamic-javascript-web-app_toc"
+neos_toc_url = "http://console.cloud.google.com?walkthrough_id=panels--sic--dynamic-javascript-web-app_toc"
 run_service_name = "dev-journey"
 ```
 
diff --git a/infra/main.tf b/infra/main.tf
@@ -109,7 +109,7 @@ resource "google_secret_manager_secret_iam_binding" "nextauth_secret" {
 
 resource "google_service_account" "cloud_run" {
   project      = var.project_id
-  account_id   = "${var.deployment_name}-run"
+  account_id   = "sa-run"
   display_name = "Service account for ${var.deployment_name} Cloud Run service."
 }
 
diff --git a/infra/outputs.tf b/infra/outputs.tf
@@ -20,7 +20,7 @@ output "frontend_url" {
 
 output "neos_toc_url" {
   description = "Neos Tutorial URL"
-  value       = "http://console.cloud.google.com/welcome?walkthrough_id=panels--sic--dynamic-javascript-web-app_toc"
+  value       = "http://console.cloud.google.com?walkthrough_id=panels--sic--dynamic-javascript-web-app_toc"
 }
 
 output "run_service_name" {

Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ resource "google_secret_manager_secret_iam_binding" "nextauth_secret" {`
`109`	`109`
`110`	`110`	`resource "google_service_account" "cloud_run" {`
`111`	`111`	`project = var.project_id`
`112`		`- account_id = "${var.deployment_name}-run"`
	`112`	`+ account_id = "sa-run"`
`113`	`113`	`display_name = "Service account for ${var.deployment_name} Cloud Run service."`
`114`	`114`	`}`
`115`	`115`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ output "frontend_url" {`
`20`	`20`
`21`	`21`	`output "neos_toc_url" {`
`22`	`22`	`description = "Neos Tutorial URL"`
`23`		`- value = "http://console.cloud.google.com/welcome?walkthrough_id=panels--sic--dynamic-javascript-web-app_toc"`
	`23`	`+ value = "http://console.cloud.google.com?walkthrough_id=panels--sic--dynamic-javascript-web-app_toc"`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`output "run_service_name" {`