Skip to content

Commit bf522c6

Browse files
authored
Merge pull request #47150 from MicrosoftDocs/master
7/20 PM Publish
2 parents 4e5ac8a + dfc6366 commit bf522c6

File tree

140 files changed

+1434
-659
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

140 files changed

+1434
-659
lines changed

.openpublishing.redirection.json

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,9 +157,14 @@
157157
},
158158
{
159159
"source_path": "articles/iot-edge/how-to-vscode-develop-azure-function.md",
160-
"redirect_url": "/azure/iot-edge/tutorial-multiple-modules-in-vscode",
160+
"redirect_url": "/azure/iot-edge/how-to-develop-csharp-function",
161161
"redirect_document_id": true
162162
},
163+
{
164+
"source_path": "articles/iot-edge/iot-edge-what-is-azure-iot.md",
165+
"redirect_url": "/azure/iot-fundamentals/iot-introduction",
166+
"redirect_document_id": false
167+
},
163168
{
164169
"source_path": "articles/cognitive-services/custom-decision-service/custom-decision-service-tutorial-analytics.md",
165170
"redirect_url": "/azure/cognitive-services/custom-decision-service",
@@ -172,7 +177,7 @@
172177
},
173178
{
174179
"source_path": "articles/iot-edge/how-to-vscode-develop-csharp-module.md",
175-
"redirect_url": "/azure/iot-edge/tutorial-multiple-modules-in-vscode",
180+
"redirect_url": "/azure/iot-edge/how-to-develop-csharp-module",
176181
"redirect_document_id": false
177182
},
178183
{

articles/active-directory-b2c/active-directory-b2c-reference-trustframeworks-defined-ief-custom.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ In terms of implementation, the TF specification consists of a set of policies t
8585

8686
- The metadata for establishing network communications between participants. This metadata, along with the technical profiles, are used during a transaction to plumb “on the wire” interoperability between the relying party and other community participants.
8787

88-
- The protocol conversion if any (for example, SAML, OAuth2, WS-Federation, and OpenID Connect).
88+
- The protocol conversion if any (for example, SAML 2.0, OAuth2, WS-Federation, and OpenID Connect).
8989

9090
- The authentication requirements.
9191

articles/active-directory/authentication/howto-password-ban-bad-on-premises-troubleshoot.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ If it is decided to uninstall the public preview software and cleanup all relate
203203
```
204204
$scp = “serviceConnectionPoint”
205205
$keywords = “{EBEFB703-6113-413D-9167-9F8DD4D24468}*”
206-
Get-ADObject -SearchScope Subtree -Filter { objectClass -eq $scp -and keywords -eq $keywords }
206+
Get-ADObject -SearchScope Subtree -Filter { objectClass -eq $scp -and keywords -like $keywords }
207207
```
208208

209209
Do not omit the asterisk (“*”) at the end of the $keywords variable value.
@@ -215,7 +215,7 @@ If it is decided to uninstall the public preview software and cleanup all relate
215215
```
216216
$scp = “serviceConnectionPoint”
217217
$keywords = “{B11BB10A-3E7D-4D37-A4C3-51DE9D0F77C9}*”
218-
Get-ADObject -SearchScope Subtree -Filter { objectClass -eq $scp -and keywords -eq $keywords }
218+
Get-ADObject -SearchScope Subtree -Filter { objectClass -eq $scp -and keywords -like $keywords }
219219
```
220220

221221
The resulting object found via the `Get-ADObject` command can then be piped to `Remove-ADObject`, or deleted manually.

articles/active-directory/connect/active-directory-aadconnect-sso-quick-start.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ Ensure that the machine running the Mac OS is joined to AD. For instructions on
135135

136136
#### Google Chrome (all platforms)
137137

138-
If you have overriden the [AuthNegotiateDelegateWhitelist](https://www.chromium.org/administrators/policy-list-3#AuthNegotiateDelegateWhitelist) or the [AuthServerWhitelist](https://www.chromium.org/administrators/policy-list-3#AuthServerWhitelist) policy settings in your environment, ensure that you add Azure AD's URL (https://autologon.microsoftazuread-sso.com) to them as well.
138+
If you have overridden the [AuthNegotiateDelegateWhitelist](https://www.chromium.org/administrators/policy-list-3#AuthNegotiateDelegateWhitelist) or the [AuthServerWhitelist](https://www.chromium.org/administrators/policy-list-3#AuthServerWhitelist) policy settings in your environment, ensure that you add Azure AD's URL (https://autologon.microsoftazuread-sso.com) to them as well.
139139

140140
#### Google Chrome (Mac OS only)
141141

articles/active-directory/managed-service-identity/how-to-manage-ua-identity-arm.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ It is not possible to list and delete a user assigned identity using an Azure Re
3333

3434
- If you're unfamiliar with Managed Service Identity, check out the [overview section](overview.md). **Be sure to review the [difference between a system assigned and user assigned identity](overview.md#how-does-it-work)**.
3535
- If you don't already have an Azure account, [sign up for a free account](https://azure.microsoft.com/free/) before continuing.
36-
37-
Whether you sign in to Azure locally or via the Azure portal, use an account that is associated with the Azure subscription that contains the VM. Also ensure that your account belongs to a role that gives you write permissions on the VM (for example, the role of “Virtual Machine Contributor”).
36+
- To perform the operations in this article, your account needs the following role assignment:
37+
- [Managed Identity Contributor](/azure/role-based-access-control/built-in-roles#managed-identity-contributor) role to create, read (list), update, and delete a user assigned identity.
3838

3939
## Template creation and editing
4040

@@ -47,7 +47,7 @@ As with the Azure portal and scripting, Azure Resource Manager templates provide
4747

4848
## Create a user assigned identity
4949

50-
To create a user assigned identity, use the following template. At a minimum, your account needs to be assigned the [Managed Identity Contributor](/azure/role-based-access-control/built-in-roles#managed-identity-contributor) role to create a user assigned identity. Replace the `<USER ASSIGNED IDENTITY NAME>` value with your own values:
50+
To create a user assigned identity, use the following template. Replace the `<USER ASSIGNED IDENTITY NAME>` value with your own values:
5151

5252
[!INCLUDE[ua-character-limit](~/includes/managed-identity-ua-character-limits.md)]
5353

articles/active-directory/managed-service-identity/how-to-manage-ua-identity-cli.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,10 @@ In this article, you learn how to create, list and delete a user assigned identi
2929

3030
- If you're unfamiliar with Managed Service Identity, check out the [overview section](overview.md). **Be sure to review the [difference between a system assigned and user assigned identity](overview.md#how-does-it-work)**.
3131
- If you don't already have an Azure account, [sign up for a free account](https://azure.microsoft.com/free/) before continuing.
32-
32+
- To perform the management operations in this article, your account needs the following role assignments:
33+
- [Managed Identity Contributor](/azure/role-based-access-control/built-in-roles#managed-identity-contributor) role to create, read (list), update, and delete a user assigned identity.
34+
- [Managed Identity Operator](/azure/role-based-access-control/built-in-roles#managed-identity-operator) role to read (list) the properties of a user assigned identity.
3335
- To run the CLI script examples, you have three options:
34-
3536
- Use [Azure Cloud Shell](../../cloud-shell/overview.md) from the Azure portal (see next section).
3637
- Use the embedded Azure Cloud Shell via the "Try It" button, located in the top right corner of each code block.
3738
- [Install the latest version of CLI 2.0](https://docs.microsoft.com/cli/azure/install-azure-cli) (2.0.13 or later) if you prefer to use a local CLI console. Sign in to Azure using `az login`, using an account that is associated with the Azure subscription under which you would like to deploy the user assigned identity.
@@ -40,7 +41,7 @@ In this article, you learn how to create, list and delete a user assigned identi
4041

4142
## Create a user assigned managed identity
4243

43-
To create a user assigned identity, use the [az identity create](/cli/azure/identity#az-identity-create) command. The `-g` parameter specifies the resource group where to create the user assigned identity, and the `-n` parameter specifies its name. At a minimum, your account needs to be assigned the [Managed Identity Contributor](/azure/role-based-access-control/built-in-roles#managed-identity-contributor) role to create a user assigned identity. Replace the `<RESOURCE GROUP>` and `<USER ASSIGNED IDENTITY NAME>` parameter values with your own values:
44+
To create a user assigned identity, use the [az identity create](/cli/azure/identity#az-identity-create) command. The `-g` parameter specifies the resource group where to create the user assigned identity, and the `-n` parameter specifies its name. Replace the `<RESOURCE GROUP>` and `<USER ASSIGNED IDENTITY NAME>` parameter values with your own values:
4445

4546
[!INCLUDE[ua-character-limit](~/includes/managed-identity-ua-character-limits.md)]
4647

@@ -49,7 +50,7 @@ az identity create -g <RESOURCE GROUP> -n <USER ASSIGNED IDENTITY NAME>
4950
```
5051
## List user assigned identities
5152

52-
To list user assigned identities, use the [az identity list](/cli/azure/identity#az-identity-list) command. The `-g` parameter specifies the resource group where the user assigned identity was created. At a minimum, your account needs to be assigned the [Managed Identity Operator](/azure/role-based-access-control/built-in-roles#managed-identity-operator) role to list the properties of a user assigned identity. Replace the `<RESOURCE GROUP>` with your own value:
53+
To list user assigned identities, use the [az identity list](/cli/azure/identity#az-identity-list) command. Replace the `<RESOURCE GROUP>` with your own value:
5354

5455
```azurecli-interactive
5556
az identity list -g <RESOURCE GROUP>
@@ -60,7 +61,7 @@ In the json response, user identities have `"Microsoft.ManagedIdentity/userAssig
6061

6162
## Delete a user assigned identity
6263

63-
To delete a user assigned identity, use the [az identity delete](/cli/azure/identity#az-identity-delete) command. The -n parameter specifies its name and the -g parameter specifies the resource group where the user assigned identity was created. At a minimum, your account needs to be assigned the [Managed Identity Contributor](/azure/role-based-access-control/built-in-roles#managed-identity-contributor) role to delete a user assigned identity. Replace the `<USER ASSIGNED IDENTITY NAME>` and `<RESOURCE GROUP>` parameters values with your own values:
64+
To delete a user assigned identity, use the [az identity delete](/cli/azure/identity#az-identity-delete) command. The -n parameter specifies its name and the -g parameter specifies the resource group where the user assigned identity was created. Replace the `<USER ASSIGNED IDENTITY NAME>` and `<RESOURCE GROUP>` parameters values with your own values:
6465

6566
```azurecli-interactive
6667
az identity delete -n <USER ASSIGNED IDENTITY NAME> -g <RESOURCE GROUP>

articles/active-directory/managed-service-identity/how-to-manage-ua-identity-powershell.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,13 @@ In this article, you learn how to create, list and delete a user assigned identi
3131
- If you don't already have an Azure account, [sign up for a free account](https://azure.microsoft.com/free/) before continuing.
3232
- Install [the latest version of Azure PowerShell](https://www.powershellgallery.com/packages/AzureRM) if you haven't already.
3333
- If you choose to install and use PowerShell locally, this tutorial requires the Azure PowerShell module version 5.7.0 or later. Run ` Get-Module -ListAvailable AzureRM` to find the version. If you need to upgrade, see [Install Azure PowerShell module](/powershell/azure/install-azurerm-ps). If you are running PowerShell locally, you also need to run `Login-AzureRmAccount` to create a connection with Azure.
34+
- To perform the management operations in this article, your account needs the following role assignments:
35+
- [Managed Identity Contributor](/azure/role-based-access-control/built-in-roles#managed-identity-contributor) role to create, read (list), update, and delete a user assigned identity.
36+
- [Managed Identity Operator](/azure/role-based-access-control/built-in-roles#managed-identity-operator) role to read (list) the properties of a user assigned identity.
3437

3538
## Create a user assigned identity
3639

37-
To create a user assigned identity, use the [New-AzureRmUserAssignedIdentity](/powershell/module/azurerm.managedserviceidentity/new-azurermuserassignedidentity) command. The `ResourceGroupName` parameter specifies the resource group where to create the user assigned identity, and the `-Name` parameter specifies its name. At a minimum, your account needs to be assigned the [Managed Identity Contributor](/azure/role-based-access-control/built-in-roles#managed-identity-contributor) role to create a user assigned identity. Replace the `<RESOURCE GROUP>` and `<USER ASSIGNED IDENTITY NAME>` parameter values with your own values:
40+
To create a user assigned identity, use the [New-AzureRmUserAssignedIdentity](/powershell/module/azurerm.managedserviceidentity/new-azurermuserassignedidentity) command. The `ResourceGroupName` parameter specifies the resource group where to create the user assigned identity, and the `-Name` parameter specifies its name. Replace the `<RESOURCE GROUP>` and `<USER ASSIGNED IDENTITY NAME>` parameter values with your own values:
3841

3942
[!INCLUDE[ua-character-limit](~/includes/managed-identity-ua-character-limits.md)]
4043

@@ -43,7 +46,7 @@ New-AzureRmUserAssignedIdentity -ResourceGroupName <RESOURCEGROUP> -Name <USER A
4346
```
4447
## List user assigned identities
4548

46-
To list user assigned identities, use the [Get-AzureRmUserAssigned](/powershell/module/azurerm.managedserviceidentity/get-azurermuserassignedidentity) command. The `-ResourceGroupName` parameter specifies the resource group where the user assigned identity was created. At a minimum, your account needs to be assigned the [Managed Identity Operator](/azure/role-based-access-control/built-in-roles#managed-identity-operator) role to list the properties of a user assigned identity. Replace the `<RESOURCE GROUP>` with your own value:
49+
To list user assigned identities, use the [Get-AzureRmUserAssigned](/powershell/module/azurerm.managedserviceidentity/get-azurermuserassignedidentity) command. The `-ResourceGroupName` parameter specifies the resource group where the user assigned identity was created. Replace the `<RESOURCE GROUP>` with your own value:
4750

4851
```azurepowershell-interactive
4952
Get-AzureRmUserAssignedIdentity -ResourceGroupName <RESOURCE GROUP>
@@ -54,7 +57,7 @@ In the response, user identities have `"Microsoft.ManagedIdentity/userAssignedId
5457

5558
## Delete a user assigned identity
5659

57-
To delete a user identity, use the [Remove-AzureRmUserAssignedIdentity](/powershell/module/azurerm.managedserviceidentity/remove-azurermuserassignedidentity) command. The `-ResourceGroupName` parameter specifies the resource group where the user assigned identity was created and the `-Name` parameter specifies its name. At a minimum, your account needs to be assigned the [Managed Identity Contributor](/azure/role-based-access-control/built-in-roles#managed-identity-contributor) role to delete a user assigned identity. Replace the `<RESOURCE GROUP>` and the `<USER ASSIGNED IDENTITY NAME>` parameters values with your own values:
60+
To delete a user identity, use the [Remove-AzureRmUserAssignedIdentity](/powershell/module/azurerm.managedserviceidentity/remove-azurermuserassignedidentity) command. The `-ResourceGroupName` parameter specifies the resource group where the user assigned identity was created and the `-Name` parameter specifies its name. Replace the `<RESOURCE GROUP>` and the `<USER ASSIGNED IDENTITY NAME>` parameters values with your own values:
5861

5962
```azurecli-interactive
6063
Remove-AzurRmUserAssignedIdentity -ResourceGroupName <RESOURCE GROUP> -Name <USER ASSIGNED IDENTITY NAME>

articles/active-directory/managed-service-identity/how-to-manage-ua-identity-rest.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,16 @@ In this article, you learn how to create, list, and delete a user assigned manag
3131
- If you are using Windows, install the [Windows Subsystem for Linux](https://msdn.microsoft.com/commandline/wsl/about) or use the [Azure Cloud Shell](../../cloud-shell/overview.md) in the Azure portal.
3232
- If you use the [Windows Subsystem for Linux](https://msdn.microsoft.com/commandline/wsl/about) or a [Linux distribution OS](/cli/azure/install-azure-cli-apt?view=azure-cli-latest), [Install the Azure CLI local console](/azure/install-azure-cli).
3333
- If you are using Azure CLI local console, sign in to Azure using `az login` with an account that is associated with the Azure subscription you would like to deploy or retrieve user assigned managed identity information.
34+
- To perform the management operations in this article, your account needs the following role assignments:
35+
- [Managed Identity Contributor](/azure/role-based-access-control/built-in-roles#managed-identity-contributor) role to create, read (list), update, and delete a user assigned identity.
36+
- [Managed Identity Operator](/azure/role-based-access-control/built-in-roles#managed-identity-operator) role to read (list) the properties of a user assigned identity.
3437
- Retrieve a Bearer access token using `az account get-access-token` to perform the following user assigned managed identity operations.
3538

3639
[!INCLUDE [cloud-shell-try-it.md](../../../includes/cloud-shell-try-it.md)]
3740

3841
## Create a user assigned managed identity
3942

40-
To create a user assigned managed identity, use the following CURL request to the Azure Resource Manager API. At a minimum, your account needs to be assigned the [Managed Identity Contributor](/azure/role-based-access-control/built-in-roles#managed-identity-contributor) role to create a user assigned identity. Replace the `<SUBSCRIPTION ID>`, `<RESOURCE GROUP>`, `<USER ASSIGNED IDENTITY NAME>`,`<LOCATION>`, and `<ACCESS TOKEN>` values with your own values:
43+
To create a user assigned managed identity, use the following CURL request to the Azure Resource Manager API. Replace the `<SUBSCRIPTION ID>`, `<RESOURCE GROUP>`, `<USER ASSIGNED IDENTITY NAME>`,`<LOCATION>`, and `<ACCESS TOKEN>` values with your own values:
4144

4245
[!INCLUDE[ua-character-limit](~/includes/managed-identity-ua-character-limits.md)]
4346

@@ -49,14 +52,14 @@ ation": "<LOCATION>"}' -H "Content-Type: application/json" -H "Authorization: Be
4952

5053
## List user assigned managed identities
5154

52-
To list user assigned managed identities, use the following CURL request to the Azure Resource Manager API. At a minimum, your account needs to be assigned the [Managed Identity Operator](/azure/role-based-access-control/built-in-roles#managed-identity-operator) role to list the properties of a user assigned identity. Replace the `<SUBSCRIPTION ID>`, `<RESOURCE GROUP>`, and `<ACCESS TOKEN>` values with your own values:
55+
To list user assigned managed identities, use the following CURL request to the Azure Resource Manager API. Replace the `<SUBSCRIPTION ID>`, `<RESOURCE GROUP>`, and `<ACCESS TOKEN>` values with your own values:
5356

5457
```bash
5558
curl 'https://management.azure.com/subscriptions/<SUBSCRIPTION ID>/resourceGroups/<RESOURCE GROUP>/providers/Microsoft.ManagedIdentity/userAssignedIdentities?api-version=2015-08-31-preview' -H "Authorization: Bearer <ACCESS TOKEN>"
5659
```
5760
## Delete a user assigned managed identity
5861

59-
To delete a user assigned managed identity, use the following CURL request to the Azure Resource Manager API. At a minimum, your account needs to be assigned the [Managed Identity Contributor](/azure/role-based-access-control/built-in-roles#managed-identity-contributor) role to delete a user assigned identity. Replace the `<SUBSCRIPTION ID>`, `<RESOURCE GROUP>`, and `<ACCESS TOKEN>` parameters values with your own values:
62+
To delete a user assigned managed identity, use the following CURL request to the Azure Resource Manager API. Replace the `<SUBSCRIPTION ID>`, `<RESOURCE GROUP>`, and `<ACCESS TOKEN>` parameters values with your own values:
6063

6164
> [!NOTE]
6265
> Deleting a user assigned identity will not remove the reference from any resource it was assigned to. To remove a user assigned managed from a VM using CURL see [Remove a user assigned identity from an Azure VM](qs-configure-rest-vm.md#remove-a-user-assigned identity-from-an-azure-vm).

0 commit comments

Comments
 (0)