Implement rust management APIs (Azure#1854)

LarryOsterman · web-flow · commit 798f9776a5ca · 2024-10-15T14:58:26.000-07:00
* Implement rust management APIs
diff --git a/sdk/core/azure_core_amqp/src/connection.rs b/sdk/core/azure_core_amqp/src/connection.rs
@@ -30,7 +30,6 @@ impl AmqpConnectionOptions {
     pub fn builder() -> builders::AmqpConnectionOptionsBuilder {
         builders::AmqpConnectionOptionsBuilder::new()
     }
-
     pub fn max_frame_size(&self) -> Option<u32> {
         self.max_frame_size
     }
@@ -124,47 +123,38 @@ pub mod builders {
                 options: Default::default(),
             }
         }
-        pub fn build(&mut self) -> AmqpConnectionOptions {
-            self.options.clone()
+        pub fn build(self) -> AmqpConnectionOptions {
+            self.options
         }
-        pub fn with_max_frame_size(&mut self, max_frame_size: u32) -> &mut Self {
+        pub fn with_max_frame_size(mut self, max_frame_size: u32) -> Self {
             self.options.max_frame_size = Some(max_frame_size);
             self
         }
-        pub fn with_channel_max(&mut self, channel_max: u16) -> &mut Self {
+        pub fn with_channel_max(mut self, channel_max: u16) -> Self {
             self.options.channel_max = Some(channel_max);
             self
         }
-        pub fn with_idle_timeout(&mut self, idle_timeout: Duration) -> &mut Self {
+        pub fn with_idle_timeout(mut self, idle_timeout: Duration) -> Self {
             self.options.idle_timeout = Some(idle_timeout);
             self
         }
-        pub fn with_outgoing_locales(&mut self, outgoing_locales: Vec<String>) -> &mut Self {
+        pub fn with_outgoing_locales(mut self, outgoing_locales: Vec<String>) -> Self {
             self.options.outgoing_locales = Some(outgoing_locales);
             self
         }
-        pub fn with_incoming_locales(&mut self, incoming_locales: Vec<String>) -> &mut Self {
+        pub fn with_incoming_locales(mut self, incoming_locales: Vec<String>) -> Self {
             self.options.incoming_locales = Some(incoming_locales);
             self
         }
-        pub fn with_offered_capabilities(
-            &mut self,
-            offered_capabilities: Vec<AmqpSymbol>,
-        ) -> &mut Self {
+        pub fn with_offered_capabilities(mut self, offered_capabilities: Vec<AmqpSymbol>) -> Self {
             self.options.offered_capabilities = Some(offered_capabilities);
             self
         }
-        pub fn with_desired_capabilities(
-            &mut self,
-            desired_capabilities: Vec<AmqpSymbol>,
-        ) -> &mut Self {
+        pub fn with_desired_capabilities(mut self, desired_capabilities: Vec<AmqpSymbol>) -> Self {
             self.options.desired_capabilities = Some(desired_capabilities);
             self
         }
-        pub fn with_properties<K, V>(
-            &mut self,
-            properties: impl Into<AmqpOrderedMap<K, V>>,
-        ) -> &mut Self
+        pub fn with_properties<K, V>(mut self, properties: impl Into<AmqpOrderedMap<K, V>>) -> Self
         where
             K: Into<AmqpSymbol> + Debug + Default + PartialEq,
             V: Into<AmqpValue> + Debug + Default,
@@ -177,7 +167,7 @@ pub mod builders {
             self.options.properties = Some(properties_map);
             self
         }
-        pub fn with_buffer_size(&mut self, buffer_size: usize) -> &mut Self {
+        pub fn with_buffer_size(mut self, buffer_size: usize) -> Self {
             self.options.buffer_size = Some(buffer_size);
             self
         }
diff --git a/sdk/core/azure_core_amqp/src/fe2o3/management.rs b/sdk/core/azure_core_amqp/src/fe2o3/management.rs
@@ -11,13 +11,17 @@ use crate::{
 };
 
 use async_std::sync::Mutex;
-use azure_core::{credentials::AccessToken, error::Result};
+use azure_core::{
+    credentials::AccessToken,
+    error::{ErrorKind, Result},
+    Error,
+};
 use fe2o3_amqp_management::operations::ReadResponse;
 use fe2o3_amqp_types::{messaging::ApplicationProperties, primitives::SimpleValue};
 use std::sync::{Arc, OnceLock};
 use tracing::debug;
 
-use super::error::{AmqpManagement, AmqpManagementAttach};
+use super::error::{AmqpLinkDetach, AmqpManagement, AmqpManagementAttach};
 
 #[derive(Debug)]
 pub(crate) struct Fe2o3AmqpManagement {
@@ -67,6 +71,18 @@ impl AmqpManagementApis for Fe2o3AmqpManagement {
         })?;
         Ok(())
     }
+
+    async fn detach(mut self) -> Result<()> {
+        // Detach the management client from the session.
+        let management = self
+            .management
+            .take()
+            .ok_or_else(|| Error::message(ErrorKind::Other, "Unattached management node."))?;
+        let management = management.into_inner();
+        management.close().await.map_err(AmqpLinkDetach::from)?;
+        Ok(())
+    }
+
     async fn call(
         &self,
         operation_type: impl Into<String>,
diff --git a/sdk/core/azure_core_amqp/src/management.rs b/sdk/core/azure_core_amqp/src/management.rs
@@ -17,6 +17,7 @@ type ManagementImplementation = super::noop::NoopAmqpManagement;
 
 pub trait AmqpManagementApis {
     fn attach(&self) -> impl std::future::Future<Output = Result<()>>;
+    fn detach(self) -> impl std::future::Future<Output = Result<()>>;
 
     #[allow(unused_variables)]
     fn call(
@@ -35,6 +36,9 @@ impl AmqpManagementApis for AmqpManagement {
     async fn attach(&self) -> Result<()> {
         self.implementation.attach().await
     }
+    async fn detach(self) -> Result<()> {
+        self.implementation.detach().await
+    }
     async fn call(
         &self,
         operation_type: impl Into<String>,
diff --git a/sdk/core/azure_core_amqp/src/noop.rs b/sdk/core/azure_core_amqp/src/noop.rs
@@ -123,6 +123,10 @@ impl AmqpManagementApis for NoopAmqpManagement {
         unimplemented!();
     }
 
+    async fn detach(self) -> Result<()> {
+        unimplemented!();
+    }
+
     async fn call(
         &self,
         operation_type: impl Into<String>,
@@ -148,11 +152,9 @@ impl AmqpSenderApis for NoopAmqpSender {
     ) -> Result<()> {
         unimplemented!();
     }
-
     async fn detach(self) -> Result<()> {
         unimplemented!();
     }
-
     fn max_message_size(&self) -> Result<Option<u64>> {
         unimplemented!();
     }
diff --git a/sdk/core/azure_core_amqp/src/sender.rs b/sdk/core/azure_core_amqp/src/sender.rs
@@ -146,65 +146,56 @@ pub mod builders {
             }
         }
 
-        pub fn with_sender_settle_mode(
-            &mut self,
-            sender_settle_mode: SenderSettleMode,
-        ) -> &mut Self {
+        pub fn with_sender_settle_mode(mut self, sender_settle_mode: SenderSettleMode) -> Self {
             self.options.sender_settle_mode = Some(sender_settle_mode);
             self
         }
 
         pub fn with_receiver_settle_mode(
-            &mut self,
+            mut self,
             receiver_settle_mode: ReceiverSettleMode,
-        ) -> &mut Self {
+        ) -> Self {
             self.options.receiver_settle_mode = Some(receiver_settle_mode);
             self
         }
 
-        pub fn with_source(&mut self, source: impl Into<AmqpSource>) -> &mut Self {
+        pub fn with_source(mut self, source: impl Into<AmqpSource>) -> Self {
             self.options.source = Some(source.into());
             self
         }
-        pub fn with_offered_capabilities(
-            &mut self,
-            offered_capabilities: Vec<AmqpSymbol>,
-        ) -> &mut Self {
+        pub fn with_offered_capabilities(mut self, offered_capabilities: Vec<AmqpSymbol>) -> Self {
             self.options.offered_capabilities = Some(offered_capabilities);
             self
         }
         #[allow(dead_code)]
-        pub fn with_desired_capabilities(
-            &mut self,
-            desired_capabilities: Vec<AmqpSymbol>,
-        ) -> &mut Self {
+        pub fn with_desired_capabilities(mut self, desired_capabilities: Vec<AmqpSymbol>) -> Self {
             self.options.desired_capabilities = Some(desired_capabilities);
             self
         }
 
         pub fn with_properties(
-            &mut self,
+            mut self,
             properties: impl Into<AmqpOrderedMap<AmqpSymbol, AmqpValue>>,
-        ) -> &mut Self {
+        ) -> Self {
             let properties_map: AmqpOrderedMap<AmqpSymbol, AmqpValue> =
                 properties.into().iter().collect();
 
             self.options.properties = Some(properties_map);
             self
         }
 
-        pub fn with_initial_delivery_count(&mut self, initial_delivery_count: u32) -> &mut Self {
+        pub fn with_initial_delivery_count(mut self, initial_delivery_count: u32) -> Self {
             self.options.initial_delivery_count = Some(initial_delivery_count);
             self
         }
 
-        pub fn with_max_message_size(&mut self, max_message_size: u64) -> &mut Self {
+        pub fn with_max_message_size(mut self, max_message_size: u64) -> Self {
             self.options.max_message_size = Some(max_message_size);
             self
         }
 
-        pub fn build(&mut self) -> AmqpSenderOptions {
-            self.options.clone()
+        pub fn build(self) -> AmqpSenderOptions {
+            self.options
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,6 @@ impl AmqpConnectionOptions {`
`30`	`30`	`pub fn builder() -> builders::AmqpConnectionOptionsBuilder {`
`31`	`31`	`builders::AmqpConnectionOptionsBuilder::new()`
`32`	`32`	`}`
`33`		`-`
`34`	`33`	`pub fn max_frame_size(&self) -> Option<u32> {`
`35`	`34`	`self.max_frame_size`
`36`	`35`	`}`
`@@ -124,47 +123,38 @@ pub mod builders {`
`124`	`123`	`options: Default::default(),`
`125`	`124`	`}`
`126`	`125`	`}`
`127`		`- pub fn build(&mut self) -> AmqpConnectionOptions {`
`128`		`- self.options.clone()`
	`126`	`+ pub fn build(self) -> AmqpConnectionOptions {`
	`127`	`+ self.options`
`129`	`128`	`}`
`130`		`- pub fn with_max_frame_size(&mut self, max_frame_size: u32) -> &mut Self {`
	`129`	`+ pub fn with_max_frame_size(mut self, max_frame_size: u32) -> Self {`
`131`	`130`	`self.options.max_frame_size = Some(max_frame_size);`
`132`	`131`	`self`
`133`	`132`	`}`
`134`		`- pub fn with_channel_max(&mut self, channel_max: u16) -> &mut Self {`
	`133`	`+ pub fn with_channel_max(mut self, channel_max: u16) -> Self {`
`135`	`134`	`self.options.channel_max = Some(channel_max);`
`136`	`135`	`self`
`137`	`136`	`}`
`138`		`- pub fn with_idle_timeout(&mut self, idle_timeout: Duration) -> &mut Self {`
	`137`	`+ pub fn with_idle_timeout(mut self, idle_timeout: Duration) -> Self {`
`139`	`138`	`self.options.idle_timeout = Some(idle_timeout);`
`140`	`139`	`self`
`141`	`140`	`}`
`142`		`- pub fn with_outgoing_locales(&mut self, outgoing_locales: Vec<String>) -> &mut Self {`
	`141`	`+ pub fn with_outgoing_locales(mut self, outgoing_locales: Vec<String>) -> Self {`
`143`	`142`	`self.options.outgoing_locales = Some(outgoing_locales);`
`144`	`143`	`self`
`145`	`144`	`}`
`146`		`- pub fn with_incoming_locales(&mut self, incoming_locales: Vec<String>) -> &mut Self {`
	`145`	`+ pub fn with_incoming_locales(mut self, incoming_locales: Vec<String>) -> Self {`
`147`	`146`	`self.options.incoming_locales = Some(incoming_locales);`
`148`	`147`	`self`
`149`	`148`	`}`
`150`		`- pub fn with_offered_capabilities(`
`151`		`- &mut self,`
`152`		`- offered_capabilities: Vec<AmqpSymbol>,`
`153`		`- ) -> &mut Self {`
	`149`	`+ pub fn with_offered_capabilities(mut self, offered_capabilities: Vec<AmqpSymbol>) -> Self {`
`154`	`150`	`self.options.offered_capabilities = Some(offered_capabilities);`
`155`	`151`	`self`
`156`	`152`	`}`
`157`		`- pub fn with_desired_capabilities(`
`158`		`- &mut self,`
`159`		`- desired_capabilities: Vec<AmqpSymbol>,`
`160`		`- ) -> &mut Self {`
	`153`	`+ pub fn with_desired_capabilities(mut self, desired_capabilities: Vec<AmqpSymbol>) -> Self {`
`161`	`154`	`self.options.desired_capabilities = Some(desired_capabilities);`
`162`	`155`	`self`
`163`	`156`	`}`
`164`		`- pub fn with_properties<K, V>(`
`165`		`- &mut self,`
`166`		`- properties: impl Into<AmqpOrderedMap<K, V>>,`
`167`		`- ) -> &mut Self`
	`157`	`+ pub fn with_properties<K, V>(mut self, properties: impl Into<AmqpOrderedMap<K, V>>) -> Self`
`168`	`158`	`where`
`169`	`159`	`K: Into<AmqpSymbol> + Debug + Default + PartialEq,`
`170`	`160`	`V: Into<AmqpValue> + Debug + Default,`
`@@ -177,7 +167,7 @@ pub mod builders {`
`177`	`167`	`self.options.properties = Some(properties_map);`
`178`	`168`	`self`
`179`	`169`	`}`
`180`		`- pub fn with_buffer_size(&mut self, buffer_size: usize) -> &mut Self {`
	`170`	`+ pub fn with_buffer_size(mut self, buffer_size: usize) -> Self {`
`181`	`171`	`self.options.buffer_size = Some(buffer_size);`
`182`	`172`	`self`
`183`	`173`	`}`
Original file line number	Diff line number	Diff line change
`@@ -123,6 +123,10 @@ impl AmqpManagementApis for NoopAmqpManagement {`
`123`	`123`	`unimplemented!();`
`124`	`124`	`}`
`125`	`125`
	`126`	`+ async fn detach(self) -> Result<()> {`
	`127`	`+ unimplemented!();`
	`128`	`+ }`
	`129`	`+`
`126`	`130`	`async fn call(`
`127`	`131`	`&self,`
`128`	`132`	`operation_type: impl Into<String>,`
`@@ -148,11 +152,9 @@ impl AmqpSenderApis for NoopAmqpSender {`
`148`	`152`	`) -> Result<()> {`
`149`	`153`	`unimplemented!();`
`150`	`154`	`}`
`151`		`-`
`152`	`155`	`async fn detach(self) -> Result<()> {`
`153`	`156`	`unimplemented!();`
`154`	`157`	`}`
`155`		`-`
`156`	`158`	`fn max_message_size(&self) -> Result<Option<u64>> {`
`157`	`159`	`unimplemented!();`
`158`	`160`	`}`