apiclient: fixed formatting and cleaned up code

Author: Anish Cheraku

sources/api/apiclient/src/apply.rs

@@ -273,6 +273,7 @@ mod resolver_selection_tests {
     #[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")]
+    
     fn resolver_selection(input: &str, expected: std::any::TypeId) {
         let settings = SettingsInput::new(input);
         let resolver = select_resolver(&settings).expect("should have a resolver for this scheme");

sources/api/apiclient/src/uri_resolver.rs

@@ -169,30 +169,16 @@ impl TryFrom<&SettingsInput> for S3Uri {
         use resolver_error::*;
         const PREFIX: &str = "s3://";
         let uri_str = input.input.as_str();
-        ensure!(
-            uri_str.starts_with(PREFIX),
-            S3UriSchemeSnafu {
-                input_source: input.input.clone()
-            }
-        );
-
-        let remainder = &uri_str[PREFIX.len()..];
+        let remainder = uri_str.strip_prefix(PREFIX).context(S3UriSchemeSnafu {
+            input_source: input.input.clone(),
+        })?;
         let mut parts = remainder.splitn(2, '/');
-        let bucket = parts.next().unwrap_or("");
-        let key = parts.next().unwrap_or("");
-
-        ensure!(
-            !bucket.is_empty(),
-            S3UriMissingBucketSnafu {
-                input_source: input.input.clone()
-            }
-        );
-        ensure!(
-            !key.is_empty(),
-            S3UriMissingKeySnafu {
-                input_source: input.input.clone()
-            }
-        );
+        let bucket = parts.next().context(S3UriMissingBucketSnafu {
+            input_source: input.input.clone(),
+        })?;
+        let key = parts.next().context(S3UriMissingKeySnafu {
+            input_source: input.input.clone(),
+        })?;
 
         Ok(S3Uri {
             bucket: bucket.to_string(),