Merge pull request #9206 from LawnGnome/unify-cdn-invalidation

Unify CDN invalidation into a single method on `Environment`

Author: LawnGnome

src/worker/environment.rs

@@ -5,6 +5,7 @@ use crate::team_repo::TeamRepo;
 use crate::typosquat;
 use crate::util::diesel::Conn;
 use crate::Emails;
+use anyhow::Context;
 use crates_io_index::{Repository, RepositoryConfig};
 use derive_builder::Builder;
 use diesel_async::pooled_connection::deadpool::Pool;
@@ -71,6 +72,19 @@ impl Environment {
         self.fastly.as_ref()
     }
 
+    /// Invalidate a file in all registered CDNs.
+    pub(crate) async fn invalidate_cdns(&self, path: &str) -> anyhow::Result<()> {
+        if let Some(cloudfront) = self.cloudfront() {
+            cloudfront.invalidate(path).await.context("CloudFront")?;
+        }
+
+        if let Some(fastly) = self.fastly() {
+            fastly.invalidate(path).await.context("Fastly")?;
+        }
+
+        Ok(())
+    }
+
     /// Returns the typosquatting cache, initialising it if required.
     pub(crate) fn typosquat_cache(
         &self,

src/worker/jobs/dump_db.rs

@@ -48,16 +48,8 @@ impl BackgroundJob for DumpDb {
         info!("Database dump tarball uploaded");
 
         info!("Invalidating CDN caches…");
-        if let Some(cloudfront) = env.cloudfront() {
-            if let Err(error) = cloudfront.invalidate(TAR_PATH).await {
-                warn!("Failed to invalidate CloudFront cache: {}", error);
-            }
-        }
-
-        if let Some(fastly) = env.fastly() {
-            if let Err(error) = fastly.invalidate(TAR_PATH).await {
-                warn!("Failed to invalidate Fastly cache: {}", error);
-            }
+        if let Err(error) = env.invalidate_cdns(TAR_PATH).await {
+            warn!("Failed to invalidate CDN caches: {error}");
         }
 
         info!("Uploading zip file…");
@@ -67,16 +59,8 @@ impl BackgroundJob for DumpDb {
         info!("Database dump zip file uploaded");
 
         info!("Invalidating CDN caches…");
-        if let Some(cloudfront) = env.cloudfront() {
-            if let Err(error) = cloudfront.invalidate(ZIP_PATH).await {
-                warn!("Failed to invalidate CloudFront cache: {}", error);
-            }
-        }
-
-        if let Some(fastly) = env.fastly() {
-            if let Err(error) = fastly.invalidate(ZIP_PATH).await {
-                warn!("Failed to invalidate Fastly cache: {}", error);
-            }
+        if let Err(error) = env.invalidate_cdns(ZIP_PATH).await {
+            warn!("Failed to invalidate CDN caches: {error}");
         }
 
         Ok(())

src/worker/jobs/rss/sync_crate_feed.rs

@@ -86,18 +86,8 @@ impl BackgroundJob for SyncCrateFeed {
         ctx.storage.upload_feed(&feed_id, &channel).await?;
 
         let path = object_store::path::Path::from(&feed_id);
-        if let Some(cloudfront) = ctx.cloudfront() {
-            info!(%path, "Invalidating CloudFront cache…");
-            cloudfront.invalidate(path.as_ref()).await?;
-        } else {
-            info!("Skipping CloudFront cache invalidation (CloudFront not configured)");
-        }
-
-        if let Some(fastly) = ctx.fastly() {
-            info!(%path, "Invalidating Fastly cache…");
-            fastly.invalidate(path.as_ref()).await?;
-        } else {
-            info!("Skipping Fastly cache invalidation (Fastly not configured)");
+        if let Err(error) = ctx.invalidate_cdns(path.as_ref()).await {
+            warn!("Failed to invalidate CDN caches: {error}");
         }
 
         info!("Finished syncing updates feed");

src/worker/jobs/rss/sync_crates_feed.rs

@@ -70,18 +70,8 @@ impl BackgroundJob for SyncCratesFeed {
         ctx.storage.upload_feed(&feed_id, &channel).await?;
 
         let path = object_store::path::Path::from(&feed_id);
-        if let Some(cloudfront) = ctx.cloudfront() {
-            info!(%path, "Invalidating CloudFront cache…");
-            cloudfront.invalidate(path.as_ref()).await?;
-        } else {
-            info!("Skipping CloudFront cache invalidation (CloudFront not configured)");
-        }
-
-        if let Some(fastly) = ctx.fastly() {
-            info!(%path, "Invalidating Fastly cache…");
-            fastly.invalidate(path.as_ref()).await?;
-        } else {
-            info!("Skipping Fastly cache invalidation (Fastly not configured)");
+        if let Err(error) = ctx.invalidate_cdns(path.as_ref()).await {
+            warn!("Failed to invalidate CDN caches: {error}");
         }
 
         info!("Finished syncing crates feed");

src/worker/jobs/rss/sync_updates_feed.rs

@@ -70,18 +70,8 @@ impl BackgroundJob for SyncUpdatesFeed {
         ctx.storage.upload_feed(&feed_id, &channel).await?;
 
         let path = object_store::path::Path::from(&feed_id);
-        if let Some(cloudfront) = ctx.cloudfront() {
-            info!(%path, "Invalidating CloudFront cache…");
-            cloudfront.invalidate(path.as_ref()).await?;
-        } else {
-            info!("Skipping CloudFront cache invalidation (CloudFront not configured)");
-        }
-
-        if let Some(fastly) = ctx.fastly() {
-            info!(%path, "Invalidating Fastly cache…");
-            fastly.invalidate(path.as_ref()).await?;
-        } else {
-            info!("Skipping Fastly cache invalidation (Fastly not configured)");
+        if let Err(error) = ctx.invalidate_cdns(path.as_ref()).await {
+            warn!("Failed to invalidate CDN caches: {error}");
         }
 
         info!("Finished syncing updates feed");