create pg database and user, fix db url

johnstcn · johnstcn · commit b83f7f6cde31 · 2023-05-11T17:51:13.000+01:00
diff --git a/scaletest/terraform/coder.tf b/scaletest/terraform/coder.tf
@@ -45,7 +45,7 @@ resource "kubernetes_secret" "coder-db" {
     namespace = kubernetes_namespace.coder_namespace.metadata.0.name
   }
   data = {
-    url = "postgres://coder:${urlencode(random_password.coder-postgres-password.result)}@${google_sql_database_instance.db.private_ip_address}?sslmode=disable"
+    url = "postgres://coder:${urlencode(random_password.coder-postgres-password.result)}@${google_sql_database_instance.db.private_ip_address}/${google_sql_database.coder.name}?sslmode=disable"
   }
 }
 
diff --git a/scaletest/terraform/gcp_db.tf b/scaletest/terraform/gcp_db.tf
@@ -41,3 +41,18 @@ resource "google_sql_database_instance" "db" {
     }
   }
 }
+
+resource "google_sql_database" "coder" {
+  project = var.project_id
+  instance = google_sql_database_instance.db.id
+  name = "${var.name}-coder"
+  deletion_policy = "DELETE"
+}
+
+resource "google_sql_user" "coder" {
+  project = var.project_id
+  instance = google_sql_database_instance.db.id
+  name = "coder"
+  type = "BUILT_IN"
+  password = random_password.coder-postgres-password.result
+}

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ resource "kubernetes_secret" "coder-db" {`
`45`	`45`	`namespace = kubernetes_namespace.coder_namespace.metadata.0.name`
`46`	`46`	`}`
`47`	`47`	`data = {`
`48`		`- url = "postgres://coder:${urlencode(random_password.coder-postgres-password.result)}@${google_sql_database_instance.db.private_ip_address}?sslmode=disable"`
	`48`	`+ url = "postgres://coder:${urlencode(random_password.coder-postgres-password.result)}@${google_sql_database_instance.db.private_ip_address}/${google_sql_database.coder.name}?sslmode=disable"`
`49`	`49`	`}`
`50`	`50`	`}`
`51`	`51`
Original file line number	Diff line number	Diff line change
`@@ -41,3 +41,18 @@ resource "google_sql_database_instance" "db" {`
`41`	`41`	`}`
`42`	`42`	`}`
`43`	`43`	`}`
	`44`	`+`
	`45`	`+resource "google_sql_database" "coder" {`
	`46`	`+ project = var.project_id`
	`47`	`+ instance = google_sql_database_instance.db.id`
	`48`	`+ name = "${var.name}-coder"`
	`49`	`+ deletion_policy = "DELETE"`
	`50`	`+}`
	`51`	`+`
	`52`	`+resource "google_sql_user" "coder" {`
	`53`	`+ project = var.project_id`
	`54`	`+ instance = google_sql_database_instance.db.id`
	`55`	`+ name = "coder"`
	`56`	`+ type = "BUILT_IN"`
	`57`	`+ password = random_password.coder-postgres-password.result`
	`58`	`+}`