Skip to content

Commit 8eb9e3b

Browse files
authored
Merge pull request #109347 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 56d4c47 + 148ac82 commit 8eb9e3b

File tree

8 files changed

+34
-38
lines changed

8 files changed

+34
-38
lines changed

articles/aks/use-managed-identity.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: Use managed identities in Azure Kubernetes Service
3-
description: Learn how to use managed identities in Azure Kubernetes Service (AKS)
3+
description: Learn how to use managed identities in Azure Kubernetes Service (AKS)
44
services: container-service
55
author: saudas
66
manager: saudas
@@ -18,7 +18,7 @@ Currently, an Azure Kubernetes Service (AKS) cluster (specifically, the Kubernet
1818
AKS creates two managed identities:
1919

2020
- **System-assigned managed identity**: The identity that the Kubernetes cloud provider uses to create Azure resources on behalf of the user. The life cycle of the system-assigned identity is tied to that of the cluster. The identity is deleted when the cluster is deleted.
21-
- **User-assigned managed identity**: The identity that's used for authorization in the cluster. For example, the user-assigned identity is used to authorize AKS to use access control records (ACRs), or to authorize the kubelet to get metadata from Azure.
21+
- **User-assigned managed identity**: The identity that's used for authorization in the cluster. For example, the user-assigned identity is used to authorize AKS to use Azure Container Registries (ACRs), or to authorize the kubelet to get metadata from Azure.
2222

2323
Add-ons also authenticate using a managed identity. For each add-on, a managed identity is created by AKS and lasts for the life of the add-on. For creating and using your own VNet, static IP address, or attached Azure disk where the resources are outside of the MC_* resource group, use the PrincipalID of the cluster to perform a role assignment. For more information on role assignment, see [Delegate access to other Azure resources](kubernetes-service-principal.md#delegate-access-to-other-azure-resources).
2424

articles/cognitive-services/Ink-Recognizer/quickstarts/csharp.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ The source code for this quickstart can be found on [GitHub](https://go.microsof
3434
3. Search for `Newtonsoft.Json` and install the package
3535
- If you are using Linux/MacOS, this application can be ran using [Mono](https://www.mono-project.com/).
3636

37-
- The example ink stroke data for this quickstart can be found on [GitHub](https://github.com/Azure-Samples/cognitive-services-REST-api-samples/blob/master/dotnet/InkRecognition/quickstart/example-ink-strokes.json).
37+
- The example ink stroke data for this quickstart can be found on [GitHub](https://github.com/Azure-Samples/cognitive-services-REST-api-samples/blob/master/dotnet/Vision/InkRecognition/quickstart/example-ink-strokes.json).
3838

3939
### Create an Ink Recognizer resource
4040

@@ -85,7 +85,7 @@ Create a function called `LoadJson()` to load the ink data JSON file. Use a `Str
8585

8686
## Run the application and view the response
8787

88-
Run the application. A successful response is returned in JSON format. You can also find the JSON response on [GitHub](https://github.com/Azure-Samples/cognitive-services-REST-api-samples/blob/master/dotnet/InkRecognition/quickstart/example-response.json).
88+
Run the application. A successful response is returned in JSON format. You can also find the JSON response on [GitHub](https://github.com/Azure-Samples/cognitive-services-REST-api-samples/blob/master/dotnet/Vision/InkRecognition/quickstart/example-response.json).
8989

9090

9191
## Next steps

articles/cognitive-services/Speech-Service/devices-sdk-release-notes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ The following sections list changes in the most recent releases.
5454
**Breaking changes**
5555

5656
- Due to the new keyword technology all keywords must be re-created at our improved keyword portal. To fully remove old keywords from the device uninstall the old app.
57-
- adb uninstall com.microsoft.coginitiveservices.speech.samples.sdsdkstarterapp
57+
- adb uninstall com.microsoft.cognitiveservices.speech.samples.sdsdkstarterapp
5858

5959
## Speech Devices SDK 1.4.0: 2019-Apr release
6060

articles/cognitive-services/Speech-Service/speech-devices-sdk-roobo-v2.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ For more development information, see the [Roobo development guide](http://dwn.r
3232

3333
## Audio Record/Play
3434

35-
DDK2 audio operations can be performed in the following ways
35+
DDK2 audio operations can be performed in the following ways:
3636
* Use ALSA Open-source libraries and their applications.
3737
* Use appmainprog interface to do application development.
3838
DDK2 audio - related software framework uses standard ALSA framework, you can use libasound. So to develop software directly. So you can use ALSA's arecord and aplay directly to record and play audio.

articles/event-grid/cloudevents-schema.md

Lines changed: 25 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -153,35 +153,27 @@ The following sample C# code for an HTTP trigger simulates Event Grid trigger be
153153

154154
```csharp
155155
[FunctionName("HttpTrigger")]
156-
public static async Task<HttpResponseMessage> Run([HttpTrigger(AuthorizationLevel.Anonymous, "get", "post", Route = null)]HttpRequestMessage req, ILogger log)
156+
public static async Task<HttpResponseMessage> Run([HttpTrigger(AuthorizationLevel.Anonymous, "get", "post", "options", Route = null)]HttpRequestMessage req, ILogger log)
157157
{
158158
log.LogInformation("C# HTTP trigger function processed a request.");
159+
if (req.Method == "OPTIONS")
160+
{
161+
// If the request is for subscription validation, send back the validation code
162+
163+
var response = req.CreateResponse(HttpStatusCode.OK);
164+
response.Add("Webhook-Allowed-Origin", "eventgrid.azure.net");
165+
166+
return response;
167+
}
159168

160169
var requestmessage = await req.Content.ReadAsStringAsync();
161170
var message = JToken.Parse(requestmessage);
162171

163-
if (message.Type == JTokenType.Array)
164-
{
165-
// If the request is for subscription validation, send back the validation code.
166-
if (string.Equals((string)message[0]["eventType"],
167-
"Microsoft.EventGrid.SubscriptionValidationEvent",
168-
System.StringComparison.OrdinalIgnoreCase))
169-
{
170-
log.LogInformation("Validate request received");
171-
return req.CreateResponse<object>(new
172-
{
173-
validationResponse = message[0]["data"]["validationCode"]
174-
});
175-
}
176-
}
177-
else
178-
{
179-
// The request is not for subscription validation, so it's for an event.
180-
// CloudEvents schema delivers one event at a time.
181-
log.LogInformation($"Source: {message["source"]}");
182-
log.LogInformation($"Time: {message["eventTime"]}");
183-
log.LogInformation($"Event data: {message["data"].ToString()}");
184-
}
172+
// The request is not for subscription validation, so it's for an event.
173+
// CloudEvents schema delivers one event at a time.
174+
log.LogInformation($"Source: {message["source"]}");
175+
log.LogInformation($"Time: {message["eventTime"]}");
176+
log.LogInformation($"Event data: {message["data"].ToString()}");
185177

186178
return req.CreateResponse(HttpStatusCode.OK);
187179
}
@@ -192,22 +184,26 @@ The following sample JavaScript code for an HTTP trigger simulates Event Grid tr
192184
```javascript
193185
module.exports = function (context, req) {
194186
context.log('JavaScript HTTP trigger function processed a request.');
195-
196-
var message = req.body;
197-
// If the request is for subscription validation, send back the validation code.
198-
if (message.length > 0 && message[0].eventType == "Microsoft.EventGrid.SubscriptionValidationEvent") {
187+
188+
if (req.method == "OPTIONS) {
189+
// If the request is for subscription validation, send back the validation code
190+
199191
context.log('Validate request received');
200-
var code = message[0].data.validationCode;
201192
context.res = { status: 200, body: { "ValidationResponse": code } };
193+
context.res.headers.append('Webhook-Allowed-Origin', 'eventgrid.azure.net');
202194
}
203-
else {
195+
else
196+
{
197+
var message = req.body;
198+
204199
// The request is not for subscription validation, so it's for an event.
205200
// CloudEvents schema delivers one event at a time.
206201
var event = JSON.parse(message);
207202
context.log('Source: ' + event.source);
208203
context.log('Time: ' + event.eventTime);
209204
context.log('Data: ' + JSON.stringify(event.data));
210205
}
206+
211207
context.done();
212208
};
213209
```

articles/event-hubs/event-hubs-event-processor-host.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ ms.author: shvija
2121
# Event processor host
2222
> [!NOTE]
2323
> This article applies to the old version of Azure Event Hubs SDK. To learn how to migrate your code to the newer version of the SDK, see these migration guides.
24-
> - [.NET](https://github.com/Azure/azure-sdk-for-net/blob/master/sdk/eventhub/Azure.Messaging.EventHubs/MIGRATIONGUIDE.md)
24+
> - [.NET](https://github.com/Azure/azure-sdk-for-net/blob/master/sdk/eventhub/Azure.Messaging.EventHubs/MigrationGuide.md)
2525
> - [Java](https://github.com/Azure/azure-sdk-for-java/blob/master/sdk/eventhubs/azure-messaging-eventhubs/migration-guide.md)
2626
> - [Python](https://github.com/Azure/azure-sdk-for-python/blob/master/sdk/eventhub/azure-eventhub/migration_guide.md)
2727
> - [Java Script](https://github.com/Azure/azure-sdk-for-js/blob/master/sdk/eventhub/event-hubs/migrationguide.md)

articles/iot-edge/tutorial-python-module.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ Use the following table to understand your options for developing and deploying
4343

4444
## Prerequisites
4545

46-
Before beginning this tutorial, you should have gone through the previous tutorial to set up your development environment for Linux container development: [Develop IoT Edge modules for Linux devices](tutorial-develop-for-linux.md). By completing either of those tutorials, you should have the following prerequisites in place:
46+
Before beginning this tutorial, you should have gone through the previous tutorial to set up your development environment for Linux container development: [Develop IoT Edge modules for Linux devices](tutorial-develop-for-linux.md). By completing that tutorial, you should have the following prerequisites in place:
4747

4848
* A free or standard-tier [IoT Hub](../iot-hub/iot-hub-create-through-portal.md) in Azure.
4949
* A [Linux device running Azure IoT Edge](quickstart-linux.md)

articles/virtual-machines/workloads/sap/sap-hana-scale-out-standby-netapp-files-rhel.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ Before you begin, refer to the following SAP notes and papers:
8585
* Azure-specific RHEL documentation:
8686
* [Install SAP HANA on Red Hat Enterprise Linux for Use in Microsoft Azure](https://access.redhat.com/solutions/3193782)
8787
* [NetApp SAP Applications on Microsoft Azure using Azure NetApp Files][anf-sap-applications-azure]
88-
* [SAP HANA on NetApp Systems with Network File System (NFS)](https://www.netapp.com/us/media/tr-4435.pdf): A configuration guide that contains information about how to set up SAP HANA by using Azure NFS by NetApp
88+
8989

9090
## Overview
9191

0 commit comments

Comments
 (0)