Merge branch 'master' into feat-crates-io-replicate-entire-bucket-in-…

…fallback
rust-lang · Aug 5, 2024 · 7581526 · 7581526
2 parents d74a5f1 + 6a3f3e6
commit 7581526
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 46 deletions.
diff --git a/terragrunt/accounts/legacy/crates-io-prod/deployed-ref b/terragrunt/accounts/legacy/crates-io-prod/deployed-ref
@@ -1 +1 @@
-73aff0e7a3e0d7cf94715a358b690682c7d6be5a
+f6b400a403563fd233dcaa58cc63c05c6fd40550
diff --git a/terragrunt/accounts/legacy/crates-io-staging/crates-io/.terraform.lock.hcl b/terragrunt/accounts/legacy/crates-io-staging/crates-io/.terraform.lock.hcl
diff --git a/terragrunt/modules/crates-io-downloads-archive/README.md b/terragrunt/modules/crates-io-downloads-archive/README.md
diff --git a/terragrunt/modules/crates-io-downloads-archive/main.tf b/terragrunt/modules/crates-io-downloads-archive/main.tf
diff --git a/terragrunt/modules/crates-io-downloads-archive/variables.tf b/terragrunt/modules/crates-io-downloads-archive/variables.tf
diff --git a/terragrunt/modules/crates-io/s3-static.tf b/terragrunt/modules/crates-io/s3-static.tf
@@ -31,6 +31,18 @@ resource "aws_s3_bucket" "static" {
     }
   }
 
+  // Delete old RSS feeds as eagerly as possible, without deleting live ones.
+  lifecycle_rule {
+    id      = "purge-old-rss-feeds"
+    enabled = true
+    prefix  = "rss/"
+
+    abort_incomplete_multipart_upload_days = 1
+    noncurrent_version_expiration {
+      days = 1
+    }
+  }
+
   lifecycle {
     ignore_changes = [
       replication_configuration,