Skip to content

Commit 2ae8018

Browse files
committed
update tests
1 parent 49b89c0 commit 2ae8018

File tree

4 files changed

+22
-17
lines changed

4 files changed

+22
-17
lines changed

sdk/identity/azure-identity/src/main/java/com/azure/identity/DefaultAzureCredentialBuilder.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818
import java.util.Objects;
1919
import java.util.concurrent.ExecutorService;
2020

21-
22-
2321
/**
2422
* <p>Fluent credential builder for instantiating {@link DefaultAzureCredential}.</p>
2523
*
@@ -343,7 +341,6 @@ private void addDevCredentials(List<TokenCredential> credentials) {
343341
credentials.add(new OSBrokerCredential(tenantId));
344342
}
345343

346-
347344
private WorkloadIdentityCredential getWorkloadIdentityCredential() {
348345
Configuration configuration = identityClientOptions.getConfiguration() == null
349346
? Configuration.getGlobalConfiguration().clone()

sdk/identity/azure-identity/src/main/java/com/azure/identity/OSBrokerCredential.java

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515

1616
class OSBrokerCredential implements TokenCredential {
1717
private static final ClientLogger LOGGER = new ClientLogger(OSBrokerCredential.class);
18-
private static final String BROKER_BUILDER_CLASS = "com.azure.identity.broker.InteractiveBrowserBrokerCredentialBuilder";
18+
private static final String BROKER_BUILDER_CLASS
19+
= "com.azure.identity.broker.InteractiveBrowserBrokerCredentialBuilder";
1920
private final String tenantId;
2021
private final AtomicReference<TokenCredential> cached = new AtomicReference<>();
2122

@@ -38,11 +39,12 @@ public Mono<AccessToken> getToken(TokenRequestContext request) {
3839
}
3940

4041
private TokenCredential createBrokerCredential() {
41-
final String troubleshoot = " To mitigate this issue, refer to http://aka.ms/azsdk/java/identity/dacbrokerauth/troubleshoot";
42+
final String troubleshoot
43+
= " To mitigate this issue, refer to http://aka.ms/azsdk/java/identity/dacbrokerauth/troubleshoot";
4244
if (!IdentityUtil.isBrokerAvailable()) {
4345
throw LOGGER.logExceptionAsError(
4446
new CredentialUnavailableException("azure-identity-broker dependency is not available. "
45-
+ "Ensure you have azure-identity-broker dependency added to your application." + troubleshoot));
47+
+ "Ensure you have azure-identity-broker dependency added to your application." + troubleshoot));
4648
}
4749
try {
4850
Class<?> builderClass = Class.forName(BROKER_BUILDER_CLASS);
@@ -56,12 +58,14 @@ private TokenCredential createBrokerCredential() {
5658
}
5759
return browserCredentialBuilder.build();
5860
} catch (ClassNotFoundException e) {
59-
throw LOGGER.logExceptionAsError(
60-
new CredentialUnavailableException("InteractiveBrowserBrokerCredentialBuilder class not found. "
61-
+ "Ensure you have azure-identity-broker dependency added to your application." + troubleshoot, e));
61+
throw LOGGER
62+
.logExceptionAsError(new CredentialUnavailableException(
63+
"InteractiveBrowserBrokerCredentialBuilder class not found. "
64+
+ "Ensure you have azure-identity-broker dependency added to your application." + troubleshoot,
65+
e));
6266
} catch (Exception e) {
63-
throw LOGGER.logExceptionAsError(
64-
new CredentialUnavailableException("Failed to create InteractiveBrowserBrokerCredential dynamically." + troubleshoot, e));
67+
throw LOGGER.logExceptionAsError(new CredentialUnavailableException(
68+
"Failed to create InteractiveBrowserBrokerCredential dynamically." + troubleshoot, e));
6569
}
6670
}
6771
}

sdk/identity/azure-identity/src/test/java/com/azure/identity/DacOsBrokerCredentialTest.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,17 @@ public class DacOsBrokerCredentialTest {
1111
@Test
1212
public void testBrokerUnavailable() {
1313
// setup
14-
TokenRequestContext request = new TokenRequestContext()
15-
.addScopes("https://vault.azure.net/.default").setTenantId("newTenant");
14+
TokenRequestContext request
15+
= new TokenRequestContext().addScopes("https://vault.azure.net/.default").setTenantId("newTenant");
1616

1717
// Simulate broker unavailable by using a test double or by ensuring the environment does not support broker
1818
OSBrokerCredential credential = new OSBrokerCredential("tenant");
1919
StepVerifier.create(credential.getToken(request))
2020
.expectErrorMatches(e -> e instanceof CredentialUnavailableException
2121
&& e.getMessage().contains("azure-identity-broker dependency is not available")
22-
&& e.getMessage().contains("To mitigate this issue, refer to http://aka.ms/azsdk/java/identity/dacbrokerauth/troubleshoot"))
22+
&& e.getMessage()
23+
.contains(
24+
"To mitigate this issue, refer to http://aka.ms/azsdk/java/identity/dacbrokerauth/troubleshoot"))
2325
.verify();
2426
}
2527
}

sdk/identity/azure-identity/src/test/java/com/azure/identity/DefaultAzureCredentialTest.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -659,14 +659,15 @@ public void testDeveloperOnlyCredentialsChain(String devValue) {
659659
List<TokenCredential> credentials = extractCredentials(credential);
660660

661661
// Only developer credentials should be present (4)
662-
assertEquals(5, credentials.size());
662+
assertEquals(6, credentials.size());
663663

664664
// Verify developer credentials in order
665665
assertInstanceOf(IntelliJCredential.class, credentials.get(0));
666666
assertInstanceOf(VisualStudioCodeCredential.class, credentials.get(1));
667667
assertInstanceOf(AzureCliCredential.class, credentials.get(2));
668668
assertInstanceOf(AzurePowerShellCredential.class, credentials.get(3));
669669
assertInstanceOf(AzureDeveloperCliCredential.class, credentials.get(4));
670+
assertInstanceOf(OSBrokerCredential.class, credentials.get(5));
670671
}
671672

672673
@ParameterizedTest
@@ -772,8 +773,8 @@ public void testDefaultCredentialChainWithoutFilter() {
772773
// Extract credentials to check their types and order
773774
List<TokenCredential> credentials = extractCredentials(credential);
774775

775-
// Verify the complete chain with all 7 credentials
776-
assertEquals(8, credentials.size());
776+
// Verify the complete chain with all 9 credentials
777+
assertEquals(9, credentials.size());
777778
assertInstanceOf(EnvironmentCredential.class, credentials.get(0));
778779
assertInstanceOf(WorkloadIdentityCredential.class, credentials.get(1));
779780
assertInstanceOf(ManagedIdentityCredential.class, credentials.get(2));
@@ -782,6 +783,7 @@ public void testDefaultCredentialChainWithoutFilter() {
782783
assertInstanceOf(AzureCliCredential.class, credentials.get(5));
783784
assertInstanceOf(AzurePowerShellCredential.class, credentials.get(6));
784785
assertInstanceOf(AzureDeveloperCliCredential.class, credentials.get(7));
786+
assertInstanceOf(OSBrokerCredential.class, credentials.get(8));
785787
}
786788

787789
/**

0 commit comments

Comments
 (0)