Fix auzre arc managed identity (Azure#37736)

roryp · Nov 23, 2023 · 1c3fad0 · 1c3fad0
1 parent fe469af
commit 1c3fad0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/sdk/identity/azure-identity/CHANGELOG.md b/sdk/identity/azure-identity/CHANGELOG.md
@@ -7,6 +7,7 @@
 ### Breaking Changes
 
 ### Bugs Fixed
+- fixed Azure Arc Managed Identiy not being retrived because of a code logic bug (misplaced finally block)
 
 ### Other Changes
 

diff --git a/...entity/azure-identity/src/main/java/com/azure/identity/implementation/IdentityClient.java b/...entity/azure-identity/src/main/java/com/azure/identity/implementation/IdentityClient.java
@@ -927,7 +927,7 @@ private Mono<AccessToken> authenticateToArcManagedIdentityEndpoint(String identi
                          + " Unauthorized response from Azure Arc Managed Identity Endpoint, received: %d", status),
                         null, e));
                 }
-
+            } finally {
                 String realm = connection.getHeaderField("WWW-Authenticate");
 
                 if (realm == null) {
@@ -946,17 +946,17 @@ private Mono<AccessToken> authenticateToArcManagedIdentityEndpoint(String identi
                 String secretKeyPath = realm.substring(separatorIndex + 1);
                 secretKey = new String(Files.readAllBytes(Paths.get(secretKeyPath)), StandardCharsets.UTF_8);
 
-            } finally {
+
                 if (connection != null) {
                     connection.disconnect();
                 }
-            }
 
+                if (secretKey == null) {
+                    throw LOGGER.logExceptionAsError(new ClientAuthenticationException("Did not receive a secret value"
+                        + " in the response from Azure Arc Managed Identity Endpoint",
+                        null));
+                }
 
-            if (secretKey == null) {
-                throw LOGGER.logExceptionAsError(new ClientAuthenticationException("Did not receive a secret value"
-                     + " in the response from Azure Arc Managed Identity Endpoint",
-                    null));
             }