CORE-260 support list of storage admins

remerge · May 3, 2024 · 5244d31 · 5244d31
1 parent 4a7dbe3
commit 5244d31
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/google/static-website/main.tf b/google/static-website/main.tf
@@ -5,7 +5,7 @@ locals {
 }
 
 resource "google_compute_backend_bucket" "static" {
-  project  = var.project
+  project = var.project
 
   name        = var.bucket_name == "" ? "${local.website_domain_name_dashed}-bucket" : "${var.bucket_name}"
   bucket_name = module.website.name
@@ -18,9 +18,7 @@ module "website" {
   project_id      = var.project
   names           = [local.website_domain_name_dashed]
   set_admin_roles = true
-  admins = [
-    var.storage_admin,
-  ]
+  admins          = var.storage_admin
   website = {
     main_page_suffix = var.index_page
     not_found_page   = var.not_found_page

diff --git a/google/static-website/variables.tf b/google/static-website/variables.tf
@@ -5,7 +5,8 @@ variable "project" {
 
 variable "storage_admin" {
   description = "Bucket storage admin"
-  type        = string
+  type        = list(string)
+  default     = []
 }
 
 variable "lb_address" {