Parse more headers

Author: rylev

sdk/core/src/models/etag.rs

@@ -1,5 +1,5 @@
 use serde::{Deserialize, Serialize};
-use std::fmt;
+use std::{fmt, str::FromStr};
 
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
 pub struct Etag(String);
@@ -19,6 +19,13 @@ impl AsRef<str> for Etag {
     }
 }
 
+impl FromStr for Etag {
+    type Err = crate::error::Error;
+    fn from_str(s: &str) -> crate::Result<Self> {
+        Ok(Self(s.into()))
+    }
+}
+
 impl fmt::Display for Etag {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         write!(f, "{}", self.0)

sdk/storage/src/core/headers/mod.rs

@@ -1,8 +1,8 @@
 use crate::{ConsistencyCRC64, ConsistencyMD5};
-use azure_core::error::{Error, ErrorKind, ResultExt};
+use azure_core::error::Error;
 use azure_core::headers::{
-    self, client_request_id_from_headers_optional, date_from_headers, request_id_from_headers,
-    server_from_headers, version_from_headers, HeaderName, Headers,
+    client_request_id_from_headers_optional, date_from_headers, request_id_from_headers,
+    server_from_headers, version_from_headers, HeaderName, Headers, CONTENT_MD5,
 };
 use azure_core::RequestId;
 use chrono::{DateTime, Utc};
@@ -36,45 +36,23 @@ pub const COPY_ID: HeaderName = HeaderName::from_static("x-ms-copy-id");
 pub const RENAME_SOURCE: HeaderName = HeaderName::from_static("x-ms-rename-source");
 
 pub fn content_crc64_from_headers(headers: &Headers) -> azure_core::Result<ConsistencyCRC64> {
-    content_crc64_from_headers_optional(headers)?.ok_or_else(|| {
-        Error::with_message(ErrorKind::DataConversion, || {
-            format!("header not found: {:?}", CONTENT_CRC64)
-        })
-    })
+    headers.get_as(&CONTENT_CRC64)
 }
 
 pub fn content_crc64_from_headers_optional(
     headers: &Headers,
 ) -> azure_core::Result<Option<ConsistencyCRC64>> {
-    headers
-        .get_optional_str(&CONTENT_CRC64)
-        .map(|content_crc64| {
-            ConsistencyCRC64::decode(content_crc64).with_context(ErrorKind::DataConversion, || {
-                format!("failed to decode content_crc64 from headers: {content_crc64}")
-            })
-        })
-        .transpose()
+    headers.get_optional_as(&CONTENT_CRC64)
 }
 
 pub fn content_md5_from_headers(headers: &Headers) -> azure_core::Result<ConsistencyMD5> {
-    content_md5_from_headers_optional(headers)?.ok_or_else(|| {
-        Error::with_message(ErrorKind::DataConversion, || {
-            format!("header not found: {:?}", headers::CONTENT_MD5)
-        })
-    })
+    headers.get_as(&CONTENT_MD5)
 }
 
 pub fn content_md5_from_headers_optional(
     headers: &Headers,
 ) -> azure_core::Result<Option<ConsistencyMD5>> {
-    headers
-        .get_optional_str(&headers::CONTENT_MD5)
-        .map(|content_md5| {
-            ConsistencyMD5::decode(content_md5).with_context(ErrorKind::DataConversion, || {
-                format!("failed to decode content_md5 from headers: {content_md5}")
-            })
-        })
-        .transpose()
+    headers.get_optional_as(&CONTENT_MD5)
 }
 
 pub fn consistency_from_headers(

sdk/storage/src/core/mod.rs

@@ -50,7 +50,7 @@ mod consistency {
     use azure_core::error::{Error, ErrorKind, ResultExt};
     use bytes::Bytes;
     use serde::{Deserialize, Deserializer};
-    use std::convert::TryInto;
+    use std::{convert::TryInto, str::FromStr};
 
     #[derive(Debug, Clone, PartialEq)]
     pub struct ConsistencyCRC64(Bytes);
@@ -99,13 +99,19 @@ mod consistency {
         }
     }
 
+    impl FromStr for ConsistencyCRC64 {
+        type Err = azure_core::error::Error;
+
+        fn from_str(s: &str) -> Result<Self, Self::Err> {
+            Self::decode(s)
+        }
+    }
+
     #[derive(Debug, Clone, PartialEq)]
     pub struct ConsistencyMD5(Bytes);
 
     const MD5_BYTE_LENGTH: usize = 16;
 
-    impl ConsistencyMD5 {}
-
     impl ConsistencyMD5 {
         /// Decodes from base64 encoded input
         pub fn decode(input: impl AsRef<[u8]>) -> azure_core::Result<Self> {
@@ -146,6 +152,14 @@ mod consistency {
         }
     }
 
+    impl FromStr for ConsistencyMD5 {
+        type Err = azure_core::error::Error;
+
+        fn from_str(s: &str) -> Result<Self, Self::Err> {
+            Self::decode(s)
+        }
+    }
+
     #[cfg(test)]
     mod test {
         use super::*;

sdk/storage_blobs/src/blob/mod.rs

@@ -211,30 +211,15 @@ impl Blob {
             .to_string();
 
         let content_length = h.get_as(&headers::CONTENT_LENGTH)?;
-
-        let last_modified = h.get_str(&headers::LAST_MODIFIED)?;
-        let last_modified = from_azure_time(last_modified)?;
-
-        let etag = h.get_str(&headers::ETAG)?.into();
-
+        let last_modified = from_azure_time(h.get_str(&headers::LAST_MODIFIED)?)?;
+        let etag = h.get_as(&headers::ETAG)?;
         let blob_sequence_number = h.get_optional_as(&headers::BLOB_SEQUENCE_NUMBER)?;
         let blob_type = h.get_as(&headers::BLOB_TYPE)?;
         let access_tier = h.get_optional_as(&headers::BLOB_ACCESS_TIER)?;
         let content_encoding = h.get_optional_string(&headers::CONTENT_ENCODING);
         let content_language = h.get_optional_string(&headers::CONTENT_LANGUAGE);
-
-        let content_md5 = h
-            .get_optional_str(&headers::CONTENT_MD5)
-            .map(|header| ConsistencyMD5::decode(header.as_bytes()))
-            .transpose()
-            .map_kind(ErrorKind::DataConversion)?;
-
-        let content_crc64 = h
-            .get_optional_str(&azure_storage::headers::CONTENT_CRC64)
-            .map(|header| ConsistencyCRC64::decode(header.as_bytes()))
-            .transpose()
-            .map_kind(ErrorKind::DataConversion)?;
-
+        let content_md5 = h.get_optional_as(&headers::CONTENT_MD5)?;
+        let content_crc64 = h.get_optional_as(&azure_storage::headers::CONTENT_CRC64)?;
         let cache_control = h.get_optional_string(&headers::CACHE_CONTROL);
         let content_disposition = h.get_optional_string(&headers::CONTENT_DISPOSITION);
         let lease_status = h.get_as(&headers::LEASE_STATUS)?;