blob_storage: Make Snapshot type consistent.

sdk/storage_blobs/src/blob/mod.rs

@@ -22,10 +22,12 @@ use azure_core::{
     content_type, date,
     headers::{self, Headers},
     parsing::from_azure_time,
-    Etag, LeaseDuration, LeaseState, LeaseStatus,
+    AppendToUrlQuery, Etag, LeaseDuration, LeaseState, LeaseStatus,
 };
 use azure_storage::{ConsistencyCRC64, ConsistencyMD5, CopyId, CopyProgress};
+use std::borrow::Cow;
 use std::collections::HashMap;
+use std::str::FromStr;
 use time::OffsetDateTime;
 
 #[cfg(feature = "azurite_workaround")]
@@ -59,7 +61,10 @@ create_enum!(RehydratePriority, (High, "High"), (Standard, "Standard"));
 
 create_enum!(PageWriteType, (Update, "update"), (Clear, "clear"));
 
+use azure_core::error::Error;
+use azure_core::headers::HeaderName;
 use serde::{self, Deserialize, Deserializer};
+
 fn deserialize_crc64_optional<'de, D>(deserializer: D) -> Result<Option<ConsistencyCRC64>, D::Error>
 where
     D: Deserializer<'de>,
@@ -88,7 +93,7 @@ where
 #[serde(rename_all = "PascalCase")]
 pub struct Blob {
     pub name: String,
-    pub snapshot: Option<OffsetDateTime>,
+    pub snapshot: Option<Snapshot>,
     pub version_id: Option<String>,
     pub is_current_version: Option<bool>,
     pub deleted: Option<bool>,
@@ -230,9 +235,7 @@ impl Blob {
 
         let tags = h.get_optional_as(&headers::TAGS)?;
 
-        // TODO: Retrieve the snapshot time from
-        // the headers
-        let snapshot = None;
+        let snapshot = h.get_optional_as(&SNAPSHOT)?;
 
         Ok(Blob {
             name: blob_name.into(),
@@ -287,3 +290,41 @@ impl Blob {
 pub(crate) fn copy_status_from_headers(headers: &Headers) -> azure_core::Result<CopyStatus> {
     headers.get_as(&headers::COPY_STATUS)
 }
+
+pub const SNAPSHOT: HeaderName = HeaderName::from_static("x-ms-snapshot");
+
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+pub struct Snapshot(Cow<'static, str>);
+
+impl Snapshot {
+    pub fn new<S: Into<Cow<'static, str>>>(s: S) -> Self {
+        Self(s.into())
+    }
+
+    pub const fn from_static(s: &'static str) -> Self {
+        Self(Cow::Borrowed(s))
+    }
+}
+
+impl<S> From<S> for Snapshot
+where
+    S: Into<Cow<'static, str>>,
+{
+    fn from(f: S) -> Self {
+        Self::new(f)
+    }
+}
+
+impl FromStr for Snapshot {
+    type Err = Error;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        Ok(Self::new(s.to_string()))
+    }
+}
+
+impl AppendToUrlQuery for Snapshot {
+    fn append_to_url_query(&self, url: &mut url::Url) {
+        url.query_pairs_mut().append_pair("snapshot", &self.0);
+    }
+}

sdk/storage_blobs/src/blob/operations/delete_blob_snapshot.rs

@@ -1,3 +1,4 @@
+use crate::blob::Snapshot;
 use crate::{blob::operations::DeleteBlobResponse, prelude::*};
 use azure_core::{headers::Headers, prelude::*};
 

sdk/storage_blobs/src/blob/operations/snapshot_blob.rs

@@ -1,5 +1,6 @@
+use crate::blob::{Snapshot, SNAPSHOT};
 use crate::prelude::*;
-use azure_core::headers::{etag_from_headers, HeaderName};
+use azure_core::headers::etag_from_headers;
 use azure_core::{
     headers::{date_from_headers, last_modified_from_headers, request_id_from_headers, Headers},
     prelude::*,
@@ -64,5 +65,3 @@ impl TryFrom<&Headers> for SnapshotBlobResponse {
         })
     }
 }
-
-pub const SNAPSHOT: HeaderName = HeaderName::from_static("x-ms-snapshot");

sdk/storage_blobs/src/clients/blob_client.rs

@@ -1,3 +1,4 @@
+use crate::blob::Snapshot;
 use crate::{
     blob::operations::*,
     options::{BA512Range, Tags},

sdk/storage_blobs/src/options/blob_versioning.rs

@@ -1,4 +1,5 @@
-use super::{Snapshot, VersionId};
+use super::VersionId;
+use crate::blob::Snapshot;
 use azure_core::AppendToUrlQuery;
 
 #[derive(Debug, Clone)]

sdk/storage_blobs/src/options/mod.rs

@@ -43,11 +43,3 @@ request_query!(
     VersionId,
     "version_id"
 );
-
-request_query!(
-    /// This type could also be a DateTime but the docs clearly states to treat is as opaque so we do not convert it in any way.
-    ///
-    /// See: <https://docs.microsoft.com/rest/api/storageservices/get-blob>"]
-    Snapshot,
-    "snapshot"
-);