Add support for module identities and rewrite requests (Azure#158)

* Add support for module identities and rewrite requests

* Fix formatting of invoke_method_builder.rs

* Changed required fields for builders and removed execute() from getters

Author: corollaries

sdk/iothub/Cargo.toml

@@ -11,8 +11,7 @@ bytes = "1.0"
 chrono = "0.4"
 crypto-mac = { version = "0.10", features = ["std"] }
 hmac = "0.10"
-hyper = "0.14"
-hyper-tls = "0.5"
+http = "0.2"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 serde_derive = "1.0"
@@ -21,3 +20,6 @@ url = "2.2"
 
 [dev-dependencies]
 tokio = { version = "1.0", features = ["macros"] }
+hyper = "0.14"
+hyper-rustls = "0.22"
+reqwest = "0.11.0"

sdk/iothub/examples/device_identity.rs

@@ -1,9 +1,12 @@
-use iothub::service::identity::{DesiredCapability, Status};
+use std::sync::Arc;
+
+use azure_core::HttpClient;
+use iothub::service::resources::{AuthenticationMechanism, DesiredCapability, Status};
 use iothub::service::ServiceClient;
 use std::error::Error;
 
 #[tokio::main]
-async fn main() -> Result<(), Box<dyn Error>> {
+async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
     let iothub_connection_string = std::env::var("IOTHUB_CONNECTION_STRING")
         .expect("Set env variable IOTHUB_CONNECTION_STRING first!");
 
@@ -12,17 +15,19 @@ async fn main() -> Result<(), Box<dyn Error>> {
         .expect("Please pass the device id as the first parameter");
 
     println!("Getting device twin for device '{}'", device_id);
-
-    let service_client = ServiceClient::from_connection_string(iothub_connection_string, 3600)?;
+    let http_client: Arc<Box<dyn HttpClient>> = Arc::new(Box::new(reqwest::Client::new()));
+    let service_client =
+        ServiceClient::from_connection_string(http_client, iothub_connection_string, 3600)?;
     let device = service_client
         .create_device_identity()
-        .device_id(device_id)
-        .authentication_using_sas(
-            "QhgevIUBSWe37q1MP+M/vtktjOcrE74BVbpcxlLQw58=",
-            "6YS6w5wqkpdfkEW7iOP1NvituehFlFRfPko2n7KY4Gk=",
+        .execute(
+            &device_id,
+            Status::Enabled,
+            AuthenticationMechanism::new_using_symmetric_key(
+                "QhgevIUBSWe37q1MP+M/vtktjOcrE74BVbpcxlLQw58=",
+                "6YS6w5wqkpdfkEW7iOP1NvituehFlFRfPko2n7KY4Gk",
+            ),
         )
-        .status(Status::Enabled)
-        .execute()
         .await?;
 
     println!("Successfully created a new device '{}'", device.device_id);
@@ -33,14 +38,15 @@ async fn main() -> Result<(), Box<dyn Error>> {
     );
     let device = service_client
         .update_device_identity(device.etag)
-        .device_id(device.device_id)
         .device_capability(DesiredCapability::IotEdge)
-        .authentication_using_sas(
-            "QhgevIUBSWe37q1MP+M/vtktjOcrE74BVbpcxlLQw58=",
-            "6YS6w5wqkpdfkEW7iOP1NvituehFlFRfPko2n7KY4Gk=",
+        .execute(
+            &device_id,
+            Status::Enabled,
+            AuthenticationMechanism::new_using_symmetric_key(
+                "QhgevIUBSWe37q1MP+M/vtktjOcrE74BVbpcxlLQw58=",
+                "6YS6w5wqkpdfkEW7iOP1NvituehFlFRfPko2n7KY4Gk",
+            ),
         )
-        .status(Status::Disabled)
-        .execute()
         .await?;
 
     println!("Getting device identity of '{}'", device.device_id);
@@ -49,7 +55,8 @@ async fn main() -> Result<(), Box<dyn Error>> {
 
     println!("Deleting device '{}'", device.device_id);
     service_client
-        .delete_device_identity(device.device_id, None)
+        .delete_device_identity(device.device_id, device.etag)
+        .execute()
         .await?;
 
     Ok(())

sdk/iothub/examples/directmethod.rs

@@ -1,9 +1,12 @@
+use std::error::Error;
+use std::sync::Arc;
+
+use azure_core::HttpClient;
 use iothub::service::ServiceClient;
 use serde_json;
-use std::error::Error;
 
 #[tokio::main]
-async fn main() -> Result<(), Box<dyn Error>> {
+async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
     let iothub_connection_string = std::env::var("IOTHUB_CONNECTION_STRING")
         .expect("Set env variable IOTHUB_CONNECTION_STRING first!");
 
@@ -23,7 +26,9 @@ async fn main() -> Result<(), Box<dyn Error>> {
         .nth(4)
         .expect("Please pass the payload as the fourth parameter");
 
-    let service_client = ServiceClient::from_connection_string(iothub_connection_string, 3600)?;
+    let http_client: Arc<Box<dyn HttpClient>> = Arc::new(Box::new(reqwest::Client::new()));
+    let service_client =
+        ServiceClient::from_connection_string(http_client, iothub_connection_string, 3600)?;
     println!(
         "Sending direct method {} to {}:{} on: {}",
         method_name, device_id, module_id, service_client.iothub_name

sdk/iothub/examples/gettwin.rs

@@ -1,8 +1,11 @@
+use std::sync::Arc;
+
+use azure_core::HttpClient;
 use iothub::service::ServiceClient;
 use std::error::Error;
 
 #[tokio::main]
-async fn main() -> Result<(), Box<dyn Error>> {
+async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
     let iothub_connection_string = std::env::var("IOTHUB_CONNECTION_STRING")
         .expect("Set env variable IOTHUB_CONNECTION_STRING first!");
 
@@ -12,7 +15,9 @@ async fn main() -> Result<(), Box<dyn Error>> {
 
     println!("Getting device twin for device: {}", device_id);
 
-    let service_client = ServiceClient::from_connection_string(iothub_connection_string, 3600)?;
+    let http_client: Arc<Box<dyn HttpClient>> = Arc::new(Box::new(reqwest::Client::new()));
+    let service_client =
+        ServiceClient::from_connection_string(http_client, iothub_connection_string, 3600)?;
     let twin = service_client.get_device_twin(device_id).await?;
 
     println!("Received device twin: {:?}", twin);

sdk/iothub/examples/module_identity.rs

@@ -0,0 +1,78 @@
+use std::sync::Arc;
+
+use azure_core::HttpClient;
+use iothub::service::resources::AuthenticationMechanism;
+use iothub::service::ServiceClient;
+use std::error::Error;
+
+#[tokio::main]
+async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
+    let iothub_connection_string = std::env::var("IOTHUB_CONNECTION_STRING")
+        .expect("Set env variable IOTHUB_CONNECTION_STRING first!");
+
+    let device_id = std::env::args()
+        .nth(1)
+        .expect("Please pass the device id as the first parameter");
+
+    let module_id = std::env::args()
+        .nth(2)
+        .expect("Please pass the module id as the second parameter");
+
+    let http_client: Arc<Box<dyn HttpClient>> = Arc::new(Box::new(reqwest::Client::new()));
+    let service_client =
+        ServiceClient::from_connection_string(http_client, iothub_connection_string, 3600)?;
+    let module = service_client
+        .create_module_identity()
+        .execute(
+            &device_id,
+            &module_id,
+            "IoTEdge",
+            AuthenticationMechanism::new_using_symmetric_key(
+                "QhgevIUBSWe37q1MP+M/vtktjOcrE74BVbpcxlLQw58=",
+                "6YS6w5wqkpdfkEW7iOP1NvituehFlFRfPko2n7KY4Gk",
+            ),
+        )
+        .await?;
+
+    println!(
+        "Successfully created a new module '{}:{}'",
+        module.device_id, module.module_id
+    );
+
+    println!(
+        "Setting status to disabled of module '{}:{}'",
+        module.device_id, module.module_id
+    );
+    let module = service_client
+        .update_module_identity(module.etag)
+        .execute(
+            &device_id,
+            &module_id,
+            "Docker",
+            AuthenticationMechanism::new_using_symmetric_key(
+                "QhgevIUBSWe37q1MP+M/vtktjOcrE74BVbpcxlLQw58=",
+                "6YS6w5wqkpdfkEW7iOP1NvituehFlFRfPko2n7KY4Gk",
+            ),
+        )
+        .await?;
+
+    println!(
+        "Getting module identity of '{}:{}'",
+        module.device_id, module.module_id
+    );
+    let module = service_client
+        .get_module_identity(module.device_id, module.module_id)
+        .await?;
+    println!("Identity is: {:?}", module);
+
+    println!(
+        "Deleting module '{}:{}'",
+        module.device_id, module.module_id
+    );
+    service_client
+        .delete_module_identity(module.device_id, module.module_id, module.etag)
+        .execute()
+        .await?;
+
+    Ok(())
+}

sdk/iothub/examples/updatetwin.rs

@@ -1,9 +1,11 @@
+use azure_core::HttpClient;
 use iothub::service::ServiceClient;
 use serde_json;
 use std::error::Error;
+use std::sync::Arc;
 
 #[tokio::main]
-async fn main() -> Result<(), Box<dyn Error>> {
+async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
     let iothub_connection_string = std::env::var("IOTHUB_CONNECTION_STRING")
         .expect("Set env variable IOTHUB_CONNECTION_STRING first!");
 
@@ -16,8 +18,10 @@ async fn main() -> Result<(), Box<dyn Error>> {
         .expect("Please pass the payload as the second parameter");
 
     println!("Updating device twin for device: {}", device_id);
+    let http_client: Arc<Box<dyn HttpClient>> = Arc::new(Box::new(reqwest::Client::new()));
 
-    let service_client = ServiceClient::from_connection_string(iothub_connection_string, 3600)?;
+    let service_client =
+        ServiceClient::from_connection_string(http_client, iothub_connection_string, 3600)?;
     let updated_twin = service_client
         .update_device_twin(device_id)
         .properties(serde_json::from_str(&payload)?)

sdk/iothub/src/lib.rs

@@ -1 +1,5 @@
+#![deny(missing_docs)]
+//! The IoT Hub crate contains a client that can be used to manage the IoT Hub.
+
+/// The service module contains the IoT Hub Service Client that can be used to manage the IoT Hub.
 pub mod service;