apiclient: add support for SSM and Secrets Manager ARNs

Author: Anish Cheraku

sources/Cargo.lock

@@ -45,14 +45,15 @@ 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
 unindent.workspace = true
 url.workspace = true
-aws-smithy-runtime-api.workspace = true
-tempfile.workspace = true
 
 [build-dependencies]
 generate-readme.workspace = true
+
+[dev-dependencies]
+tempfile.workspace = true
+test-case.workspace = true

sources/api/apiclient/Cargo.toml

@@ -74,7 +74,13 @@ pub struct SettingsInput {
 impl SettingsInput {
     pub(crate) fn new(input: impl Into<String>) -> Self {
         let input = input.into();
-        let parsed_url = Url::parse(&input).ok();
+        let parsed_url = match Url::parse(&input) {
+            Ok(url) => Some(url),
+            Err(err) => {
+                log::debug!("URL parse failed for '{}': {}", input, err);
+                None
+            }
+        };
         SettingsInput { input, parsed_url }
     }
 }
@@ -89,39 +95,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::SecretsManagerUri::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(),
@@ -266,13 +266,15 @@ mod resolver_selection_tests {
     use std::any::{Any, TypeId};
     use test_case::test_case;
 
-    #[test_case("-",                    TypeId::of::<crate::uri_resolver::StdinUri>();         "stdin")]
-    #[test_case("file:///tmp/folder",      TypeId::of::<crate::uri_resolver::FileUri>();          "file")]
-    #[test_case("http://amazon.com",   TypeId::of::<crate::uri_resolver::HttpUri>();          "http")]
-    #[test_case("https://amazon.com",  TypeId::of::<crate::uri_resolver::HttpUri>();          "https")]
-    #[test_case("s3://mybucket/path",   TypeId::of::<crate::uri_resolver::S3Uri>();            "s3")]
-    #[test_case("secretsmanager://sec", TypeId::of::<crate::uri_resolver::SecretsManagerUri>(); "secrets")]
-    #[test_case("ssm://param",          TypeId::of::<crate::uri_resolver::SsmUri>();           "ssm")]
+    #[test_case("-",                                                                TypeId::of::<crate::uri_resolver::StdinUri>();                  "stdin")]
+    #[test_case("file:///tmp/folder",                                               TypeId::of::<crate::uri_resolver::FileUri>();                   "file")]
+    #[test_case("http://amazon.com",                                                TypeId::of::<crate::uri_resolver::HttpUri>();                   "http")]
+    #[test_case("https://amazon.com",                                               TypeId::of::<crate::uri_resolver::HttpUri>();                   "https")]
+    #[test_case("s3://mybucket/path",                                               TypeId::of::<crate::uri_resolver::S3Uri>();                     "s3")]
+    #[test_case("secretsmanager://sec",                                             TypeId::of::<crate::uri_resolver::SecretsManagerUri>();         "secrets")]
+    #[test_case("ssm://param",                                                      TypeId::of::<crate::uri_resolver::SsmUri>();                    "ssmUri")]
+    #[test_case("arn:aws:ssm:<region>:<account_id>:parameter/<name>",               TypeId::of::<crate::uri_resolver::SsmArn>();                    "ssmArn")]
+    #[test_case("arn:aws:secretsmanager:<region>:<account-id>:secret:<secret-id>",  TypeId::of::<crate::uri_resolver::SecretsManagerArn>();         "secretsmanagerArn")]
 
     fn resolver_selection(input: &str, expected: std::any::TypeId) {
         let settings = SettingsInput::new(input);