code review 4.5

Author: Anish Cheraku

sources/api/apiclient/Cargo.toml

@@ -45,7 +45,6 @@ serde_json.workspace = true
 signal-hook.workspace = true
 simplelog.workspace = true
 snafu = { workspace = true, features = ["futures"] }
-test-case.workspace = true
 tokio = { workspace = true, features = ["fs", "io-std", "io-util", "macros", "rt-multi-thread", "time"] }
 tokio-tungstenite = { workspace = true, features = ["connect"] }
 toml.workspace = true
@@ -55,3 +54,6 @@ tempfile.workspace = true
 
 [build-dependencies]
 generate-readme.workspace = true
+
+[dev-dependencies]
+test-case.workspace = true

sources/api/apiclient/src/apply.rs

@@ -89,49 +89,33 @@ where
     resolver.resolve().await.context(ResolverFailureSnafu)
 }
 
+/// Macro to try multiple settings resolver types in sequence, returning the first one that succeeds.
+macro_rules! try_resolvers {
+    ($input:expr, $($resolver_type:ty),+ $(,)?) => {
+        $(
+            if let Ok(r) = <$resolver_type>::try_from($input) {
+                log::debug!("select_resolver: picked {}", stringify!($resolver_type));
+                return Ok(Box::new(r));
+            }
+        )+
+    };
+}
+
 /// Choose which UriResolver applies to `input` (stdin, file://, http(s)://, s3://, secretsmanager://, and ssm://).
 fn select_resolver(input: &SettingsInput) -> Result<Box<dyn crate::uri_resolver::UriResolver>> {
-    use crate::uri_resolver;
-
-    // stdin ("-")
-    if let Ok(r) = uri_resolver::StdinUri::try_from(input) {
-        return Ok(Box::new(r));
-    }
-
-    // file://
-    if let Ok(r) = uri_resolver::FileUri::try_from(input) {
-        return Ok(Box::new(r));
-    }
-
-    // http(s)://
-    if let Ok(r) = uri_resolver::HttpUri::try_from(input) {
-        return Ok(Box::new(r));
-    }
-
-    // s3://
-    if let Ok(r) = uri_resolver::S3Uri::try_from(input) {
-        return Ok(Box::new(r));
-    }
-
-    // secretsmanager://
-    if let Ok(r) = uri_resolver::SecretsManagerArn::try_from(input) {
-        return Ok(Box::new(r));
-    }
-
-    // secretsmanager://
-    if let Ok(r) = uri_resolver::SecretsManagerUri::try_from(input) {
-        return Ok(Box::new(r));
-    }
-
-    // arn:aws:ssm:…
-    if let Ok(r) = uri_resolver::SsmArn::try_from(input) {
-        return Ok(Box::new(r));
-    }
-
-    // ssm://
-    if let Ok(r) = uri_resolver::SsmUri::try_from(input) {
-        return Ok(Box::new(r));
-    }
+    use crate::uri_resolver::*;
+
+    try_resolvers!(
+        input,
+        StdinUri,
+        FileUri,
+        HttpUri,
+        S3Uri,
+        SecretsManagerArn,
+        SecretsManagerUri,
+        SsmArn,
+        SsmUri,
+    );
 
     error::NoResolverSnafu {
         input_source: input.input.clone(),