Skip to content

Commit 9f90274

Browse files
author
gitName
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into su
2 parents b95a103 + 857ff4b commit 9f90274

File tree

141 files changed

+8034
-1215
lines changed

Some content is hidden

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

141 files changed

+8034
-1215
lines changed

‎articles/active-directory-b2c/api-connectors-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ Using Azure AD B2C, you can add your own business logic to a user journey by cal
8585
![Diagram of a RESTful service claims exchange](media/api-connectors-overview/restful-service-claims-exchange.png)
8686

8787
> [!NOTE]
88-
> If there is slow or no response from the RESTful service to Azure AD B2C, the timeout is 30 seconds and the retry count is two times (meaning there are 3 tries in total). Currently, you can't configure the timeout and retry count settings.
88+
> HTTP requests may be cancelled if there is a slow or no response from the RESTful service to Azure AD B2C. The default timeout is 10 seconds and the default retry count is one (meaning there are 2 tries in total).
8989
9090
## Calling a RESTful service
9191

‎articles/app-service/environment/creation-terraform.md

Lines changed: 141 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,141 @@
1+
---
2+
title: 'Quickstart: Use Terraform to configure an Azure App Service Environment v3'
3+
description: In this quickstart, you learn how to configure an Azure App Service Environment v3.
4+
ms.topic: quickstart
5+
ms.date: 04/08/2025
6+
ms.custom: devx-track-terraform
7+
ms.service: azure-app-service
8+
author: cephalin
9+
ms.author: cephalin
10+
#customer intent: As a Terraform user, I want to learn how to configure an Azure App Service Environment v3.
11+
content_well_notification:
12+
- AI-contribution
13+
---
14+
15+
# Quickstart: Use Terraform to configure an Azure App Service Environment v3
16+
17+
In this quickstart, you use [Terraform](/azure/developer/terraform) to create an App Service Environment, single-tenant deployment of Azure App Service. You use it with an Azure virtual network. You need one subnet for a deployment of App Service Environment, and this subnet can't be used for anything else. You create a resource group, virtual network, and a subnet to configure an Azure App Service Environment v3.
18+
19+
In this article, you learn how to:
20+
21+
> [!div class="checklist"]
22+
> * Create an Azure resource group with a unique name.
23+
> * Establish a virtual network with a specified name and address.
24+
> * Generate a random name for the subnet, and create a subnet in the virtual network.
25+
> * Delegate the subnet to the Microsoft.Web/hostingEnvironments service.
26+
> * Generate a random name for the App Service Environment v3, and create an App Service Environment v3 in the subnet.
27+
> * Set the internal load-balancing mode for the App Service Environment v3.
28+
> * Set cluster settings for the App Service Environment v3.
29+
> * Tag the App Service Environment v3.
30+
> * Output the names of the resource group, virtual network, subnet, and App Service Environment v3.
31+
32+
## Prerequisites
33+
34+
- An Azure account with an active subscription. You can [create an account for free](https://azure.microsoft.com/free/?WT.mc_id=A261C142F).
35+
- Terraform. For more information, see [Install and configure Terraform](/azure/developer/terraform/quickstart-configure).
36+
37+
> [!IMPORTANT]
38+
> If you're using the 4.x azurerm provider, you must [explicitly specify the Azure subscription ID](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/guides/4.0-upgrade-guide#specifying-subscription-id-is-now-mandatory) to authenticate to Azure before running the Terraform commands.
39+
>
40+
> One way to specify the Azure subscription ID without putting it in the `providers` block is to specify the subscription ID in an environment variable named `ARM_SUBSCRIPTION_ID`.
41+
>
42+
> For more information, see the [Azure provider reference documentation](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs#argument-reference).
43+
44+
## Implement the Terraform code
45+
46+
The sample code for this article is located in the [Azure Terraform GitHub repo](https://github.com/Azure/terraform/tree/master/quickstart/101-app-service-environment). You can view the log file containing the [test results from current and previous versions of Terraform](https://github.com/Azure/terraform/tree/master/quickstart/101-app-service-environment/TestRecord.md). See more [articles and sample code showing how to use Terraform to manage Azure resources](/azure/terraform).
47+
48+
1. Create a directory in which to test and run the sample Terraform code, and make it the current directory.
49+
50+
1. Create a file named `main.tf`, and insert the following code:
51+
:::code language="Terraform" source="~/terraform_samples/quickstart/101-app-service-environment/main.tf":::
52+
53+
1. Create a file named `outputs.tf`, and insert the following code:
54+
:::code language="Terraform" source="~/terraform_samples/quickstart/101-app-service-environment/outputs.tf":::
55+
56+
1. Create a file named `providers.tf`, and insert the following code:
57+
:::code language="Terraform" source="~/terraform_samples/quickstart/101-app-service-environment/providers.tf":::
58+
59+
1. Create a file named `variables.tf`, and insert the following code:
60+
:::code language="Terraform" source="~/terraform_samples/quickstart/101-app-service-environment/variables.tf":::
61+
62+
## Initialize Terraform
63+
64+
[!INCLUDE [terraform-init.md](~/azure-dev-docs-pr/articles/terraform/includes/terraform-init.md)]
65+
66+
## Create a Terraform execution plan
67+
68+
[!INCLUDE [terraform-plan.md](~/azure-dev-docs-pr/articles/terraform/includes/terraform-plan.md)]
69+
70+
## Apply a Terraform execution plan
71+
72+
[!INCLUDE [terraform-apply-plan.md](~/azure-dev-docs-pr/articles/terraform/includes/terraform-apply-plan.md)]
73+
74+
## Verify the results
75+
76+
### [Azure CLI](#tab/azure-cli)
77+
78+
1. Get the Azure resource group name.
79+
80+
```console
81+
resource_group_name=$(terraform output -raw resource_group_name)
82+
```
83+
84+
1. Get the virtual network name.
85+
86+
```console
87+
virtual_network_name=$(terraform output -raw virtual_network_name)
88+
```
89+
90+
1. Get the subnet name.
91+
92+
```console
93+
subnet_name=$(terraform output -raw subnet_name)
94+
```
95+
96+
1. Run `az appservice ase show` to view the App Service Environment v3.
97+
98+
```azurecli
99+
az appservice ase show --name $app_service_environment_v3_name --resource-group $resource_group_name
100+
```
101+
102+
### [Azure PowerShell](#tab/azure-powershell)
103+
104+
1. Get the Azure resource group name.
105+
106+
```console
107+
$resource_group_name=$(terraform output -raw resource_group_name)
108+
```
109+
110+
1. Get the virtual network name.
111+
112+
```console
113+
$virtual_network_name=$(terraform output -virtual_network_name)
114+
```
115+
116+
1. Get the subnet name.
117+
118+
```console
119+
$subnet_name=$(terraform output -subnet_name)
120+
```
121+
122+
1. Run `Get-AzAppServiceEnvironment` to view the AKS cluster within the Azure Extended Zone.
123+
124+
```azurepowershell
125+
Get-AzAppServiceEnvironment -Name $app_service_environment_v3_name -ResourceGroupName $resource_group_name
126+
```
127+
128+
---
129+
130+
## Clean up resources
131+
132+
[!INCLUDE [terraform-plan-destroy.md](~/azure-dev-docs-pr/articles/terraform/includes/terraform-plan-destroy.md)]
133+
134+
## Troubleshoot Terraform on Azure
135+
136+
[Troubleshoot common problems when using Terraform on Azure](/azure/developer/terraform/troubleshoot).
137+
138+
## Next steps
139+
140+
> [!div class="nextstepaction"]
141+
> [See more articles about Azure app service environment v3.](/search/?terms=Azure%20app%20service%20environment%20v3%20and%20terraform)

‎articles/app-service/environment/toc.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
items:
1212
- name: Create App Service Environment in portal
1313
href: creation.md
14+
- name: Create an App Service Environment using Terraform
15+
href: creation-terraform.md
1416
- name: Tutorials
1517
items:
1618
- name: Integrate with Application Gateway

‎articles/azure-functions/durable/durable-functions-troubleshooting-guide.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ traces
129129
| extend status = customDimensions["prop__status"]
130130
| extend details = customDimensions["prop__Details"]
131131
| extend reason = customDimensions["prop__reason"]
132-
| where severityLevel > 1 // to see all logs of severity level "Information" or greater.
132+
| where severityLevel >= 1 // to see all logs of severity level "Information" or greater.
133133
| where instanceId == orchestrationInstanceID
134134
| sort by timestamp asc
135135
```

‎articles/azure-maps/creator-facility-ontology.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ When importing a GeoJSON package, the `ID` and `Geometry` fields must be supplie
8181

8282
:::image type="content" source="./media/creator-indoor-maps/geojson.png" alt-text="A screenshot showing the geometry and ID fields in a GeoJSON file.":::
8383

84-
For more information, see [Create a dataset using a GeoJson package].
84+
For more information, see [Create a dataset using a GeoJSON package].
8585

8686
---
8787

@@ -585,7 +585,7 @@ Learn more about Creator for indoor maps by reading:
585585
[Polygon]: /rest/api/maps-creator/wfs/get-features?tabs=HTTP#geojsonpolygon
586586

587587
<!--------- learn.microsoft.com links --------------->
588-
[Create a dataset using a GeoJson package]: how-to-dataset-geojson.md
588+
[Create a dataset using a GeoJSON package]: how-to-dataset-geojson.md
589589
[Creator for indoor maps]: creator-indoor-maps.md
590590

591591
<!--------- External Links --------------->

‎articles/azure-maps/how-to-dataset-geojson.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
2-
title: How to create a dataset using a GeoJson package
3-
description: Learn how to create a dataset using a GeoJson package.
2+
title: How to create a dataset using a GeoJSON package
3+
description: Learn how to create a dataset using a GeoJSON package.
44
author: faterceros
55
ms.author: aterceros
66
ms.date: 11/01/2021
@@ -9,7 +9,7 @@ ms.service: azure-maps
99
ms.subservice: creator
1010
---
1111

12-
# Create a dataset using a GeoJson package (Preview)
12+
# Create a dataset using a GeoJSON package (Preview)
1313

1414
> [!NOTE]
1515
>
@@ -36,7 +36,7 @@ Azure Maps Creator enables users to import their indoor map data in GeoJSON form
3636
3737
## Create dataset using the GeoJSON package
3838

39-
For more information on the GeoJSON package, see the [Geojson zip package requirements] section.
39+
For more information on the GeoJSON package, see the [GeoJSON zip package requirements] section.
4040

4141
### Upload the GeoJSON package
4242

@@ -95,7 +95,7 @@ https://us.atlas.microsoft.com/datasets?api-version=2023-03-01-preview&conversio
9595
| conversionId | The ID returned when converting your drawing package. |
9696
| datasetId | The dataset ID returned when creating the original dataset from a GeoJSON package. |
9797

98-
## Geojson zip package requirements
98+
## GeoJSON zip package requirements
9999

100100
The GeoJSON zip package consists of one or more [RFC 7946] compliant GeoJSON files, one for each feature class, all in the root directory (subdirectories aren't supported), compressed with standard Zip compression and named using the `.ZIP` extension.
101101

@@ -137,7 +137,7 @@ Feature IDs can only contain alpha-numeric (a-z, A-Z, 0-9), hyphen (-), dot (.)
137137
[dataset]: creator-indoor-maps.md#datasets
138138
[Facility Ontology 2.0]: creator-facility-ontology.md?pivots=facility-ontology-v2
139139
[facility]: creator-facility-ontology.md?pivots=facility-ontology-v2#facility
140-
[Geojson zip package requirements]: #geojson-zip-package-requirements
140+
[GeoJSON zip package requirements]: #geojson-zip-package-requirements
141141
[How to create data registry]: how-to-create-data-registries.md
142142
[level]: creator-facility-ontology.md?pivots=facility-ontology-v2#level
143143
[line]: creator-facility-ontology.md?pivots=facility-ontology-v2#lineelement

‎articles/azure-maps/migrate-get-traffic-incidents.md

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -69,22 +69,22 @@ The following table lists the fields that can appear in the HTTP response when r
6969

7070
| Bing Maps response field | Azure Maps response field | Description |
7171
|--------------------------|---------------------------|-------------|
72-
| Description (Json)<br>Description (XML)  | `d`  | This output is in the [tm] response element of Azure Maps.  |
73-
| End (Json)<br>EndTimeUTC (XML)  | `ed`  | This output is in the [tm] response element of Azure Maps. The date is described in the ISO8601 format and includes time in UTC.  |
74-
| eventList (Json)<br>EventList (XML)  | Not supported | |
75-
| icon (Json)<br>Icon (XML)  | `ic`  | This output is in the [tm] response element of Azure Maps. See [IconCategory] (`ic`) for more info.  |
76-
| incidentId (Json)<br>IncidentId (XML)  | `id` | This output is in the [tm] response element of Azure Maps.  |
77-
| isEndTimeBackfilled (Json)<br>IsEndTimeBackfilled (XML)  | Not supported | |
78-
| isJamcident (Json)<br>IsJamcident (XML)  | Not supported |
79-
| lastModified (Json)<br>LastModifiedUTC (XML)  | Not supported | |
80-
| point (Json)<br>Point (XML)  | `p`  | This output is in the [tm] response element of Azure Maps. See [point] (`p`) for more info.  |
81-
| roadClosed (Json)<br>RoadClosed (XML)  | See description | The [IconCategory] output of the [tm] response element of Azure Maps can be used to indicate a road closure.   |
82-
| severity (Json)<br>Severity (XML)  | `ty`  | This output is in the [tm] response element. See [DelayMagnitude]:  (`ty`) for more info.  |
83-
| severityScore (Json)<br>SeverityScore (XML)              | Not supported | |
84-
| Start (Json)<br>StartTimeUTC (XML)  | `sd`  | This output is in the [tm] response element of Azure Maps. The date is described in the ISO8601 format and includes time in UTC.  |
85-
| title (Json)<br>Title (XML)  | See description | The `f` output in the [tm] response element of Azure Maps provides the name of the intersection or location where the traffic caused by the the incident starts and can serve as an alternative to the Bing Maps `title` output.  |
86-
| toPoint (Json)<br>ToPoint (XML)  | See description | The `t` output in the [tm] response element of Azure Maps provides the name of the intersection or location where the traffic due to the incident ends and can serve as an alternative to the Bing Maps `toPoint` output.  |
87-
| type (Json)<br>Type (XML)  | `c`  | The `c` output in the [tm] response element of Azure Maps provides the cause of the incident, if available.  |
72+
| Description (JSON)<br>Description (XML)  | `d`  | This output is in the [tm] response element of Azure Maps.  |
73+
| End (JSON)<br>EndTimeUTC (XML)  | `ed`  | This output is in the [tm] response element of Azure Maps. The date is described in the ISO8601 format and includes time in UTC.  |
74+
| eventList (JSON)<br>EventList (XML)  | Not supported | |
75+
| icon (JSON)<br>Icon (XML)  | `ic`  | This output is in the [tm] response element of Azure Maps. See [IconCategory] (`ic`) for more info.  |
76+
| incidentId (JSON)<br>IncidentId (XML)  | `id` | This output is in the [tm] response element of Azure Maps.  |
77+
| isEndTimeBackfilled (JSON)<br>IsEndTimeBackfilled (XML)  | Not supported | |
78+
| isJamcident (JSON)<br>IsJamcident (XML)  | Not supported |
79+
| lastModified (JSON)<br>LastModifiedUTC (XML)  | Not supported | |
80+
| point (JSON)<br>Point (XML)  | `p`  | This output is in the [tm] response element of Azure Maps. See [point] (`p`) for more info.  |
81+
| roadClosed (JSON)<br>RoadClosed (XML)  | See description | The [IconCategory] output of the [tm] response element of Azure Maps can be used to indicate a road closure.   |
82+
| severity (JSON)<br>Severity (XML)  | `ty`  | This output is in the [tm] response element. See [DelayMagnitude]:  (`ty`) for more info.  |
83+
| severityScore (JSON)<br>SeverityScore (XML)              | Not supported | |
84+
| Start (JSON)<br>StartTimeUTC (XML)  | `sd`  | This output is in the [tm] response element of Azure Maps. The date is described in the ISO8601 format and includes time in UTC.  |
85+
| title (JSON)<br>Title (XML)  | See description | The `f` output in the [tm] response element of Azure Maps provides the name of the intersection or location where the traffic caused by the the incident starts and can serve as an alternative to the Bing Maps `title` output.  |
86+
| toPoint (JSON)<br>ToPoint (XML)  | See description | The `t` output in the [tm] response element of Azure Maps provides the name of the intersection or location where the traffic due to the incident ends and can serve as an alternative to the Bing Maps `toPoint` output.  |
87+
| type (JSON)<br>Type (XML)  | `c`  | The `c` output in the [tm] response element of Azure Maps provides the cause of the incident, if available.  |
8888

8989
For more information about the Azure Maps Get Traffic Incident Detail API response fields, see [Responses].
9090

0 commit comments

Comments
 (0)