Merge pull request #215 from MindFlavor/cosmos/user/dev

CosmosDB: Implemented User methods

Author: Francesco Cogno

README.md

@@ -5,15 +5,15 @@
 
 [![Build Status](https://travis-ci.org/MindFlavor/AzureSDKForRust.svg?branch=master)](https://travis-ci.org/MindFlavor/AzureSDKForRust) [![Coverage Status](https://coveralls.io/repos/MindFlavor/AzureSDKForRust/badge.svg?branch=master&service=github)](https://coveralls.io/github/MindFlavor/AzureSDKForRust?branch=master) ![stability-unstable](https://img.shields.io/badge/stability-unstable-yellow.svg)
 
-[![tag](https://img.shields.io/github/tag/mindflavor/AzureSDKForRust.svg)](https://github.com/MindFlavor/AzureSDKForRust/tree/core_0.35.0) [![release](https://img.shields.io/github/release/mindflavor/AzureSDKForRust.svg)](https://github.com/MindFlavor/AzureSDKForRust/releases/tag/core_0.35.0) [![commitssince](https://img.shields.io/github/commits-since/mindflavor/AzureSDKForRust/core_0.35.0.svg)](https://github.com/MindFlavor/AzureSDKForRust/commits/master)
+[![tag](https://img.shields.io/github/tag/mindflavor/AzureSDKForRust.svg)](https://github.com/MindFlavor/AzureSDKForRust/tree/cosmos_0.32.2) [![release](https://img.shields.io/github/release/mindflavor/AzureSDKForRust.svg)](https://github.com/MindFlavor/AzureSDKForRust/releases/tag/cosmos_0.32.2) [![commitssince](https://img.shields.io/github/commits-since/mindflavor/AzureSDKForRust/cosmos_0.32.2.svg)](https://github.com/MindFlavor/AzureSDKForRust/commits/master)
 
 [![GitHub contributors](https://img.shields.io/github/contributors/MindFlavor/AzureSDKForRust.svg)](https://github.com/MindFlavor/AzureSDKForRust/graphs/contributors)
 
 Crate | Docs | Crates.io | Downloads | Downloads@Latest |
 -- | -- | -- | -- | -- |
 [azure_sdk_auth_aad](https://github.com/MindFlavor/AzureSDKForRust/tree/master/azure_sdk_auth_aad) | [![docs](https://docs.rs/azure_sdk_auth_aad/badge.svg)](https://docs.rs/azure_sdk_auth_aad/0.35.0/azure_sdk_auth_aad) | [![Crate](https://img.shields.io/crates/v/azure_sdk_auth_aad.svg)](https://crates.io/crates/azure_sdk_auth_aad) | [![cratedown](https://img.shields.io/crates/d/azure_sdk_auth_aad.svg)](https://crates.io/crates/azure_sdk_auth_aad) | [![cratelastdown](https://img.shields.io/crates/dv/azure_sdk_auth_aad.svg)](https://crates.io/crates/azure_sdk_auth_aad)
 [azure_sdk_core](https://github.com/MindFlavor/AzureSDKForRust/tree/master/azure_sdk_core) | [![docs](https://docs.rs/azure_sdk_core/badge.svg)](https://docs.rs/azure_sdk_core/0.35.0/azure_sdk_core) | [![Crate](https://img.shields.io/crates/v/azure_sdk_core.svg)](https://crates.io/crates/azure_sdk_core) | [![cratedown](https://img.shields.io/crates/d/azure_sdk_core.svg)](https://crates.io/crates/azure_sdk_core) | [![cratelastdown](https://img.shields.io/crates/dv/azure_sdk_core.svg)](https://crates.io/crates/azure_sdk_core)
-[azure_sdk_cosmos](https://github.com/MindFlavor/AzureSDKForRust/tree/master/azure_sdk_cosmos) | [![docs](https://docs.rs/azure_sdk_cosmos/badge.svg)](https://docs.rs/azure_sdk_cosmos/0.32.1/azure_sdk_cosmos) | [![Crate](https://img.shields.io/crates/v/azure_sdk_cosmos.svg)](https://crates.io/crates/azure_sdk_cosmos) | [![cratedown](https://img.shields.io/crates/d/azure_sdk_cosmos.svg)](https://crates.io/crates/azure_sdk_cosmos) | [![cratelastdown](https://img.shields.io/crates/dv/azure_sdk_cosmos.svg)](https://crates.io/crates/azure_sdk_cosmos)
+[azure_sdk_cosmos](https://github.com/MindFlavor/AzureSDKForRust/tree/master/azure_sdk_cosmos) | [![docs](https://docs.rs/azure_sdk_cosmos/badge.svg)](https://docs.rs/azure_sdk_cosmos/0.32.2/azure_sdk_cosmos) | [![Crate](https://img.shields.io/crates/v/azure_sdk_cosmos.svg)](https://crates.io/crates/azure_sdk_cosmos) | [![cratedown](https://img.shields.io/crates/d/azure_sdk_cosmos.svg)](https://crates.io/crates/azure_sdk_cosmos) | [![cratelastdown](https://img.shields.io/crates/dv/azure_sdk_cosmos.svg)](https://crates.io/crates/azure_sdk_cosmos)
 [azure_sdk_service_bus](https://github.com/MindFlavor/AzureSDKForRust/tree/master/azure_sdk_service_bus) | [![docs](https://docs.rs/azure_sdk_service_bus/badge.svg)](https://docs.rs/azure_sdk_service_bus/0.30.1/azure_sdk_service_bus) | [![Crate](https://img.shields.io/crates/v/azure_sdk_service_bus.svg)](https://crates.io/crates/azure_sdk_service_bus) | [![cratedown](https://img.shields.io/crates/d/azure_sdk_service_bus.svg)](https://crates.io/crates/azure_sdk_service_bus) | [![cratelastdown](https://img.shields.io/crates/dv/azure_sdk_service_bus.svg)](https://crates.io/crates/azure_sdk_service_bus)
 [azure_sdk_storage_account](https://github.com/MindFlavor/AzureSDKForRust/tree/master/azure_sdk_storage_account) | [![docs](https://docs.rs/azure_sdk_storage_account/badge.svg)](https://docs.rs/azure_sdk_storage_account/0.30.1/azure_sdk_storage_account) | [![Crate](https://img.shields.io/crates/v/azure_sdk_storage_account.svg)](https://crates.io/crates/azure_sdk_storage_account) | [![cratedown](https://img.shields.io/crates/d/azure_sdk_storage_account.svg)](https://crates.io/crates/azure_sdk_storage_account) | [![cratelastdown](https://img.shields.io/crates/dv/azure_sdk_storage_account.svg)](https://crates.io/crates/azure_sdk_storage_account)
 [azure_sdk_storage_blob](https://github.com/MindFlavor/AzureSDKForRust/tree/master/azure_sdk_storage_blob) | [![docs](https://docs.rs/azure_sdk_storage_blob/badge.svg)](https://docs.rs/azure_sdk_storage_blob/0.30.1/azure_sdk_storage_blob) | [![Crate](https://img.shields.io/crates/v/azure_sdk_storage_blob.svg)](https://crates.io/crates/azure_sdk_storage_blob) | [![cratedown](https://img.shields.io/crates/d/azure_sdk_storage_blob.svg)](https://crates.io/crates/azure_sdk_storage_blob) | [![cratelastdown](https://img.shields.io/crates/dv/azure_sdk_storage_blob.svg)](https://crates.io/crates/azure_sdk_storage_blob)

azure_sdk_cosmos/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name          = "azure_sdk_cosmos"
-version       = "0.32.1"
+version       = "0.32.2"
 description   = "Rust wrappers around Microsoft Azure REST APIs - Azure Cosmos DB crate"
 readme        = "README.md"
 authors       = ["Francesco Cogno <francesco.cogno@outlook.com>", "Max Gortman <mgortman@microsoft.com>"]

azure_sdk_cosmos/examples/user00.rs

@@ -0,0 +1,50 @@
+use azure_sdk_cosmos::prelude::*;
+use std::error::Error;
+
+#[tokio::main]
+async fn main() -> Result<(), Box<dyn Error>> {
+    // First we retrieve the account name and master key from environment variables.
+    // We expect master keys (ie, not resource constrained)
+    let master_key =
+        std::env::var("COSMOS_MASTER_KEY").expect("Set env variable COSMOS_MASTER_KEY first!");
+    let account = std::env::var("COSMOS_ACCOUNT").expect("Set env variable COSMOS_ACCOUNT first!");
+
+    let database_name = std::env::args()
+        .nth(1)
+        .expect("please specify the database name as first command line parameter");
+    let user_name = std::env::args()
+        .nth(2)
+        .expect("please specify the user name as first command line parameter");
+
+    let authorization_token =
+        AuthorizationToken::new(account.clone(), TokenType::Master, &master_key)?;
+
+    let client = ClientBuilder::new(authorization_token)?;
+    let database_client = client.with_database(&database_name);
+    let user_client = database_client.with_user(&user_name);
+
+    let create_user_response = user_client.create_user().execute().await?;
+    println!("create_user_response == {:#?}", create_user_response);
+
+    let list_users_response = database_client.list_users().execute().await?;
+    println!("list_users_response == {:#?}", list_users_response);
+
+    let get_user_response = user_client.get_user().execute().await?;
+    println!("get_user_response == {:#?}", get_user_response);
+
+    let new_user = format!("{}replaced", user_name);
+
+    let replace_user_response = user_client
+        .replace_user()
+        .with_user_name(&new_user)
+        .execute()
+        .await?;
+    println!("replace_user_response == {:#?}", replace_user_response);
+
+    let user_client = database_client.with_user(&new_user);
+
+    let delete_user_response = user_client.delete_user().execute().await?;
+    println!("delete_user_response == {:#?}", delete_user_response);
+
+    Ok(())
+}

azure_sdk_cosmos/src/clients/client.rs

@@ -27,6 +27,7 @@ pub(crate) enum ResourceType {
     Collections,
     Documents,
     StoredProcedures,
+    Users,
 }
 
 pub trait CosmosUriBuilder {
@@ -322,14 +323,15 @@ fn string_to_sign(
             ResourceType::Collections => "colls",
             ResourceType::Documents => "docs",
             ResourceType::StoredProcedures => "sprocs",
+            ResourceType::Users => "users",
         },
         resource_link,
         time.to_lowercase()
     )
 }
 
 fn generate_resource_link(u: &str) -> &str {
-    static ENDING_STRINGS: &[&str] = &["dbs", "colls", "docs"];
+    static ENDING_STRINGS: &[&str] = &["dbs", "colls", "docs", "users"];
 
     // store the element only if it does not end with dbs, colls or docs
     let p = u;

azure_sdk_cosmos/src/clients/database_client.rs

@@ -1,7 +1,7 @@
-use crate::clients::{Client, CollectionClient, CosmosUriBuilder, ResourceType};
+use crate::clients::{Client, CollectionClient, CosmosUriBuilder, ResourceType, UserClient};
 use crate::database::DatabaseName;
-use crate::requests;
 use crate::DatabaseBuilderTrait;
+use crate::{requests, UserName};
 use crate::{CollectionName, DatabaseTrait};
 use azure_sdk_core::No;
 
@@ -66,6 +66,14 @@ where
     ) -> CollectionClient<'c, CUB> {
         CollectionClient::new(self, collection_name)
     }
+
+    fn with_user<'c>(&'c self, user_name: &'c dyn UserName) -> UserClient<'c, CUB> {
+        UserClient::new(&self, user_name)
+    }
+
+    fn list_users<'c>(&'c self) -> requests::ListUsersBuilder<'c, CUB> {
+        requests::ListUsersBuilder::new(self)
+    }
 }
 
 impl<'a, CUB> DatabaseBuilderTrait<'a, CUB> for DatabaseClient<'a, CUB>

azure_sdk_cosmos/src/clients/mod.rs

@@ -3,8 +3,10 @@ mod collection_client;
 mod database_client;
 mod document_client;
 mod stored_procedure_client;
+mod user_client;
 pub use client::*;
 pub use collection_client::CollectionClient;
 pub use database_client::DatabaseClient;
 pub use document_client::DocumentClient;
 pub use stored_procedure_client::StoredProcedureClient;
+pub use user_client::UserClient;

azure_sdk_cosmos/src/clients/user_client.rs

@@ -0,0 +1,67 @@
+use crate::clients::{Client, CosmosUriBuilder, DatabaseClient};
+use crate::database::DatabaseName;
+use crate::{requests, DatabaseTrait, UserName, UserTrait};
+use azure_sdk_core::No;
+
+#[derive(Debug, Clone)]
+pub struct UserClient<'a, CUB>
+where
+    CUB: CosmosUriBuilder,
+{
+    database_client: &'a DatabaseClient<'a, CUB>,
+    user_name: &'a dyn UserName,
+}
+
+impl<'a, CUB> UserClient<'a, CUB>
+where
+    CUB: CosmosUriBuilder,
+{
+    pub(crate) fn new(
+        database_client: &'a DatabaseClient<'a, CUB>,
+        user_name: &'a dyn UserName,
+    ) -> Self {
+        Self {
+            database_client,
+            user_name,
+        }
+    }
+
+    pub(crate) fn main_client(&self) -> &Client<CUB> {
+        self.database_client.main_client()
+    }
+
+    pub(crate) fn hyper_client(
+        &self,
+    ) -> &hyper::Client<hyper_rustls::HttpsConnector<hyper::client::HttpConnector>> {
+        self.main_client().hyper_client()
+    }
+}
+
+impl<'a, CUB> UserTrait<'a, CUB> for UserClient<'a, CUB>
+where
+    CUB: CosmosUriBuilder,
+{
+    fn database_name(&self) -> &'a dyn DatabaseName {
+        self.database_client.database_name()
+    }
+
+    fn user_name(&self) -> &'a dyn UserName {
+        self.user_name
+    }
+
+    fn create_user(&self) -> requests::CreateUserBuilder<'_, CUB> {
+        requests::CreateUserBuilder::new(self)
+    }
+
+    fn get_user(&self) -> requests::GetUserBuilder<'_, CUB> {
+        requests::GetUserBuilder::new(self)
+    }
+
+    fn replace_user(&self) -> requests::ReplaceUserBuilder<'_, CUB, No> {
+        requests::ReplaceUserBuilder::new(self)
+    }
+
+    fn delete_user(&self) -> requests::DeleteUserBuilder<'_, CUB> {
+        requests::DeleteUserBuilder::new(self)
+    }
+}

azure_sdk_cosmos/src/lib.rs

@@ -23,6 +23,7 @@ mod requests;
 pub mod responses;
 pub mod stored_procedure;
 mod to_json_vector;
+mod user;
 
 pub use self::authorization_token::*;
 use self::collection::IndexingPolicy;
@@ -35,14 +36,15 @@ pub use self::query::{Param, ParamDef, Query};
 pub use self::requests::*;
 use crate::clients::{
     Client, CollectionClient, CosmosUriBuilder, DatabaseClient, DocumentClient,
-    StoredProcedureClient,
+    StoredProcedureClient, UserClient,
 };
 use crate::collection::Collection;
 use crate::collection::CollectionName;
 use crate::database::DatabaseName;
 use crate::headers::*;
 pub use crate::partition_keys::PartitionKeys;
 use crate::stored_procedure::{Parameters, StoredProcedureName};
+pub use crate::user::{User, UserName};
 use azure_sdk_core::No;
 use http::request::Builder;
 use serde::Serialize;
@@ -314,6 +316,13 @@ where
     fn stored_procedure_client(&self) -> &'a StoredProcedureClient<'a, CUB>;
 }
 
+pub trait UserClientRequired<'a, CUB>
+where
+    CUB: CosmosUriBuilder,
+{
+    fn user_client(&self) -> &'a UserClient<'a, CUB>;
+}
+
 pub trait StoredProcedureNameRequired<'a> {
     fn stored_procedure_name(&self) -> &'a str;
 }
@@ -428,6 +437,15 @@ where
     fn with_database_name(self, database_name: &'a DB) -> Self::O;
 }
 
+pub trait UserNameRequired<'a> {
+    fn user_name(&self) -> &'a dyn UserName;
+}
+
+pub trait UserNameSupport<'a> {
+    type O;
+    fn with_user_name(self, user_name: &'a dyn UserName) -> Self::O;
+}
+
 //// New implementation
 pub trait CosmosTrait<CUB>
 where
@@ -453,6 +471,8 @@ where
         &'c self,
         collection_name: &'c dyn CollectionName,
     ) -> CollectionClient<'c, CUB>;
+    fn with_user<'c>(&'c self, user_name: &'c dyn UserName) -> UserClient<'c, CUB>;
+    fn list_users<'c>(&'c self) -> requests::ListUsersBuilder<'c, CUB>;
 }
 
 pub(crate) trait DatabaseBuilderTrait<'a, CUB>: DatabaseTrait<'a, CUB>
@@ -528,3 +548,15 @@ where
 {
     fn prepare_request(&self, method: hyper::Method) -> http::request::Builder;
 }
+
+pub trait UserTrait<'a, CUB>
+where
+    CUB: CosmosUriBuilder,
+{
+    fn database_name(&self) -> &'a dyn DatabaseName;
+    fn user_name(&self) -> &'a dyn UserName;
+    fn create_user(&self) -> requests::CreateUserBuilder<'_, CUB>;
+    fn get_user(&self) -> requests::GetUserBuilder<'_, CUB>;
+    fn replace_user(&self) -> requests::ReplaceUserBuilder<'_, CUB, No>;
+    fn delete_user(&self) -> requests::DeleteUserBuilder<'_, CUB>;
+}

azure_sdk_cosmos/src/prelude.rs

@@ -20,5 +20,6 @@ pub use crate::{
     PartitionKeys, PartitionKeysOption, PartitionKeysRequired, PartitionKeysSupport,
     PartitionRangeIdOption, PartitionRangeIdSupport, QueryCrossPartitionOption,
     QueryCrossPartitionSupport, QueryRequired, QuerySupport, StoredProcedureNameRequired,
-    StoredProcedureNameSupport, StoredProcedureTrait, TokenType,
+    StoredProcedureNameSupport, StoredProcedureTrait, TokenType, UserClientRequired, UserName,
+    UserNameRequired, UserNameSupport, UserTrait,
 };

azure_sdk_cosmos/src/requests/create_user_builder.json

@@ -0,0 +1,24 @@
+{
+	"name": "CreateUserBuilder",
+	"derive": "Debug, Clone",
+	"uses": [
+			"crate::clients::{CosmosUriBuilder, UserClient, ResourceType}",
+			"crate::prelude::*",
+			"crate::responses::CreateUserResponse",
+			"azure_sdk_core::errors::{check_status_extract_headers_and_body, AzureError}",
+			"hyper::StatusCode",
+			"std::convert::TryInto"
+	],
+	"extra_types": [ "'a", "CUB" ],
+	"inline": true,
+	"extra_wheres": [ "CUB: CosmosUriBuilder" ],
+	"constructor_fields": [
+		{
+			"name": "user_client",
+			"field_type": "&'a UserClient<'a, CUB>",
+			"trait_get": "UserClientRequired<'a, CUB>"
+		}
+	],
+	"fields": [
+	]
+}