Update gcp-logging bucket to reflect current lifecycle rule

alphagov · Jul 11, 2024 · 1e08b18 · 1e08b18
1 parent b80dc29
commit 1e08b18
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/terraform/deployments/vpc/google_logging_bucket.tf b/terraform/deployments/vpc/google_logging_bucket.tf
@@ -3,7 +3,7 @@ data "google_project" "project" {}
 resource "google_storage_bucket" "google_logging" {
   name          = "govuk-${var.govuk_environment}-gcp-logging"
   location      = "eu"
-  storage_class = "multi_regional"
+  storage_class = "MULTI_REGIONAL"
 
   versioning {
     enabled = true
@@ -15,15 +15,15 @@ resource "google_storage_bucket" "google_logging" {
     }
 
     condition {
-      age = 30
+      age        = 30
+      with_state = "ARCHIVED"
     }
   }
 }
 
-resource "google_storage_bucket_acl" "google_logging" {
+resource "google_storage_bucket_access_control" "google_logging" {
   bucket = google_storage_bucket.google_logging.name
 
-  role_entity = [
-    "WRITER:group-cloud-storage-analytics@google.com",
-  ]
+  role   = "WRITER"
+  entity = "group-cloud-storage-analytics@google.com"
 }