Skip to content

Commit 772047b

Browse files
authored
Flatten azure_identity module structure (Azure#2655)
1 parent 4a9a4ab commit 772047b

13 files changed

+41
-54
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ const SECRET_HEADER: HeaderName = HeaderName::from_static("x-identity-header");
1414
const SECRET_ENV: &str = "IDENTITY_HEADER";
1515

1616
#[derive(Debug)]
17-
pub struct AppServiceManagedIdentityCredential {
17+
pub(crate) struct AppServiceManagedIdentityCredential {
1818
credential: ImdsManagedIdentityCredential,
1919
}
2020

sdk/identity/azure_identity/src/credentials/azure_cli_credentials.rs renamed to sdk/identity/azure_identity/src/azure_cli_credential.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,9 @@
22
// Licensed under the MIT License.
33

44
use crate::{
5-
credentials::TokenCredentialOptions,
65
env::Env,
76
process::{shell_exec, OutputProcessor},
8-
validate_scope, validate_subscription, validate_tenant_id,
7+
validate_scope, validate_subscription, validate_tenant_id, TokenCredentialOptions,
98
};
109
use azure_core::{
1110
credentials::{AccessToken, Secret, TokenCredential, TokenRequestOptions},
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
// Licensed under the MIT License.
33

44
use crate::{
5-
credentials::cache::TokenCache, deserialize, validate_not_empty, validate_tenant_id,
6-
EntraIdErrorResponse, EntraIdTokenResponse, TokenCredentialOptions,
5+
deserialize, validate_not_empty, validate_tenant_id, EntraIdErrorResponse,
6+
EntraIdTokenResponse, TokenCache, TokenCredentialOptions,
77
};
88
use azure_core::{
99
credentials::{AccessToken, TokenCredential, TokenRequestOptions},
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright (c) Microsoft Corporation. All rights reserved.
22
// Licensed under the MIT License.
33

4-
use crate::{credentials::cache::TokenCache, EntraIdTokenResponse, TokenCredentialOptions};
4+
use crate::{EntraIdTokenResponse, TokenCache, TokenCredentialOptions};
55
use azure_core::{
66
base64,
77
credentials::{AccessToken, Secret, TokenCredential, TokenRequestOptions},

sdk/identity/azure_identity/src/client_secret_credential.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
// Licensed under the MIT License.
33

44
use crate::{
5-
credentials::cache::TokenCache, deserialize, EntraIdErrorResponse, EntraIdTokenResponse,
6-
TokenCredentialOptions,
5+
deserialize, EntraIdErrorResponse, EntraIdTokenResponse, TokenCache, TokenCredentialOptions,
76
};
87
use azure_core::credentials::TokenRequestOptions;
98
use azure_core::http::StatusCode;

sdk/identity/azure_identity/src/credentials/mod.rs

Lines changed: 0 additions & 35 deletions
This file was deleted.

sdk/identity/azure_identity/src/credentials/default_azure_credentials.rs renamed to sdk/identity/azure_identity/src/default_azure_credential.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
// Copyright (c) Microsoft Corporation. All rights reserved.
22
// Licensed under the MIT License.
33

4-
use crate::{credentials::cache::TokenCache, TokenCredentialOptions};
54
#[cfg(not(target_arch = "wasm32"))]
65
use crate::{AzureCliCredential, AzureDeveloperCliCredential};
6+
use crate::{TokenCache, TokenCredentialOptions};
77
#[cfg(not(target_arch = "wasm32"))]
88
use azure_core::error::ResultExt;
99
use azure_core::{
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright (c) Microsoft Corporation. All rights reserved.
22
// Licensed under the MIT License.
33

4-
use crate::{credentials::cache::TokenCache, env::Env, TokenCredentialOptions, UserAssignedId};
4+
use crate::{env::Env, TokenCache, TokenCredentialOptions, UserAssignedId};
55
use azure_core::{
66
credentials::{AccessToken, Secret, TokenCredential, TokenRequestOptions},
77
error::{http_response_from_body, Error, ErrorKind},

sdk/identity/azure_identity/src/lib.rs

Lines changed: 30 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,48 @@
44
#![doc = include_str!("../README.md")]
55
#![cfg_attr(docsrs, feature(doc_auto_cfg))]
66

7+
mod app_service_managed_identity_credential;
8+
#[cfg(not(target_arch = "wasm32"))]
9+
mod azure_cli_credential;
710
mod azure_developer_cli_credential;
811
mod azure_pipelines_credential;
12+
mod cache;
13+
mod client_assertion_credential;
14+
#[cfg(feature = "client_certificate")]
15+
mod client_certificate_credential;
916
mod client_secret_credential;
10-
mod credentials;
17+
mod default_azure_credential;
1118
mod env;
19+
mod imds_managed_identity_credential;
1220
mod managed_identity_credential;
21+
mod options;
1322
mod process;
23+
mod virtual_machine_managed_identity_credential;
24+
mod workload_identity_credential;
25+
26+
#[cfg(not(target_arch = "wasm32"))]
27+
pub use azure_cli_credential::*;
28+
pub use azure_developer_cli_credential::*;
29+
pub use azure_pipelines_credential::*;
30+
pub use client_assertion_credential::*;
31+
#[cfg(feature = "client_certificate")]
32+
pub use client_certificate_credential::*;
33+
pub use client_secret_credential::*;
34+
pub use default_azure_credential::*;
35+
pub use managed_identity_credential::*;
36+
pub use options::TokenCredentialOptions;
37+
pub use workload_identity_credential::*;
38+
39+
pub(crate) use app_service_managed_identity_credential::*;
40+
pub(crate) use cache::TokenCache;
41+
pub(crate) use imds_managed_identity_credential::*;
42+
pub(crate) use virtual_machine_managed_identity_credential::*;
1443

1544
use azure_core::{
1645
error::{ErrorKind, ResultExt},
1746
http::Response,
1847
Error, Result,
1948
};
20-
pub use azure_developer_cli_credential::*;
21-
pub use azure_pipelines_credential::*;
22-
pub use client_secret_credential::*;
23-
pub use credentials::*;
24-
pub use managed_identity_credential::*;
2549
use serde::Deserialize;
2650
use std::borrow::Cow;
2751
use typespec_client_core::http::Model;

0 commit comments

Comments
 (0)