Skip to content

Commit b6a422e

Browse files
authored
Rename Azure AD to Microsoft Entra ID in doc files (Azure#37093)
1 parent e67ed88 commit b6a422e

File tree

5 files changed

+17
-15
lines changed

5 files changed

+17
-15
lines changed

.vscode/cspell.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,7 @@
276276
"encryptor",
277277
"endtoend",
278278
"entra",
279+
"Entra",
279280
"Esto",
280281
"etag",
281282
"eventhub",

sdk/spring/CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ This section includes changes in `spring-cloud-azure-autoconfigure` module.
88

99
#### Bugs Fixed
1010
- Fix the issue that prevented the `disableChallengeResourceVerification` property of the AKV `SecretClient` to be configured [#36628](https://github.com/Azure/azure-sdk-for-java/pull/36628).
11+
- Use a new name Microsoft Entra ID instead of the old name Azure Active Directory in the Spring configuration metadata file [#37093](https://github.com/Azure/azure-sdk-for-java/pull/37093).
1112

1213
### Spring Integration Azure Event Hubs
1314
This section includes changes in the `spring-integration-azure-eventhubs` module.

sdk/spring/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ The following application starters are provided by Spring Cloud Azure under the
7171
| Name | Description |
7272
|------------------------------------------------------|--------------------------------------------------------------------|
7373
| spring-cloud-azure-starter | Core starter, including auto-configuration support |
74-
| spring-cloud-azure-starter-active-directory | Starter for using Azure Active Directory with Spring Security |
74+
| spring-cloud-azure-starter-active-directory | Starter for using Microsoft Entra ID with Spring Security |
7575
| spring-cloud-azure-starter-active-directory-b2c | Starter for using Azure Active Directory B2C with Spring Security |
7676
| spring-cloud-azure-starter-appconfiguration | Starter for using Azure App Configuration |
7777
| spring-cloud-azure-starter-cosmos | Starter for using Azure Cosmos DB |

sdk/spring/spring-cloud-azure-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
{
1414
"name": "azure.activedirectory.allow-telemetry",
1515
"type": "java.lang.Boolean",
16-
"description": "If Telemetry events should be published to Azure AD.",
16+
"description": "If Telemetry events should be published to Microsoft Entra ID.",
1717
"defaultValue": true,
1818
"deprecation": {
1919
"level": "error",
@@ -33,7 +33,7 @@
3333
{
3434
"name": "azure.activedirectory.application-type",
3535
"type": "java.lang.String",
36-
"description": "Type of the AAD application.",
36+
"description": "Type of the Microsoft Entra application.",
3737
"deprecation": {
3838
"level": "error",
3939
"reason": "Use uniform property format(spring.cloud.azure.*) in all Spring Cloud Azure libraries.",
@@ -262,7 +262,7 @@
262262
{
263263
"name": "azure.activedirectory.client-id",
264264
"type": "java.lang.String",
265-
"description": "Registered application ID in Azure AD. Must be configured when OAuth2 authentication is done in front end.",
265+
"description": "Registered application ID in Microsoft Entra ID. Must be configured when OAuth2 authentication is done in front end.",
266266
"deprecation": {
267267
"level": "error",
268268
"reason": "Use uniform property format(spring.cloud.azure.*) in all Spring Cloud Azure libraries.",
@@ -1007,7 +1007,7 @@
10071007
{
10081008
"name": "spring.cloud.azure.active-directory.enabled",
10091009
"type": "java.lang.Boolean",
1010-
"description": "Whether to enable Azure Active Directory related auto-configuration.",
1010+
"description": "Whether to enable Microsoft Entra ID related auto-configuration.",
10111011
"defaultValue": false
10121012
},
10131013
{
@@ -1307,25 +1307,25 @@
13071307
{
13081308
"name": "spring.cloud.azure.keyvault.secret.property-sources[0].profile.environment.active-directory-endpoint",
13091309
"type": "java.lang.String",
1310-
"description": "The Azure Active Directory endpoint to connect to.",
1310+
"description": "The Microsoft Entra endpoint to connect to.",
13111311
"sourceType": "com.azure.spring.cloud.autoconfigure.properties.core.profile.AzureProfileConfigurationProperties$AzureEnvironmentConfigurationProperties"
13121312
},
13131313
{
13141314
"name": "spring.cloud.azure.keyvault.secret.property-sources[0].profile.environment.active-directory-graph-api-version",
13151315
"type": "java.lang.String",
1316-
"description": "The Azure Active Directory Graph API version.",
1316+
"description": "The Microsoft Entra Graph API version.",
13171317
"sourceType": "com.azure.spring.cloud.autoconfigure.properties.core.profile.AzureProfileConfigurationProperties$AzureEnvironmentConfigurationProperties"
13181318
},
13191319
{
13201320
"name": "spring.cloud.azure.keyvault.secret.property-sources[0].profile.environment.active-directory-graph-endpoint",
13211321
"type": "java.lang.String",
1322-
"description": "The Azure Active Directory Graph endpoint.",
1322+
"description": "The Microsoft Entra Graph endpoint.",
13231323
"sourceType": "com.azure.spring.cloud.autoconfigure.properties.core.profile.AzureProfileConfigurationProperties$AzureEnvironmentConfigurationProperties"
13241324
},
13251325
{
13261326
"name": "spring.cloud.azure.keyvault.secret.property-sources[0].profile.environment.active-directory-resource-id",
13271327
"type": "java.lang.String",
1328-
"description": "The Azure Active Directory resource ID.",
1328+
"description": "The Microsoft Entra resource ID.",
13291329
"sourceType": "com.azure.spring.cloud.autoconfigure.properties.core.profile.AzureProfileConfigurationProperties$AzureEnvironmentConfigurationProperties"
13301330
},
13311331
{
@@ -1585,7 +1585,7 @@
15851585
{
15861586
"name": "spring.datasource.azure.profile.environment.active-directory-endpoint",
15871587
"type": "java.lang.String",
1588-
"description": "The Azure Active Directory endpoint to connect to.",
1588+
"description": "The Microsoft Entra endpoint to connect to.",
15891589
"sourceType": "com.azure.spring.cloud.service.implementation.passwordless.AzureJdbcPasswordlessProperties"
15901590
},
15911591
{
@@ -1603,7 +1603,7 @@
16031603
{
16041604
"name": "spring.datasource.azure.passwordless-enabled",
16051605
"type": "java.lang.Boolean",
1606-
"description": "Whether to enable passwordless connections to Azure databases by using OAuth2 Azure Active Directory token credentials.",
1606+
"description": "Whether to enable passwordless connections to Azure databases by using OAuth2 Microsoft Entra token credentials.",
16071607
"sourceType": "com.azure.spring.cloud.service.implementation.passwordless.AzureJdbcPasswordlessProperties",
16081608
"defaultValue": false
16091609
},
@@ -1653,7 +1653,7 @@
16531653
{
16541654
"name": "spring.redis.azure.profile.environment.active-directory-endpoint",
16551655
"type": "java.lang.String",
1656-
"description": "The Azure Active Directory endpoint to connect to.",
1656+
"description": "The Microsoft Entra endpoint to connect to.",
16571657
"sourceType": "com.azure.spring.cloud.service.implementation.passwordless.AzureRedisPasswordlessProperties"
16581658
},
16591659
{
@@ -1671,7 +1671,7 @@
16711671
{
16721672
"name": "spring.redis.azure.passwordless-enabled",
16731673
"type": "java.lang.Boolean",
1674-
"description": "Whether to enable passwordless connections to Azure Redis Cache by using OAuth2 Azure Active Directory token credentials.",
1674+
"description": "Whether to enable passwordless connections to Azure Redis Cache by using OAuth2 Microsoft Entra token credentials.",
16751675
"sourceType": "com.azure.spring.cloud.service.implementation.passwordless.AzureRedisPasswordlessProperties",
16761676
"defaultValue": false
16771677
},

sdk/spring/spring-cloud-azure-starter-appconfiguration-config/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ The values in App Configuration are filtered through the existing Environment wh
238238

239239
#### Use Managed Identity to access App Configuration
240240

241-
[Managed identity][azure_managed_identity] allows application to access [Azure Active Directory][azure_active_directory] protected resource on [Azure][azure].
241+
[Managed identity][azure_managed_identity] allows application to access [Microsoft Entra ID][microsoft_entra_id] protected resource on [Azure][azure].
242242

243243
In this library, [Azure Identity SDK][azure_identity_sdk] is used to access Azure App Configuration and optionally Azure Key Vault, for secrets. Only one method of authentication can be set at one time. When not using the AppConfigCredentialProvider and/or KeyVaultCredentialProvider the same authentication method is used for both App Configuration and Key Vault.
244244

@@ -344,7 +344,7 @@ Please follow [instructions here][contributing_md] to build from source or contr
344344
[enable_managed_identities]: https://docs.microsoft.com/azure/active-directory/managed-identities-azure-resources/overview#how-can-i-use-managed-identities-for-azure-resources
345345
[support_azure_services]: https://docs.microsoft.com/azure/active-directory/managed-identities-azure-resources/services-support-managed-identities
346346
[azure]: https://azure.microsoft.com
347-
[azure_active_directory]: https://azure.microsoft.com/services/active-directory/
347+
[microsoft_entra_id]: https://microsoft.com/security/business/identity-access/microsoft-entra-id
348348
[azure_identity_sdk]: https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/identity/azure-identity
349349
[azure_rbac]: https://docs.microsoft.com/azure/role-based-access-control/role-assignments-portal
350350
[app_configuration_SDK]: https://github.com/Azure/azure-sdk-for-java/tree/main/sdk/appconfiguration/azure-data-appconfiguration#key-concepts

0 commit comments

Comments
 (0)