Skip to content

Commit 4172349

Browse files
authored
Merge pull request #111924 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/Microsoft/azure-docs (branch master)
2 parents 89e96fc + f049515 commit 4172349

File tree

8 files changed

+23
-19
lines changed

8 files changed

+23
-19
lines changed

articles/automation/manage-runas-account.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Run As accounts in Azure Automation provide authentication for managing resource
1414
The service principal for a Run as Account does not have permissions to read Azure AD by default. If you want to add permissions to read or manage Azure AD, you'll need to grant the permissions on the service principal under **API permissions**. To learn more, see [Add permissions to access web APIs](../active-directory/develop/quickstart-configure-app-access-web-apis.md#add-permissions-to-access-web-apis).
1515

1616
>[!NOTE]
17-
>This article has been updated to use the new Azure PowerShell Az module. You can still use the AzureRM module, which will continue to receive bug fixes until at least December 2020. To learn more about the new Az module and AzureRM compatibility, see [Introducing the new Azure PowerShell Az module](https://docs.microsoft.com/powershell/azure/new-azureps-module-az?view=azps-3.5.0). For Az module installation instructions on your Hybrid Runbook Worker, see [Install the Azure PowerShell Module](https://docs.microsoft.com/powershell/azure/install-az-ps?view=azps-3.5.0). For your Automation account, you can update your modules to the latest version using [How to update Azure PowerShell modules in Azure Automation](automation-update-azure-modules.md).
17+
>This article has been updated to use the new Azure PowerShell Az module. You can still use the AzureRM module, which will continue to receive bug fixes until at least December 2020. To learn more about the new Az module and AzureRM compatibility, see [Introducing the new Azure PowerShell Az module](https://docs.microsoft.com/powershell/azure/new-azureps-module-az). For Az module installation instructions on your Hybrid Runbook Worker, see [Install the Azure PowerShell Module](https://docs.microsoft.com/powershell/azure/install-az-ps). For your Automation account, you can update your modules to the latest version using [How to update Azure PowerShell modules in Azure Automation](automation-update-azure-modules.md).
1818
1919
## Types of Run As accounts
2020

@@ -58,12 +58,12 @@ To create or update a Run As account, you must have specific privileges and perm
5858

5959
|Task|Cmdlet |Minimum Permissions |Where you set the permissions|
6060
|---|---------|---------|---|
61-
|Create Azure AD Application|[New-AzADApplication](https://docs.microsoft.com/powershell/module/az.resources/new-azadapplication?view=azps-3.5.0) | Application Developer role<sup>1</sup> |[Azure AD](../active-directory/develop/howto-create-service-principal-portal.md#required-permissions)</br>Home > Azure AD > App Registrations |
62-
|Add a credential to the application.|[New-AzADAppCredential](https://docs.microsoft.com/powershell/module/az.resources/new-azadappcredential?view=azps-3.5.0) | Application Administrator or Global Administrator<sup>1</sup> |[Azure AD](../active-directory/develop/howto-create-service-principal-portal.md#required-permissions)</br>Home > Azure AD > App Registrations|
63-
|Create and get an Azure AD service principal|[New-AzADServicePrincipal](https://docs.microsoft.com/powershell/module/az.resources/new-azadserviceprincipal?view=azps-3.5.0)</br>[Get-AzADServicePrincipal](https://docs.microsoft.com/powershell/module/az.resources/get-azadserviceprincipal?view=azps-3.5.0) | Application Administrator or Global Administrator<sup>1</sup> |[Azure AD](../active-directory/develop/howto-create-service-principal-portal.md#required-permissions)</br>Home > Azure AD > App Registrations|
64-
|Assign or get the RBAC role for the specified principal|[New-AzRoleAssignment](https://docs.microsoft.com/powershell/module/az.resources/new-azroleassignment?view=azps-3.5.0)</br>[Get-AzRoleAssignment](https://docs.microsoft.com/powershell/module/Az.Resources/Get-AzRoleAssignment?view=azps-3.5.0) | User Access Administrator or Owner, or have the following permissions:</br></br><code>Microsoft.Authorization/Operations/read</br>Microsoft.Authorization/permissions/read</br>Microsoft.Authorization/roleDefinitions/read</br>Microsoft.Authorization/roleAssignments/write</br>Microsoft.Authorization/roleAssignments/read</br>Microsoft.Authorization/roleAssignments/delete</code></br></br> | [Subscription](../role-based-access-control/role-assignments-portal.md)</br>Home > Subscriptions > \<subscription name\> - Access Control (IAM)|
65-
|Create or remove an Automation certificate|[New-AzAutomationCertificate](https://docs.microsoft.com/powershell/module/Az.Automation/New-AzAutomationCertificate?view=azps-3.5.0)</br>[Remove-AzAutomationCertificate](https://docs.microsoft.com/powershell/module/az.automation/remove-azautomationcertificate?view=azps-3.5.0) | Contributor on resource group |Automation account resource group|
66-
|Create or remove an Automation connection|[New-AzAutomationConnection](https://docs.microsoft.com/powershell/module/az.automation/new-azautomationconnection?view=azps-3.5.0)</br>[Remove-AzAutomationConnection](https://docs.microsoft.com/powershell/module/az.automation/remove-azautomationconnection?view=azps-3.5.0)|Contributor on resource group |Automation account resource group|
61+
|Create Azure AD Application|[New-AzADApplication](https://docs.microsoft.com/powershell/module/az.resources/new-azadapplication) | Application Developer role<sup>1</sup> |[Azure AD](../active-directory/develop/howto-create-service-principal-portal.md#required-permissions)</br>Home > Azure AD > App Registrations |
62+
|Add a credential to the application.|[New-AzADAppCredential](https://docs.microsoft.com/powershell/module/az.resources/new-azadappcredential) | Application Administrator or Global Administrator<sup>1</sup> |[Azure AD](../active-directory/develop/howto-create-service-principal-portal.md#required-permissions)</br>Home > Azure AD > App Registrations|
63+
|Create and get an Azure AD service principal|[New-AzADServicePrincipal](https://docs.microsoft.com/powershell/module/az.resources/new-azadserviceprincipal)</br>[Get-AzADServicePrincipal](https://docs.microsoft.com/powershell/module/az.resources/get-azadserviceprincipal) | Application Administrator or Global Administrator<sup>1</sup> |[Azure AD](../active-directory/develop/howto-create-service-principal-portal.md#required-permissions)</br>Home > Azure AD > App Registrations|
64+
|Assign or get the RBAC role for the specified principal|[New-AzRoleAssignment](https://docs.microsoft.com/powershell/module/az.resources/new-azroleassignment)</br>[Get-AzRoleAssignment](https://docs.microsoft.com/powershell/module/Az.Resources/Get-AzRoleAssignment) | User Access Administrator or Owner, or have the following permissions:</br></br><code>Microsoft.Authorization/Operations/read</br>Microsoft.Authorization/permissions/read</br>Microsoft.Authorization/roleDefinitions/read</br>Microsoft.Authorization/roleAssignments/write</br>Microsoft.Authorization/roleAssignments/read</br>Microsoft.Authorization/roleAssignments/delete</code></br></br> | [Subscription](../role-based-access-control/role-assignments-portal.md)</br>Home > Subscriptions > \<subscription name\> - Access Control (IAM)|
65+
|Create or remove an Automation certificate|[New-AzAutomationCertificate](https://docs.microsoft.com/powershell/module/Az.Automation/New-AzAutomationCertificate)</br>[Remove-AzAutomationCertificate](https://docs.microsoft.com/powershell/module/az.automation/remove-azautomationcertificate) | Contributor on resource group |Automation account resource group|
66+
|Create or remove an Automation connection|[New-AzAutomationConnection](https://docs.microsoft.com/powershell/module/az.automation/new-azautomationconnection)</br>[Remove-AzAutomationConnection](https://docs.microsoft.com/powershell/module/az.automation/remove-azautomationconnection)|Contributor on resource group |Automation account resource group|
6767

6868
<sup>1</sup> Non-administrator users in your Azure AD tenant can [register AD applications](../active-directory/develop/howto-create-service-principal-portal.md#required-permissions) if the Azure AD tenant's **Users can register applications** option on the User settings page is set to **Yes**. If the application registration setting is **No**, the user performing this action must be as defined in this table.
6969

articles/azure-functions/functions-dotnet-dependency-injection.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ms.reviewer: jehollan
1212

1313
Azure Functions supports the dependency injection (DI) software design pattern, which is a technique to achieve [Inversion of Control (IoC)](https://docs.microsoft.com/dotnet/standard/modern-web-apps-azure-architecture/architectural-principles#dependency-inversion) between classes and their dependencies.
1414

15-
- Dependency injection in Azure Functions is built on the .NET Core Dependency Injection features. Familiarity with the [.NET Core dependency injection](https://docs.microsoft.com/aspnet/core/fundamentals/dependency-injection) is recommended. There are differences, however, in how you override dependencies and how configuration values are read with Azure Functions on the Consumption plan.
15+
- Dependency injection in Azure Functions is built on the .NET Core Dependency Injection features. Familiarity with [.NET Core dependency injection](https://docs.microsoft.com/aspnet/core/fundamentals/dependency-injection) is recommended. There are differences in how you override dependencies and how configuration values are read with Azure Functions on the Consumption plan.
1616

1717
- Support for dependency injection begins with Azure Functions 2.x.
1818

articles/azure-resource-manager/templates/template-tutorial-create-templates-with-dependent-resources.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
---
1+
---
22
title: Template with dependent resources
33
description: Learn how to create an Azure Resource Manager template with multiple resources, and how to deploy it using the Azure portal
44
author: mumian
@@ -91,11 +91,11 @@ When you explore the template in this section, try to answer these questions:
9191

9292
![Visual Studio Code Azure Resource Manager templates virtual network dependsOn](./media/template-tutorial-create-templates-with-dependent-resources/resource-manager-template-virtual-network-definition.png)
9393

94-
The dependsOn element enables you to define one resource as a dependent on one or more resources. The dependsOn element enables you to define one resource as a dependent on one or more resources. This resource depends on one other resource:
94+
The dependsOn element enables you to define one resource as a dependent on one or more resources. This resource depends on one other resource:
9595

9696
* `Microsoft.Network/networkSecurityGroups`
9797

98-
1. Expand the fifty resource. The resource type is `Microsoft.Network/networkInterfaces`. The resource depends on two other resources:
98+
1. Expand the fifth resource. The resource type is `Microsoft.Network/networkInterfaces`. The resource depends on two other resources:
9999

100100
* `Microsoft.Network/publicIPAddresses`
101101
* `Microsoft.Network/virtualNetworks`
@@ -158,7 +158,7 @@ When the Azure resources are no longer needed, clean up the resources you deploy
158158

159159
1. From the Azure portal, select **Resource group** from the left menu.
160160
2. Enter the resource group name in the **Filter by name** field.
161-
3. Select the resource group name. You shall see a total of six resources in the resource group.
161+
3. Select the resource group name. You'll see a total of six resources in the resource group.
162162
4. Select **Delete resource group** from the top menu.
163163

164164
## Next steps

articles/data-factory/continuous-integration-deployment.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,18 +231,22 @@ function getPipelineDependencies {
231231
return @($activity.Pipeline.ReferenceName)
232232
} elseif ($activity.Activities) {
233233
$result = @()
234-
return $activity.Activities | ForEach-Object{ $result += getPipelineDependencies -activity $_ }
234+
$activity.Activities | ForEach-Object{ $result += getPipelineDependencies -activity $_ }
235+
return $result
235236
} elseif ($activity.ifFalseActivities -or $activity.ifTrueActivities) {
236237
$result = @()
237238
$activity.ifFalseActivities | Where-Object {$_ -ne $null} | ForEach-Object{ $result += getPipelineDependencies -activity $_ }
238239
$activity.ifTrueActivities | Where-Object {$_ -ne $null} | ForEach-Object{ $result += getPipelineDependencies -activity $_ }
240+
return $result
239241
} elseif ($activity.defaultActivities) {
240242
$result = @()
241243
$activity.defaultActivities | ForEach-Object{ $result += getPipelineDependencies -activity $_ }
242244
if ($activity.cases) {
243245
$activity.cases | ForEach-Object{ $_.activities } | ForEach-Object{$result += getPipelineDependencies -activity $_ }
244246
}
245247
return $result
248+
} else {
249+
return @()
246250
}
247251
}
248252

articles/event-hubs/authenticate-shared-access-signature.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Shared access signature (SAS) gives you granular control over the type of access
1818
- The permissions granted by the SAS. For example, a SAS for an Event Hubs namespace might grant the listen permission, but not the send permission.
1919
- Only clients that present valid credentials can send data to an event hub.
2020
- A client can't impersonate another client.
21-
- A rouge client can be blocked from sending data to an event hub.
21+
- A rogue client can be blocked from sending data to an event hub.
2222

2323
This article covers authenticating the access to Event Hubs resources using SAS. To learn about **authorizing** access to Event Hubs resources using SAS, see [this article](authorize-access-shared-access-signature.md).
2424

@@ -230,4 +230,4 @@ See the following related articles:
230230
- [Authenticate requests to Azure Event Hubs from an application using Azure Active Directory](authenticate-application.md)
231231
- [Authenticate a managed identity with Azure Active Directory to access Event Hubs Resources](authenticate-managed-identity.md)
232232
- [Authorize access to Event Hubs resources using Azure Active Directory](authorize-access-azure-active-directory.md)
233-
- [Authorize access to Event Hubs resources using Shared Access Signatures](authorize-access-shared-access-signature.md)
233+
- [Authorize access to Event Hubs resources using Shared Access Signatures](authorize-access-shared-access-signature.md)

articles/frontdoor/front-door-routing-methods.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ There are four main concepts to traffic routing available in Front Door:
2222
* **[Latency](#latency):** The latency-based routing ensures that requests are sent to the lowest latency backends acceptable within a sensitivity range. Basically, your user requests are sent to the "closest" set of backends with respect to network latency.
2323
* **[Priority](#priority):** You can assign priorities to your different backends when you want to use a primary service backend for all traffic, and provide backups in case the primary or the backup backends are unavailable.
2424
* **[Weighted](#weighted):** You can assign weights to your different backends when you want to distribute traffic across a set of backends, either evenly or according to weight coefficients.
25-
* **Session Affinity:** You can configure session affinity for your frontend hosts or domains when you want that subsequent requests from a user are sent to the same backend as long as the user session is still active and the backend instance still reports healthy based on health probes.
25+
* **[Session Affinity](#affinity):** You can configure session affinity for your frontend hosts or domains when you want that subsequent requests from a user are sent to the same backend as long as the user session is still active and the backend instance still reports healthy based on health probes.
2626

2727
All Front Door configurations include monitoring of backend health and automated instant global failover. For more information, see [Front Door Backend Monitoring](front-door-health-probes.md). Your Front Door can be configured to either work based off a single routing method and depending on your application needs you can use multiple or all of these routing methods in combination to build an optimal routing topology.
2828

articles/virtual-desktop/delegated-access-virtual-desktop.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ Windows Virtual Desktop delegated access supports the following values for each
3232
Delegated access in Windows Virtual Desktop has several built-in role definitions you can assign to users and service principals.
3333

3434
* An RDS Owner can manage everything, including access to resources.
35-
* An RDS Contributor can manage everything but access to resources.
36-
* An RDS Reader can view everything but can't make any changes.
35+
* An RDS Contributor can manage everything, but can't access to resources.
36+
* An RDS Reader can view everything, but can't make any changes.
3737
* An RDS Operator can view diagnostic activities.
3838

3939
## PowerShell cmdlets for role assignments

articles/virtual-machine-scale-sets/quick-create-portal.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ You can deploy a scale set with a Windows Server image or Linux image such as RH
5555
1. Type **Scale set** in the search box. In the results, under **Marketplace**, select **Virtual machine scale sets**. The **Create a virtual machine scale set** page will open.
5656
1. In the **Basics** tab, under **Project details**, make sure the correct subscription is selected and then choose to **Create new** resource group. Type *myVMSSResourceGroup* for the name and then select **OK** .
5757
1. Type *myScaleSet* as the name for your scale set.
58-
1. In **Region**, select a region that is close to you area.
58+
1. In **Region**, select a region that is close to your area.
5959
1. Leave the default value of **ScaleSet VMs** for **Orchestrator**.
6060
1. Select a marketplace image for **Image**. In this example, we have chosen *Ubuntu Server 18.04 LTS*.
6161
1. Enter your desired username, and select which authentication type you prefer.

0 commit comments

Comments
 (0)