Revert "Get rid of operator inside conditional"

This reverts commit ab179af.
lsst · Apr 19, 2024 · 31f54de · 31f54de
1 parent 0592cf7
commit 31f54de
Showing 1 changed file with 2 additions and 16 deletions.
diff --git a/environment/deployments/science-platform/main.tf b/environment/deployments/science-platform/main.tf
@@ -109,28 +109,14 @@ resource "google_service_account_iam_member" "hips_sa_wi" {
 }
 
 resource "google_service_account" "sqlproxy_butler_int_sa" {
-  count        = var.environment == "dev" ? 1 : 0
+  count        = (var.environment == "dev" || var.environment == "demo") ? 1 : 0
   account_id   = "sqlproxy-butler-int"
   display_name = "Created by Terraform"
   project      = module.project_factory.project_id
 }
 
-resource "google_service_account" "sqlproxy_butler_int_sa" {
-  count        = var.environment == "demo" ? 1 : 0
-  account_id   = "sqlproxy-butler-int"
-  display_name = "Created by Terraform"
-  project      = module.project_factory.project_id
-}
-
-resource "google_service_account_iam_member" "sqlproxy_butler_int_sa" {
-  count              = var.environment == "dev" ? 1 : 0
-  service_account_id = google_service_account.sqlproxy_butler_int_sa[count.index].name
-  role               = "roles/iam.workloadIdentityUser"
-  member             = "serviceAccount:${module.project_factory.project_id}.svc.id.goog[sqlproxy-cross-project/sqlproxy-butler-int]"
-}
-
 resource "google_service_account_iam_member" "sqlproxy_butler_int_sa" {
-  count              = var.environment == "demo" ? 1 : 0
+  count              = (var.environment == "dev" || var.environment == "demo") ? 1 : 0
   service_account_id = google_service_account.sqlproxy_butler_int_sa[count.index].name
   role               = "roles/iam.workloadIdentityUser"
   member             = "serviceAccount:${module.project_factory.project_id}.svc.id.goog[sqlproxy-cross-project/sqlproxy-butler-int]"