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/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/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(

sdk/eventhubs/azure_messaging_eventhubs/tests/producer.rs

@@ -9,7 +9,7 @@ use azure_core_amqp::{
     messaging::{AmqpMessage, AmqpMessageBody},
     value::{AmqpList, AmqpValue},
 };
-use azure_identity::{DefaultAzureCredential, TokenCredentialOptions};
+use azure_identity::DefaultAzureCredential;
 use azure_messaging_eventhubs::producer::{
     batch::EventDataBatchOptions, ProducerClient, ProducerClientOptions,
 };
@@ -26,7 +26,7 @@ async fn test_new() {
     let _client = ProducerClient::new(
         host,
         eventhub,
-        DefaultAzureCredential::create(TokenCredentialOptions::default()).unwrap(),
+        DefaultAzureCredential::new().unwrap(),
         ProducerClientOptions::builder()
             .with_application_id("test_new")
             .build(),
@@ -40,7 +40,7 @@ async fn test_new_with_error() {
     let producer = ProducerClient::new(
         "invalid_host",
         eventhub,
-        azure_identity::DefaultAzureCredential::create(TokenCredentialOptions::default()).unwrap(),
+        azure_identity::DefaultAzureCredential::new().unwrap(),
         ProducerClientOptions::builder()
             .with_application_id("test_new_with_error")
             .build(),
@@ -58,7 +58,7 @@ async fn test_open() {
     let client = ProducerClient::new(
         host,
         eventhub,
-        azure_identity::DefaultAzureCredential::create(TokenCredentialOptions::default()).unwrap(),
+        azure_identity::DefaultAzureCredential::new().unwrap(),
         ProducerClientOptions::builder()
             .with_application_id("test_open")
             .build(),
@@ -73,7 +73,7 @@ async fn test_close() {
     let client = ProducerClient::new(
         host,
         eventhub,
-        azure_identity::DefaultAzureCredential::create(TokenCredentialOptions::default()).unwrap(),
+        azure_identity::DefaultAzureCredential::new().unwrap(),
         ProducerClientOptions::builder()
             .with_application_id("test_close")
             .build(),
@@ -88,7 +88,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 = ProducerClient::new(
         host,
@@ -110,7 +110,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 = ProducerClient::new(
         host,
@@ -163,7 +163,7 @@ async fn test_create_batch() {
     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,
@@ -186,7 +186,7 @@ async fn test_create_and_send_batch() {
     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,
@@ -238,7 +238,7 @@ async fn test_add_amqp_messages_to_batch() -> Result<(), Box<dyn std::error::Err
     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,
@@ -315,7 +315,7 @@ async fn test_overload_batch() {
     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();
 
     info!("Create producer client...");
 

sdk/eventhubs/azure_messaging_eventhubs/tests/round_trip.rs

@@ -10,7 +10,7 @@ use azure_core_amqp::{
     messaging::{AmqpMessage, AmqpMessageProperties},
     value::{AmqpList, AmqpValue},
 };
-use azure_identity::{DefaultAzureCredential, TokenCredentialOptions};
+use azure_identity::DefaultAzureCredential;
 use azure_messaging_eventhubs::{
     consumer::{ConsumerClient, ConsumerClientOptions, ReceiveOptions, StartPosition},
     models::{EventData, MessageId},
@@ -32,7 +32,7 @@ async fn test_round_trip_batch() {
     let producer = ProducerClient::new(
         host.clone(),
         eventhub.clone(),
-        DefaultAzureCredential::create(TokenCredentialOptions::default()).unwrap(),
+        DefaultAzureCredential::new().unwrap(),
         ProducerClientOptions::builder()
             .with_application_id(TEST_NAME)
             .build(),
@@ -114,7 +114,7 @@ async fn test_round_trip_batch() {
         host,
         eventhub,
         None,
-        DefaultAzureCredential::create(TokenCredentialOptions::default()).unwrap(),
+        DefaultAzureCredential::new().unwrap(),
         Some(
             ConsumerClientOptions::builder()
                 .with_application_id(TEST_NAME)

sdk/identity/.dict.txt

@@ -0,0 +1,8 @@
+adfs
+appservice
+azureauth
+clientcertificate
+clientsecret
+imds
+msal
+workloadidentity

sdk/identity/azure_identity/examples/default_credentials.rs

@@ -1,16 +1,19 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
+use azure_core::credentials::TokenCredential;
+use azure_identity::DefaultAzureCredential;
+use std::sync::Arc;
+
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn std::error::Error>> {
-    tracing_subscriber::fmt().init();
     let subscription_id =
         std::env::var("AZURE_SUBSCRIPTION_ID").expect("AZURE_SUBSCRIPTION_ID required");
 
-    let credential = azure_identity::create_default_credential()?;
+    let credential = DefaultAzureCredential::new().map(|cred| Arc::new(cred))?;
 
-    // Let's enumerate the Azure storage accounts in the subscription using the REST API directly.
-    // This is just an example. It is easier to use the Azure SDK for Rust crates.
+    // Enumerate the Azure storage accounts in the subscription using the REST API directly.
+    // This is just an example: you would normally pass in an `Arc::new(credential)` to an Azure SDK client.
     let url = url::Url::parse(&format!("https://management.azure.com/subscriptions/{subscription_id}/providers/Microsoft.Storage/storageAccounts?api-version=2019-06-01"))?;
 
     let access_token = credential