Canonicalize URL path segments in ResourceExt (Azure#2369)

* Canonicalize URL path segments in Resourceext

Fixes Azure#2177

* Add "canonicalizes" to KV dictionary

Author: heaths

sdk/keyvault/.dict.txt

@@ -1,3 +1,4 @@
+canonicalizes
 cbcpad
 ciphertext
 ckmaeskeywrap

sdk/keyvault/azure_security_keyvault_keys/CHANGELOG.md

@@ -8,6 +8,8 @@
 
 ### Bugs Fixed
 
+- `ResourceExt` canonicalizes URL path segments ([#2177](https://github.com/Azure/azure-sdk-for-rust/issues/2177))
+
 ### Other Changes
 
 ## 0.1.0 (2025-02-18)

sdk/keyvault/azure_security_keyvault_keys/src/resource.rs

@@ -94,10 +94,10 @@ fn deconstruct(url: &Url) -> Result<ResourceId> {
     let vault_url = format!("{}://{}", url.scheme(), url.authority(),);
     let mut segments = url
         .path_segments()
-        .ok_or_else(|| azure_core::Error::message(ErrorKind::DataConversion, "invalid url"))?;
+        .ok_or_else(|| azure_core::Error::message(ErrorKind::DataConversion, "invalid url"))?
+        .filter(|s| !s.is_empty());
     segments
         .next()
-        .and_then(none_if_empty)
         .ok_or_else(|| azure_core::Error::message(ErrorKind::DataConversion, "missing collection"))
         .and_then(|col| {
             if col != "keys" {
@@ -110,10 +110,9 @@ fn deconstruct(url: &Url) -> Result<ResourceId> {
         })?;
     let name = segments
         .next()
-        .and_then(none_if_empty)
         .ok_or_else(|| azure_core::Error::message(ErrorKind::DataConversion, "missing name"))
         .map(String::from)?;
-    let version = segments.next().and_then(none_if_empty).map(String::from);
+    let version = segments.next().map(String::from);
 
     Ok(ResourceId {
         source_id: url.as_str().into(),
@@ -123,14 +122,6 @@ fn deconstruct(url: &Url) -> Result<ResourceId> {
     })
 }
 
-fn none_if_empty(s: &str) -> Option<&str> {
-    if s.is_empty() {
-        return None;
-    }
-
-    Some(s)
-}
-
 mod private {
     use crate::models::{DeletedKeyBundle, DeletedKeyItem, KeyBundle, KeyItem};
 
@@ -284,4 +275,19 @@ mod tests {
             }
         );
     }
+
+    #[test]
+    fn canonicalizes() {
+        assert_eq!(
+            "https://vault.azure.net//keys/name/version"
+                .parse::<ResourceId>()
+                .unwrap(),
+            ResourceId {
+                source_id: "https://vault.azure.net//keys/name/version".to_string(),
+                vault_url: "https://vault.azure.net".into(),
+                name: "name".into(),
+                version: Some("version".into()),
+            }
+        );
+    }
 }

sdk/keyvault/azure_security_keyvault_secrets/CHANGELOG.md

@@ -8,6 +8,8 @@
 
 ### Bugs Fixed
 
+- `ResourceExt` canonicalizes URL path segments ([#2177](https://github.com/Azure/azure-sdk-for-rust/issues/2177))
+
 ### Other Changes
 
 ## 0.1.0 (2025-02-18)

sdk/keyvault/azure_security_keyvault_secrets/src/resource.rs

@@ -92,10 +92,10 @@ fn deconstruct(url: &Url) -> Result<ResourceId> {
     let vault_url = format!("{}://{}", url.scheme(), url.authority(),);
     let mut segments = url
         .path_segments()
-        .ok_or_else(|| azure_core::Error::message(ErrorKind::DataConversion, "invalid url"))?;
+        .ok_or_else(|| azure_core::Error::message(ErrorKind::DataConversion, "invalid url"))?
+        .filter(|s| !s.is_empty());
     segments
         .next()
-        .and_then(none_if_empty)
         .ok_or_else(|| azure_core::Error::message(ErrorKind::DataConversion, "missing collection"))
         .and_then(|col| {
             if col != "secrets" {
@@ -108,10 +108,9 @@ fn deconstruct(url: &Url) -> Result<ResourceId> {
         })?;
     let name = segments
         .next()
-        .and_then(none_if_empty)
         .ok_or_else(|| azure_core::Error::message(ErrorKind::DataConversion, "missing name"))
         .map(String::from)?;
-    let version = segments.next().and_then(none_if_empty).map(String::from);
+    let version = segments.next().map(String::from);
 
     Ok(ResourceId {
         source_id: url.as_str().into(),
@@ -121,14 +120,6 @@ fn deconstruct(url: &Url) -> Result<ResourceId> {
     })
 }
 
-fn none_if_empty(s: &str) -> Option<&str> {
-    if s.is_empty() {
-        return None;
-    }
-
-    Some(s)
-}
-
 mod private {
     use crate::models::{DeletedSecretBundle, DeletedSecretItem, SecretBundle, SecretItem};
 
@@ -281,4 +272,19 @@ mod tests {
             }
         );
     }
+
+    #[test]
+    fn canonicalizes() {
+        assert_eq!(
+            "https://vault.azure.net//secrets/name/version"
+                .parse::<ResourceId>()
+                .unwrap(),
+            ResourceId {
+                source_id: "https://vault.azure.net//secrets/name/version".to_string(),
+                vault_url: "https://vault.azure.net".into(),
+                name: "name".into(),
+                version: Some("version".into()),
+            }
+        );
+    }
 }