Cosmos: Adds GlobalEndpointManager, ClientRetryPolicy and LocationCache To Support Cross-Regional Routing

Cargo.toml

@@ -153,6 +153,7 @@ wasm-bindgen-futures = "0.4"
 wasm-bindgen-test = "0.3"
 zerofrom = "0.1.5"
 zip = { version = "4.0.0", default-features = false, features = ["deflate"] }
+moka = { version = "0.12", features = ["future"] }
 
 [workspace.lints.clippy]
 large_futures = "deny"

sdk/cosmos/.dict.txt

@@ -8,6 +8,9 @@ udfs
 backoff
 pluggable
 cloneable
+moka
+substatus
+retryable
 
 # Cosmos' docs all use "Autoscale" as a single word, rather than a compound "AutoScale" or "Auto Scale"
 autoscale

sdk/cosmos/azure_data_cosmos/Cargo.toml

@@ -21,6 +21,7 @@ serde_json.workspace = true
 serde.workspace = true
 tracing.workspace = true
 url.workspace = true
+moka.workspace = true
 
 [dev-dependencies]
 azure_identity.workspace = true

sdk/cosmos/azure_data_cosmos/src/clients/container_client.rs

@@ -9,8 +9,9 @@ use crate::{
     DeleteContainerOptions, FeedPager, ItemOptions, PartitionKey, Query, ReplaceContainerOptions,
     ThroughputOptions,
 };
+use std::sync::Arc;
 
-use crate::cosmos_request::CosmosRequestBuilder;
+use crate::cosmos_request::CosmosRequest;
 use crate::operation_context::OperationType;
 use azure_core::http::response::Response;
 use serde::{de::DeserializeOwned, Serialize};
@@ -22,19 +23,19 @@ use serde::{de::DeserializeOwned, Serialize};
 pub struct ContainerClient {
     link: ResourceLink,
     items_link: ResourceLink,
-    pipeline: CosmosPipeline,
+    pipeline: Arc<CosmosPipeline>,
 }
 
 impl ContainerClient {
     pub(crate) fn new(
-        pipeline: CosmosPipeline,
+        pipeline: Arc<CosmosPipeline>,
         database_link: &ResourceLink,
         container_id: &str,
     ) -> Self {
         let link = database_link
             .feed(ResourceType::Containers)
             .item(container_id);
-        let items_link = link.feed(ResourceType::Items);
+        let items_link = link.feed(ResourceType::Documents);
 
         Self {
             link,
@@ -65,13 +66,9 @@ impl ContainerClient {
     ) -> azure_core::Result<Response<ContainerProperties>> {
         let options = options.unwrap_or_default();
         let cosmos_request =
-            CosmosRequestBuilder::new(OperationType::Read, ResourceType::Containers).build()?;
+            CosmosRequest::builder(OperationType::Read, self.link.clone()).build()?;
         self.pipeline
-            .send(
-                cosmos_request,
-                self.link.clone(),
-                options.method_options.context,
-            )
+            .send(cosmos_request, options.method_options.context)
             .await
     }
 
@@ -111,14 +108,10 @@ impl ContainerClient {
         options: Option<ReplaceContainerOptions<'_>>,
     ) -> azure_core::Result<Response<ContainerProperties>> {
         let options = options.unwrap_or_default();
-        let builder = CosmosRequestBuilder::new(OperationType::Replace, ResourceType::Containers);
+        let builder = CosmosRequest::builder(OperationType::Replace, self.link.clone());
         let cosmos_request = builder.json(&properties).build()?;
         self.pipeline
-            .send(
-                cosmos_request,
-                self.link.clone(),
-                options.method_options.context,
-            )
+            .send(cosmos_request, options.method_options.context)
             .await
     }
 
@@ -181,14 +174,10 @@ impl ContainerClient {
         options: Option<DeleteContainerOptions<'_>>,
     ) -> azure_core::Result<Response<()>> {
         let options = options.unwrap_or_default();
-        let builder = CosmosRequestBuilder::new(OperationType::Delete, ResourceType::Containers);
+        let builder = CosmosRequest::builder(OperationType::Delete, self.link.clone());
         let cosmos_request = builder.build()?;
         self.pipeline
-            .send(
-                cosmos_request,
-                self.link.clone(),
-                options.method_options.context,
-            )
+            .send(cosmos_request, options.method_options.context)
             .await
     }
 
@@ -264,19 +253,15 @@ impl ContainerClient {
         options: Option<ItemOptions<'_>>,
     ) -> azure_core::Result<Response<()>> {
         let options = options.clone().unwrap_or_default();
-        let builder = CosmosRequestBuilder::new(OperationType::Create, ResourceType::Items);
+        let builder = CosmosRequest::builder(OperationType::Create, self.items_link.clone());
         let cosmos_request = builder
             .headers(&options)
             .json(&item)
             .partition_key(partition_key.into())
             .build()?;
 
         self.pipeline
-            .send(
-                cosmos_request,
-                self.items_link.clone(),
-                options.method_options.context,
-            )
+            .send(cosmos_request, options.method_options.context)
             .await
     }
 
@@ -354,15 +339,15 @@ impl ContainerClient {
     ) -> azure_core::Result<Response<()>> {
         let link = self.items_link.item(item_id);
         let options = options.clone().unwrap_or_default();
-        let builder = CosmosRequestBuilder::new(OperationType::Replace, ResourceType::Items);
+        let builder = CosmosRequest::builder(OperationType::Replace, link);
         let cosmos_request = builder
             .headers(&options)
             .json(&item)
             .partition_key(partition_key.into())
             .build()?;
 
         self.pipeline
-            .send(cosmos_request, link, options.method_options.context)
+            .send(cosmos_request, options.method_options.context)
             .await
     }
 
@@ -441,19 +426,15 @@ impl ContainerClient {
         options: Option<ItemOptions<'_>>,
     ) -> azure_core::Result<Response<()>> {
         let options = options.clone().unwrap_or_default();
-        let builder = CosmosRequestBuilder::new(OperationType::Upsert, ResourceType::Items);
+        let builder = CosmosRequest::builder(OperationType::Upsert, self.items_link.clone());
         let cosmos_request = builder
             .headers(&options)
             .json(&item)
             .partition_key(partition_key.into())
             .build()?;
 
         self.pipeline
-            .send(
-                cosmos_request,
-                self.items_link.clone(),
-                options.method_options.context,
-            )
+            .send(cosmos_request, options.method_options.context)
             .await
     }
 
@@ -499,14 +480,14 @@ impl ContainerClient {
         options.enable_content_response_on_write = true;
 
         let link = self.items_link.item(item_id);
-        let builder = CosmosRequestBuilder::new(OperationType::Read, ResourceType::Items);
+        let builder = CosmosRequest::builder(OperationType::Read, link);
         let cosmos_request = builder
             .partition_key(partition_key.into())
             .headers(&options)
             .build()?;
 
         self.pipeline
-            .send(cosmos_request, link, options.method_options.context)
+            .send(cosmos_request, options.method_options.context)
             .await
     }
 
@@ -539,14 +520,14 @@ impl ContainerClient {
         let link = self.items_link.item(item_id);
         let options = options.clone().unwrap_or_default();
 
-        let builder = CosmosRequestBuilder::new(OperationType::Delete, ResourceType::Items);
+        let builder = CosmosRequest::builder(OperationType::Delete, link);
         let cosmos_request = builder
             .partition_key(partition_key.into())
             .headers(&options)
             .build()?;
 
         self.pipeline
-            .send(cosmos_request, link, options.method_options.context)
+            .send(cosmos_request, options.method_options.context)
             .await
     }
 
@@ -614,15 +595,15 @@ impl ContainerClient {
     ) -> azure_core::Result<Response<()>> {
         let options = options.clone().unwrap_or_default();
         let link = self.items_link.item(item_id);
-        let builder = CosmosRequestBuilder::new(OperationType::Patch, ResourceType::Items);
+        let builder = CosmosRequest::builder(OperationType::Patch, link);
         let cosmos_request = builder
             .partition_key(partition_key.into())
             .headers(&options)
             .json(&patch)
             .build()?;
 
         self.pipeline
-            .send(cosmos_request, link, options.method_options.context)
+            .send(cosmos_request, options.method_options.context)
             .await
     }