Remove ClientSecretCredential, EnvironmentCredential

.vscode/cspell.json

@@ -65,6 +65,11 @@
       "name": "cosmos",
       "path": "../sdk/cosmos/.dict.txt",
       "noSuggest": true
+    },
+    {
+      "name": "identity",
+      "path": "../sdk/identity/.dict.txt",
+      "noSuggest": true
     }
   ],
   "overrides": [
@@ -94,11 +99,10 @@
     },
     {
       "filename": "sdk/identity/**",
-      "words": [
-        "adfs",
-        "azureauth",
-        "msal",
-        "imds"
+      "dictionaries": [
+        "crates",
+        "rust-custom",
+        "identity"
       ]
     },
     {

sdk/cosmos/azure_data_cosmos/examples/cosmos_connect.rs

@@ -1,5 +1,6 @@
 use azure_data_cosmos::{clients::DatabaseClientMethods, CosmosClient, CosmosClientMethods};
 use clap::Parser;
+use std::sync::Arc;
 
 /// A simple example to show connecting to a Cosmos DB Account and retrieving the properties of a database.
 #[derive(Parser)]
@@ -33,13 +34,13 @@ fn create_client(args: &Args) -> CosmosClient {
     if let Some(key) = args.key.as_ref() {
         CosmosClient::with_key(&args.endpoint, key.clone(), None).unwrap()
     } else {
-        let cred = azure_identity::create_default_credential().unwrap();
+        let cred = Arc::new(azure_identity::DefaultAzureCredential::new().unwrap());
         CosmosClient::new(&args.endpoint, cred, None).unwrap()
     }
 }
 
 #[cfg(not(feature = "key_auth"))]
 fn create_client(args: &Args) -> CosmosClient {
-    let cred = azure_identity::create_default_credential().unwrap();
+    let cred = Arc::new(azure_identity::DefaultAzureCredential::new().unwrap());
     CosmosClient::new(&args.endpoint, cred, None).unwrap()
 }

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

@@ -42,9 +42,10 @@ impl CosmosClient {
     /// # Examples
     ///
     /// ```rust,no_run
+    /// # use std::sync::Arc;
     /// use azure_data_cosmos::CosmosClient;
     ///
-    /// let credential = azure_identity::create_default_credential().unwrap();
+    /// let credential = Arc::new(azure_identity::DefaultAzureCredential::new().unwrap());
     /// let client = CosmosClient::new("https://myaccount.documents.azure.com/", credential, None).unwrap();
     /// ```
     pub fn new(

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

@@ -21,10 +21,11 @@ pub trait DatabaseClientMethods {
     /// # Examples
     ///
     /// ```rust,no_run
+    /// # use std::sync::Arc;
     /// # async fn doc() {
     /// use azure_data_cosmos::{CosmosClient, CosmosClientMethods, clients::DatabaseClientMethods};
     ///
-    /// let credential = azure_identity::create_default_credential().unwrap();
+    /// let credential = Arc::new(azure_identity::DefaultAzureCredential::new().unwrap());
     /// let client = CosmosClient::new("https://myaccount.documents.azure.com/", credential, None).unwrap();
     /// let db_client = client.database_client("my_database");
     /// let response = db_client.read(None)

sdk/eventhubs/azure_messaging_eventhubs/README.md

@@ -166,7 +166,7 @@ async fn send_events() {
     let host = std::env::var("EVENTHUBS_HOST").unwrap();
     let eventhub = std::env::var("EVENTHUB_NAME").unwrap();
 
-    let credential = azure_identity::DefaultAzureCredential::create(azure_identity::TokenCredentialOptions::default()).unwrap();
+    let credential = azure_identity::DefaultAzureCredential::new().unwrap();
 
     let client = azure_messaging_eventhubs::producer::ProducerClient::new(
         host,
@@ -200,7 +200,7 @@ async fn receive_events() {
     let host = std::env::var("EVENTHUBS_HOST").unwrap();
     let eventhub = std::env::var("EVENTHUB_NAME").unwrap();
 
-    let credential = azure_identity::DefaultAzureCredential::create(azure_identity::TokenCredentialOptions::default()).unwrap();
+    let credential = azure_identity::DefaultAzureCredential::new().unwrap();
     let client = azure_messaging_eventhubs::consumer::ConsumerClient::new(
         host,
         eventhub,

sdk/eventhubs/azure_messaging_eventhubs/examples/eventhubs_partition_properties.rs

@@ -2,7 +2,7 @@
 // Licensed under the MIT license.
 // cspell: words
 use azure_core::error::Result;
-use azure_identity::{DefaultAzureCredential, TokenCredentialOptions};
+use azure_identity::DefaultAzureCredential;
 use azure_messaging_eventhubs::producer::{ProducerClient, ProducerClientOptions};
 
 use std::env;
@@ -17,7 +17,7 @@ async fn main() -> Result<()> {
     let host = env::var("EVENTHUBS_HOST").unwrap();
     let eventhub = env::var("EVENTHUB_NAME").unwrap();
 
-    let credential = DefaultAzureCredential::create(TokenCredentialOptions::default()).unwrap();
+    let credential = DefaultAzureCredential::new().unwrap();
 
     let client = ProducerClient::new(
         host,

sdk/eventhubs/azure_messaging_eventhubs/examples/eventhubs_properties.rs

@@ -3,7 +3,7 @@
 // cspell: words
 
 use azure_core::error::Result;
-use azure_identity::{DefaultAzureCredential, TokenCredentialOptions};
+use azure_identity::DefaultAzureCredential;
 use azure_messaging_eventhubs::producer::{ProducerClient, ProducerClientOptions};
 
 use std::env;
@@ -18,7 +18,7 @@ async fn main() -> Result<()> {
     let host = env::var("EVENTHUBS_HOST").unwrap();
     let eventhub = env::var("EVENTHUB_NAME").unwrap();
 
-    let credential = DefaultAzureCredential::create(TokenCredentialOptions::default()).unwrap();
+    let credential = DefaultAzureCredential::new().unwrap();
 
     let client = ProducerClient::new(
         host,

sdk/eventhubs/azure_messaging_eventhubs/src/consumer/README.md

@@ -15,7 +15,7 @@ and manage the lifecycle of the consumer client.
 use azure_messaging_eventhubs::consumer::ConsumerClient;
 use azure_identity::{DefaultAzureCredential, TokenCredentialOptions};
 
-let my_credential = DefaultAzureCredential::create(TokenCredentialOptions::default()).unwrap();
+let my_credential = DefaultAzureCredential::new().unwrap();
 let consumer = ConsumerClient::new("my_namespace", "my_eventhub", None, my_credential, None);
 ```
 
@@ -27,7 +27,7 @@ use azure_identity::{DefaultAzureCredential, TokenCredentialOptions};
 
 #[tokio::main]
 async fn main() {
-    let my_credential = DefaultAzureCredential::create(TokenCredentialOptions::default()).unwrap();
+    let my_credential = DefaultAzureCredential::new().unwrap();
     let consumer = ConsumerClient::new("my_namespace", "my_eventhub", None, my_credential, None);
 
     let result = consumer.open().await;
@@ -53,7 +53,7 @@ use azure_identity::{DefaultAzureCredential, TokenCredentialOptions};
 
 #[tokio::main]
 async fn main() {
-    let my_credential = DefaultAzureCredential::create(TokenCredentialOptions::default()).unwrap();
+    let my_credential = DefaultAzureCredential::new().unwrap();
     let consumer = ConsumerClient::new("my_namespace", "my_eventhub", None, my_credential, None);
 
     consumer.open().await.unwrap();
@@ -82,7 +82,7 @@ use async_std::stream::StreamExt;
 
 #[tokio::main]
 async fn main() {
-    let my_credential = DefaultAzureCredential::create(TokenCredentialOptions::default()).unwrap();
+    let my_credential = DefaultAzureCredential::new().unwrap();
     let consumer = ConsumerClient::new("my_namespace", "my_eventhub", None, my_credential, None);
     let partition_id = "0";
     let options = None;

sdk/eventhubs/azure_messaging_eventhubs/src/consumer/mod.rs

@@ -75,7 +75,7 @@ impl ConsumerClient {
     /// use azure_messaging_eventhubs::consumer::ConsumerClient;
     /// use azure_identity::{DefaultAzureCredential, TokenCredentialOptions};
     ///
-    ///     let my_credential = DefaultAzureCredential::create(TokenCredentialOptions::default()).unwrap();
+    ///     let my_credential = DefaultAzureCredential::new()?;
     /// let consumer = ConsumerClient::new("my_namespace", "my_eventhub", None, my_credential, None);
     /// # Ok(())}
     /// ```
@@ -124,7 +124,7 @@ impl ConsumerClient {
     ///
     /// #[tokio::main]
     /// async fn main() {
-    ///     let my_credential = DefaultAzureCredential::create(TokenCredentialOptions::default()).unwrap();
+    ///     let my_credential = DefaultAzureCredential::new().unwrap();
     ///     let consumer = ConsumerClient::new("my_namespace", "my_eventhub", None, my_credential, None);
     ///
     ///     let result = consumer.open().await;
@@ -166,7 +166,7 @@ impl ConsumerClient {
     ///
     /// #[tokio::main]
     /// async fn main() {
-    ///     let my_credential = DefaultAzureCredential::create(TokenCredentialOptions::default()).unwrap();
+    ///     let my_credential = DefaultAzureCredential::new().unwrap();
     ///     let consumer = ConsumerClient::new("my_namespace", "my_eventhub", None, my_credential, None);
     ///
     ///     consumer.open().await.unwrap();
@@ -214,7 +214,7 @@ impl ConsumerClient {
     ///
     /// #[tokio::main]
     /// async fn main() {
-    ///     let my_credential = DefaultAzureCredential::create(TokenCredentialOptions::default()).unwrap();
+    ///     let my_credential = DefaultAzureCredential::new().unwrap();
     ///     let consumer = ConsumerClient::new("my_namespace", "my_eventhub", None, my_credential, None);
     ///     let partition_id = "0";
     ///     let options = None;
@@ -315,7 +315,7 @@ impl ConsumerClient {
     ///
     /// #[tokio::main]
     /// async fn main() {
-    ///     let my_credential = DefaultAzureCredential::create(TokenCredentialOptions::default()).unwrap();
+    ///     let my_credential = DefaultAzureCredential::new().unwrap();
     ///     let consumer = ConsumerClient::new("my_namespace", "my_eventhub", None, my_credential, None);
     ///
     ///     let eventhub_properties = consumer.get_eventhub_properties().await;
@@ -366,7 +366,7 @@ impl ConsumerClient {
     ///
     /// #[tokio::main]
     /// async fn main() {
-    ///     let my_credential = DefaultAzureCredential::create(TokenCredentialOptions::default()).unwrap();
+    ///     let my_credential = DefaultAzureCredential::new().unwrap();
     ///     let consumer = ConsumerClient::new("my_namespace", "my_eventhub", None, my_credential, None);
     ///     let partition_id = "0";
     ///

sdk/eventhubs/azure_messaging_eventhubs/src/lib.rs

@@ -19,7 +19,7 @@
 /// # use azure_identity::{DefaultAzureCredential, TokenCredentialOptions};
 /// # #[tokio::main]
 /// # async fn main() -> Result<(), Box<dyn std::error::Error + 'static>> {
-/// # let my_credentials = DefaultAzureCredential::create(TokenCredentialOptions::default()).unwrap();
+/// # let my_credentials = DefaultAzureCredential::new()?;
 
 /// use azure_messaging_eventhubs::consumer::ConsumerClient;
 /// use azure_messaging_eventhubs::models::EventData;
@@ -83,7 +83,7 @@ pub mod models {
     /// # use azure_identity::{DefaultAzureCredential, TokenCredentialOptions};
     /// # #[tokio::main]
     /// # async fn main() -> Result<(), Box<dyn std::error::Error>> {
-    /// # let my_credentials = DefaultAzureCredential::create(TokenCredentialOptions::default()).unwrap();
+    /// # let my_credentials = DefaultAzureCredential::new()?;
     /// let consumer_client = azure_messaging_eventhubs::consumer::ConsumerClient::new("fully_qualified_domain", "eventhub_name", None, my_credentials, None);
     ///
     /// let eventhub_properties = consumer_client.get_eventhub_properties().await?;
@@ -128,7 +128,7 @@ pub mod models {
     /// # use azure_identity::{DefaultAzureCredential, TokenCredentialOptions};
     /// # #[tokio::main]
     /// # async fn main() -> Result<(), Box<dyn std::error::Error>> {
-    /// # let my_credentials = DefaultAzureCredential::create(TokenCredentialOptions::default()).unwrap();
+    /// # let my_credentials = DefaultAzureCredential::new()?;
     /// let consumer_client = azure_messaging_eventhubs::consumer::ConsumerClient::new("fully_qualified_domain", "eventhub_name", None, my_credentials, None);
     ///
     /// let partition_properties = consumer_client.get_partition_properties("0").await?;

sdk/eventhubs/azure_messaging_eventhubs/src/producer/batch.rs

@@ -39,7 +39,7 @@ struct EventDataBatchState {
 /// # use azure_identity::TokenCredentialOptions;
 ///
 /// # async fn send_event_batch() -> Result<(), Box<dyn std::error::Error>> {
-/// # let credentials = azure_identity::DefaultAzureCredential::create(TokenCredentialOptions::default()).unwrap();
+/// # let credentials = azure_identity::DefaultAzureCredential::new()?;
 /// # let producer_client = ProducerClient::new("fully_qualified_domain_name", "event_hub_name", credentials, ProducerClientOptions::builder().build());
 ///
 /// let mut batch = producer_client.create_batch(None).await?;
@@ -154,7 +154,7 @@ impl<'a> EventDataBatch<'a> {
     /// # use azure_messaging_eventhubs::models::EventData;
     ///
     /// # async fn send_event_batch() -> Result<(), Box<dyn std::error::Error>> {
-    /// # let my_credential = azure_identity::DefaultAzureCredential::create(azure_identity::TokenCredentialOptions::default()).unwrap();
+    /// # let my_credential = azure_identity::DefaultAzureCredential::new()?;
     /// # let producer_client = ProducerClient::new("fully_qualified_domain_name", "event_hub_name", my_credential, ProducerClientOptions::builder().build());
     /// let mut batch = producer_client.create_batch(None).await?;
     ///
@@ -201,7 +201,7 @@ impl<'a> EventDataBatch<'a> {
     /// # use azure_messaging_eventhubs::models::AmqpMessage;
     ///
     /// # async fn send_event_batch() -> Result<(), Box<dyn std::error::Error>> {
-    /// # let my_credential = azure_identity::DefaultAzureCredential::create(azure_identity::TokenCredentialOptions::default()).unwrap();
+    /// # let my_credential = azure_identity::DefaultAzureCredential::new()?;
     /// # let producer_client = ProducerClient::new("fully_qualified_domain_name", "event_hub_name", my_credential, ProducerClientOptions::builder().build());
     /// let mut batch = producer_client.create_batch(None).await?;
     ///

sdk/eventhubs/azure_messaging_eventhubs/src/producer/mod.rs

@@ -72,7 +72,7 @@ struct SenderInstance {
 /// async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
 ///    let fully_qualified_namespace = std::env::var("EVENT_HUB_NAMESPACE")?;
 ///    let eventhub_name = std::env::var("EVENT_HUB_NAME")?;
-///    let my_credentials = DefaultAzureCredential::create(TokenCredentialOptions::default()).unwrap();
+///    let my_credentials = DefaultAzureCredential::new()?;
 ///    let options = ProducerClientOptions::builder()
 ///      .with_application_id("your_application_id")
 ///      .build();
@@ -165,7 +165,7 @@ impl ProducerClient {
     /// async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
     ///   let fully_qualified_namespace = std::env::var("EVENT_HUB_NAMESPACE")?;
     ///   let eventhub_name = std::env::var("EVENT_HUB_NAME")?;
-    ///   let my_credentials = DefaultAzureCredential::create(TokenCredentialOptions::default()).unwrap();
+    ///   let my_credentials = DefaultAzureCredential::new()?;
     ///   let options = ProducerClientOptions::builder()
     ///     .with_application_id("your_application_id")
     ///     .build();
@@ -207,7 +207,7 @@ impl ProducerClient {
     /// async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
     ///   let fully_qualified_namespace = std::env::var("EVENT_HUB_NAMESPACE")?;
     ///   let eventhub_name = std::env::var("EVENT_HUB_NAME")?;
-    ///   let my_credentials = DefaultAzureCredential::create(TokenCredentialOptions::default()).unwrap();
+    ///   let my_credentials = DefaultAzureCredential::new()?;
     ///   let options = ProducerClientOptions::builder()
     ///    .with_application_id("your_application_id")
     ///    .build();
@@ -252,7 +252,7 @@ impl ProducerClient {
     /// async fn main() -> Result<(), Box<dyn Error + Send + Sync>> {
     ///   let fully_qualified_namespace = std::env::var("EVENT_HUB_NAMESPACE")?;
     ///   let eventhub_name = std::env::var("EVENT_HUB_NAME")?;
-    ///   let my_credentials = DefaultAzureCredential::create(TokenCredentialOptions::default()).unwrap();
+    ///   let my_credentials = DefaultAzureCredential::new()?;
     ///   let producer = ProducerClient::new(fully_qualified_namespace, eventhub_name, my_credentials, ProducerClientOptions::builder().build());
     ///   producer.open().await?;
     ///   let properties = producer.get_eventhub_properties().await?;
@@ -290,7 +290,7 @@ impl ProducerClient {
     ///  let fully_qualified_namespace = std::env::var("EVENT_HUB_NAMESPACE")?;
     ///     let eventhub_name = std::env::var("EVENT_HUB_NAME")?;
     ///     let eventhub_name = std::env::var("EVENT_HUB_NAME")?;
-    ///     let my_credentials = DefaultAzureCredential::create(TokenCredentialOptions::default()).unwrap();
+    ///     let my_credentials = DefaultAzureCredential::new()?;
     ///     let producer = ProducerClient::new(fully_qualified_namespace, eventhub_name, my_credentials, ProducerClientOptions::builder().build());
     ///     producer.open().await?;
     ///     let partition_properties = producer.get_partition_properties("0").await?;

sdk/eventhubs/azure_messaging_eventhubs/tests/consumer.rs

@@ -6,7 +6,7 @@
 #![cfg(all(test, feature = "test_e2e"))] // to run this, do: `cargo test --features test_e2e`
 
 use async_std::future::timeout;
-use azure_identity::{DefaultAzureCredential, TokenCredentialOptions};
+use azure_identity::DefaultAzureCredential;
 use azure_messaging_eventhubs::consumer::{
     ConsumerClient, ConsumerClientOptions, ReceiveOptions, StartPosition,
 };
@@ -25,7 +25,7 @@ async fn test_new() {
         host,
         eventhub,
         None,
-        DefaultAzureCredential::create(TokenCredentialOptions::default()).unwrap(),
+        DefaultAzureCredential::new().unwrap(),
         Some(
             ConsumerClientOptions::builder()
                 .with_application_id("test_new")
@@ -43,7 +43,7 @@ async fn test_new_with_error() {
         "invalid_host",
         eventhub,
         None,
-        DefaultAzureCredential::create(TokenCredentialOptions::default()).unwrap(),
+        DefaultAzureCredential::new().unwrap(),
         Some(
             ConsumerClientOptions::builder()
                 .with_application_id("test_new")
@@ -64,7 +64,7 @@ async fn test_open() {
         host,
         eventhub,
         None,
-        azure_identity::DefaultAzureCredential::create(TokenCredentialOptions::default()).unwrap(),
+        azure_identity::DefaultAzureCredential::new().unwrap(),
         Some(
             ConsumerClientOptions::builder()
                 .with_application_id("test_open")
@@ -82,7 +82,7 @@ async fn test_close() {
         host,
         eventhub,
         None,
-        azure_identity::DefaultAzureCredential::create(TokenCredentialOptions::default()).unwrap(),
+        azure_identity::DefaultAzureCredential::new().unwrap(),
         Some(
             ConsumerClientOptions::builder()
                 .with_application_id("test_close")
@@ -99,7 +99,7 @@ async fn test_get_properties() {
     let host = env::var("EVENTHUBS_HOST").unwrap();
     let eventhub = env::var("EVENTHUB_NAME").unwrap();
 
-    let credential = DefaultAzureCredential::create(TokenCredentialOptions::default()).unwrap();
+    let credential = DefaultAzureCredential::new().unwrap();
 
     let client = ConsumerClient::new(
         host,
@@ -124,7 +124,7 @@ async fn test_get_partition_properties() {
     let host = env::var("EVENTHUBS_HOST").unwrap();
     let eventhub = env::var("EVENTHUB_NAME").unwrap();
 
-    let credential = DefaultAzureCredential::create(TokenCredentialOptions::default()).unwrap();
+    let credential = DefaultAzureCredential::new().unwrap();
 
     let client = ConsumerClient::new(
         host,
@@ -159,7 +159,7 @@ async fn receive_lots_of_events() {
 
     info!("Establishing credentials.");
 
-    let credential = DefaultAzureCredential::create(TokenCredentialOptions::default()).unwrap();
+    let credential = DefaultAzureCredential::new().unwrap();
 
     info!("Creating client.");
     let client = ConsumerClient::new(