Rename Azure AD to Microsoft Entra Id (#17827)
This commit is contained in:
Cheena Malhotra
GitHub
Родитель
3bd72ef0af
Коммит
6f003d76e1
|
|
@ -117,7 +117,7 @@
|
|||
<source xml:lang="en">SQL Login</source>
|
||||
</trans-unit>
|
||||
<trans-unit id="authTypeAzureActiveDirectory">
|
||||
<source xml:lang="en">Azure Active Directory - Universal w/ MFA Support</source>
|
||||
<source xml:lang="en">Microsoft Entra Id - Universal w/ MFA Support</source>
|
||||
</trans-unit>
|
||||
<trans-unit id="azureAuthTypeCodeGrant">
|
||||
<source xml:lang="en">Azure Code Grant</source>
|
||||
|
|
@ -147,7 +147,7 @@
|
|||
<source xml:lang="en">Microsoft Corp</source>
|
||||
</trans-unit>
|
||||
<trans-unit id="azureMicrosoftAccount">
|
||||
<source xml:lang="en">Microsoft Account</source>
|
||||
<source xml:lang="en">Microsoft Entra Account</source>
|
||||
</trans-unit>
|
||||
<trans-unit id="azureNoMicrosoftResource">
|
||||
<source xml:lang="en">Provider '{0}' does not have a Microsoft resource endpoint defined.</source>
|
||||
|
|
@ -189,25 +189,25 @@
|
|||
<source xml:lang="en">Copy code and open webpage</source>
|
||||
</trans-unit>
|
||||
<trans-unit id="azureChooseAccount">
|
||||
<source xml:lang="en">Choose an Azure Active Directory Account</source>
|
||||
<source xml:lang="en">Choose a Microsoft Entra account</source>
|
||||
</trans-unit>
|
||||
<trans-unit id="azureAddAccount">
|
||||
<source xml:lang="en">Add an Account...</source>
|
||||
<source xml:lang="en">Add a Microsoft Entra account...</source>
|
||||
</trans-unit>
|
||||
<trans-unit id="accountAddedSuccessfully">
|
||||
<source xml:lang="en">Azure account {0} successfully added.</source>
|
||||
<source xml:lang="en">Microsoft Entra account {0} successfully added.</source>
|
||||
</trans-unit>
|
||||
<trans-unit id="accountCouldNotBeAdded">
|
||||
<source xml:lang="en">New Azure account could not be added.</source>
|
||||
<source xml:lang="en">New Microsoft Entra account could not be added.</source>
|
||||
</trans-unit>
|
||||
<trans-unit id="accountRemovedSuccessfully">
|
||||
<source xml:lang="en">Selected Azure Account removed successfully.</source>
|
||||
<source xml:lang="en">Selected Microsoft Entra account removed successfully.</source>
|
||||
</trans-unit>
|
||||
<trans-unit id="accountRemovalFailed">
|
||||
<source xml:lang="en">An error occurred while removing user account: {0}</source>
|
||||
<source xml:lang="en">An error occurred while removing Microsoft Entra account: {0}</source>
|
||||
</trans-unit>
|
||||
<trans-unit id="noAzureAccountForRemoval">
|
||||
<source xml:lang="en">No Azure Account can be found for removal.</source>
|
||||
<source xml:lang="en">No Microsoft Entra account can be found for removal.</source>
|
||||
</trans-unit>
|
||||
<trans-unit id="clearedAzureTokenCache">
|
||||
<source xml:lang="en">Azure token cache cleared successfully.</source>
|
||||
|
|
@ -216,10 +216,10 @@
|
|||
<source xml:lang="en">Cannot connect due to expired tokens. Please re-authenticate and try again.</source>
|
||||
</trans-unit>
|
||||
<trans-unit id="aad">
|
||||
<source xml:lang="en">AAD</source>
|
||||
<source xml:lang="en">Microsoft Entra Id</source>
|
||||
</trans-unit>
|
||||
<trans-unit id="azureChooseTenant">
|
||||
<source xml:lang="en">Choose an Azure tenant</source>
|
||||
<source xml:lang="en">Choose a Microsoft Entra tenant</source>
|
||||
</trans-unit>
|
||||
<trans-unit id="tenant">
|
||||
<source xml:lang="en">Tenant</source>
|
||||
|
|
@ -351,7 +351,7 @@
|
|||
<source xml:lang="en">Encryption was enabled on this connection, review your SSL and certificate configuration for the target SQL Server, or set 'Trust server certificate' to 'true' in the settings file. Note: A self-signed certificate offers only limited protection and is not a recommended practice for production environments. Do you want to enable 'Trust server certificate' on this connection and retry?</source>
|
||||
</trans-unit>
|
||||
<trans-unit id="msgPromptRetryFirewallRuleNotSignedIn">
|
||||
<source xml:lang="en">Your client IP address does not have access to the server. Add an Azure account and create a new firewall rule to enable access.</source>
|
||||
<source xml:lang="en">Your client IP address does not have access to the server. Add a Microsoft Entra account and create a new firewall rule to enable access.</source>
|
||||
</trans-unit>
|
||||
<trans-unit id="msgPromptRetryFirewallRuleSignedIn">
|
||||
<source xml:lang="en">Your client IP Address '{0}' does not have access to the server '{1}' you're attempting to connect to. Would you like to create new firewall rule?</source>
|
||||
|
|
@ -429,7 +429,7 @@
|
|||
<source xml:lang="en">Error when refreshing token</source>
|
||||
</trans-unit>
|
||||
<trans-unit id="msgAzureCredStoreSaveFailedError">
|
||||
<source xml:lang="en">Keys for token cache could not be saved in credential store, this may cause Azure access token persistence issues and connection instabilities. It's likely that SqlTools has reached credential storage limit on Windows, please clear at least 2 credentials that start with "Microsoft.SqlTools|" in Windows Credential Manager and reload.</source>
|
||||
<source xml:lang="en">Keys for token cache could not be saved in credential store, this may cause Microsoft Entra Id access token persistence issues and connection instabilities. It's likely that SqlTools has reached credential storage limit on Windows, please clear at least 2 credentials that start with "Microsoft.SqlTools|" in Windows Credential Manager and reload.</source>
|
||||
</trans-unit>
|
||||
<trans-unit id="msgRefreshConnection">
|
||||
<source xml:lang="en">Failed to refresh connection ${0} with uri {1}, invalid connection result.</source>
|
||||
|
|
@ -438,7 +438,7 @@
|
|||
<source xml:lang="en">Successfully refreshed token for connection {0} with uri {1}, {2}</source>
|
||||
</trans-unit>
|
||||
<trans-unit id="msgRefreshTokenNotNeeded">
|
||||
<source xml:lang="en">No need to refresh Azure acccount token for connection {0} with uri {1}</source>
|
||||
<source xml:lang="en">No need to refresh Microsoft Entra acccount token for connection {0} with uri {1}</source>
|
||||
</trans-unit>
|
||||
<trans-unit id="msgConnectedServerInfo">
|
||||
<source xml:lang="en">Connected to server "{0}" on document "{1}". Server information: {2}</source>
|
||||
|
|
|
|||
|
|
@ -99,13 +99,13 @@
|
|||
<source xml:lang="en">Copy Object Name</source>
|
||||
</trans-unit>
|
||||
<trans-unit id="mssql.addAadAccount">
|
||||
<source xml:lang="en">Add Azure Account</source>
|
||||
<source xml:lang="en">Add Microsoft Entra Account</source>
|
||||
</trans-unit>
|
||||
<trans-unit id="mssql.removeAadAccount">
|
||||
<source xml:lang="en">Remove Azure Account</source>
|
||||
<source xml:lang="en">Remove Microsoft Entra Account</source>
|
||||
</trans-unit>
|
||||
<trans-unit id="mssql.clearAzureAccountTokenCache">
|
||||
<source xml:lang="en">Clear Azure acccount token cache</source>
|
||||
<source xml:lang="en">Clear Microsoft Entra account token cache</source>
|
||||
</trans-unit>
|
||||
<trans-unit id="mssql.rebuildIntelliSenseCache">
|
||||
<source xml:lang="en">Refresh IntelliSense Cache</source>
|
||||
|
|
@ -218,11 +218,8 @@
|
|||
<trans-unit id="mssql.connection.emptyPasswordInput">
|
||||
<source xml:lang="en">[Optional] Indicates whether this profile has an empty password explicitly set</source>
|
||||
</trans-unit>
|
||||
<trans-unit id="mssql.azureAuthenticationLibrary">
|
||||
<source xml:lang="en">The library used for the Azure Active Directory authentication flow. Please restart Visual Studio Code after changing this option.</source>
|
||||
</trans-unit>
|
||||
<trans-unit id="mssql.enableSqlAuthenticationProvider">
|
||||
<source xml:lang="en">Enables use of the Sql Authentication Provider for 'Active Directory Interactive' authentication mode when user selects 'AzureMFA' authentication. This enables Server-side resource endpoint integration when fetching access tokens. This option is only supported for 'MSAL' Azure Authentication Library. Please restart Visual Studio Code after changing this option.</source>
|
||||
<source xml:lang="en">Enables use of the Sql Authentication Provider for 'Microsoft Entra Id Interactive' authentication mode when user selects 'AzureMFA' authentication. This enables Server-side resource endpoint integration when fetching access tokens. This option is only supported for 'MSAL' Authentication Library. Please restart Visual Studio Code after changing this option.</source>
|
||||
</trans-unit>
|
||||
<trans-unit id="mssql.enableConnectionPooling">
|
||||
<source xml:lang="en">Enables connection pooling to improve overall connectivity performance. This setting is enabled by default. Visual Studio Code is required to be relaunched when the value is changed. To clear pooled connections, run the command: 'MS SQL: Clear Pooled Connections'</source>
|
||||
|
|
|
|||
|
|
@ -31,9 +31,9 @@
|
|||
"mssql.objectExplorerNewQuery":"New Query",
|
||||
"mssql.toggleSqlCmd":"Toggle SQLCMD Mode",
|
||||
"mssql.copyObjectName":"Copy Object Name",
|
||||
"mssql.addAadAccount":"Add Azure Account",
|
||||
"mssql.removeAadAccount":"Remove Azure Account",
|
||||
"mssql.clearAzureAccountTokenCache":"Clear Azure acccount token cache",
|
||||
"mssql.addAadAccount":"Add Microsoft Entra Account",
|
||||
"mssql.removeAadAccount":"Remove Microsoft Entra Account",
|
||||
"mssql.clearAzureAccountTokenCache":"Clear Microsoft Entra account token cache",
|
||||
"mssql.rebuildIntelliSenseCache":"Refresh IntelliSense Cache",
|
||||
"mssql.logDebugInfo":"[Optional] Log debug output to the VS Code console (Help -> Toggle Developer Tools)",
|
||||
"mssql.maxRecentConnections":"The maximum number of recently used connections to store in the connection list.",
|
||||
|
|
@ -71,8 +71,7 @@
|
|||
"mssql.connection.profileName":"[Optional] Specify a custom name for this connection profile to easily browse and search in the command palette of Visual Studio Code.",
|
||||
"mssql.connection.savePassword":"[Optional] When set to 'true', the password for SQL Server authentication is saved in the secure store of your operating system such as KeyChain in MacOS or Secure Store in Windows.",
|
||||
"mssql.connection.emptyPasswordInput":"[Optional] Indicates whether this profile has an empty password explicitly set",
|
||||
"mssql.azureAuthenticationLibrary":"The library used for the Azure Active Directory authentication flow. Please restart Visual Studio Code after changing this option.",
|
||||
"mssql.enableSqlAuthenticationProvider":"Enables use of the Sql Authentication Provider for 'Active Directory Interactive' authentication mode when user selects 'AzureMFA' authentication. This enables Server-side resource endpoint integration when fetching access tokens. This option is only supported for 'MSAL' Azure Authentication Library. Please restart Visual Studio Code after changing this option.",
|
||||
"mssql.enableSqlAuthenticationProvider":"Enables use of the Sql Authentication Provider for 'Microsoft Entra Id Interactive' authentication mode when user selects 'AzureMFA' authentication. This enables Server-side resource endpoint integration when fetching access tokens. This option is only supported for 'MSAL' Authentication Library. Please restart Visual Studio Code after changing this option.",
|
||||
"mssql.enableConnectionPooling":"Enables connection pooling to improve overall connectivity performance. This setting is enabled by default. Visual Studio Code is required to be relaunched when the value is changed. To clear pooled connections, run the command: 'MS SQL: Clear Pooled Connections'",
|
||||
"mssql.shortcuts":"Shortcuts related to the results window",
|
||||
"mssql.messagesDefaultOpen":"True for the messages pane to be open by default; false for closed",
|
||||
|
|
|
|||
|
|
@ -510,7 +510,7 @@ export interface ITokenClaims { // https://docs.microsoft.com/en-us/azure/active
|
|||
aud: string;
|
||||
/**
|
||||
* Identifies the issuer, or 'authorization server' that constructs and
|
||||
* returns the token. It also identifies the Azure AD tenant for which
|
||||
* returns the token. It also identifies the Microsoft Entra tenant for which
|
||||
* the user was authenticated. If the token was issued by the v2.0 endpoint,
|
||||
* the URI will end in /v2.0. The GUID that indicates that the user is a consumer
|
||||
* user from a Microsoft account is 9188040d-6c67-4c5b-b112-36a304b66dad.
|
||||
|
|
@ -528,7 +528,7 @@ export interface ITokenClaims { // https://docs.microsoft.com/en-us/azure/active
|
|||
* account not in the same tenant as the issuer - guests, for instance.
|
||||
* If the claim isn't present, it means that the value of iss can be used instead.
|
||||
* For personal accounts being used in an organizational context (for instance,
|
||||
* a personal account invited to an Azure AD tenant), the idp claim may be
|
||||
* a personal account invited to an Microsoft Entra tenant), the idp claim may be
|
||||
* 'live.com' or an STS URI containing the Microsoft account tenant
|
||||
* 9188040d-6c67-4c5b-b112-36a304b66dad.
|
||||
*/
|
||||
|
|
@ -561,7 +561,7 @@ export interface ITokenClaims { // https://docs.microsoft.com/en-us/azure/active
|
|||
*/
|
||||
at_hash: string;
|
||||
/**
|
||||
* An internal claim used by Azure AD to record data for token reuse. Should be ignored.
|
||||
* An internal claim used by Microsoft Entra to record data for token reuse. Should be ignored.
|
||||
*/
|
||||
aio: string;
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -112,8 +112,8 @@ suite('Connection Profile tests', () => {
|
|||
LocalizedConstants.usernamePrompt, // UserName
|
||||
LocalizedConstants.passwordPrompt, // Password
|
||||
LocalizedConstants.msgSavePassword, // Save Password
|
||||
LocalizedConstants.aad, // Choose AAD Account
|
||||
LocalizedConstants.tenant, // Choose AAD Tenant
|
||||
LocalizedConstants.aad, // Choose MEID Account
|
||||
LocalizedConstants.tenant, // Choose ME Tenant
|
||||
LocalizedConstants.profileNamePrompt // Profile Name
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -197,11 +197,11 @@ declare module 'vscode-mssql' {
|
|||
*/
|
||||
Integrated = 'Integrated',
|
||||
/**
|
||||
* Azure Active Directory - Universal with MFA support
|
||||
* Microsoft Entra Id - Universal with MFA support
|
||||
*/
|
||||
AzureMFA = 'AzureMFA',
|
||||
/**
|
||||
* Azure Active Directory - Password
|
||||
* Microsoft Entra Id - Password
|
||||
*/
|
||||
AzureMFAAndUser = 'AzureMFAAndUser',
|
||||
/**
|
||||
|
|
@ -1696,15 +1696,15 @@ declare module 'vscode-mssql' {
|
|||
readonly type?: string;
|
||||
}
|
||||
|
||||
/** Azure Active Directory identity configuration for a resource. */
|
||||
/** Microsoft Entra Id identity configuration for a resource. */
|
||||
export interface UserIdentity {
|
||||
/**
|
||||
* The Azure Active Directory principal id.
|
||||
* The Microsoft Entra Id principal id.
|
||||
* NOTE: This property will not be serialized. It can only be populated by the server.
|
||||
*/
|
||||
readonly principalId?: string;
|
||||
/**
|
||||
* The Azure Active Directory client id.
|
||||
* The Microsoft Entra Id client id.
|
||||
* NOTE: This property will not be serialized. It can only be populated by the server.
|
||||
*/
|
||||
readonly clientId?: string;
|
||||
|
|
@ -1722,21 +1722,21 @@ declare module 'vscode-mssql' {
|
|||
*/
|
||||
export type IdentityType = string;
|
||||
|
||||
/** Azure Active Directory identity configuration for a resource. */
|
||||
/** Microsoft Entra Id identity configuration for a resource. */
|
||||
export interface ResourceIdentity {
|
||||
/** The resource ids of the user assigned identities to use */
|
||||
userAssignedIdentities?: {
|
||||
[propertyName: string]: UserIdentity;
|
||||
};
|
||||
/**
|
||||
* The Azure Active Directory principal id.
|
||||
* The Microsoft Entra Id principal id.
|
||||
* NOTE: This property will not be serialized. It can only be populated by the server.
|
||||
*/
|
||||
readonly principalId?: string;
|
||||
/** The identity type. Set this to 'SystemAssigned' in order to automatically create and assign an Azure Active Directory principal for the resource. */
|
||||
/** The identity type. Set this to 'SystemAssigned' in order to automatically create and assign an Microsoft Entra Id principal for the resource. */
|
||||
type?: IdentityType;
|
||||
/**
|
||||
* The Azure Active Directory tenant id.
|
||||
* The Microsoft Entra tenant id.
|
||||
* NOTE: This property will not be serialized. It can only be populated by the server.
|
||||
*/
|
||||
readonly tenantId?: string;
|
||||
|
|
@ -1754,7 +1754,7 @@ declare module 'vscode-mssql' {
|
|||
|
||||
/** An Azure SQL Database server. */
|
||||
export type Server = TrackedResource & {
|
||||
/** The Azure Active Directory identity of the server. */
|
||||
/** The Microsoft Entra identity of the server. */
|
||||
identity?: ResourceIdentity;
|
||||
/**
|
||||
* Kind of sql server. This is metadata used for the Azure portal experience.
|
||||
|
|
@ -1797,7 +1797,7 @@ declare module 'vscode-mssql' {
|
|||
federatedClientId?: string;
|
||||
/** A CMK URI of the key to use for encryption. */
|
||||
keyId?: string;
|
||||
/** The Azure Active Directory identity of the server. */
|
||||
/** The Microsoft Entra identity of the server. */
|
||||
administrators?: ServerExternalAdministrator;
|
||||
/** Whether or not to restrict outbound network access for this server. Value is optional but if passed in, must be 'Enabled' or 'Disabled' */
|
||||
restrictOutboundNetworkAccess?: ServerNetworkAccessFlag;
|
||||
|
|
@ -1849,7 +1849,7 @@ declare module 'vscode-mssql' {
|
|||
sid?: string;
|
||||
/** Tenant ID of the administrator. */
|
||||
tenantId?: string;
|
||||
/** Azure Active Directory only Authentication enabled. */
|
||||
/** Microsoft Entra Id only Authentication enabled. */
|
||||
azureADOnlyAuthentication?: boolean;
|
||||
}
|
||||
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче