Skip to content

Commit 9d5c324

Browse files
heathsheaths
authored
Remove ClientSecretCredential, EnvironmentCredential (#1821)
* Remove ClientSecretCredential, EnvironmentCredential Also moves SpecificAzureCredential to a sample. Fixes #1812. * Use DAC constructor instead of factory function Also fixes a few lints * Fix doc tests
1 parent 9dd612c commit 9d5c324

28 files changed

+273
-869
lines changed

‎.vscode/cspell.json‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,11 @@
6565
"name": "cosmos",
6666
"path": "../sdk/cosmos/.dict.txt",
6767
"noSuggest": true
68+
},
69+
{
70+
"name": "identity",
71+
"path": "../sdk/identity/.dict.txt",
72+
"noSuggest": true
6873
}
6974
],
7075
"overrides": [
@@ -94,11 +99,10 @@
9499
},
95100
{
96101
"filename": "sdk/identity/**",
97-
"words": [
98-
"adfs",
99-
"azureauth",
100-
"msal",
101-
"imds"
102+
"dictionaries": [
103+
"crates",
104+
"rust-custom",
105+
"identity"
102106
]
103107
},
104108
{

‎sdk/cosmos/azure_data_cosmos/examples/cosmos_connect.rs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
use azure_data_cosmos::{clients::DatabaseClientMethods, CosmosClient, CosmosClientMethods};
22
use clap::Parser;
3+
use std::sync::Arc;
34

45
/// A simple example to show connecting to a Cosmos DB Account and retrieving the properties of a database.
56
#[derive(Parser)]
@@ -33,13 +34,13 @@ fn create_client(args: &Args) -> CosmosClient {
3334
if let Some(key) = args.key.as_ref() {
3435
CosmosClient::with_key(&args.endpoint, key.clone(), None).unwrap()
3536
} else {
36-
let cred = azure_identity::create_default_credential().unwrap();
37+
let cred = Arc::new(azure_identity::DefaultAzureCredential::new().unwrap());
3738
CosmosClient::new(&args.endpoint, cred, None).unwrap()
3839
}
3940
}
4041

4142
#[cfg(not(feature = "key_auth"))]
4243
fn create_client(args: &Args) -> CosmosClient {
43-
let cred = azure_identity::create_default_credential().unwrap();
44+
let cred = Arc::new(azure_identity::DefaultAzureCredential::new().unwrap());
4445
CosmosClient::new(&args.endpoint, cred, None).unwrap()
4546
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,10 @@ impl CosmosClient {
4242
/// # Examples
4343
///
4444
/// ```rust,no_run
45+
/// # use std::sync::Arc;
4546
/// use azure_data_cosmos::CosmosClient;
4647
///
47-
/// let credential = azure_identity::create_default_credential().unwrap();
48+
/// let credential = Arc::new(azure_identity::DefaultAzureCredential::new().unwrap());
4849
/// let client = CosmosClient::new("https://myaccount.documents.azure.com/", credential, None).unwrap();
4950
/// ```
5051
pub fn new(

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,11 @@ pub trait DatabaseClientMethods {
2121
/// # Examples
2222
///
2323
/// ```rust,no_run
24+
/// # use std::sync::Arc;
2425
/// # async fn doc() {
2526
/// use azure_data_cosmos::{CosmosClient, CosmosClientMethods, clients::DatabaseClientMethods};
2627
///
27-
/// let credential = azure_identity::create_default_credential().unwrap();
28+
/// let credential = Arc::new(azure_identity::DefaultAzureCredential::new().unwrap());
2829
/// let client = CosmosClient::new("https://myaccount.documents.azure.com/", credential, None).unwrap();
2930
/// let db_client = client.database_client("my_database");
3031
/// let response = db_client.read(None)

‎sdk/eventhubs/azure_messaging_eventhubs/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ async fn send_events() {
166166
let host = std::env::var("EVENTHUBS_HOST").unwrap();
167167
let eventhub = std::env::var("EVENTHUB_NAME").unwrap();
168168

169-
let credential = azure_identity::DefaultAzureCredential::create(azure_identity::TokenCredentialOptions::default()).unwrap();
169+
let credential = azure_identity::DefaultAzureCredential::new().unwrap();
170170

171171
let client = azure_messaging_eventhubs::producer::ProducerClient::new(
172172
host,
@@ -200,7 +200,7 @@ async fn receive_events() {
200200
let host = std::env::var("EVENTHUBS_HOST").unwrap();
201201
let eventhub = std::env::var("EVENTHUB_NAME").unwrap();
202202

203-
let credential = azure_identity::DefaultAzureCredential::create(azure_identity::TokenCredentialOptions::default()).unwrap();
203+
let credential = azure_identity::DefaultAzureCredential::new().unwrap();
204204
let client = azure_messaging_eventhubs::consumer::ConsumerClient::new(
205205
host,
206206
eventhub,

‎sdk/eventhubs/azure_messaging_eventhubs/examples/eventhubs_partition_properties.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Licensed under the MIT license.
33
// cspell: words
44
use azure_core::error::Result;
5-
use azure_identity::{DefaultAzureCredential, TokenCredentialOptions};
5+
use azure_identity::DefaultAzureCredential;
66
use azure_messaging_eventhubs::producer::{ProducerClient, ProducerClientOptions};
77

88
use std::env;
@@ -17,7 +17,7 @@ async fn main() -> Result<()> {
1717
let host = env::var("EVENTHUBS_HOST").unwrap();
1818
let eventhub = env::var("EVENTHUB_NAME").unwrap();
1919

20-
let credential = DefaultAzureCredential::create(TokenCredentialOptions::default()).unwrap();
20+
let credential = DefaultAzureCredential::new().unwrap();
2121

2222
let client = ProducerClient::new(
2323
host,

‎sdk/eventhubs/azure_messaging_eventhubs/examples/eventhubs_properties.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// cspell: words
44

55
use azure_core::error::Result;
6-
use azure_identity::{DefaultAzureCredential, TokenCredentialOptions};
6+
use azure_identity::DefaultAzureCredential;
77
use azure_messaging_eventhubs::producer::{ProducerClient, ProducerClientOptions};
88

99
use std::env;
@@ -18,7 +18,7 @@ async fn main() -> Result<()> {
1818
let host = env::var("EVENTHUBS_HOST").unwrap();
1919
let eventhub = env::var("EVENTHUB_NAME").unwrap();
2020

21-
let credential = DefaultAzureCredential::create(TokenCredentialOptions::default()).unwrap();
21+
let credential = DefaultAzureCredential::new().unwrap();
2222

2323
let client = ProducerClient::new(
2424
host,

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ and manage the lifecycle of the consumer client.
1515
use azure_messaging_eventhubs::consumer::ConsumerClient;
1616
use azure_identity::{DefaultAzureCredential, TokenCredentialOptions};
1717

18-
let my_credential = DefaultAzureCredential::create(TokenCredentialOptions::default()).unwrap();
18+
let my_credential = DefaultAzureCredential::new().unwrap();
1919
let consumer = ConsumerClient::new("my_namespace", "my_eventhub", None, my_credential, None);
2020
```
2121

@@ -27,7 +27,7 @@ use azure_identity::{DefaultAzureCredential, TokenCredentialOptions};
2727

2828
#[tokio::main]
2929
async fn main() {
30-
let my_credential = DefaultAzureCredential::create(TokenCredentialOptions::default()).unwrap();
30+
let my_credential = DefaultAzureCredential::new().unwrap();
3131
let consumer = ConsumerClient::new("my_namespace", "my_eventhub", None, my_credential, None);
3232

3333
let result = consumer.open().await;
@@ -53,7 +53,7 @@ use azure_identity::{DefaultAzureCredential, TokenCredentialOptions};
5353

5454
#[tokio::main]
5555
async fn main() {
56-
let my_credential = DefaultAzureCredential::create(TokenCredentialOptions::default()).unwrap();
56+
let my_credential = DefaultAzureCredential::new().unwrap();
5757
let consumer = ConsumerClient::new("my_namespace", "my_eventhub", None, my_credential, None);
5858

5959
consumer.open().await.unwrap();
@@ -82,7 +82,7 @@ use async_std::stream::StreamExt;
8282

8383
#[tokio::main]
8484
async fn main() {
85-
let my_credential = DefaultAzureCredential::create(TokenCredentialOptions::default()).unwrap();
85+
let my_credential = DefaultAzureCredential::new().unwrap();
8686
let consumer = ConsumerClient::new("my_namespace", "my_eventhub", None, my_credential, None);
8787
let partition_id = "0";
8888
let options = None;

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ impl ConsumerClient {
7575
/// use azure_messaging_eventhubs::consumer::ConsumerClient;
7676
/// use azure_identity::{DefaultAzureCredential, TokenCredentialOptions};
7777
///
78-
/// let my_credential = DefaultAzureCredential::create(TokenCredentialOptions::default()).unwrap();
78+
/// let my_credential = DefaultAzureCredential::new()?;
7979
/// let consumer = ConsumerClient::new("my_namespace", "my_eventhub", None, my_credential, None);
8080
/// # Ok(())}
8181
/// ```
@@ -124,7 +124,7 @@ impl ConsumerClient {
124124
///
125125
/// #[tokio::main]
126126
/// async fn main() {
127-
/// let my_credential = DefaultAzureCredential::create(TokenCredentialOptions::default()).unwrap();
127+
/// let my_credential = DefaultAzureCredential::new().unwrap();
128128
/// let consumer = ConsumerClient::new("my_namespace", "my_eventhub", None, my_credential, None);
129129
///
130130
/// let result = consumer.open().await;
@@ -166,7 +166,7 @@ impl ConsumerClient {
166166
///
167167
/// #[tokio::main]
168168
/// async fn main() {
169-
/// let my_credential = DefaultAzureCredential::create(TokenCredentialOptions::default()).unwrap();
169+
/// let my_credential = DefaultAzureCredential::new().unwrap();
170170
/// let consumer = ConsumerClient::new("my_namespace", "my_eventhub", None, my_credential, None);
171171
///
172172
/// consumer.open().await.unwrap();
@@ -214,7 +214,7 @@ impl ConsumerClient {
214214
///
215215
/// #[tokio::main]
216216
/// async fn main() {
217-
/// let my_credential = DefaultAzureCredential::create(TokenCredentialOptions::default()).unwrap();
217+
/// let my_credential = DefaultAzureCredential::new().unwrap();
218218
/// let consumer = ConsumerClient::new("my_namespace", "my_eventhub", None, my_credential, None);
219219
/// let partition_id = "0";
220220
/// let options = None;
@@ -315,7 +315,7 @@ impl ConsumerClient {
315315
///
316316
/// #[tokio::main]
317317
/// async fn main() {
318-
/// let my_credential = DefaultAzureCredential::create(TokenCredentialOptions::default()).unwrap();
318+
/// let my_credential = DefaultAzureCredential::new().unwrap();
319319
/// let consumer = ConsumerClient::new("my_namespace", "my_eventhub", None, my_credential, None);
320320
///
321321
/// let eventhub_properties = consumer.get_eventhub_properties().await;
@@ -366,7 +366,7 @@ impl ConsumerClient {
366366
///
367367
/// #[tokio::main]
368368
/// async fn main() {
369-
/// let my_credential = DefaultAzureCredential::create(TokenCredentialOptions::default()).unwrap();
369+
/// let my_credential = DefaultAzureCredential::new().unwrap();
370370
/// let consumer = ConsumerClient::new("my_namespace", "my_eventhub", None, my_credential, None);
371371
/// let partition_id = "0";
372372
///

‎sdk/eventhubs/azure_messaging_eventhubs/src/lib.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
/// # use azure_identity::{DefaultAzureCredential, TokenCredentialOptions};
2020
/// # #[tokio::main]
2121
/// # async fn main() -> Result<(), Box<dyn std::error::Error + 'static>> {
22-
/// # let my_credentials = DefaultAzureCredential::create(TokenCredentialOptions::default()).unwrap();
22+
/// # let my_credentials = DefaultAzureCredential::new()?;
2323
2424
/// use azure_messaging_eventhubs::consumer::ConsumerClient;
2525
/// use azure_messaging_eventhubs::models::EventData;
@@ -83,7 +83,7 @@ pub mod models {
8383
/// # use azure_identity::{DefaultAzureCredential, TokenCredentialOptions};
8484
/// # #[tokio::main]
8585
/// # async fn main() -> Result<(), Box<dyn std::error::Error>> {
86-
/// # let my_credentials = DefaultAzureCredential::create(TokenCredentialOptions::default()).unwrap();
86+
/// # let my_credentials = DefaultAzureCredential::new()?;
8787
/// let consumer_client = azure_messaging_eventhubs::consumer::ConsumerClient::new("fully_qualified_domain", "eventhub_name", None, my_credentials, None);
8888
///
8989
/// let eventhub_properties = consumer_client.get_eventhub_properties().await?;
@@ -128,7 +128,7 @@ pub mod models {
128128
/// # use azure_identity::{DefaultAzureCredential, TokenCredentialOptions};
129129
/// # #[tokio::main]
130130
/// # async fn main() -> Result<(), Box<dyn std::error::Error>> {
131-
/// # let my_credentials = DefaultAzureCredential::create(TokenCredentialOptions::default()).unwrap();
131+
/// # let my_credentials = DefaultAzureCredential::new()?;
132132
/// let consumer_client = azure_messaging_eventhubs::consumer::ConsumerClient::new("fully_qualified_domain", "eventhub_name", None, my_credentials, None);
133133
///
134134
/// let partition_properties = consumer_client.get_partition_properties("0").await?;

0 commit comments

Comments
 (0)