Don't stop trying dev credentials on failures

Fixes Azure#34733 For our dev time credentials we want to always keep going. This change wraps any failure from the credentials in a `CredentialUnavailableException` so `ChainedTokenCredential` will continue them properly.
billwert · Jul 6, 2023 · 87a2af5 · 87a2af5
1 parent 04d79bb
commit 87a2af5
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 15 deletions.
diff --git a/sdk/identity/azure-identity/src/main/java/com/azure/identity/AzureCliCredential.java b/sdk/identity/azure-identity/src/main/java/com/azure/identity/AzureCliCredential.java
@@ -83,7 +83,8 @@ public Mono<AccessToken> getToken(TokenRequestContext request) {
         return identityClient.authenticateWithAzureCli(request)
             .doOnNext(token -> LoggingUtil.logTokenSuccess(LOGGER, request))
             .doOnError(error -> LoggingUtil.logTokenError(LOGGER, identityClient.getIdentityClientOptions(), request,
-                error));
+                error))
+            .onErrorMap(error -> new CredentialUnavailableException("Azure CLI authentication is not available", error));
     }
 
     @Override
@@ -94,7 +95,7 @@ public AccessToken getTokenSync(TokenRequestContext request) {
             return accessToken;
         } catch (Exception e) {
             LoggingUtil.logTokenError(LOGGER, identityClient.getIdentityClientOptions(), request, e);
-            throw e;
+            throw new CredentialUnavailableException("Azure CLI authentication is not available", e);
         }
     }
 }
diff --git a/...identity/azure-identity/src/main/java/com/azure/identity/AzureDeveloperCliCredential.java b/...identity/azure-identity/src/main/java/com/azure/identity/AzureDeveloperCliCredential.java
@@ -83,7 +83,8 @@ public Mono<AccessToken> getToken(TokenRequestContext request) {
         return identityClient.authenticateWithAzureDeveloperCli(request)
             .doOnNext(token -> LoggingUtil.logTokenSuccess(LOGGER, request))
             .doOnError(error -> LoggingUtil.logTokenError(LOGGER, identityClient.getIdentityClientOptions(), request,
-                error));
+                error))
+            .onErrorMap(error -> new CredentialUnavailableException("Azure Developer CLI authentication is not available", error));
     }
 
     @Override
@@ -94,7 +95,7 @@ public AccessToken getTokenSync(TokenRequestContext request) {
             return accessToken;
         } catch (Exception e) {
             LoggingUtil.logTokenError(LOGGER, identityClient.getIdentityClientOptions(), request, e);
-            throw e;
+            throw new CredentialUnavailableException("Azure Developer CLI authentication is not available", e);
         }
     }
 }
diff --git a/sdk/identity/azure-identity/src/main/java/com/azure/identity/AzurePowerShellCredential.java b/sdk/identity/azure-identity/src/main/java/com/azure/identity/AzurePowerShellCredential.java
@@ -75,6 +75,7 @@ public Mono<AccessToken> getToken(TokenRequestContext request) {
         return identityClient.authenticateWithAzurePowerShell(request)
             .doOnNext(token -> LoggingUtil.logTokenSuccess(LOGGER, request))
             .doOnError(error -> LoggingUtil.logTokenError(LOGGER, identityClient.getIdentityClientOptions(), request,
-                error));
+                error))
+            .onErrorMap(error -> new CredentialUnavailableException("Azure Powershell authentication is not available", error));
     }
 }
diff --git a/sdk/identity/azure-identity/src/main/java/com/azure/identity/IntelliJCredential.java b/sdk/identity/azure-identity/src/main/java/com/azure/identity/IntelliJCredential.java
@@ -133,6 +133,7 @@ public Mono<AccessToken> getToken(TokenRequestContext request) {
                    })
             .doOnNext(token -> LoggingUtil.logTokenSuccess(LOGGER, request))
             .doOnError(error -> LoggingUtil.logTokenError(LOGGER, identityClient.getIdentityClientOptions(),
-                request, error));
+                request, error))
+            .onErrorMap(error -> new CredentialUnavailableException("IntelliJ authentication is not available", error));
     }
 }
diff --git a/sdk/identity/azure-identity/src/main/java/com/azure/identity/SharedTokenCacheCredential.java b/sdk/identity/azure-identity/src/main/java/com/azure/identity/SharedTokenCacheCredential.java
@@ -101,7 +101,8 @@ public Mono<AccessToken> getToken(TokenRequestContext request) {
             .map(this::updateCache)
             .doOnNext(token -> LoggingUtil.logTokenSuccess(LOGGER, request))
             .doOnError(error -> LoggingUtil.logTokenError(LOGGER, identityClient.getIdentityClientOptions(),
-                request, error));
+                request, error))
+            .onErrorMap(error -> new CredentialUnavailableException("SharedToken authentication is not available", error));
     }
 
     private AccessToken updateCache(MsalToken msalToken) {

diff --git a/sdk/identity/azure-identity/src/test/java/com/azure/identity/AzureCliCredentialTest.java b/sdk/identity/azure-identity/src/test/java/com/azure/identity/AzureCliCredentialTest.java
@@ -59,7 +59,7 @@ public void azureCliCredentialWinAzureCLINotInstalledException() throws Exceptio
             // test
             AzureCliCredential credential = new AzureCliCredentialBuilder().build();
             StepVerifier.create(credential.getToken(request))
-                .expectErrorMatches(e -> e instanceof Exception && e.getMessage().contains("Azure CLI not installed"))
+                .expectErrorMatches(e -> e instanceof CredentialUnavailableException && e.getCause().getMessage().contains("Azure CLI not installed"))
                 .verify();
             Assert.assertNotNull(identityClientMock);
         }
@@ -79,7 +79,7 @@ public void azureCliCredentialAzNotLogInException() throws Exception {
             // test
             AzureCliCredential credential = new AzureCliCredentialBuilder().build();
             StepVerifier.create(credential.getToken(request))
-                .expectErrorMatches(e -> e instanceof Exception && e.getMessage().contains("Azure not Login"))
+                .expectErrorMatches(e -> e instanceof CredentialUnavailableException && e.getCause().getMessage().contains("Azure not Login"))
                 .verify();
             Assert.assertNotNull(identityClientMock);
         }
@@ -99,7 +99,7 @@ public void azureCliCredentialAuthenticationFailedException() throws Exception {
             // test
             AzureCliCredential credential = new AzureCliCredentialBuilder().build();
             StepVerifier.create(credential.getToken(request))
-                .expectErrorMatches(e -> e instanceof Exception && e.getMessage().contains("other error"))
+                .expectErrorMatches(e -> e instanceof CredentialUnavailableException && e.getCause().getMessage().contains("other error"))
                 .verify();
             Assert.assertNotNull(identityClientMock);
         }
@@ -127,7 +127,7 @@ public void testInvalidMultiTenantAuth() {
         AzureCliCredential credential =
             new AzureCliCredentialBuilder().tenantId("tenant").build();
         StepVerifier.create(credential.getToken(request))
-            .expectErrorMatches(e -> e instanceof ClientAuthenticationException && (e.getMessage().startsWith("The current credential is not configured to")))
+            .expectErrorMatches(e -> e instanceof CredentialUnavailableException && (e.getCause().getMessage().startsWith("The current credential is not configured to")))
             .verify();
     }
 

diff --git a/...tity/azure-identity/src/test/java/com/azure/identity/AzureDeveloperCliCredentialTest.java b/...tity/azure-identity/src/test/java/com/azure/identity/AzureDeveloperCliCredentialTest.java
@@ -57,7 +57,7 @@ public void azureDeveloperCliCredentialWinAzureCLINotInstalledException() throws
             // test
             AzureDeveloperCliCredential credential = new AzureDeveloperCliCredentialBuilder().build();
             StepVerifier.create(credential.getToken(request))
-                .expectErrorMatches(e -> e instanceof Exception && e.getMessage().contains("Azure CLI not installed"))
+                .expectErrorMatches(e -> e instanceof CredentialUnavailableException && e.getCause().getMessage().contains("Azure CLI not installed"))
                 .verify();
             Assert.assertNotNull(identityClientMock);
         }
@@ -77,7 +77,7 @@ public void azureDeveloperCliCredentialAzNotLogInException() throws Exception {
             // test
             AzureDeveloperCliCredential credential = new AzureDeveloperCliCredentialBuilder().build();
             StepVerifier.create(credential.getToken(request))
-                .expectErrorMatches(e -> e instanceof Exception && e.getMessage().contains("Azure not Login"))
+                .expectErrorMatches(e -> e instanceof CredentialUnavailableException && e.getCause().getMessage().contains("Azure not Login"))
                 .verify();
             Assert.assertNotNull(identityClientMock);
         }
@@ -97,7 +97,7 @@ public void azureDeveloperCliCredentialAuthenticationFailedException() throws Ex
             // test
             AzureDeveloperCliCredential credential = new AzureDeveloperCliCredentialBuilder().build();
             StepVerifier.create(credential.getToken(request))
-                .expectErrorMatches(e -> e instanceof Exception && e.getMessage().contains("other error"))
+                .expectErrorMatches(e -> e instanceof CredentialUnavailableException && e.getCause().getMessage().contains("other error"))
                 .verify();
             Assert.assertNotNull(identityClientMock);
         }

diff --git a/...entity/azure-identity/src/test/java/com/azure/identity/AzurePowerShellCredentialTest.java b/...entity/azure-identity/src/test/java/com/azure/identity/AzurePowerShellCredentialTest.java
@@ -60,7 +60,7 @@ public void azurePowerShellCredentialNotInstalledException() throws Exception {
             // test
             AzurePowerShellCredential credential = new AzurePowerShellCredentialBuilder().build();
             StepVerifier.create(credential.getToken(request))
-                .expectErrorMatches(e -> e instanceof Exception && e.getMessage()
+                .expectErrorMatches(e -> e instanceof CredentialUnavailableException && e.getCause().getMessage()
                     .contains("Azure PowerShell not installed"))
                 .verify();
             Assert.assertNotNull(identityClientMock);