Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public final class AzureUserSecurityContext implements JsonSerializable<AzureUse
private String applicationName;

/*
* This identifier is the Microsoft Entra ID (formerly Azure Active Directory) user object ID used to authenticate
* This identifier is the Microsoft Entra ID user object ID used to authenticate
* end-users within the generative AI application. Sensitive personal information should not be included in this
* field.
*/
Expand Down Expand Up @@ -80,7 +80,7 @@ public AzureUserSecurityContext setApplicationName(String applicationName) {
}

/**
* Get the endUserId property: This identifier is the Microsoft Entra ID (formerly Azure Active Directory) user
* Get the endUserId property: This identifier is the Microsoft Entra ID user
* object ID used to authenticate end-users within the generative AI application. Sensitive personal information
* should not be included in this field.
*
Expand All @@ -92,7 +92,7 @@ public String getEndUserId() {
}

/**
* Set the endUserId property: This identifier is the Microsoft Entra ID (formerly Azure Active Directory) user
* Set the endUserId property: This identifier is the Microsoft Entra ID user
* object ID used to authenticate end-users within the generative AI application. Sensitive personal information
* should not be included in this field.
*
Expand Down
4 changes: 2 additions & 2 deletions sdk/ai/azure-ai-inference/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ ChatCompletionsAsyncClient client = new ChatCompletionsClientBuilder()
.buildAsyncClient();
```

#### Create a client with Azure Active Directory credential
#### Create a client with Microsoft Entra ID credential
Azure SDK for Java supports an Azure Identity package, making it easy to get credentials from Microsoft identity
platform.

Expand All @@ -73,7 +73,7 @@ Authentication with AAD requires some initial setup:
[//]: # ({x-version-update-end})

Authorization is easiest using [DefaultAzureCredential][wiki_identity]. It finds the best credential to use in its
running environment. For more information about using Azure Active Directory authorization with OpenAI service, please
running environment. For more information about using Microsoft Entra ID authorization with OpenAI service, please
refer to [the associated documentation][aad_authorization].

```java readme-sample-createChatCompletionsClientWithAAD
Expand Down
2 changes: 1 addition & 1 deletion sdk/ai/azure-ai-inference/TROUBLESHOOTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ asyncClient.complete(new ChatCompletionsOptions(chatMessages))

### Authentication errors

Azure Inference supports Azure Active Directory authentication. [ChatCompletionsClientBuilder][chat_completions_client_builder]
Azure Inference supports Microsoft Entra ID authentication. [ChatCompletionsClientBuilder][chat_completions_client_builder]
offers an API to set the `credential`. To provide a valid credential, you can use `azure-identity` dependency. For more
details on getting started, refer to the [README][how_to_create_chat_completions_client] of Azure Inference library.
You can also refer to the [Azure Identity documentation][identity_doc] for more details on the various types of
Expand Down
4 changes: 2 additions & 2 deletions sdk/anomalydetector/azure-ai-anomalydetector/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ Alternatively, you can use the [Azure CLI][azure_cli] snippet below to get the A
az cognitiveservices account keys list --resource-group <your-resource-group-name> --name <your-resource-name>
```

#### Create AnomalyDetectorClient with Azure Active Directory Credential
#### Create AnomalyDetectorClient with Microsoft Entra ID Credential

You can authenticate with Azure Active Directory using the [Azure Identity library][azure_identity]. Note that regional
You can authenticate with Microsoft Entra ID using the [Azure Identity library][azure_identity]. Note that regional
endpoints do not support AAD authentication. Create a [custom subdomain][custom_subdomain] for your resource in order
to use this type of authentication.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ public String id() {
}

/**
* Get the appIds property: The allowed Azure Active Directory Application IDs.
* Get the appIds property: The allowed Microsoft Entra ID Application IDs.
*
* @return the appIds value.
*/
Expand All @@ -92,7 +92,7 @@ public List<String> appIds() {
}

/**
* Set the appIds property: The allowed Azure Active Directory Application IDs.
* Set the appIds property: The allowed Microsoft Entra ID Application IDs.
*
* @param appIds the appIds value to set.
* @return the AuthorizationAccessPolicyContractInner object itself.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
public final class AuthorizationAccessPolicyContractProperties
implements JsonSerializable<AuthorizationAccessPolicyContractProperties> {
/*
* The allowed Azure Active Directory Application IDs
* The allowed Microsoft Entra ID Application IDs
*/
private List<String> appIds;

Expand All @@ -40,7 +40,7 @@ public AuthorizationAccessPolicyContractProperties() {
}

/**
* Get the appIds property: The allowed Azure Active Directory Application IDs.
* Get the appIds property: The allowed Microsoft Entra ID Application IDs.
*
* @return the appIds value.
*/
Expand All @@ -49,7 +49,7 @@ public List<String> appIds() {
}

/**
* Set the appIds property: The allowed Azure Active Directory Application IDs.
* Set the appIds property: The allowed Microsoft Entra ID Application IDs.
*
* @param appIds the appIds value to set.
* @return the AuthorizationAccessPolicyContractProperties object itself.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ public GroupContractInner withTypePropertiesType(GroupType type) {

/**
* Get the externalId property: For external groups, this property contains the id of the group from the external
* identity provider, e.g. for Azure Active Directory `aad://&lt;tenant&gt;.onmicrosoft.com/groups/&lt;group object
* identity provider, e.g. for Microsoft Entra ID `aad://&lt;tenant&gt;.onmicrosoft.com/groups/&lt;group object
* id&gt;`; otherwise the value is null.
*
* @return the externalId value.
Expand All @@ -174,7 +174,7 @@ public String externalId() {

/**
* Set the externalId property: For external groups, this property contains the id of the group from the external
* identity provider, e.g. for Azure Active Directory `aad://&lt;tenant&gt;.onmicrosoft.com/groups/&lt;group object
* identity provider, e.g. for Microsoft Entra ID `aad://&lt;tenant&gt;.onmicrosoft.com/groups/&lt;group object
* id&gt;`; otherwise the value is null.
*
* @param externalId the externalId value to set.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public final class GroupContractProperties implements JsonSerializable<GroupCont

/*
* For external groups, this property contains the id of the group from the external identity provider, e.g. for
* Azure Active Directory `aad://<tenant>.onmicrosoft.com/groups/<group object id>`; otherwise the value is null.
* Microsoft Entra ID `aad://<tenant>.onmicrosoft.com/groups/<group object id>`; otherwise the value is null.
*/
private String externalId;

Expand Down Expand Up @@ -122,7 +122,7 @@ public GroupContractProperties withType(GroupType type) {

/**
* Get the externalId property: For external groups, this property contains the id of the group from the external
* identity provider, e.g. for Azure Active Directory `aad://&lt;tenant&gt;.onmicrosoft.com/groups/&lt;group object
* identity provider, e.g. for Microsoft Entra ID `aad://&lt;tenant&gt;.onmicrosoft.com/groups/&lt;group object
* id&gt;`; otherwise the value is null.
*
* @return the externalId value.
Expand All @@ -133,7 +133,7 @@ public String externalId() {

/**
* Set the externalId property: For external groups, this property contains the id of the group from the external
* identity provider, e.g. for Azure Active Directory `aad://&lt;tenant&gt;.onmicrosoft.com/groups/&lt;group object
* identity provider, e.g. for Microsoft Entra ID `aad://&lt;tenant&gt;.onmicrosoft.com/groups/&lt;group object
* id&gt;`; otherwise the value is null.
*
* @param externalId the externalId value to set.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public final class GroupCreateParametersProperties implements JsonSerializable<G

/*
* Identifier of the external groups, this property contains the id of the group from the external identity
* provider, e.g. for Azure Active Directory `aad://<tenant>.onmicrosoft.com/groups/<group object id>`; otherwise
* provider, e.g. for Microsoft Entra ID `aad://<tenant>.onmicrosoft.com/groups/<group object id>`; otherwise
* the value is null.
*/
private String externalId;
Expand Down Expand Up @@ -108,7 +108,7 @@ public GroupCreateParametersProperties withType(GroupType type) {

/**
* Get the externalId property: Identifier of the external groups, this property contains the id of the group from
* the external identity provider, e.g. for Azure Active Directory
* the external identity provider, e.g. for Microsoft Entra ID
* `aad://&lt;tenant&gt;.onmicrosoft.com/groups/&lt;group object id&gt;`; otherwise the value is null.
*
* @return the externalId value.
Expand All @@ -119,7 +119,7 @@ public String externalId() {

/**
* Set the externalId property: Identifier of the external groups, this property contains the id of the group from
* the external identity provider, e.g. for Azure Active Directory
* the external identity provider, e.g. for Microsoft Entra ID
* `aad://&lt;tenant&gt;.onmicrosoft.com/groups/&lt;group object id&gt;`; otherwise the value is null.
*
* @param externalId the externalId value to set.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public final class GroupUpdateParametersProperties implements JsonSerializable<G

/*
* Identifier of the external groups, this property contains the id of the group from the external identity
* provider, e.g. for Azure Active Directory `aad://<tenant>.onmicrosoft.com/groups/<group object id>`; otherwise
* provider, e.g. for Microsoft Entra ID `aad://<tenant>.onmicrosoft.com/groups/<group object id>`; otherwise
* the value is null.
*/
private String externalId;
Expand Down Expand Up @@ -107,7 +107,7 @@ public GroupUpdateParametersProperties withType(GroupType type) {

/**
* Get the externalId property: Identifier of the external groups, this property contains the id of the group from
* the external identity provider, e.g. for Azure Active Directory
* the external identity provider, e.g. for Microsoft Entra ID
* `aad://&lt;tenant&gt;.onmicrosoft.com/groups/&lt;group object id&gt;`; otherwise the value is null.
*
* @return the externalId value.
Expand All @@ -118,7 +118,7 @@ public String externalId() {

/**
* Set the externalId property: Identifier of the external groups, this property contains the id of the group from
* the external identity provider, e.g. for Azure Active Directory
* the external identity provider, e.g. for Microsoft Entra ID
* `aad://&lt;tenant&gt;.onmicrosoft.com/groups/&lt;group object id&gt;`; otherwise the value is null.
*
* @param externalId the externalId value to set.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ public IdentityProviderContractInner withSigninTenant(String signinTenant) {
}

/**
* Get the allowedTenants property: List of Allowed Tenants when configuring Azure Active Directory login.
* Get the allowedTenants property: List of Allowed Tenants when configuring Microsoft Entra ID login.
*
* @return the allowedTenants value.
*/
Expand All @@ -193,7 +193,7 @@ public List<String> allowedTenants() {
}

/**
* Set the allowedTenants property: List of Allowed Tenants when configuring Azure Active Directory login.
* Set the allowedTenants property: List of Allowed Tenants when configuring Microsoft Entra ID login.
*
* @param allowedTenants the allowedTenants value to set.
* @return the IdentityProviderContractInner object itself.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
import java.util.List;

/**
* The external Identity Providers like Facebook, Google, Microsoft, Twitter or Azure Active Directory which can be used
* The external Identity Providers like Facebook, Google, Microsoft, Twitter or Microsoft Entra ID which can be used
* to enable access to the API Management service developer portal for all users.
*/
@Fluent
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
import java.util.List;

/**
* The external Identity Providers like Facebook, Google, Microsoft, Twitter or Azure Active Directory which can be used
* The external Identity Providers like Facebook, Google, Microsoft, Twitter or Microsoft Entra ID which can be used
* to enable access to the API Management service developer portal for all users.
*/
@Fluent
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public interface AuthorizationAccessPolicyContract {
String type();

/**
* Gets the appIds property: The allowed Azure Active Directory Application IDs.
* Gets the appIds property: The allowed Microsoft Entra ID Application IDs.
*
* @return the appIds value.
*/
Expand Down Expand Up @@ -130,9 +130,9 @@ interface WithCreate extends DefinitionStages.WithAppIds, DefinitionStages.WithT
*/
interface WithAppIds {
/**
* Specifies the appIds property: The allowed Azure Active Directory Application IDs.
* Specifies the appIds property: The allowed Microsoft Entra ID Application IDs.
*
* @param appIds The allowed Azure Active Directory Application IDs.
* @param appIds The allowed Microsoft Entra ID Application IDs.
* @return the next definition stage.
*/
WithCreate withAppIds(List<String> appIds);
Expand Down Expand Up @@ -217,9 +217,9 @@ interface UpdateStages {
*/
interface WithAppIds {
/**
* Specifies the appIds property: The allowed Azure Active Directory Application IDs.
* Specifies the appIds property: The allowed Microsoft Entra ID Application IDs.
*
* @param appIds The allowed Azure Active Directory Application IDs.
* @param appIds The allowed Microsoft Entra ID Application IDs.
* @return the next definition stage.
*/
Update withAppIds(List<String> appIds);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public interface GroupContract {

/**
* Gets the externalId property: For external groups, this property contains the id of the group from the external
* identity provider, e.g. for Azure Active Directory `aad://&lt;tenant&gt;.onmicrosoft.com/groups/&lt;group object
* identity provider, e.g. for Microsoft Entra ID `aad://&lt;tenant&gt;.onmicrosoft.com/groups/&lt;group object
* id&gt;`; otherwise the value is null.
*
* @return the externalId value.
Expand Down Expand Up @@ -182,11 +182,11 @@ interface WithType {
interface WithExternalId {
/**
* Specifies the externalId property: Identifier of the external groups, this property contains the id of
* the group from the external identity provider, e.g. for Azure Active Directory
* the group from the external identity provider, e.g. for Microsoft Entra ID
* `aad://&lt;tenant&gt;.onmicrosoft.com/groups/&lt;group object id&gt;`; otherwise the value is null..
*
* @param externalId Identifier of the external groups, this property contains the id of the group from the
* external identity provider, e.g. for Azure Active Directory
* external identity provider, e.g. for Microsoft Entra ID
* `aad://&lt;tenant&gt;.onmicrosoft.com/groups/&lt;group object id&gt;`; otherwise the value is null.
* @return the next definition stage.
*/
Expand Down Expand Up @@ -286,11 +286,11 @@ interface WithType {
interface WithExternalId {
/**
* Specifies the externalId property: Identifier of the external groups, this property contains the id of
* the group from the external identity provider, e.g. for Azure Active Directory
* the group from the external identity provider, e.g. for Microsoft Entra ID
* `aad://&lt;tenant&gt;.onmicrosoft.com/groups/&lt;group object id&gt;`; otherwise the value is null..
*
* @param externalId Identifier of the external groups, this property contains the id of the group from the
* external identity provider, e.g. for Azure Active Directory
* external identity provider, e.g. for Microsoft Entra ID
* `aad://&lt;tenant&gt;.onmicrosoft.com/groups/&lt;group object id&gt;`; otherwise the value is null.
* @return the next definition stage.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ public GroupCreateParameters withType(GroupType type) {

/**
* Get the externalId property: Identifier of the external groups, this property contains the id of the group from
* the external identity provider, e.g. for Azure Active Directory
* the external identity provider, e.g. for Microsoft Entra ID
* `aad://&lt;tenant&gt;.onmicrosoft.com/groups/&lt;group object id&gt;`; otherwise the value is null.
*
* @return the externalId value.
Expand All @@ -119,7 +119,7 @@ public String externalId() {

/**
* Set the externalId property: Identifier of the external groups, this property contains the id of the group from
* the external identity provider, e.g. for Azure Active Directory
* the external identity provider, e.g. for Microsoft Entra ID
* `aad://&lt;tenant&gt;.onmicrosoft.com/groups/&lt;group object id&gt;`; otherwise the value is null.
*
* @param externalId the externalId value to set.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ public GroupUpdateParameters withType(GroupType type) {

/**
* Get the externalId property: Identifier of the external groups, this property contains the id of the group from
* the external identity provider, e.g. for Azure Active Directory
* the external identity provider, e.g. for Microsoft Entra ID
* `aad://&lt;tenant&gt;.onmicrosoft.com/groups/&lt;group object id&gt;`; otherwise the value is null.
*
* @return the externalId value.
Expand All @@ -119,7 +119,7 @@ public String externalId() {

/**
* Set the externalId property: Identifier of the external groups, this property contains the id of the group from
* the external identity provider, e.g. for Azure Active Directory
* the external identity provider, e.g. for Microsoft Entra ID
* `aad://&lt;tenant&gt;.onmicrosoft.com/groups/&lt;group object id&gt;`; otherwise the value is null.
*
* @param externalId the externalId value to set.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public class IdentityProviderBaseParameters implements JsonSerializable<Identity
private String signinTenant;

/*
* List of Allowed Tenants when configuring Azure Active Directory login.
* List of Allowed Tenants when configuring Microsoft Entra ID login.
*/
private List<String> allowedTenants;

Expand Down Expand Up @@ -109,7 +109,7 @@ public IdentityProviderBaseParameters withSigninTenant(String signinTenant) {
}

/**
* Get the allowedTenants property: List of Allowed Tenants when configuring Azure Active Directory login.
* Get the allowedTenants property: List of Allowed Tenants when configuring Microsoft Entra ID login.
*
* @return the allowedTenants value.
*/
Expand All @@ -118,7 +118,7 @@ public List<String> allowedTenants() {
}

/**
* Set the allowedTenants property: List of Allowed Tenants when configuring Azure Active Directory login.
* Set the allowedTenants property: List of Allowed Tenants when configuring Microsoft Entra ID login.
*
* @param allowedTenants the allowedTenants value to set.
* @return the IdentityProviderBaseParameters object itself.
Expand Down
Loading
Loading