cloudfront: Extract CloudFrontError enum

Author: Turbo87

src/cloudfront.rs

@@ -1,10 +1,40 @@
 use aws_credential_types::Credentials;
 use aws_sdk_cloudfront::config::retry::RetryConfig;
 use aws_sdk_cloudfront::config::{BehaviorVersion, Region};
+use aws_sdk_cloudfront::error::{BuildError, SdkError};
+use aws_sdk_cloudfront::operation::create_invalidation::CreateInvalidationError;
 use aws_sdk_cloudfront::types::{InvalidationBatch, Paths};
 use aws_sdk_cloudfront::{Client, Config};
 use tracing::{debug, instrument, warn};
 
+#[derive(Debug, thiserror::Error)]
+pub enum CloudFrontError {
+    #[error(transparent)]
+    BuildError(#[from] BuildError),
+    #[error(transparent)]
+    SdkError(Box<SdkError<CreateInvalidationError>>),
+}
+
+impl From<SdkError<CreateInvalidationError>> for CloudFrontError {
+    fn from(err: SdkError<CreateInvalidationError>) -> Self {
+        CloudFrontError::SdkError(Box::new(err))
+    }
+}
+
+impl CloudFrontError {
+    pub fn is_too_many_invalidations_error(&self) -> bool {
+        let CloudFrontError::SdkError(sdk_error) = self else {
+            return false;
+        };
+
+        let Some(service_error) = sdk_error.as_service_error() else {
+            return false;
+        };
+
+        service_error.is_too_many_invalidations_in_progress()
+    }
+}
+
 pub struct CloudFront {
     client: Client,
     distribution_id: String,
@@ -36,13 +66,13 @@ impl CloudFront {
     /// Invalidate a file on CloudFront
     ///
     /// `path` is the path to the file to invalidate, such as `config.json`, or `re/ge/regex`
-    pub async fn invalidate(&self, path: &str) -> anyhow::Result<()> {
+    pub async fn invalidate(&self, path: &str) -> Result<(), CloudFrontError> {
         self.invalidate_many(vec![path.to_string()]).await
     }
 
     /// Invalidate multiple paths on Cloudfront.
     #[instrument(skip(self))]
-    pub async fn invalidate_many(&self, mut paths: Vec<String>) -> anyhow::Result<()> {
+    pub async fn invalidate_many(&self, mut paths: Vec<String>) -> Result<(), CloudFrontError> {
         let now = chrono::offset::Utc::now().timestamp_micros();
 
         // We need to ensure that paths have a starting slash.
@@ -72,15 +102,11 @@ impl CloudFront {
 
         debug!("Sending invalidation request");
 
-        match invalidation_request.send().await {
-            Ok(_) => {
-                debug!("Invalidation request successful");
-                Ok(())
-            }
-            Err(error) => {
-                warn!(?error, "Invalidation request failed");
-                Err(error.into())
-            }
-        }
+        Ok(invalidation_request
+            .send()
+            .await
+            .map(|_| ()) // We don't care about the result, just that it worked
+            .inspect(|_| debug!("Invalidation request successful"))
+            .inspect_err(|error| warn!(?error, "Invalidation request failed"))?)
     }
 }