Merge pull request #14229 from Turbo87/cloudfront-cache-tags

cloudfront: Support cache-tag invalidations

Author: Turbo87

src/cloudfront.rs

@@ -42,6 +42,18 @@ pub struct CloudFront {
     static_distribution_id: String,
 }
 
+/// Normalizes CloudFront invalidation entries.
+///
+/// Path invalidations must start with `/`. Cache-tag invalidations already start with `#`
+/// and must remain unchanged so CloudFront recognizes them as cache tags.
+fn normalize_invalidation_paths(paths: &mut [String]) {
+    for path in paths {
+        if !path.starts_with('/') && !path.starts_with('#') {
+            *path = format!("/{path}");
+        }
+    }
+}
+
 impl CloudFront {
     pub fn from_environment() -> Option<Self> {
         let access_key = match dotenvy::var("AWS_ACCESS_KEY") {
@@ -111,12 +123,7 @@ impl CloudFront {
         let distribution_id = self.distribution_id(distribution);
         let now = chrono::offset::Utc::now().timestamp_micros();
 
-        // We need to ensure that paths have a starting slash.
-        for path in paths.iter_mut() {
-            if !path.starts_with('/') {
-                *path = format!("/{path}");
-            }
-        }
+        normalize_invalidation_paths(&mut paths);
 
         let paths = Paths::builder()
             // It looks like you have to set quantity even if you provide a full blown Vec, because
@@ -146,3 +153,24 @@ impl CloudFront {
             .inspect_err(|error| warn!("Invalidation request failed: {error}"))?)
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn normalizes_invalidation_paths() {
+        let mut paths = vec![
+            "index/config.json".into(),
+            "/db-dump.tar.gz".into(),
+            "#crate:serde".into(),
+        ];
+
+        normalize_invalidation_paths(&mut paths);
+
+        assert_eq!(
+            paths,
+            ["/index/config.json", "/db-dump.tar.gz", "#crate:serde"]
+        );
+    }
+}