Update error message format as requested - append claims after --ClaimsChallenge

Co-authored-by: xiangyan99 <[email protected]>

Author: Copilot

sdk/identity/azure-identity/azure/identity/_credentials/azure_powershell.py

@@ -139,7 +139,7 @@ def get_token(
         # Check if claims challenge is provided
         if claims:
             raise CredentialUnavailableError(
-                message=f"Fail to get token with claims challenge '{claims}', please run Connect-AzAccount --ClaimsChallenge"
+                message=f"Fail to get token, please run Connect-AzAccount --ClaimsChallenge {claims}"
             )
 
         options: TokenRequestOptions = {}
@@ -180,7 +180,7 @@ def _get_token_base(
         if options and options.get("claims"):
             claims_value = options.get("claims")
             raise CredentialUnavailableError(
-                message=f"Fail to get token with claims challenge '{claims_value}', please run Connect-AzAccount --ClaimsChallenge"
+                message=f"Fail to get token, please run Connect-AzAccount --ClaimsChallenge {claims_value}"
             )
 
         tenant_id = options.get("tenant_id") if options else None

sdk/identity/azure-identity/azure/identity/aio/_credentials/azure_powershell.py

@@ -84,7 +84,7 @@ async def get_token(
         # Check if claims challenge is provided
         if claims:
             raise CredentialUnavailableError(
-                message=f"Fail to get token with claims challenge '{claims}', please run Connect-AzAccount --ClaimsChallenge"
+                message=f"Fail to get token, please run Connect-AzAccount --ClaimsChallenge {claims}"
             )
 
         # only ProactorEventLoop supports subprocesses on Windows (and it isn't the default loop on Python < 3.8)
@@ -124,7 +124,7 @@ async def get_token_info(self, *scopes: str, options: Optional[TokenRequestOptio
         if options and options.get("claims"):
             claims_value = options.get("claims")
             raise CredentialUnavailableError(
-                message=f"Fail to get token with claims challenge '{claims_value}', please run Connect-AzAccount --ClaimsChallenge"
+                message=f"Fail to get token, please run Connect-AzAccount --ClaimsChallenge {claims_value}"
             )
 
         if sys.platform.startswith("win") and not isinstance(asyncio.get_event_loop(), asyncio.ProactorEventLoop):
@@ -139,7 +139,7 @@ async def _get_token_base(
         if options and options.get("claims"):
             claims_value = options.get("claims")
             raise CredentialUnavailableError(
-                message=f"Fail to get token with claims challenge '{claims_value}', please run Connect-AzAccount --ClaimsChallenge"
+                message=f"Fail to get token, please run Connect-AzAccount --ClaimsChallenge {claims_value}"
             )
 
         tenant_id = options.get("tenant_id") if options else None

sdk/identity/azure-identity/tests/test_powershell_credential.py

@@ -390,12 +390,12 @@ def test_claims_challenge_error(get_token_method):
         # Test claims parameter in get_token method
         with pytest.raises(CredentialUnavailableError) as exc_info:
             getattr(AzurePowerShellCredential(), get_token_method)("scope", claims="some-claims")
-        assert "Fail to get token with claims challenge 'some-claims', please run Connect-AzAccount --ClaimsChallenge" in str(exc_info.value)
+        assert "Fail to get token, please run Connect-AzAccount --ClaimsChallenge some-claims" in str(exc_info.value)
     else:
         # Test claims in options for get_token_info method
         with pytest.raises(CredentialUnavailableError) as exc_info:
             getattr(AzurePowerShellCredential(), get_token_method)("scope", options={"claims": "some-claims"})
-        assert "Fail to get token with claims challenge 'some-claims', please run Connect-AzAccount --ClaimsChallenge" in str(exc_info.value)
+        assert "Fail to get token, please run Connect-AzAccount --ClaimsChallenge some-claims" in str(exc_info.value)
 
 
 @pytest.mark.parametrize("get_token_method", GET_TOKEN_METHODS)

sdk/identity/azure-identity/tests/test_powershell_credential_async.py

@@ -399,12 +399,12 @@ async def test_claims_challenge_error(get_token_method):
         # Test claims parameter in get_token method
         with pytest.raises(CredentialUnavailableError) as exc_info:
             await getattr(AzurePowerShellCredential(), get_token_method)("scope", claims="some-claims")
-        assert "Fail to get token with claims challenge 'some-claims', please run Connect-AzAccount --ClaimsChallenge" in str(exc_info.value)
+        assert "Fail to get token, please run Connect-AzAccount --ClaimsChallenge some-claims" in str(exc_info.value)
     else:
         # Test claims in options for get_token_info method
         with pytest.raises(CredentialUnavailableError) as exc_info:
             await getattr(AzurePowerShellCredential(), get_token_method)("scope", options={"claims": "some-claims"})
-        assert "Fail to get token with claims challenge 'some-claims', please run Connect-AzAccount --ClaimsChallenge" in str(exc_info.value)
+        assert "Fail to get token, please run Connect-AzAccount --ClaimsChallenge some-claims" in str(exc_info.value)
 
 
 @pytest.mark.parametrize("get_token_method", GET_TOKEN_METHODS)