Skip to content

Commit ecd467b

Browse files
committed
Merging changes synced from https://github.com/MicrosoftDocs/azure-docs-pr (branch live)
2 parents d15910e + 4ca8107 commit ecd467b

File tree

62 files changed

+754
-858
lines changed

Some content is hidden

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

62 files changed

+754
-858
lines changed

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23059,6 +23059,11 @@
2305923059
"redirect_url": "/azure/storage/blobs/storage-dotnet-shared-access-signature-part-2",
2306023060
"redirect_document_id": true
2306123061
},
23062+
{
23063+
"source_path": "articles/storage/blobs/storage-dotnet-shared-access-signature-part-2.md",
23064+
"redirect_url": "/azure/storage/common/storage-dotnet-shared-access-signature-part-1",
23065+
"redirect_document_id": false
23066+
},
2306223067
{
2306323068
"source_path": "articles/storage/storage-e2e-troubleshooting.md",
2306423069
"redirect_url": "/azure/storage/common/storage-e2e-troubleshooting",

articles/active-directory/b2b/tutorial-bulk-invite.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ foreach ($email in $invitations)
105105
{New-AzureADMSInvitation `
106106
-InvitedUserEmailAddress $email.InvitedUserEmailAddress `
107107
-InvitedUserDisplayName $email.Name `
108-
-InviteRedirectUrl https://myapps.azure.com `
108+
-InviteRedirectUrl https://myapps.microsoft.com `
109109
-InvitedUserMessageInfo $messageInfo `
110110
-SendInvitationMessage $true
111111
}

articles/active-directory/develop/quickstart-v2-windows-desktop.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ In this quickstart, you'll learn how to write a Windows desktop .NET (WPF) appli
6767
6868
#### Step 2: Download your Visual Studio project
6969

70-
[Download the Visual Studio project](https://github.com/Azure-Samples/active-directory-dotnet-desktop-msgraph-v2/archive/msal3x.zip)
70+
[Download the Visual Studio project](https://github.com/Azure-Samples/active-directory-dotnet-desktop-msgraph-v2/archive/msal3x.zip) ([View Project on Github](https://github.com/Azure-Samples/active-directory-dotnet-desktop-msgraph-v2/))
7171

7272
#### Step 3: Configure your Visual Studio project
7373

articles/active-directory/manage-apps/end-user-experiences.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ms.service: active-directory
88
ms.subservice: app-mgmt
99
ms.workload: identity
1010
ms.topic: conceptual
11-
ms.date: 11/09/2018
11+
ms.date: 05/03/2019
1212
ms.author: celested
1313
ms.reviewer: arvindh
1414
ms.collection: M365-identity-device-management
@@ -48,7 +48,9 @@ Most federated applications that support SAML 2.0, WS-Federation, or OpenID conn
4848
## Direct sign-on links
4949
Azure AD also supports direct single sign-on links to individual applications that support password-based single sign-on, linked single sign-on, and any form of federated single sign-on.
5050

51-
These links are specifically crafted URLs that send a user through the Azure AD sign-in process for a specific application without requiring the user launch them from the Azure AD access panel or Office 365. These **User access URLs** can be found under the properties of available enterprise applications under Azure Active Directory in the Azure portal.
51+
These links are specifically crafted URLs that send a user through the Azure AD sign-in process for a specific application without requiring the user launch them from the Azure AD access panel or Office 365. These **User access URLs** can be found under the properties of available enterprise applications. In the Azure portal, select **Azure Active Directory** > **Enterprise applications**. Select the application, and then select **Properties**.
52+
53+
![Example of the User access URL in Twitter properties](media/end-user-experiences/direct-sign-on-link.png)
5254

5355
These links can be copied and pasted anywhere you want to provide a sign-in link to the selected application. This could be in an email, or in any custom web-based portal that you have set up for user application access. Here's an example of an Azure AD direct single sign-on URL for Twitter:
5456

54.8 KB
Loading

articles/aks/limit-egress-traffic.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ In AKS, there are two sets of ports and addresses:
5959
* The [optional recommended addresses and ports for AKS clusters](#optional-recommended-addresses-and-ports-for-aks-clusters) aren't required for all scenarios, but integration with other services such as Azure Monitor won't work correctly. Review this list of optional ports and FQDNs, and authorize any of the services and components used in your AKS cluster.
6060

6161
> [!NOTE]
62-
> Limiting egress traffic only works on new AKS clusters created after you enable the feature flag registration. You can't limit egress traffic on an existing AKS cluster created before the feature flag was registered.
62+
> Limiting egress traffic only works on new AKS clusters created after you enable the feature flag registration. For existing clusters, [perform a cluster upgrade operation][aks-upgrade] using the `az aks upgrade` command before you limit the egress traffic.
6363
6464
## Required ports and addresses for AKS clusters
6565

@@ -115,3 +115,4 @@ In this article, you learned what ports and addresses to allow if you restrict e
115115
[az-feature-register]: /cli/azure/feature#az-feature-register
116116
[az-feature-list]: /cli/azure/feature#az-feature-list
117117
[az-provider-register]: /cli/azure/provider#az-provider-register
118+
[aks-upgrade]: upgrade-cluster.md

articles/azure-resource-manager/grant-access-to-create-subscription.md

Lines changed: 120 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
title: Grant access to create Azure Enterprise subscriptions| Microsoft Docs
33
description: Learn how to give a user or service principal the ability to programmatically create Azure Enterprise subscriptions.
44
services: azure-resource-manager
5-
author: adpick
6-
manager: adpick
5+
author: jureid
6+
manager: jureid
77
editor: ''
88

99
ms.assetid:
@@ -12,8 +12,8 @@ ms.devlang: na
1212
ms.topic: conceptual
1313
ms.tgt_pltfrm: na
1414
ms.workload: na
15-
ms.date: 06/05/2018
16-
ms.author: adpick
15+
ms.date: 04/09/2019
16+
ms.author: jureid
1717
---
1818

1919
# Grant access to create Azure Enterprise subscriptions (preview)
@@ -22,14 +22,118 @@ As an Azure customer on [Enterprise Agreement (EA)](https://azure.microsoft.com/
2222

2323
To create a subscription, see [Programmatically create Azure Enterprise subscriptions (preview)](programmatically-create-subscription.md).
2424

25-
## Delegate access to an enrollment account using RBAC
25+
## Grant subscription creation access to a user or group
2626

27-
To give another user or service principal the ability to create subscriptions against a specific account, [give them an RBAC Owner role at the scope of the enrollment account](../active-directory/role-based-access-control-manage-access-rest.md). The following example gives a user in the tenant with `principalId` of `<userObjectId>` (for [email protected]) an Owner role on the enrollment account. To find the enrollment account ID and principal ID, see [Programmatically create Azure Enterprise subscriptions (preview)](programmatically-create-subscription.md).
27+
To create subscriptions under an enrollment account, users must have the [RBAC Owner role](../role-based-access-control/built-in-roles.md#owner) on that account. You can grant a user or a group of users the RBAC Owner role on an enrollment account by following these steps:
2828

29-
# [REST](#tab/rest)
29+
### 1. Get the object ID of the enrollment account you want to grant access to
30+
31+
To grant others the RBAC Owner role on an enrollment account, you must either be the Account Owner or an RBAC Owner of the account.
32+
33+
### [REST](#tab/rest)
34+
35+
Request to list all enrollment accounts you have access to:
36+
37+
```json
38+
GET https://management.azure.com/providers/Microsoft.Billing/enrollmentAccounts?api-version=2018-03-01-preview
39+
```
40+
41+
Azure responds with a list of all enrollment accounts you have access to:
42+
43+
```json
44+
{
45+
"value": [
46+
{
47+
"id": "/providers/Microsoft.Billing/enrollmentAccounts/747ddfe5-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
48+
"name": "747ddfe5-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
49+
"type": "Microsoft.Billing/enrollmentAccounts",
50+
"properties": {
51+
"principalName": "[email protected]"
52+
}
53+
},
54+
{
55+
"id": "/providers/Microsoft.Billing/enrollmentAccounts/4cd2fcf6-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
56+
"name": "4cd2fcf6-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
57+
"type": "Microsoft.Billing/enrollmentAccounts",
58+
"properties": {
59+
"principalName": "[email protected]"
60+
}
61+
}
62+
]
63+
}
64+
```
65+
66+
Use the `principalName` property to identify the account that you want to grant RBAC Owner access to. Copy the `name` of that account. For example, if you wanted to grant RBAC Owner access to the [email protected] enrollment account, you'd copy ```747ddfe5-xxxx-xxxx-xxxx-xxxxxxxxxxxx```. This is the object ID of the enrollment account. Paste this value somewhere so that you can use it in the next step as `enrollmentAccountObjectId`.
67+
68+
### [PowerShell](#tab/azure-powershell)
69+
70+
Open [Azure Cloud Shell](https://shell.azure.com/) and select PowerShell.
71+
72+
Use the [Get-AzEnrollmentAccount](/powershell/module/az.billing/get-azenrollmentaccount) cmdlet to list all enrollment accounts you have access to.
73+
74+
```azurepowershell-interactive
75+
Get-AzEnrollmentAccount
76+
```
77+
78+
Azure responds with a list of enrollment accounts you have access to:
79+
80+
```azurepowershell
81+
ObjectId | PrincipalName
82+
747ddfe5-xxxx-xxxx-xxxx-xxxxxxxxxxxx | [email protected]
83+
4cd2fcf6-xxxx-xxxx-xxxx-xxxxxxxxxxxx | [email protected]
84+
```
85+
86+
Use the `principalName` property to identify the account you want to grant RBAC Owner access to. Copy the `ObjectId` of that account. For example, if you wanted to grant RBAC Owner access to the [email protected] enrollment account, you'd copy ```747ddfe5-xxxx-xxxx-xxxx-xxxxxxxxxxxx```. Paste this object ID somewhere so that you can use it in the next step as the `enrollmentAccountObjectId`.
87+
88+
### [Azure CLI](#tab/azure-cli)
89+
90+
Use the [az billing enrollment-account list](https://aka.ms/EASubCreationPublicPreviewCLI) command to list all enrollment accounts you have access to.
91+
92+
```azurecli-interactive
93+
az billing enrollment-account list
94+
```
95+
96+
Azure responds with a list of enrollment accounts you have access to:
97+
98+
```json
99+
[
100+
{
101+
"id": "/providers/Microsoft.Billing/enrollmentAccounts/747ddfe5-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
102+
"name": "747ddfe5-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
103+
"principalName": "[email protected]",
104+
"type": "Microsoft.Billing/enrollmentAccounts",
105+
},
106+
{
107+
"id": "/providers/Microsoft.Billing/enrollmentAccounts/747ddfe5-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
108+
"name": "4cd2fcf6-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
109+
"principalName": "[email protected]",
110+
"type": "Microsoft.Billing/enrollmentAccounts",
111+
}
112+
]
113+
114+
```
115+
116+
Use the `principalName` property to identify the account that you want to grant RBAC Owner access to. Copy the `name` of that account. For example, if you wanted to grant RBAC Owner access to the [email protected] enrollment account, you'd copy ```747ddfe5-xxxx-xxxx-xxxx-xxxxxxxxxxxx```. This is the object ID of the enrollment account. Paste this value somewhere so that you can use it in the next step as `enrollmentAccountObjectId`.
117+
118+
<a id="userObjectId"></a>
119+
120+
### 2. Get object ID of the user or group you want to give the RBAC Owner role to
121+
122+
1. In the Azure portal, search on **Azure Active Directory**.
123+
1. If you want to grant a user access, click on **Users** in the menu on the left. If you want to grant access to a group, click **Groups**.
124+
1. Select the User or Group you want to give the RBAC Owner role to.
125+
1. If you selected a User, you'll find the object ID in the Profile page. If you selected a Group, the object ID will be in the Overview page. Copy the **ObjectID** by clicking the icon to the right of the text box. Paste this somewhere so that you can use it in the next step as `userObjectId`.
126+
127+
### 3. Grant the user or group the RBAC Owner role on the enrollment account
128+
129+
Using the values you collected in the first two steps, grant the user or group the RBAC Owner role on the enrollment account.
130+
131+
### [REST](#tab/rest-2)
132+
133+
Run the following command, replacing ```<enrollmentAccountObjectId>``` with the `name` you copied in the first step (```747ddfe5-xxxx-xxxx-xxxx-xxxxxxxxxxxx```). Replace ```<userObjectId>``` with the object ID you copied from the second step.
30134

31135
```json
32-
PUT https://management.azure.com/providers/Microsoft.Billing/enrollmentAccounts/747ddfe5-xxxx-xxxx-xxxx-xxxxxxxxxxxx/providers/Microsoft.Authorization/roleAssignments/<roleAssignmentGuid>?api-version=2015-07-01
136+
PUT https://management.azure.com/providers/Microsoft.Billing/enrollmentAccounts/<enrollmentAccountObjectId>/providers/Microsoft.Authorization/roleAssignments/<roleAssignmentGuid>?api-version=2015-07-01
33137

34138
{
35139
"properties": {
@@ -58,27 +162,27 @@ When the Owner role is successfully assigned at the enrollment account scope, Az
58162
}
59163
```
60164

61-
# [PowerShell](#tab/azure-powershell)
165+
### [PowerShell](#tab/azure-powershell-2)
62166

63167
[!INCLUDE [updated-for-az](../../includes/updated-for-az.md)]
64168

65-
Use the [New-AzRoleAssignment](../active-directory/role-based-access-control-manage-access-powershell.md) to give another user Owner access to your enrollment account.
169+
Run the following [New-AzRoleAssignment](../active-directory/role-based-access-control-manage-access-powershell.md) command, replacing ```<enrollmentAccountObjectId>``` with the `ObjectId` collected in the first step (```747ddfe5-xxxx-xxxx-xxxx-xxxxxxxxxxxx```). Replace ```<userObjectId>``` with the object ID collected in the second step.
66170

67171
```azurepowershell-interactive
68-
New-AzRoleAssignment -RoleDefinitionName Owner -ObjectId <userObjectId> -Scope /providers/Microsoft.Billing/enrollmentAccounts/747ddfe5-xxxx-xxxx-xxxx-xxxxxxxxxxxx
172+
New-AzRoleAssignment -RoleDefinitionName Owner -ObjectId <userObjectId> -Scope /providers/Microsoft.Billing/enrollmentAccounts/<enrollmentAccountObjectId>
69173
```
70174

71-
# [Azure CLI](#tab/azure-cli)
175+
### [Azure CLI](#tab/azure-cli-2)
72176

73-
Use the [az role assignment create](../active-directory/role-based-access-control-manage-access-azure-cli.md) to give another user Owner access to your enrollment account.
177+
Run the following [az role assignment create](../active-directory/role-based-access-control-manage-access-azure-cli.md) command, replacing ```<enrollmentAccountObjectId>``` with the `name` you copied in the first step (```747ddfe5-xxxx-xxxx-xxxx-xxxxxxxxxxxx```). Replace ```<userObjectId>``` with the object ID collected in the second step.
74178

75-
```azurecli-interactive
76-
az role assignment create --role Owner --assignee-object-id <userObjectId> --scope /providers/Microsoft.Billing/enrollmentAccounts/747ddfe5-xxxx-xxxx-xxxx-xxxxxxxxxxxx
179+
```azurecli-interactive
180+
az role assignment create --role Owner --assignee-object-id <userObjectId> --scope /providers/Microsoft.Billing/enrollmentAccounts/<enrollmentAccountObjectId>
77181
```
78182

79183
----
80184

81-
Once a user becomes an RBAC Owner for your enrollment account, they can programmatically create subscriptions under it. A subscription created by a delegated user still has the original Account Owner as Service Admin, but it also has the delegated user as an Owner by default.
185+
Once a user becomes an RBAC Owner for your enrollment account, they can [programmatically create subscriptions](programmatically-create-subscription.md) under it. A subscription created by a delegated user still has the original Account Owner as Service Admin, but it also has the delegated user as an RBAC Owner by default.
82186

83187
## Audit who created subscriptions using activity logs
84188

@@ -91,7 +195,6 @@ To track the subscriptions created via this API, use the [Tenant Activity Log AP
91195
GET "/providers/Microsoft.Insights/eventtypes/management/values?api-version=2015-04-01&$filter=eventTimestamp ge '{greaterThanTimeStamp}' and eventTimestamp le '{lessThanTimestamp}' and eventChannels eq 'Operation' and resourceProvider eq 'Microsoft.Subscription'"
92196
```
93197

94-
> [!NOTE]
95198
> To conveniently call this API from the command line, try [ARMClient](https://github.com/projectkudu/ARMClient).
96199
97200
## Next steps

0 commit comments

Comments
 (0)