Create azure_data_tables crate from azure_storage

Author: johnbatty

.github/workflows/build.yml

@@ -143,7 +143,7 @@ jobs:
 
     - name: e2e tests build
       run: |
-        PROJECTS=(core  cosmos  identity  messaging_servicebus  storage)
+        PROJECTS=(core  cosmos  identity  messaging_servicebus  storage  data_tables)
         for PROJ in ${PROJECTS[@]}
         do
           echo "Checking e2e tests for $PROJ"

sdk/data_tables/Cargo.toml

@@ -0,0 +1,32 @@
+[package]
+name = "azure_data_tables"
+version = "0.1.0"
+description = "Rust wrappers around Microsoft Azure Data Tables REST APIs"
+readme = "README.md"
+authors = ["Microsoft Corp."]
+license = "MIT"
+repository = "https://github.com/azure/azure-sdk-for-rust"
+homepage = "https://github.com/azure/azure-sdk-for-rust"
+documentation = "https://docs.rs/azure_data_tables"
+keywords = ["sdk", "azure", "rest", "iot", "cloud", "data", "tables"]
+categories = ["api-bindings"]
+edition = "2018"
+
+[dependencies]
+azure_core = { path = "../core", version = "0.1.0" }
+azure_storage = { path = "../storage", version = "0.1.0" }
+bytes = "1.0"
+chrono = { version = "0.4", features = ["serde"] }
+futures = "0.3"
+http = "0.2"
+log = "0.4"
+once_cell = "1.0"
+serde = { version = "1.0" }
+serde_derive = "1.0"
+serde_json = "1.0"
+serde-xml-rs = "0.4"
+uuid = { version = "0.8", features = ["v4"] }
+url = "2.2"
+
+[dev-dependencies]
+tokio = { version = "1.0", features = ["full"] }

sdk/data_tables/README.md

@@ -0,0 +1,12 @@
+# Azure SDK for Rust - Azure Data Tables
+
+Azure Data Tables crate for the unofficial Microsoft Azure SDK for Rust. This crate is part of a collection of crates: for more information please refer to [https://github.com/azure/azure-sdk-for-rust](https://github.com/azure/azure-sdk-for-rust).
+
+## Usage
+
+To set this crate as a dependency, add this to your Cargo.toml
+
+```toml
+[dependencies]
+azure_data_tables = { version = "0.1.0", git = "https://github.com/Azure/azure-sdk-for-rust" }
+```

sdk/storage/examples/table_00.rs renamed to sdk/data_tables/examples/table_00.rs

@@ -1,5 +1,5 @@
+use azure_data_tables::prelude::*;
 use azure_storage::core::prelude::*;
-use azure_storage::table::prelude::*;
 use futures::stream::StreamExt;
 use serde::{Deserialize, Serialize};
 use std::error::Error;
@@ -34,8 +34,8 @@ async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
         .as_storage_client()
         .as_table_service_client()?;
 
-    let table = table_service.as_table_client(table_name);
-    let response = table.create().execute().await?;
+    let table_client = table_service.as_table_client(table_name);
+    let response = table_client.create().execute().await?;
     println!("response = {:?}\n", response);
 
     let mut entity = MyEntity {
@@ -44,17 +44,17 @@ async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
         surname: "Cogno".to_owned(),
     };
 
-    let partition_key_client = table.as_partition_key_client(&entity.city);
+    let partition_key_client = table_client.as_partition_key_client(&entity.city);
 
     let mut transaction = Transaction::default();
 
-    transaction.add(table.insert().to_transaction_operation(&entity)?);
+    transaction.add(table_client.insert().to_transaction_operation(&entity)?);
 
     entity.surname = "Doe".to_owned();
-    transaction.add(table.insert().to_transaction_operation(&entity)?);
+    transaction.add(table_client.insert().to_transaction_operation(&entity)?);
 
     entity.surname = "Karl".to_owned();
-    transaction.add(table.insert().to_transaction_operation(&entity)?);
+    transaction.add(table_client.insert().to_transaction_operation(&entity)?);
 
     entity.surname = "Potter".to_owned();
     let entity_client = partition_key_client.as_entity_client(&entity.surname)?;
@@ -73,7 +73,11 @@ async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
     let response = entity_client.delete().execute().await?;
     println!("response = {:?}\n", response);
 
-    let response = table.insert().return_entity(false).execute(&entity).await?;
+    let response = table_client
+        .insert()
+        .return_entity(false)
+        .execute(&entity)
+        .await?;
     println!("response = {:?}\n", response);
 
     // Get an entity from the table
@@ -83,10 +87,14 @@ async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
     let mut entity: MyEntity = response.entity;
     entity.city = "Rome".to_owned();
 
-    let response = table.insert().return_entity(true).execute(&entity).await?;
+    let response = table_client
+        .insert()
+        .return_entity(true)
+        .execute(&entity)
+        .await?;
     println!("response = {:?}\n", response);
 
-    let entity_client = table
+    let entity_client = table_client
         .as_partition_key_client(&entity.city)
         .as_entity_client(&entity.surname)?;
     // update the name passing the Etag received from the previous call.
@@ -108,7 +116,7 @@ async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
     }
 
     let mut stream = Box::pin(
-        table
+        table_client
             .query()
             .filter("Name = 'Carl'")
             .top(2)
@@ -118,7 +126,7 @@ async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
         println!("response = {:?}\n", response);
     }
 
-    let response = table.delete().execute().await?;
+    let response = table_client.delete().execute().await?;
     println!("response = {:?}\n", response);
 
     Ok(())

sdk/storage/src/table/clients/entity_client.rs renamed to sdk/data_tables/src/clients/entity_client.rs

@@ -1,5 +1,5 @@
-use crate::table::prelude::*;
-use crate::table::requests::*;
+use crate::prelude::*;
+use crate::requests::*;
 use bytes::Bytes;
 use http::method::Method;
 use http::request::{Builder, Request};

sdk/storage/src/table/clients/mod.rs renamed to sdk/data_tables/src/clients/mod.rs

@@ -1,6 +1,6 @@
-use crate::core::clients::StorageAccountClient;
-use crate::table::prelude::*;
-use crate::table::requests::*;
+use crate::prelude::*;
+use crate::requests::*;
+use azure_storage::core::clients::StorageAccountClient;
 use bytes::Bytes;
 use http::method::Method;
 use http::request::{Builder, Request};

sdk/storage/src/table/clients/partition_key_client.rs renamed to sdk/data_tables/src/clients/partition_key_client.rs

@@ -1,6 +1,6 @@
-use crate::core::clients::StorageAccountClient;
-use crate::table::clients::TableServiceClient;
-use crate::table::requests::*;
+use crate::clients::TableServiceClient;
+use crate::requests::*;
+use azure_storage::core::clients::StorageAccountClient;
 use bytes::Bytes;
 use http::method::Method;
 use http::request::{Builder, Request};

sdk/storage/src/table/clients/table_client.rs renamed to sdk/data_tables/src/clients/table_client.rs

@@ -1,5 +1,5 @@
-use crate::core::clients::{StorageAccountClient, StorageClient};
-use crate::table::requests::ListTablesBuilder;
+use crate::requests::ListTablesBuilder;
+use azure_storage::core::clients::{StorageAccountClient, StorageClient};
 use bytes::Bytes;
 use http::method::Method;
 use http::request::{Builder, Request};
@@ -67,7 +67,7 @@ impl TableServiceClient {
                 url,
                 method,
                 http_header_adder,
-                crate::core::clients::ServiceType::Table,
+                azure_storage::core::clients::ServiceType::Table,
                 request_body,
             )
     }

sdk/storage/src/table/clients/table_service_client.rs renamed to sdk/data_tables/src/clients/table_service_client.rs

@@ -1,3 +1,12 @@
+#[macro_use]
+extern crate log;
+#[macro_use]
+extern crate serde_derive;
+#[macro_use]
+extern crate azure_core;
+
+pub use azure_storage::{Error, Result};
+
 pub mod clients;
 mod continuation_next_partition_and_row_key;
 mod continuation_next_table_name;

sdk/storage/src/table/continuation_next_partition_and_row_key.rs renamed to sdk/data_tables/src/continuation_next_partition_and_row_key.rs

@@ -1,5 +1,5 @@
-pub use crate::table::clients::{
+pub use crate::clients::{
     AsEntityClient, AsPartitionKeyClient, AsTableClient, AsTableServiceClient, EntityClient,
     PartitionKeyClient, TableClient, TableServiceClient,
 };
-pub use crate::table::{Filter, IfMatchCondition, ReturnEntity, Select, Table, Top, Transaction};
+pub use crate::{Filter, IfMatchCondition, ReturnEntity, Select, Table, Top, Transaction};

sdk/storage/src/table/continuation_next_table_name.rs renamed to sdk/data_tables/src/continuation_next_table_name.rs

@@ -1,5 +1,5 @@
-use crate::table::prelude::*;
-use crate::table::responses::*;
+use crate::prelude::*;
+use crate::responses::*;
 use azure_core::headers::add_optional_header;
 use azure_core::prelude::*;
 use http::method::Method;

sdk/storage/src/table/entity_metadata.rs renamed to sdk/data_tables/src/entity_metadata.rs

@@ -1,7 +1,7 @@
-use crate::table::prelude::IfMatchCondition;
-use crate::table::prelude::*;
-use crate::table::responses::*;
-use crate::table::TransactionOperation;
+use crate::prelude::IfMatchCondition;
+use crate::prelude::*;
+use crate::responses::*;
+use crate::TransactionOperation;
 use azure_core::headers::{add_mandatory_header, add_optional_header};
 use azure_core::prelude::*;
 use http::{method::Method, StatusCode};

sdk/storage/src/table/entity_with_metadata.rs renamed to sdk/data_tables/src/entity_with_metadata.rs

@@ -1,5 +1,5 @@
-use crate::table::prelude::*;
-use crate::table::responses::*;
+use crate::prelude::*;
+use crate::responses::*;
 use azure_core::headers::add_optional_header;
 use azure_core::prelude::*;
 use http::method::Method;

sdk/storage/src/table/filter.rs renamed to sdk/data_tables/src/filter.rs

@@ -1,5 +1,5 @@
-use crate::table::prelude::*;
-use crate::table::responses::*;
+use crate::prelude::*;
+use crate::responses::*;
 use azure_core::prelude::*;
 use azure_core::{headers::add_optional_header, AppendToUrlQuery};
 use http::method::Method;

sdk/storage/src/table/if_match_condition.rs renamed to sdk/data_tables/src/if_match_condition.rs

@@ -1,6 +1,6 @@
-use crate::table::prelude::*;
-use crate::table::responses::*;
-use crate::table::TransactionOperation;
+use crate::prelude::*;
+use crate::responses::*;
+use crate::TransactionOperation;
 use azure_core::headers::{add_mandatory_header, add_optional_header};
 use azure_core::prelude::*;
 use http::method::Method;

sdk/storage/src/table/mod.rs renamed to sdk/data_tables/src/lib.rs

@@ -1,6 +1,6 @@
-use crate::table::prelude::*;
-use crate::table::responses::*;
-use crate::table::TransactionOperation;
+use crate::prelude::*;
+use crate::responses::*;
+use crate::TransactionOperation;
 use azure_core::headers::add_optional_header;
 use azure_core::prelude::*;
 use http::{method::Method, StatusCode};
@@ -54,7 +54,7 @@ impl<'a> InsertOrReplaceOrMergeEntityBuilder<'a> {
         let request = self.entity_client.prepare_request(
             url.as_str(),
             match self.operation {
-                Operation::InsertOrMerge => &crate::table::MERGE,
+                Operation::InsertOrMerge => &crate::MERGE,
                 Operation::InsertOrReplace => &Method::PUT,
             },
             &|mut request| {
@@ -87,7 +87,7 @@ impl<'a> InsertOrReplaceOrMergeEntityBuilder<'a> {
 
         let request = http::Request::builder()
             .method(match self.operation {
-                Operation::InsertOrMerge => &crate::table::MERGE,
+                Operation::InsertOrMerge => &crate::MERGE,
                 Operation::InsertOrReplace => &Method::PUT,
             })
             .uri(url.as_str());

sdk/storage/src/table/model.rs renamed to sdk/data_tables/src/model.rs

@@ -1,5 +1,5 @@
-use crate::table::responses::*;
-use crate::{table::prelude::*, ContinuationNextTableName};
+use crate::responses::*;
+use crate::{prelude::*, ContinuationNextTableName};
 use azure_core::prelude::*;
 use azure_core::{headers::add_optional_header, AppendToUrlQuery};
 use futures::stream::{unfold, Stream};

sdk/storage/src/table/prelude.rs renamed to sdk/data_tables/src/prelude.rs

@@ -1,5 +1,5 @@
-use crate::table::responses::*;
-use crate::{table::prelude::*, ContinuationNextPartitionAndRowKey};
+use crate::responses::*;
+use crate::{prelude::*, ContinuationNextPartitionAndRowKey};
 use azure_core::prelude::*;
 use azure_core::{headers::add_optional_header, AppendToUrlQuery};
 use futures::stream::{unfold, Stream};

sdk/storage/src/table/requests/create_table_builder.rs renamed to sdk/data_tables/src/requests/create_table_builder.rs

@@ -1,5 +1,5 @@
-use crate::table::prelude::*;
-use crate::table::responses::*;
+use crate::prelude::*;
+use crate::responses::*;
 use azure_core::headers::add_optional_header;
 use azure_core::prelude::*;
 use http::{method::Method, StatusCode};

sdk/storage/src/table/requests/delete_entity_builder.rs renamed to sdk/data_tables/src/requests/delete_entity_builder.rs

@@ -1,7 +1,7 @@
-use crate::table::prelude::*;
-use crate::table::responses::*;
-use crate::table::IfMatchCondition;
-use crate::table::TransactionOperation;
+use crate::prelude::*;
+use crate::responses::*;
+use crate::IfMatchCondition;
+use crate::TransactionOperation;
 use azure_core::headers::{add_mandatory_header, add_optional_header};
 use azure_core::prelude::*;
 use http::{method::Method, StatusCode};
@@ -55,7 +55,7 @@ impl<'a> UpdateOrMergeEntityBuilder<'a> {
         let request = self.entity_client.prepare_request(
             url.as_str(),
             match self.operation {
-                Operation::Merge => &crate::table::MERGE,
+                Operation::Merge => &crate::MERGE,
                 Operation::Update => &Method::PUT,
             },
             &|mut request| {
@@ -90,7 +90,7 @@ impl<'a> UpdateOrMergeEntityBuilder<'a> {
 
         let request = http::Request::builder()
             .method(match self.operation {
-                Operation::Merge => &crate::table::MERGE,
+                Operation::Merge => &crate::MERGE,
                 Operation::Update => &Method::PUT,
             })
             .uri(url.as_str());

sdk/storage/src/table/requests/delete_table_builder.rs renamed to sdk/data_tables/src/requests/delete_table_builder.rs

@@ -1,5 +1,5 @@
-use crate::core::headers::CommonStorageResponseHeaders;
-use crate::table::prelude::*;
+use crate::prelude::*;
+use azure_storage::core::headers::CommonStorageResponseHeaders;
 use bytes::Bytes;
 use http::Response;
 use std::convert::{TryFrom, TryInto};

sdk/storage/src/table/requests/get_entity_builder.rs renamed to sdk/data_tables/src/requests/get_entity_builder.rs

@@ -1,4 +1,4 @@
-use crate::core::headers::CommonStorageResponseHeaders;
+use azure_storage::core::headers::CommonStorageResponseHeaders;
 use bytes::Bytes;
 use http::Response;
 use std::convert::{TryFrom, TryInto};

sdk/storage/src/table/requests/insert_entity_builder.rs renamed to sdk/data_tables/src/requests/insert_entity_builder.rs

@@ -1,4 +1,4 @@
-use crate::core::headers::CommonStorageResponseHeaders;
+use azure_storage::core::headers::CommonStorageResponseHeaders;
 use bytes::Bytes;
 use http::Response;
 use std::convert::{TryFrom, TryInto};

sdk/storage/src/table/requests/insert_or_replace_or_merge_entity_builder.rs renamed to sdk/data_tables/src/requests/insert_or_replace_or_merge_entity_builder.rs

@@ -1,4 +1,4 @@
-use crate::core::headers::CommonStorageResponseHeaders;
+use azure_storage::core::headers::CommonStorageResponseHeaders;
 use bytes::Bytes;
 use http::Response;
 use serde::de::DeserializeOwned;

sdk/storage/src/table/requests/list_tables_builder.rs renamed to sdk/data_tables/src/requests/list_tables_builder.rs

@@ -1,10 +1,10 @@
-use crate::core::headers::CommonStorageResponseHeaders;
-use crate::core::util::HeaderMapExt;
 use crate::EntityWithMetadata;
 use azure_core::{
     headers::{etag_from_headers, get_str_from_headers},
     Etag,
 };
+use azure_storage::core::headers::CommonStorageResponseHeaders;
+use azure_storage::core::util::HeaderMapExt;
 use bytes::Bytes;
 use http::Response;
 use serde::de::DeserializeOwned;

sdk/storage/src/table/requests/mod.rs renamed to sdk/data_tables/src/requests/mod.rs

@@ -1,5 +1,5 @@
-use crate::core::headers::CommonStorageResponseHeaders;
-use crate::{table::prelude::*, ContinuationNextTableName};
+use crate::{prelude::*, ContinuationNextTableName};
+use azure_storage::core::headers::CommonStorageResponseHeaders;
 use bytes::Bytes;
 use http::Response;
 use std::convert::{TryFrom, TryInto};

sdk/storage/src/table/requests/query_entity_builder.rs renamed to sdk/data_tables/src/requests/query_entity_builder.rs

@@ -1,5 +1,5 @@
-use crate::core::headers::CommonStorageResponseHeaders;
 use azure_core::{headers::etag_from_headers, Etag};
+use azure_storage::core::headers::CommonStorageResponseHeaders;
 use bytes::Bytes;
 use http::Response;
 use std::convert::{TryFrom, TryInto};

sdk/storage/src/table/requests/submit_transaction_builder.rs renamed to sdk/data_tables/src/requests/submit_transaction_builder.rs

@@ -1,5 +1,5 @@
-use crate::core::headers::CommonStorageResponseHeaders;
 use crate::ContinuationNextPartitionAndRowKey;
+use azure_storage::core::headers::CommonStorageResponseHeaders;
 use bytes::Bytes;
 use http::Response;
 use serde::de::DeserializeOwned;