Revert "add support for gcr buckets with uniform_bucket_level_access …

…= true (#30)" (#31)

This reverts commit b882a21.

data.tf

@@ -1,9 +1,2 @@
 # get project details
 data "google_project" "this" {}
-
-data "google_storage_bucket" "bucket" {
-  for_each = toset(local.buckets)
-
-  name = each.value
-}
-

iam.tf

@@ -1,23 +1,14 @@
 # Grant cleaner service account access to delete references in Google Container Registry
-# for buckets with uniform_bucket_level_access = false
 resource "google_storage_bucket_access_control" "this" {
-  for_each = toset(local.google_storage_bucket_access_control)
+  for_each = {
+    for item in toset(local.project_storage_region) : "${item.storage_region}.${item.project_id}" => item
+  }
 
-  bucket = each.value
+  bucket = each.value.storage_region != "" ? "${each.value.storage_region}.artifacts.${each.value.project_id}.appspot.com" : "artifacts.${each.value.project_id}.appspot.com"
   role   = "WRITER"
   entity = "user-${google_service_account.cleaner.email}"
 }
 
-# Grant cleaner service account access to delete references in Google Container Registry
-# for buckets with uniform_bucket_level_access = true
-resource "google_storage_bucket_iam_member" "this" {
-  for_each = toset(local.google_storage_bucket_iam_member)
-
-  bucket = each.value
-  role   = "roles/storage.legacyBucketWriter"
-  member = "serviceAccount:${google_service_account.cleaner.email}"
-}
-
 # Add IAM policy binding to the Cloud Run service
 resource "google_cloud_run_service_iam_binding" "this" {
   location = google_cloud_run_service.this.location

locals.tf

@@ -67,18 +67,4 @@ locals {
       }
     ]
   ])
-
-  buckets = [
-    for repo in var.gcr_repositories : repo.storage_region != null ? "${repo.storage_region}.artifacts.${repo.project_id != null ? repo.project_id : local.google_project_id}.appspot.com" : "artifacts.${repo.project_id != null ? repo.project_id : local.google_project_id}.appspot.com"
-  ]
-
-  # Buckets having uniform_bucket_level_access = true
-  google_storage_bucket_iam_member = [
-    for bucket in local.buckets : bucket if data.google_storage_bucket.bucket[bucket].uniform_bucket_level_access
-  ]
-
-  # Buckets having uniform_bucket_level_access = false
-  google_storage_bucket_access_control = [
-    for bucket in local.buckets : bucket if !data.google_storage_bucket.bucket[bucket].uniform_bucket_level_access
-  ]
 }

versions.tf

@@ -5,7 +5,7 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 3.88.0"
+      version = ">= 4.1.0"
     }
   }
 }