Replace azure-identity AAD references (Azure#37076)

* Replace azure-identity AAD references

* Add entra to cspell config

* Update JavaDoc strings

* Small tweaks

* Apply suggestions from code review

Co-authored-by: Bill Wert <[email protected]>

* React to feedback

* Add paragraph tags

---------

Co-authored-by: Bill Wert <[email protected]>

Author: scottaddie

.vscode/cspell.json

@@ -274,6 +274,7 @@
     "embedme",
     "encryptor",
     "endtoend",
+    "entra",
     "Esto",
     "etag",
     "eventhub",

sdk/identity/azure-identity-extensions/Azure-Database-for-MySQL-README.md

@@ -7,9 +7,9 @@
       - [Prepare the working environment](#prepare-the-working-environment)
       - [Create an Azure Database for MySQL server](#create-an-azure-database-for-mysql-server)
       - [Configure a firewall rule for your MySQL server](#configure-a-firewall-rule-for-your-mysql-server)
-      - [Enable Azure AD-based authentication](#enable-azure-ad-based-authentication)
+      - [Enable Microsoft Entra-based authentication](#enable-azure-ad-based-authentication)
   - [Key concepts](#key-concepts)
-    - [Azure AD authentication with MySQL](#azure-ad-authentication-with-mysql)
+    - [Microsoft Entra authentication with MySQL](#azure-ad-authentication-with-mysql)
     - [Architecture](#architecture)
     - [Token as password](#token-as-password)
   - [Examples](#examples)
@@ -27,7 +27,7 @@
 
 # Azure identity JDBC MySQL plugin library for Java
 
-This package contains the jdbc authentication plugin to authenticate with Azure Active Directory (Azure AD) for Azure hosted MySQL services.
+This package contains the JDBC authentication plugin to authenticate with Microsoft Entra ID for Azure-hosted MySQL databases.
 
 [Source code][mysql_source] | [API reference documentation][docs] | [Product documentation][mysql_product_docs]
 | [Quickstart][quick_start_mysql]
@@ -112,10 +112,10 @@ az mysql server firewall-rule create \
    
 ```
 
-#### Enable Azure AD-based authentication
+#### Enable Microsoft Entra-based authentication
 
-To use Azure Active Directory access with Azure Database for MySQL, you should set the Azure Active Directory (Azure AD) admin user first. Only
-an Azure Active Directory (Azure AD) Admin user can create/enable users for Azure Active Directory (Azure AD)-based authentication.
+To use Microsoft Entra access with Azure Database for MySQL, you should set the Microsoft Entra admin user first. Only
+an Microsoft Entra admin user can create/enable users for Microsoft Entra-based authentication.
 
 ```Azure CLI
 az mysql server ad-admin create \
@@ -127,27 +127,23 @@ az mysql server ad-admin create \
 
 ## Key concepts
 
-### Azure AD authentication with MySQL
+### Microsoft Entra authentication with MySQL
 
-Microsoft Azure Active Directory (Azure Active Directory (Azure AD)) authentication is a mechanism of connecting to Azure Database for MySQL
-using identities defined in Azure Active Directory (Azure AD). With Azure Active Directory (Azure AD) authentication, you can manage database user identities and other
-Microsoft services in a central location, which simplifies permission management.
+Microsoft Entra authentication is a mechanism of connecting to Azure Database for MySQL using identities defined in Microsoft Entra ID. With Microsoft Entra authentication, you can manage database user identities and other Microsoft services in a central location, which simplifies permission management.
 
-The following high-level diagram summarizes how authentication works using Azure Active Directory (Azure AD) authentication with Azure Database
-for MySQL. The arrows indicate communication pathways.
+The following high-level diagram summarizes how authentication works using Microsoft Entra authentication with Azure Database for MySQL. The arrows indicate communication pathways.
 
 ![mysql-architecture.png](img/mysql-architecture.png)
 
-To learn more about using Azure Active Directory (Azure AD) with MySQL, see Use (Azure Active Directory for authenticating with
-MySQL)[Azure Active Directory for authenticating with MySQL]
+To learn more about using Microsoft Entra ID with MySQL, see Use (Microsoft Entra ID for authenticating with MySQL)[Microsoft Entra ID for authenticating with MySQL]
 
 ### Architecture
 
 This picture shows how the jdbc authentication plugin for MySQL authenticating with managed identity.
 
 ![mysql_design.png](img/mysql_design.png)
 
-1. The JDBC auth plugin will get an access token from Azure AD.
+1. The JDBC auth plugin will get an access token from Microsoft Entra ID.
 2. The JDBC driver will take the token obtained from step 1 as the password ( `token as password`) to connect with the MySQL server.
 3. The MySQL server will check the access token and authenticate internally.
 
@@ -203,10 +199,7 @@ Connection connection=DriverManager.getConnection(url,properties);
 
 ### Cloud Configuration
 
-Credentials default to authenticating to the Azure Active Directory endpoint for Azure Public Cloud. To access resources
-in other clouds, such as Azure Government or a private cloud, configure credentials with the `azure.authorityHost`
-argument. [AzureAuthorityHosts](https://docs.microsoft.com/java/api/com.azure.identity.azureauthorityhosts?view=azure-java-stable)
-defines authorities for well-known clouds:
+Credentials default to authenticating to the Microsoft Entra endpoint for Azure Public Cloud. To access resources in other clouds, such as Azure Government or a private cloud, configure credentials with the `azure.authorityHost` argument. [AzureAuthorityHosts](https://learn.microsoft.com/java/api/com.azure.identity.azureauthorityhosts?view=azure-java-stable) defines authorities for well-known clouds:
 
 ```java
 Properties properties=new Properties();
@@ -300,11 +293,11 @@ the [contributing guide](https://github.com/Azure/azure-sdk-for-java/blob/main/C
 
 <!-- LINKS -->
 
-[jdk]: https://docs.microsoft.com/java/azure/jdk/
+[jdk]: https://learn.microsoft.com/java/azure/jdk/
 [azure_subscription]: https://azure.microsoft.com/free/
 [mysql_source]: https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/identity/azure-identity-extensions
 [docs]: https://azure.github.io/azure-sdk-for-java/
-[mysql_product_docs]: https://docs.microsoft.com/azure/mysql/single-server/overview
+[mysql_product_docs]: https://learn.microsoft.com/azure/mysql/single-server/overview
 [quick_start_mysql]: https://aka.ms/passwordless/quickstart/mysql
-[Azure Active Directory for authenticating with MySQL]:https://docs.microsoft.com/azure/mysql/single-server/concepts-azure-ad-authentication
+[Microsoft Entra ID for authenticating with MySQL]:https://learn.microsoft.com/azure/mysql/single-server/concepts-azure-ad-authentication
 [whatismyip.akamai.com]: https://whatismyip.akamai.com/

sdk/identity/azure-identity-extensions/Azure-Database-for-PostgreSQL-README.md

@@ -7,9 +7,9 @@
       - [Prepare the working environment](#prepare-the-working-environment)
       - [Create an Azure Database for PostgreSQL server](#create-an-azure-database-for-postgresql-server)
       - [Configure a firewall rule for your PostgreSQL server](#configure-a-firewall-rule-for-your-postgresql-server)
-      - [Enable Azure AD-based authentication](#enable-azure-ad-based-authentication)
+      - [Enable Microsoft Entra-based authentication](#enable-azure-ad-based-authentication)
   - [Key concepts](#key-concepts)
-    - [Azure AD authentication with PostgreSQL](#azure-ad-authentication-with-postgresql)
+    - [Microsoft Entra authentication with PostgreSQL](#azure-ad-authentication-with-postgresql)
     - [Architecture](#architecture)
     - [Token as password](#token-as-password)
   - [Examples](#examples)
@@ -27,7 +27,7 @@
 
 # Azure identity JDBC PostgreSQL plugin library for Java
 
-This package contains the jdbc authentication plugin to authenticate with Azure Active Directory (Azure AD) for Azure hosted PostgreSQL services.
+This package contains the JDBC authentication plugin to authenticate with Microsoft Entra ID for Azure-hosted PostgreSQL databases.
 
 [Source code][postgresql_source] | [API reference documentation][docs] | [Product documentation][postgresql_product_docs]
 | [Quickstart][quick_start_postgresql]
@@ -83,7 +83,7 @@ Replace the placeholders with the following values, which are used throughout th
   region closer to where you live. You can have the full list of available regions by entering az account
   list-locations.
 - ${YOUR_POSTGRESQL_AD_NON_ADMIN_USERNAME}: The username of your PostgreSQL database server. Make ensure the username is
-  a valid user in your Azure AD tenant.
+  a valid user in your Microsoft Entra tenant.
 - ${YOUR_LOCAL_IP_ADDRESS}: The IP address of your local computer, from which you'll run your Spring Boot application.
   One convenient way to find it is to point your browser to [whatismyip.akamai.com][whatismyip.akamai.com].
 
@@ -114,10 +114,10 @@ az postgres server firewall-rule create \
     --output tsv
 ```
 
-#### Enable Azure AD-based authentication
+#### Enable Microsoft Entra ID-based authentication
 
-To use Azure Active Directory access with Azure Database for PostgreSQL, you should set the Azure AD admin user first.
-Only an Azure AD Admin user can create/enable users for Azure AD-based authentication.
+To use Microsoft Entra access with Azure Database for PostgreSQL, you should set the Microsoft Entra admin user first.
+Only a Microsoft Entra admin user can create/enable users for Microsoft Entra-based authentication.
 
 ```Azure CLI
 az postgres server ad-admin create \
@@ -129,27 +129,27 @@ az postgres server ad-admin create \
 
 ## Key concepts
 
-### Azure AD authentication with PostgreSQL
+### Microsoft Entra authentication with PostgreSQL
 
-Microsoft Azure Active Directory (Azure AD) authentication is a mechanism of connecting to Azure Database for PostgreSQL
-using identities defined in Azure AD. With Azure AD authentication, you can manage database user identities and other
+Microsoft Entra authentication is a mechanism of connecting to Azure Database for PostgreSQL
+using identities defined in Microsoft Entra ID. With Microsoft Entra authentication, you can manage database user identities and other
 Microsoft services in a central location, which simplifies permission management.
 
-The following high-level diagram summarizes how authentication works using Azure AD authentication with Azure Database
+The following high-level diagram summarizes how authentication works using Microsoft Entra authentication with Azure Database
 for PostgreSQL. The arrows indicate communication pathways.
 
 ![postgresql-architecture.png](img/postgresql-architecture.png)
 
-To learn more about using Azure AD with PostgreSQL, see Use (Use Azure Active Directory for authenticating with
-PostgreSQL)[Use Azure Active Directory for authenticating with PostgreSQL]
+To learn more about using Microsoft Entra ID with PostgreSQL, see (Use Microsoft Entra ID for authenticating with
+PostgreSQL)[Use Microsoft Entra ID for authenticating with PostgreSQL].
 
 ### Architecture
 
-This picture shows how the jdbc authentication plugin for PostgreSQl authenticating with managed identity.
+This picture shows how the JDBC authentication plugin for PostgreSQL authenticating with managed identity.
 
 ![postgresql_design.png](img/postgresql_design.png)
 
-1. The JDBC auth plugin will get an access token from Azure AD.
+1. The JDBC auth plugin will get an access token from Microsoft Entra ID.
 2. The JDBC driver will take the token obtained from step 1 as the password ( `token as password`) to connect with the PostgreSQL server.
 3. The PostgreSQL server will check the access token and authenticate internally.
 
@@ -200,9 +200,9 @@ Connection connection=DriverManager.getConnection(url,properties);
 
 ### Cloud Configuration
 
-Credentials default to authenticating to the Azure Active Directory endpoint for Azure Public Cloud. To access resources
+Credentials default to authenticating to the Microsoft Entra endpoint for Azure Public Cloud. To access resources
 in other clouds, such as Azure Government or a private cloud, configure credentials with the `azure.authorityHost`
-argument. [AzureAuthorityHosts](https://docs.microsoft.com/java/api/com.azure.identity.azureauthorityhosts?view=azure-java-stable)
+argument. [AzureAuthorityHosts](https://learn.microsoft.com/java/api/com.azure.identity.azureauthorityhosts?view=azure-java-stable)
 defines authorities for well-known clouds:
 
 ```java
@@ -293,11 +293,11 @@ the [contributing guide](https://github.com/Azure/azure-sdk-for-java/blob/main/C
 
 <!-- LINKS -->
 
-[jdk]: https://docs.microsoft.com/java/azure/jdk/
+[jdk]: https://learn.microsoft.com/java/azure/jdk/
 [azure_subscription]: https://azure.microsoft.com/free/
 [postgresql_source]: https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/identity/azure-identity-extensions
 [docs]: https://azure.github.io/azure-sdk-for-java/
-[postgresql_product_docs]: https://docs.microsoft.com/azure/postgresql/single-server/overview
+[postgresql_product_docs]: https://learn.microsoft.com/azure/postgresql/single-server/overview
 [quick_start_postgresql]: https://aka.ms/passwordless/quickstart/postgresql
-[Use Azure Active Directory for authenticating with PostgreSQL]:https://docs.microsoft.com/azure/postgresql/single-server/concepts-azure-ad-authentication
+[Use Microsoft Entra ID for authenticating with PostgreSQL]:https://learn.microsoft.com/azure/postgresql/single-server/concepts-azure-ad-authentication
 [whatismyip.akamai.com]: https://whatismyip.akamai.com/

sdk/identity/azure-identity-extensions/README.md

@@ -11,7 +11,7 @@
 
 # Azure identity authentication extensions plugin library for Java
 
-This package contains authentication extensions to get a token from Azure Active Directory (Azure AD) for Azure services, like Azure Database for MySQL.
+This package contains authentication extensions to get a token from Microsoft Entra ID for Azure services, like Azure Database for MySQL.
 
 ## Getting started
 
@@ -23,8 +23,8 @@ This package contains authentication extensions to get a token from Azure Active
 
 ## Key concepts
 
-Azure Identity Extensions contains a common template framework for users to get a token from Azure AD and
-use the token as a password. For example, to connect Azure hosted MySQL, get a token from Azure AD and use the
+Azure Identity Extensions contains a common template framework for users to get a token from Microsoft Entra ID and
+use the token as a password. For example, to connect Azure hosted MySQL, get a token from Microsoft Entra ID and use the
 token as a password to connect with MySQL.
 
 ## Architecture
@@ -52,6 +52,6 @@ Other useful docs are:
 For details on contributing to this repository, see the [contributing guide](https://github.com/Azure/azure-sdk-for-java/blob/main/CONTRIBUTING.md).
 
 <!-- LINKS -->
-[jdk]: https://docs.microsoft.com/java/azure/jdk/
+[jdk]: https://learn.microsoft.com/java/azure/jdk/
 [azure-identity-extensions-jdbc-mysql]: https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/identity/azure-identity-extensions/Azure-Database-for-MySQL-README.md
 [azure-identity-extensions-jdbc-postgresql]: https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/identity/azure-identity-extensions/Azure-Database-for-PostgreSQL-README.md

sdk/identity/azure-identity-extensions/src/main/java/com/azure/identity/extensions/implementation/template/AzureAuthenticationTemplate.java

@@ -89,7 +89,7 @@ public Mono<String> getTokenAsPasswordAsync() {
     }
 
     /**
-     * Return a password which is an Azure AD token that can be used to authenticate.
+     * Return a password which is a Microsoft Entra token that can be used to authenticate.
      *
      * Always return a valid value, and the value won't expire in a threshold.
      *

sdk/identity/azure-identity-extensions/src/main/java/com/azure/identity/extensions/implementation/token/AccessTokenResolverImpl.java

@@ -28,7 +28,7 @@ public AccessTokenResolverImpl(AccessTokenResolverOptions options) {
 
     /**
      * Get a Publisher that emits a single access token.
-     * @param tokenCredential An AAD credential that acquires a token.
+     * @param tokenCredential A Microsoft Entra credential that acquires a token.
      * @return A Publisher that emits a single access token.
      */
     @Override

sdk/identity/azure-identity-extensions/src/main/java/com/azure/identity/extensions/jdbc/mysql/AzureMysqlAuthenticationPlugin.java

@@ -15,7 +15,7 @@
 import java.util.Properties;
 
 /**
- * The authentication plugin that enables authentication with Azure AD.
+ * The authentication plugin that enables authentication with Microsoft Entra ID.
  */
 public class AzureMysqlAuthenticationPlugin implements AuthenticationPlugin<NativePacketPayload> {
     private static final ClientLogger LOGGER = new ClientLogger(AzureMysqlAuthenticationPlugin.class);

sdk/identity/azure-identity-extensions/src/main/java/com/azure/identity/extensions/jdbc/postgresql/AzurePostgresqlAuthenticationPlugin.java

@@ -13,7 +13,7 @@
 import static org.postgresql.util.PSQLState.INVALID_PASSWORD;
 
 /**
- * The authentication plugin that enables authentication with Azure AD.
+ * The authentication plugin that enables authentication with Microsoft Entra ID.
  */
 public class AzurePostgresqlAuthenticationPlugin implements AuthenticationPlugin {
 
@@ -39,11 +39,11 @@ public AzurePostgresqlAuthenticationPlugin(Properties properties) {
      * @param type The authentication method that the server is requesting.
      *
      *             <p>AzurePostgresqlAuthenticationPlugin is used as an extension to
-     *             perform authentication with Azure AD,the value here is CLEARTEXT_PASSWORD.</p>
+     *             perform authentication with Microsoft Entra ID, the value here is CLEARTEXT_PASSWORD.</p>
      *
      *             When PostgreSQL client trying to connect with PostgreSQL server:
      *             1. Client will send startup packet to server, the server will return the AuthenticationRequestType it accepts,
-     *                If the username is used to perform Azure AD authentication, the server will return CLEARTEXT_PASSWORD.
+     *                If the username is used to perform Microsoft Entra authentication, the server will return CLEARTEXT_PASSWORD.
      *             2. Client will do authentication (until AuthenticationOk).
      *
      * @return The password to use.

sdk/identity/azure-identity-perf/README.md

@@ -31,4 +31,4 @@ For details on contributing to this repository, see the [contributing guide](htt
 1. Create new Pull Request
 
 <!-- links -->
-[jdk_link]: https://docs.microsoft.com/java/azure/jdk/?view=azure-java-stable
+[jdk_link]: https://learn.microsoft.com/java/azure/jdk/?view=azure-java-stable

sdk/identity/azure-identity/CHANGELOG.md

@@ -142,7 +142,7 @@
 
 ### Features Added
 - [[#32527]](https://github.com/Azure/azure-sdk-for-java/pull/32527) Added Azure Developer CLI Credential.
-- Added support to disable instance discovery on AAD credentials.
+- Added support to disable instance discovery on Microsoft Entra ID credentials.
 - `WorkloadIdentityCredential` and `DefaultAzureCredential` support Workload Identity Federation on Kubernetes. `DefaultAzureCredential` support requires environment variable configuration as set by the Workload Identity webhook.
 
 ## 1.8.0 (2023-02-03)
@@ -163,7 +163,7 @@
 
 ### Features Added
 - Added support to configure `clientOptions`, `httpLogOptions`, `retryPolicy`, `retryOptions` and `addPolicy` on Identity credentials.
-- Added support to disable instance discovery on AAD credentials.
+- Added support to disable instance discovery on Microsoft Entra ID credentials.
 
 ## 1.7.3 (2023-01-06)
 
@@ -666,7 +666,7 @@ The `getToken(String... scopes)` methods on all the credentials are changed to `
 ## 1.0.0-preview.3 (2019-09-09)
 **New features**
 
-A new credential `SharedTokenCacheCredential` is added. It's currently only supported on Windows. This credential is capable of authenticating to Azure Active Directory if you are logged in in Visual Studio 2019.
+A new credential `SharedTokenCacheCredential` is added. It's currently only supported on Windows. This credential is capable of authenticating to Microsoft Entra ID if you are logged in in Visual Studio 2019.
 
 ## 1.0.0-preview.2 (2019-08-05)
 **Breaking changes**
@@ -710,5 +710,5 @@ See the [documentation](https://github.com/Azure/azure-sdk-for-java/blob/main/sd
 for more details. User authentication will be added in an upcoming preview
 release.
 
-This release supports only global Azure Active Directory tenants, i.e. those
+This release supports only global Microsoft Entra tenants, i.e. those
 using the https://login.microsoftonline.com authentication endpoint.