Skip to content

Commit cb2b882

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into ehubalance1114
2 parents a464456 + 3639734 commit cb2b882

38 files changed

+378
-189
lines changed

articles/active-directory/saas-apps/servicenow-tutorial.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,6 @@ To configure the integration of ServiceNow into Azure AD, you need to add Servic
6161

6262
Alternatively, you can also use the [Enterprise App Configuration Wizard](https://portal.office.com/AdminPortal/home?Q=Docs#/azureadappintegration). In this wizard, you can add an application to your tenant, add users/groups to the app, assign roles, as well as walk through the SSO configuration as well. [Learn more about Microsoft 365 wizards.](/microsoft-365/admin/misc/azure-ad-setup-guides)
6363

64-
Alternatively, you can also use the [Enterprise App Configuration Wizard](https://portal.office.com/AdminPortal/home?Q=Docs#/azureadappintegration). In this wizard, you can add an application to your tenant, add users/groups to the app, assign roles, as well as walk through the SSO configuration as well. You can learn more about O365 wizards [here](/microsoft-365/admin/misc/azure-ad-setup-guides?view=o365-worldwide&preserve-view=true).
65-
6664
## Configure and test Azure AD SSO for ServiceNow
6765

6866
Configure and test Azure AD SSO with ServiceNow by using a test user called **B.Simon**. For SSO to work, you need to establish a link relationship between an Azure AD user and the related user in ServiceNow.

articles/azure-app-configuration/faq.yml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,30 @@ sections:
145145
Yes. While you can manage feature flags and Key Vault references in App Configuration through the Azure portal or CLI, you can also create and update them programmatically using App Configuration SDKs. Therefore, you can write your customized management portal or manage them in your CI/CD programmatically. The feature flag and Key Vault reference APIs are available in SDKs of all supported languages. Check out the [sample links](https://github.com/Azure/AppConfiguration#sdks) for examples in each supported language.
146146
147147
Evaluating and consuming feature flags in your application requires the App Configuration provider and feature management libraries, which are available in .NET and Java Spring. Check out the _Feature management_ section under _Quickstarts_ and _Tutorials_ for more information.
148+
149+
- question: How to use Java Spring profiles in App Configuration?
150+
answer: |
151+
Spring profiles provide a way to separate parts of your application, including configuration, and make it only available in certain environments or when specific libraries are used.
152+
153+
You are recommended to set the label of your key-values to match your Spring profiles. By default, the App Configuration Spring provider library will load the key-values with the label(s) matching the current active Spring profile(s) (`${spring.profiles.active}`) if the label filter isn't set explicitly. If there is no active Spring profile set, key-values with "no label" will be loaded.
154+
155+
For example, with profiles `dev` and `prod`, you create key-values accordingly with the following labels.
156+
157+
| Key | Label | Value |
158+
| --- | ----- | ----- |
159+
| /application/config.message | dev | Hello from dev |
160+
| /application/config.message | prod | Hello from prod |
161+
162+
When the Spring profile is set to `dev`, the value of `config.message` will be `Hello from dev`. When the Spring profile is set to `prod`, the value of `config.message` will be `Hello from prod`.
163+
164+
This default behavior can be overridden by setting the label filter in your bootstrap file. The Spring provider library will load key-values with the specified label(s) regardless of the active Spring profile.
165+
166+
```yaml
167+
spring.cloud.azure.appconfiguration.stores[0].selects[0].label-filter: my-label
168+
```
148169
170+
To select other labels and your Spring profile(s), you can use selects like `',${spring.profiles.active}'` which will select all keys without a label and the ones matching your Spring profiles. The rightmost label(s) take priority when duplicate keys are found.
171+
149172
- question: How can I receive announcements on new releases and other information related to App Configuration?
150173
answer: |
151174
Subscribe to our [GitHub announcements repo](https://github.com/Azure/AppConfiguration-Announcements).

articles/azure-functions/functions-bindings-azure-sql-input.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,7 @@ public class GetToDoItems {
196196
authLevel = AuthorizationLevel.ANONYMOUS)
197197
HttpRequestMessage<Optional<String>> request,
198198
@SQLInput(
199+
name = "toDoItems",
199200
commandText = "SELECT * FROM dbo.ToDo",
200201
commandType = "Text",
201202
connectionStringSetting = "SqlConnectionString")
@@ -220,6 +221,7 @@ public class GetToDoItem {
220221
authLevel = AuthorizationLevel.ANONYMOUS)
221222
HttpRequestMessage<Optional<String>> request,
222223
@SQLInput(
224+
name = "toDoItems",
223225
commandText = "SELECT * FROM dbo.ToDo",
224226
commandType = "Text",
225227
parameters = "@Id={Query.id}",
@@ -251,6 +253,7 @@ public class DeleteToDo {
251253
authLevel = AuthorizationLevel.ANONYMOUS)
252254
HttpRequestMessage<Optional<String>> request,
253255
@SQLInput(
256+
name = "toDoItems",
254257
commandText = "dbo.DeleteToDo",
255258
commandType = "StoredProcedure",
256259
parameters = "@Id={Query.id}",
@@ -803,6 +806,7 @@ In the [Java functions runtime library](/java/api/overview/azure/functions/runti
803806
| **commandText** | Required. The Transact-SQL query command or name of the stored procedure executed by the binding. |
804807
| **connectionStringSetting** | Required. The name of an app setting that contains the connection string for the database against which the query or stored procedure is being executed. This value isn't the actual connection string and must instead resolve to an environment variable name. |
805808
| **commandType** | Required. A [CommandType](/dotnet/api/system.data.commandtype) value, which is ["Text"](/dotnet/api/system.data.commandtype#fields) for a query and ["StoredProcedure"](/dotnet/api/system.data.commandtype#fields) for a stored procedure. |
809+
|**name** | Required. The unique name of the function binding. |
806810
| **parameters** | Optional. Zero or more parameter values passed to the command during execution as a single string. Must follow the format `@param1=param1,@param2=param2`. Neither the parameter name nor the parameter value can contain a comma (`,`) or an equals sign (`=`). |
807811

808812
::: zone-end

articles/azure-functions/functions-bindings-azure-sql-output.md

Lines changed: 46 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ More samples for the Azure SQL output binding are available in the [GitHub repos
171171
This section contains the following examples:
172172

173173
* [HTTP trigger, write a record to a table](#http-trigger-write-record-to-table-java)
174-
<!-- * [HTTP trigger, write to two tables](#http-trigger-write-to-two-tables-java) -->
174+
* [HTTP trigger, write to two tables](#http-trigger-write-to-two-tables-java)
175175

176176
The examples refer to a `ToDoItem` class (in a separate file `ToDoItem.java`) and a corresponding database table:
177177

@@ -233,6 +233,7 @@ public class PostToDo {
233233
public HttpResponseMessage run(
234234
@HttpTrigger(name = "req", methods = {HttpMethod.POST}, authLevel = AuthorizationLevel.ANONYMOUS) HttpRequestMessage<Optional<String>> request,
235235
@SQLOutput(
236+
name = "toDoItem",
236237
commandText = "dbo.ToDo",
237238
connectionStringSetting = "SqlConnectionString")
238239
OutputBinding<ToDoItem> output) throws JsonParseException, JsonMappingException, JsonProcessingException {
@@ -248,8 +249,6 @@ public class PostToDo {
248249
}
249250
```
250251

251-
<!-- commented out until issue with java library resolved
252-
253252
<a id="http-trigger-write-to-two-tables-java"></a>
254253
### HTTP trigger, write to two tables
255254

@@ -267,9 +266,9 @@ The second table, `dbo.RequestLog`, corresponds to the following definition:
267266

268267
```sql
269268
CREATE TABLE dbo.RequestLog (
270-
Id int identity(1,1) primary key,
271-
RequestTimeStamp datetime2 not null,
272-
ItemCount int not null
269+
Id INT IDENTITY(1,1) PRIMARY KEY,
270+
RequestTimeStamp DATETIME2 NOT NULL DEFAULT(GETDATE()),
271+
ItemCount INT NOT NULL
273272
)
274273
```
275274

@@ -298,32 +297,50 @@ public class RequestLog {
298297

299298

300299
```java
301-
module.exports = async function (context, req) {
302-
context.log('JavaScript HTTP trigger and SQL output binding function processed a request.');
303-
context.log(req.body);
300+
package com.function;
304301

305-
const newLog = {
306-
RequestTimeStamp = Date.now(),
307-
ItemCount = 1
308-
}
302+
import java.util.*;
303+
import com.microsoft.azure.functions.annotation.*;
304+
import com.microsoft.azure.functions.*;
305+
import com.microsoft.azure.functions.sql.annotation.SQLOutput;
306+
import com.fasterxml.jackson.core.JsonParseException;
307+
import com.fasterxml.jackson.core.JsonProcessingException;
308+
import com.fasterxml.jackson.databind.JsonMappingException;
309+
import com.fasterxml.jackson.databind.ObjectMapper;
309310

310-
if (req.body) {
311-
context.bindings.todoItems = req.body;
312-
context.bindings.requestLog = newLog;
313-
context.res = {
314-
body: req.body,
315-
mimetype: "application/json",
316-
status: 201
317-
}
318-
} else {
319-
context.res = {
320-
status: 400,
321-
body: "Error reading request body"
322-
}
311+
import java.util.Optional;
312+
313+
public class PostToDoWithLog {
314+
@FunctionName("PostToDoWithLog")
315+
public HttpResponseMessage run(
316+
@HttpTrigger(name = "req", methods = {HttpMethod.POST}, authLevel = AuthorizationLevel.ANONYMOUS) HttpRequestMessage<Optional<String>> request,
317+
@SQLOutput(
318+
name = "toDoItem",
319+
commandText = "dbo.ToDo",
320+
connectionStringSetting = "SqlConnectionString")
321+
OutputBinding<ToDoItem> output,
322+
@SQLOutput(
323+
name = "requestLog",
324+
commandText = "dbo.RequestLog",
325+
connectionStringSetting = "SqlConnectionString")
326+
OutputBinding<RequestLog> outputLog,
327+
final ExecutionContext context) throws JsonParseException, JsonMappingException, JsonProcessingException {
328+
context.getLogger().info("Java HTTP trigger processed a request.");
329+
330+
String json = request.getBody().get();
331+
ObjectMapper mapper = new ObjectMapper();
332+
ToDoItem newToDo = mapper.readValue(json, ToDoItem.class);
333+
newToDo.Id = UUID.randomUUID();
334+
output.setValue(newToDo);
335+
336+
RequestLog newLog = new RequestLog();
337+
newLog.ItemCount = 1;
338+
outputLog.setValue(newLog);
339+
340+
return request.createResponseBuilder(HttpStatus.CREATED).header("Content-Type", "application/json").body(output).build();
323341
}
324342
}
325-
``` -->
326-
343+
```
327344

328345
::: zone-end
329346

@@ -819,6 +836,7 @@ In the [Java functions runtime library](/java/api/overview/azure/functions/runti
819836
|---------|---------|
820837
| **commandText** | Required. The name of the table being written to by the binding. |
821838
| **connectionStringSetting** | Required. The name of an app setting that contains the connection string for the database to which data is being written. This isn't the actual connection string and must instead resolve to an environment variable.|
839+
|**name** | Required. The unique name of the function binding. |
822840

823841
::: zone-end
824842

articles/azure-functions/functions-bindings-azure-sql.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ Add the Java library for SQL bindings to your functions project with an update t
177177
<dependency>
178178
<groupId>com.microsoft.azure.functions</groupId>
179179
<artifactId>azure-functions-java-library-sql</artifactId>
180-
<version>0.1.0</version>
180+
<version>0.1.1</version>
181181
</dependency>
182182
```
183183

articles/cognitive-services/Speech-Service/includes/quickstarts/speech-to-text-basics/python.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Install a version of [Python from 3.7 to 3.10](https://www.python.org/downloads/
3636

3737
Follow these steps to create a new console application.
3838

39-
1. Open a command prompt where you want the new project, and create a new file named `speech-recognition.py`.
39+
1. Open a command prompt where you want the new project, and create a new file named `speech_recognition.py`.
4040
1. Run this command to install the Speech SDK:
4141
```console
4242
pip install azure-cognitiveservices-speech

articles/cognitive-services/Speech-Service/includes/quickstarts/speech-translation-basics/python.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,19 +30,20 @@ Install a version of [Python from 3.7 to 3.10](https://www.python.org/downloads/
3030

3131
Follow these steps to create a new console application.
3232

33-
1. Open a command prompt where you want the new project, and create a new file named `speech-recognition.py`.
33+
1. Open a command prompt where you want the new project, and create a new file named `speech_translation.py`.
3434
1. Run this command to install the Speech SDK:
3535
```console
3636
pip install azure-cognitiveservices-speech
3737
```
3838
1. Copy the following code into `speech_translation.py`:
3939

4040
```Python
41+
import os
4142
import azure.cognitiveservices.speech as speechsdk
4243
4344
def recognize_from_microphone():
4445
# This example requires environment variables named "SPEECH_KEY" and "SPEECH_REGION"
45-
speech_translation_config = speechsdk.SpeechTranslationConfig(subscription=os.environ.get('SPEECH_KEY'), region=os.environ.get('SPEECH_REGION'))
46+
speech_translation_config = speechsdk.translation.SpeechTranslationConfig(subscription=os.environ.get('SPEECH_KEY'), region=os.environ.get('SPEECH_REGION'))
4647
speech_translation_config.speech_recognition_language="en-US"
4748
4849
target_language="it"

articles/cognitive-services/Speech-Service/includes/quickstarts/text-to-speech-basics/python.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Install a version of [Python from 3.7 to 3.10](https://www.python.org/downloads/
3636

3737
Follow these steps to create a new console application.
3838

39-
1. Open a command prompt where you want the new project, and create a new file named `speech-synthesis.py`.
39+
1. Open a command prompt where you want the new project, and create a new file named `speech_synthesis.py`.
4040
1. Run this command to install the Speech SDK:
4141
```console
4242
pip install azure-cognitiveservices-speech

articles/cognitive-services/Speech-Service/includes/release-notes/release-notes-containers.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,15 @@ ms.date: 03/22/2022
66
ms.author: eur
77
---
88

9+
### 2022-October release
10+
11+
#### New container versions
12+
13+
Add support for latest model versions:
14+
- Custom speech-to-text 3.7.0
15+
- Speech-to-text 3.7.0
16+
- Text-to-speech 2.6.0
17+
918
### 2022-September release
1019

1120
#### Speech-to-text 3.6.0-amd64

articles/cognitive-services/Speech-Service/releasenotes.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ See below for information about new features and other changes to the Speech ser
1919

2020
## What's new?
2121

22-
* Speech SDK 1.24.0 and Speech CLI 1.24.0 were released in October 2022. See details below.
23-
* Custom speech-to-text container v3.1.0 released in March 2022, with support to get display models.
24-
* TTS Service August 2022, five new voices in public preview were released.
22+
* Speech SDK 1.24.0 and Speech CLI 1.24.0 were released in October 2022.
23+
* Speech-to-text and text-to-speech container versions were updated in October 2022.
24+
* TTS Service November 2022, several voices for `es-MX`, `it-IT`, and `pr-BR` locales were made generally available.
2525
* TTS Service September 2022, all the prebuilt neural voices have been upgraded to high-fidelity voices with 48kHz sample rate.
2626

2727
## Release notes

0 commit comments

Comments
 (0)