From 5ea58fe56210052af7175cadc3437e32025f2e51 Mon Sep 17 00:00:00 2001 From: Cameron Taggart Date: Tue, 9 Jan 2024 23:24:45 -0600 Subject: [PATCH] opt out of cli for wasm --- .../src/token_credentials/default_credentials.rs | 2 ++ .../specific_azure_credential.rs | 16 +++++++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/sdk/identity/src/token_credentials/default_credentials.rs b/sdk/identity/src/token_credentials/default_credentials.rs index 5f367e89df..df2d7189c6 100644 --- a/sdk/identity/src/token_credentials/default_credentials.rs +++ b/sdk/identity/src/token_credentials/default_credentials.rs @@ -133,6 +133,7 @@ impl DefaultAzureCredentialBuilder { VirtualMachineManagedIdentityCredential::new(self.options.clone()), )); } + #[cfg(not(target_arch = "wasm32"))] DefaultAzureCredentialType::AzureCli => { if let Ok(credential) = AzureCliCredential::create() { sources.push(DefaultAzureCredentialEnum::AzureCli(credential)); @@ -165,6 +166,7 @@ enum DefaultAzureCredentialType { Environment, AppService, VirtualMachine, + #[cfg(not(target_arch = "wasm32"))] AzureCli, } diff --git a/sdk/identity/src/token_credentials/specific_azure_credential.rs b/sdk/identity/src/token_credentials/specific_azure_credential.rs index 2f03b55af1..3eccb3d63f 100644 --- a/sdk/identity/src/token_credentials/specific_azure_credential.rs +++ b/sdk/identity/src/token_credentials/specific_azure_credential.rs @@ -1,23 +1,24 @@ use super::options; -use std::sync::Arc; - +#[cfg(not(target_arch = "wasm32"))] +use crate::AzureCliCredential; #[cfg(feature = "client_certificate")] use crate::ClientCertificateCredential; use crate::{ - AppServiceManagedIdentityCredential, AzureCliCredential, ClientSecretCredential, - EnvironmentCredential, TokenCredentialOptions, VirtualMachineManagedIdentityCredential, - WorkloadIdentityCredential, + AppServiceManagedIdentityCredential, ClientSecretCredential, EnvironmentCredential, + TokenCredentialOptions, VirtualMachineManagedIdentityCredential, WorkloadIdentityCredential, }; use azure_core::{ auth::{AccessToken, TokenCredential}, error::{ErrorKind, ResultExt}, Error, }; +use std::sync::Arc; pub const AZURE_CREDENTIAL_TYPE: &str = "AZURE_CREDENTIAL_TYPE"; pub mod azure_credential_types { pub const ENVIRONMENT: &str = "environment"; + #[cfg(not(target_arch = "wasm32"))] pub const AZURE_CLI: &str = "azurecli"; pub const VIRTUAL_MACHINE: &str = "virtualmachine"; pub const APP_SERVICE: &str = "appservice"; @@ -57,6 +58,7 @@ pub fn create_specific_credential() -> azure_core::Result { credential.get_token(scopes).await } + #[cfg(not(target_arch = "wasm32"))] SpecificAzureCredentialEnum::AzureCli(credential) => credential.get_token(scopes).await, SpecificAzureCredentialEnum::VirtualMachine(credential) => { credential.get_token(scopes).await @@ -97,6 +100,7 @@ impl TokenCredential for SpecificAzureCredentialEnum { async fn clear_cache(&self) -> azure_core::Result<()> { match self { SpecificAzureCredentialEnum::Environment(credential) => credential.clear_cache().await, + #[cfg(not(target_arch = "wasm32"))] SpecificAzureCredentialEnum::AzureCli(credential) => credential.clear_cache().await, SpecificAzureCredentialEnum::VirtualMachine(credential) => { credential.clear_cache().await @@ -145,6 +149,7 @@ impl SpecificAzureCredential { azure_credential_types::VIRTUAL_MACHINE => SpecificAzureCredentialEnum::VirtualMachine( VirtualMachineManagedIdentityCredential::new(options), ), + #[cfg(not(target_arch = "wasm32"))] azure_credential_types::AZURE_CLI => AzureCliCredential::create() .map(SpecificAzureCredentialEnum::AzureCli) .with_context(ErrorKind::Credential, || { @@ -238,6 +243,7 @@ mod tests { /// test AZURE_CREDENTIAL_TYPE of "azurecli" #[test] + #[cfg(not(target_arch = "wasm32"))] fn test_azure_cli() -> azure_core::Result<()> { let credential = SpecificAzureCredential::create(test_options( &[("AZURE_CREDENTIAL_TYPE", "azurecli")][..],