From 688a7d98baacd45aed3cdf3ed5c489e2a0899250 Mon Sep 17 00:00:00 2001
From: Tobias Bieniek <tobias@bieniek.cloud>
Date: Sat, 1 Jun 2024 14:38:47 +0200
Subject: [PATCH 1/3] crates-io: Add `path` argument to
 `redirect_to_cloudfront()` fn

---
 terragrunt/modules/crates-io/compute-static/src/main.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/terragrunt/modules/crates-io/compute-static/src/main.rs b/terragrunt/modules/crates-io/compute-static/src/main.rs
index 3d7060502..e893e8eb5 100644
--- a/terragrunt/modules/crates-io/compute-static/src/main.rs
+++ b/terragrunt/modules/crates-io/compute-static/src/main.rs
@@ -116,7 +116,7 @@ fn handle_request(config: &Config, mut request: Request) -> Result<Response, Err
 
     // Database dump is too big to cache on Fastly
     if request.get_url_str().ends_with("db-dump.tar.gz") {
-        redirect_db_dump_to_cloudfront(config)
+        redirect_to_cloudfront(config, "db-dump.tar.gz")
     } else {
         send_request_to_s3(config, &request)
     }
@@ -192,8 +192,8 @@ fn rewrite_download_urls(request: &mut Request) {
 ///
 /// As of early 2023, certain files are too large to be served through Fastly. One of those is the
 /// database dump, which gets redirected to CloudFront.
-fn redirect_db_dump_to_cloudfront(config: &Config) -> Result<Response, Error> {
-    let url = format!("https://{}/db-dump.tar.gz", config.cloudfront_url);
+fn redirect_to_cloudfront(config: &Config, path: &str) -> Result<Response, Error> {
+    let url = format!("https://{}/{path}", config.cloudfront_url);
     Ok(Response::temporary_redirect(url))
 }
 

From 8ae0c4406714cb86e9317049d2a662585c9fb8b1 Mon Sep 17 00:00:00 2001
From: Tobias Bieniek <tobias@bieniek.cloud>
Date: Sat, 1 Jun 2024 14:39:19 +0200
Subject: [PATCH 2/3] crates-io: Add support for `db-dump.zip` files

---
 .../modules/crates-io/compute-static/src/main.rs    |  2 ++
 terragrunt/modules/crates-io/s3-static.tf           | 13 ++++++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/terragrunt/modules/crates-io/compute-static/src/main.rs b/terragrunt/modules/crates-io/compute-static/src/main.rs
index e893e8eb5..3753f7e17 100644
--- a/terragrunt/modules/crates-io/compute-static/src/main.rs
+++ b/terragrunt/modules/crates-io/compute-static/src/main.rs
@@ -117,6 +117,8 @@ fn handle_request(config: &Config, mut request: Request) -> Result<Response, Err
     // Database dump is too big to cache on Fastly
     if request.get_url_str().ends_with("db-dump.tar.gz") {
         redirect_to_cloudfront(config, "db-dump.tar.gz")
+    } else if request.get_url_str().ends_with("db-dump.zip") {
+        redirect_to_cloudfront(config, "db-dump.zip")
     } else {
         send_request_to_s3(config, &request)
     }
diff --git a/terragrunt/modules/crates-io/s3-static.tf b/terragrunt/modules/crates-io/s3-static.tf
index 6fcc0d1c6..f19fa8374 100644
--- a/terragrunt/modules/crates-io/s3-static.tf
+++ b/terragrunt/modules/crates-io/s3-static.tf
@@ -13,7 +13,7 @@ resource "aws_s3_bucket" "static" {
     max_age_seconds = 3000
   }
 
-  // Keep only the live db-dump.tar.gz and the previous day's version, removing
+  // Keep only the live db-dumps and the previous day's versions, removing
   // all the other ones. This is needed because we don't want this file to be
   // versioned, while all the other ones in the bucket should be versioned.
   lifecycle_rule {
@@ -27,6 +27,17 @@ resource "aws_s3_bucket" "static" {
     }
   }
 
+  lifecycle_rule {
+    id      = "purge-db-dump-zip"
+    enabled = true
+    prefix  = "db-dump.zip"
+
+    abort_incomplete_multipart_upload_days = 1
+    noncurrent_version_expiration {
+      days = 1
+    }
+  }
+
   lifecycle {
     ignore_changes = [
       replication_configuration,

From a0e6a0452939561aa56dd76d2f46bf08b206cbbf Mon Sep 17 00:00:00 2001
From: Tobias Bieniek <tobias@bieniek.cloud>
Date: Wed, 5 Jun 2024 15:34:32 +0200
Subject: [PATCH 3/3] crates-io: Use `dynamic` block to reduce duplication

---
 terragrunt/modules/crates-io/s3-static.tf | 27 +++++++++--------------
 1 file changed, 10 insertions(+), 17 deletions(-)

diff --git a/terragrunt/modules/crates-io/s3-static.tf b/terragrunt/modules/crates-io/s3-static.tf
index f19fa8374..8f10a0f6c 100644
--- a/terragrunt/modules/crates-io/s3-static.tf
+++ b/terragrunt/modules/crates-io/s3-static.tf
@@ -16,25 +16,18 @@ resource "aws_s3_bucket" "static" {
   // Keep only the live db-dumps and the previous day's versions, removing
   // all the other ones. This is needed because we don't want this file to be
   // versioned, while all the other ones in the bucket should be versioned.
-  lifecycle_rule {
-    id      = "purge-db-dump"
-    enabled = true
-    prefix  = "db-dump.tar.gz"
-
-    abort_incomplete_multipart_upload_days = 1
-    noncurrent_version_expiration {
-      days = 1
-    }
-  }
+  dynamic "lifecycle_rule" {
+    for_each = toset(["db-dump.tar.gz", "db-dump.zip"])
 
-  lifecycle_rule {
-    id      = "purge-db-dump-zip"
-    enabled = true
-    prefix  = "db-dump.zip"
+    content {
+      id      = "purge-${replace(lifecycle_rule.key, ".", "-")}"
+      enabled = true
+      prefix  = lifecycle_rule.key
 
-    abort_incomplete_multipart_upload_days = 1
-    noncurrent_version_expiration {
-      days = 1
+      abort_incomplete_multipart_upload_days = 1
+      noncurrent_version_expiration {
+        days = 1
+      }
     }
   }