Merge branch 'main' into u/stvoutsin/uws-cloudsql

lsst · Jun 10, 2024 · 93f1dc5 · 93f1dc5
2 parents 08fe0c5 + cb44ead
commit 93f1dc5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/environment/deployments/science-platform/cloudsql/main.tf b/environment/deployments/science-platform/cloudsql/main.tf
@@ -212,15 +212,14 @@ resource "google_storage_bucket_iam_binding" "cutouts-bucket-ro-iam-binding" {
   role   = "roles/storage.objectViewer"
   members = [
     "serviceAccount:${local.cutout_service_account}",
-    "serviceAccount:${var.butler_service_account}"
   ]
 }
 
 resource "google_storage_bucket_iam_binding" "cutouts-bucket-rw-iam-binding" {
   bucket = module.cutouts_bucket.name
-  role   = "roles/storage.objectCreator"
+  role   = "roles/storage.legacyBucketWriter"
   members = [
-    "serviceAccount:${var.butler_service_account}"
+    "serviceAccount:${local.cutout_service_account}"
   ]
 }
 

diff --git a/environment/deployments/science-platform/env/dev-cloudsql.tfvars b/environment/deployments/science-platform/env/dev-cloudsql.tfvars
@@ -19,4 +19,4 @@ db_maintenance_window_update_track = "canary"
 backups_enabled                    = true
 
 # Increase this number to force Terraform to update the dev environment.
-# Serial: 13
+# Serial: 13