Skip to content

Commit 03f1cef

Browse files
authored
Merge pull request #153833 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/MicrosoftDocs/azure-docs (branch master)
2 parents 7f386f3 + a121fae commit 03f1cef

File tree

5 files changed

+47
-54
lines changed

5 files changed

+47
-54
lines changed

articles/active-directory/develop/reference-aadsts-error-codes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ For example, if you received the error code "AADSTS50058" then do a search in [h
119119
| AADSTS50055 | InvalidPasswordExpiredPassword - The password is expired. |
120120
| AADSTS50056 | Invalid or null password -Password does not exist in store for this user. |
121121
| AADSTS50057 | UserDisabled - The user account is disabled. The account has been disabled by an administrator. |
122-
| AADSTS50058 | UserInformationNotProvided - This means that a user is not signed in. This is a common error that's expected when a user is unauthenticated and has not yet signed in.</br>If this error is encouraged in an SSO context where the user has previously signed in, this means that the SSO session was either not found or invalid.</br>This error may be returned to the application if prompt=none is specified. |
122+
| AADSTS50058 | UserInformationNotProvided - This means that a user is not signed in. This is a common error that's expected when a user is unauthenticated and has not yet signed in.</br>If this error is encountered in an SSO context where the user has previously signed in, this means that the SSO session was either not found or invalid.</br>This error may be returned to the application if prompt=none is specified. |
123123
| AADSTS50059 | MissingTenantRealmAndNoUserInformationProvided - Tenant-identifying information was not found in either the request or implied by any provided credentials. The user can contact the tenant admin to help resolve the issue. |
124124
| AADSTS50061 | SignoutInvalidRequest - The sign-out request is invalid. |
125125
| AADSTS50064 | CredentialAuthenticationError - Credential validation on username or password has failed. |

articles/availability-zones/az-overview.md

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Learn about regions and Availability Zones in Azure to meet your te
44
author: prsandhu
55
ms.service: azure
66
ms.topic: conceptual
7-
ms.date: 02/23/2021
7+
ms.date: 04/09/2021
88
ms.author: prsandhu
99
ms.reviewer: cynthn
1010
ms.custom: fasttrack-edit, mvc
@@ -148,28 +148,32 @@ As mentioned previously, Azure classifies services into three categories: founda
148148
> |------------------------------------------------------|
149149
> | Azure API for FHIR |
150150
> | Azure Analysis Services |
151+
> | Azure Blockchain Service |
151152
> | Azure Cognitive Services: Anomaly Detector |
152153
> | Azure Cognitive Services: Custom Vision |
153154
> | Azure Cognitive Services: Form Recognizer |
155+
> | Azure Cognitive Services: Immersive Reader |
156+
> | Azure Cognitive Services: Language Understanding |
154157
> | Azure Cognitive Services: Personalizer |
155158
> | Azure Cognitive Services: QnA Maker |
159+
> | Azure Cognitive Services: Speech Services |
156160
> | Azure Data Share |
161+
> | Azure Databricks |
157162
> | Azure Database for MariaDB |
158163
> | Azure Database Migration Service |
159164
> | Azure Dedicated HSM |
160165
> | Azure Digital Twins |
161166
> | Azure Health Bot |
162167
> | Azure HPC Cache |
163168
> | Azure Lab Services |
164-
> | Azure Machine Learning Studio (classic) |
165169
> | Azure NetApp Files |
166170
> | Azure Red Hat OpenShift |
167171
> | Azure SignalR Service |
168-
> | Azure Spring Cloud Service |
172+
> | Azure Spring Cloud |
173+
> | Azure Stream Analytics |
169174
> | Azure Time Series Insights |
170175
> | Azure VMware Solution |
171176
> | Azure VMware Solution by CloudSimple |
172-
> | Data Lake Analytics |
173177
> | Spatial Anchors |
174178
> | Storage: Archive Storage |
175179
> | Ultra Disk Storage |

articles/cdn/cdn-app-dev-node.md

Lines changed: 20 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ms.workload: tbd
1313
ms.tgt_pltfrm: na
1414
ms.devlang: na
1515
ms.topic: how-to
16-
ms.date: 01/23/2017
16+
ms.date: 04/02/2021
1717
ms.author: mazha
1818
ms.custom: devx-track-js
1919
---
@@ -24,14 +24,10 @@ ms.custom: devx-track-js
2424
>
2525
>
2626
27-
You can use the [Azure CDN SDK for Node.js](https://www.npmjs.com/package/azure-arm-cdn) to automate creation and management of CDN profiles and endpoints. This tutorial walks through the creation of a simple Node.js console application that demonstrates several of the available operations. This tutorial is not intended to describe all aspects of the Azure CDN SDK for Node.js in detail.
27+
You can use the [Azure CDN SDK for JavaScript](https://www.npmjs.com/package/@azure/arm-cdn) to automate creation and management of CDN profiles and endpoints. This tutorial walks through the creation of a simple Node.js console application that demonstrates several of the available operations. This tutorial is not intended to describe all aspects of the Azure CDN SDK for JavaScript in detail.
2828

29-
To complete this tutorial, you should already have [Node.js](https://www.nodejs.org) **4.x.x** or higher installed and configured. You can use any text editor you want to create your Node.js application. To write this tutorial, I used [Visual Studio Code](https://code.visualstudio.com).
29+
To complete this tutorial, you should already have [Node.js](https://www.nodejs.org) **6.x.x** or higher installed and configured. You can use any text editor you want to create your Node.js application. To write this tutorial, I used [Visual Studio Code](https://code.visualstudio.com).
3030

31-
> [!TIP]
32-
> The [completed project from this tutorial](https://code.msdn.microsoft.com/Azure-CDN-SDK-for-Nodejs-c712bc74) is available for download on MSDN.
33-
>
34-
>
3531

3632
[!INCLUDE [cdn-app-dev-prep](../../includes/cdn-app-dev-prep.md)]
3733

@@ -48,11 +44,11 @@ You will then be presented a series of questions to initialize your project. Fo
4844

4945
![NPM init output](./media/cdn-app-dev-node/cdn-npm-init.png)
5046

51-
Our project is now initialized with a *packages.json* file. Our project is going to use some Azure libraries contained in NPM packages. We'll use the Azure Client Runtime for Node.js (ms-rest-azure) and the Azure CDN Client Library for Node.js (azure-arm-cd). Let's add those to the project as dependencies.
47+
Our project is now initialized with a *packages.json* file. Our project is going to use some Azure libraries contained in NPM packages. We'll use the library for Azure Active Directory authentication in Node.js (@azure/ms-rest-nodeauth) and the Azure CDN Client Library for JavaScript (@azure/arm-cdn). Let's add those to the project as dependencies.
5248

5349
```console
54-
npm install --save ms-rest-azure
55-
npm install --save azure-arm-cdn
50+
npm install --save @azure/ms-rest-nodeauth
51+
npm install --save @azure/arm-cdn
5652
```
5753

5854
After the packages are done installing, the *package.json* file should look similar to this example (version numbers may differ):
@@ -69,8 +65,8 @@ After the packages are done installing, the *package.json* file should look simi
6965
"author": "Cam Soper",
7066
"license": "MIT",
7167
"dependencies": {
72-
"azure-arm-cdn": "^0.2.1",
73-
"ms-rest-azure": "^1.14.4"
68+
"@azure/arm-cdn": "^5.2.0",
69+
"@azure/ms-rest-nodeauth": "^3.0.0"
7470
}
7571
}
7672
```
@@ -83,8 +79,8 @@ With *app.js* open in our editor, let's get the basic structure of our program w
8379
1. Add the "requires" for our NPM packages at the top with the following:
8480

8581
``` javascript
86-
var msRestAzure = require('ms-rest-azure');
87-
var cdnManagementClient = require('azure-arm-cdn');
82+
var msRestAzure = require('@azure/ms-rest-nodeauth');
83+
const { CdnManagementClient } = require('@azure/arm-cdn');
8884
```
8985
2. We need to define some constants our methods will use. Add the following. Be sure to replace the placeholders, including the **&lt;angle brackets&gt;**, with your own values as needed.
9086

@@ -103,23 +99,9 @@ With *app.js* open in our editor, let's get the basic structure of our program w
10399
104100
``` javascript
105101
var credentials = new msRestAzure.ApplicationTokenCredentials(clientId, tenantId, clientSecret);
106-
var cdnClient = new cdnManagementClient(credentials, subscriptionId);
102+
var cdnClient = new CdnManagementClient(credentials, subscriptionId);
107103
```
108-
109-
If you are using individual user authentication, these two lines will look slightly different.
110-
111-
> [!IMPORTANT]
112-
> Only use this code sample if you are choosing to have individual user authentication instead of a service principal. Be careful to guard your individual user credentials and keep them secret.
113-
>
114-
>
115-
116-
``` javascript
117-
var credentials = new msRestAzure.UserTokenCredentials(clientId,
118-
tenantId, '<username>', '<password>', '<redirect URI>');
119-
var cdnClient = new cdnManagementClient(credentials, subscriptionId);
120-
```
121-
122-
Be sure to replace the items in **&lt;angle brackets&gt;** with the correct information. For `<redirect URI>`, use the redirect URI you entered when you registered the application in Azure AD.
104+
123105
4. Our Node.js console application is going to take some command-line parameters. Let's validate that at least one parameter was passed.
124106

125107
```javascript
@@ -232,7 +214,7 @@ function cdnList(){
232214
case "endpoints":
233215
requireParms(3);
234216
console.log("Listing endpoints...");
235-
cdnClient.endpoints.listByProfile(parms[2], resourceGroupName, callback);
217+
cdnClient.endpoints.listByProfile(resourceGroupName, parms[2], callback);
236218
break;
237219
238220
default:
@@ -275,7 +257,7 @@ function cdnCreateProfile() {
275257
}
276258
};
277259
278-
cdnClient.profiles.create(parms[2], standardCreateParameters, resourceGroupName, callback);
260+
cdnClient.profiles.create( resourceGroupName, parms[2], standardCreateParameters, callback);
279261
}
280262
281263
// create endpoint <profile name> <endpoint name> <origin hostname>
@@ -290,7 +272,7 @@ function cdnCreateEndpoint() {
290272
}]
291273
};
292274
293-
cdnClient.endpoints.create(parms[3], endpointProperties, parms[2], resourceGroupName, callback);
275+
cdnClient.endpoints.create(resourceGroupName, parms[2], parms[3], endpointProperties, callback);
294276
}
295277
```
296278

@@ -303,7 +285,7 @@ function cdnPurge() {
303285
requireParms(4);
304286
console.log("Purging endpoint...");
305287
var purgeContentPaths = [ parms[3] ];
306-
cdnClient.endpoints.purgeContent(parms[2], parms[1], resourceGroupName, purgeContentPaths, callback);
288+
cdnClient.endpoints.purgeContent(resourceGroupName, parms[2], parms[3], purgeContentPaths, callback);
307289
}
308290
```
309291

@@ -319,14 +301,14 @@ function cdnDelete() {
319301
case "profile":
320302
requireParms(3);
321303
console.log("Deleting profile...");
322-
cdnClient.profiles.deleteIfExists(parms[2], resourceGroupName, callback);
304+
cdnClient.profiles.deleteMethod(resourceGroupName, parms[2], callback);
323305
break;
324306

325307
// delete endpoint <profile name> <endpoint name>
326308
case "endpoint":
327309
requireParms(4);
328310
console.log("Deleting endpoint...");
329-
cdnClient.endpoints.deleteIfExists(parms[3], parms[2], resourceGroupName, callback);
311+
cdnClient.endpoints.deleteMethod(resourceGroupName, parms[2], parms[3], callback);
330312
break;
331313

332314
default:
@@ -361,11 +343,9 @@ Finally, let's delete our profile.
361343
![Delete profile](./media/cdn-app-dev-node/cdn-delete-profile.png)
362344

363345
## Next Steps
364-
To see the completed project from this walkthrough, [download the sample](https://code.msdn.microsoft.com/Azure-CDN-SDK-for-Nodejs-c712bc74).
365346

366-
To see the reference for the Azure CDN SDK for Node.js, view the [reference](https://azure.github.io/azure-sdk-for-node/azure-arm-cdn/latest/).
347+
To see the reference for the Azure CDN SDK for JavaScript, view the [reference](https://docs.microsoft.com/javascript/api/@azure/arm-cdn).
367348

368-
To find additional documentation on the Azure SDK for Node.js, view the [full reference](https://azure.github.io/azure-sdk-for-node/).
349+
To find additional documentation on the Azure SDK for JavaScript, view the [full reference](https://docs.microsoft.com/javascript/api/?view=azure-node-latest).
369350

370351
Manage your CDN resources with [PowerShell](cdn-manage-powershell.md).
371-

articles/cost-management-billing/manage/understand-ea-roles.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ms.custom: contperf-fy21q1
1313

1414
# Managing Azure Enterprise Agreement roles
1515

16-
To help manage your organization's usage and spend, Azure customers with an Enterprise Agreement can assign five distinct administrative roles:
16+
To help manage your organization's usage and spend, Azure customers with an Enterprise Agreement can assign six distinct administrative roles:
1717

1818
- Enterprise Administrator
1919
- Enterprise Administrator (read only)<sup>1</sup>
@@ -57,7 +57,7 @@ The following diagram illustrates simple Azure EA hierarchies.
5757
The following administrative user roles are part of your enterprise enrollment:
5858

5959
- Enterprise administrator
60-
- Ea purchaser
60+
- EA purchaser
6161
- Department administrator
6262
- Account owner
6363
- Service administrator

articles/spring-cloud/vnet-customer-responsibilities.md

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ The following is a list of resource requirements for Azure Spring Cloud services
2828
## Azure Spring Cloud network requirements
2929

3030
| Destination Endpoint | Port | Use | Note |
31-
|------|------|------|
31+
|------|------|------|------|
3232
| *:1194 *Or* [ServiceTag](../virtual-network/service-tags-overview.md#available-service-tags) - AzureCloud:1194 | UDP:1194 | Underlying Kubernetes Cluster management. | |
3333
| *:443 *Or* [ServiceTag](../virtual-network/service-tags-overview.md#available-service-tags) - AzureCloud:443 | TCP:443 | Azure Spring Cloud Service Management. | Information of service instance "requiredTraffics" could be known in resource payload, under "networkProfile" section. |
3434
| *:9000 *Or* [ServiceTag](../virtual-network/service-tags-overview.md#available-service-tags) - AzureCloud:9000 | TCP:9000 | Underlying Kubernetes Cluster management. |
@@ -38,25 +38,34 @@ The following is a list of resource requirements for Azure Spring Cloud services
3838
| *.servicebus.windows.net:443 *Or* [ServiceTag](../virtual-network/service-tags-overview.md#available-service-tags) - EventHub:443 | TCP:443 | Azure Event Hub. | Can be replaced by enabling *Azure Event Hubs* [service endpoint in virtual network](../virtual-network/virtual-network-service-endpoints-overview.md). |
3939

4040

41-
## Azure Spring Cloud FQDN requirements / application rules
41+
## Azure Spring Cloud FQDN requirements/application rules
4242

43-
Azure Firewall provides a fully qualified domain name (FQDN) tag **AzureKubernetesService** to simplify the following configurations.
43+
Azure Firewall provides the FQDN tag **AzureKubernetesService** to simplify the following configurations:
4444

4545
| Destination FQDN | Port | Use |
4646
|------|------|------|
4747
| *.azmk8s.io | HTTPS:443 | Underlying Kubernetes Cluster management. |
4848
| <i>mcr.microsoft.com</i> | HTTPS:443 | Microsoft Container Registry (MCR). |
4949
| *.cdn.mscr.io | HTTPS:443 | MCR storage backed by the Azure CDN. |
5050
| *.data.mcr.microsoft.com | HTTPS:443 | MCR storage backed by the Azure CDN. |
51-
| <i>management.azure.com</i> | HTTPS:443 | Underlying Kubernetes Cluster management. |
52-
| <i>*login.microsoftonline.com</i> | HTTPS:443 | Azure Active Directory authentication. |
53-
| <i>*login.microsoft.com</i> | HTTPS:443 | Azure Active Directory authentication. |
51+
| <i>management.azure.com</i> | HTTPS:443 | Underlying Kubernetes Cluster management. |
52+
| <i>*login.microsoftonline.com</i> | HTTPS:443 | Azure Active Directory authentication. |
53+
| <i>*login.microsoft.com</i> | HTTPS:443 | Azure Active Directory authentication. |
5454
|<i>packages.microsoft.com</i> | HTTPS:443 | Microsoft packages repository. |
5555
| <i>acs-mirror.azureedge.net</i> | HTTPS:443 | Repository required to install required binaries like kubenet and Azure CNI.​ |
5656
| *mscrl.microsoft.com* | HTTPS:80 | Required Microsoft Certificate Chain Paths. |
5757
| *crl.microsoft.com* | HTTPS:80 | Required Microsoft Certificate Chain Paths. |
5858
| *crl3.digicert.com* | HTTPS:80 | 3rd Party SSL Certificate Chain Paths. |
59+
60+
## Azure Spring Cloud optional FQDN for third-party application performance management
61+
62+
Azure Firewall provides the FQDN tag **AzureKubernetesService** to simplify the following configurations:
63+
64+
| Destination FQDN | Port | Use |
65+
| ---------------- | ---- | ------------------------------------------------------------ |
66+
| collector*.newrelic.com | TCP:443/80 | Required networks of New Relic APM agents from US region, also see [APM Agents Networks](https://docs.newrelic.com/docs/using-new-relic/cross-product-functions/install-configure/networks/#agents). |
67+
| collector*.eu01.nr-data.net | TCP:443/80 | Required networks of New Relic APM agents from EU region, also see [APM Agents Networks](https://docs.newrelic.com/docs/using-new-relic/cross-product-functions/install-configure/networks/#agents). |
5968

6069
## See also
6170
* [Access your application in a private network](access-app-virtual-network.md)
62-
* [Expose apps using Application Gateway and Azure Firewall](expose-apps-gateway-azure-firewall.md)
71+
* [Expose apps using Application Gateway and Azure Firewall](expose-apps-gateway-azure-firewall.md)

0 commit comments

Comments
 (0)