Enable manifest garbage collection in prod

dandi · Jan 9, 2025 · c3ec546 · c3ec546
1 parent eacd892
commit c3ec546
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 10 deletions.
diff --git a/terraform/modules/dandiset_bucket/main.tf b/terraform/modules/dandiset_bucket/main.tf
@@ -347,8 +347,7 @@ resource "aws_s3_bucket_lifecycle_configuration" "dandiset_bucket" {
   # S3 lifecycle policy that garbage collects old manifest file versions
   dynamic "rule" {
     # Only create this rule if versioning is enabled and we want to expire old manifest file versions
-    # TODO: remove enable_manifest_file_expiration once we are ready to deploy this to production
-    for_each = var.versioning && var.enable_manifest_file_expiration ? [1] : []
+    for_each = var.versioning ? [1] : []
 
     content {
       id = "ExpireOldManifestFileVersions"

diff --git a/terraform/modules/dandiset_bucket/variables.tf b/terraform/modules/dandiset_bucket/variables.tf
@@ -34,10 +34,3 @@ variable "log_bucket_name" {
   type        = string
   description = "The name of the log bucket."
 }
-
-# TODO: remove this after it's ready to be enabled in production
-variable "enable_manifest_file_expiration" {
-  type        = bool
-  description = "Whether or not to enable expiration of manifest files."
-  default     = false
-}
diff --git a/terraform/staging_bucket.tf b/terraform/staging_bucket.tf
@@ -10,7 +10,6 @@ module "staging_dandiset_bucket" {
     aws         = aws
     aws.project = aws
   }
-  enable_manifest_file_expiration = true
 }
 
 module "staging_embargo_bucket" {