Skip to content

Commit 0ffa998

Browse files
learn-build-service-prod[bot]learn-build-service-prod[bot]
authored
Merge pull request #303220 from MicrosoftDocs/main
Auto Publish – main to live - 2025-07-23 22:00 UTC
2 parents 3d15d9e + 9b8ed69 commit 0ffa998

File tree

656 files changed

+1412
-1133
lines changed

Some content is hidden

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

656 files changed

+1412
-1133
lines changed

‎articles/api-center/register-discover-mcp-server.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Learn about how Azure API Center can be a centralized registry for
44
author: dlepow
55
ms.service: azure-api-center
66
ms.topic: concept-article
7-
ms.date: 04/28/2025
7+
ms.date: 07/22/2025
88
ms.author: danlep
99
# Customer intent: As an API program manager, I want to register and discover MCP servers as APIs in my API Center inventory.
1010
ms.custom:
@@ -27,6 +27,9 @@ To register an MCP server in your API center inventory, specify the API type as
2727

2828
As described in the following sections, when you register an MCP server, you can specify an environment, deployment, and definition.
2929

30+
> [!TIP]
31+
> If you manage MCP servers in Azure API Management, you can enable automatic synchronization to keep your API center up to date with MCP servers and other APIs from your API Management instance. To learn more, see [Synchronize APIs from Azure API Management instance](synchronize-api-management-apis.md).
32+
3033

3134
### Environment and deployment for MCP server
3235

‎articles/api-center/synchronize-api-management-apis.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Integrate an API Management instance to Azure API Center for automa
44
author: dlepow
55
ms.service: azure-api-center
66
ms.topic: how-to
7-
ms.date: 06/25/2025
7+
ms.date: 07/22/2025
88
ms.author: danlep
99
ms.custom: devx-track-azurecli
1010
# Customer intent: As an API program manager, I want to integrate my Azure API Management instance with my API center and synchronize API Management APIs to my inventory.
@@ -23,7 +23,7 @@ Although you can use the Azure CLI to [import](import-api-management-apis.md) AP
2323

2424
When you integrate an API Management instance as an API source, the following happens:
2525

26-
1. All APIs, and optionally API definitions (specs), from the API Management instance are added to the API center inventory.
26+
1. All APIs, and optionally API definitions (specs), from the API Management instance are added to the API center inventory. MCP servers in API Management are included in the APIs added to the inventory.
2727
1. You configure an [environment](key-concepts.md#environment) of type *Azure API Management* in the API center.
2828
1. An associated [deployment](key-concepts.md#deployment) is created for each synchronized API definition from API Management.
2929

@@ -106,4 +106,5 @@ The API Management instance is integrated as an environment in your API center.
106106

107107
* [Manage API inventory with Azure CLI commands](manage-apis-azure-cli.md)
108108
* [Import APIs from API Management to your Azure API center](import-api-management-apis.md)
109+
* [Register and discover MCP servers in your API center](register-discover-mcp-server.md)
109110
* [Azure API Management documentation](../api-management/index.yml)

‎articles/azure-functions/create-first-function-azure-developer-cli.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Create functions in Azure using the Azure Developer CLI
33
description: "Learn how to use the Azure Developer CLI (azd) to create resources and deploy the local project to a Flex Consumption plan on Azure."
4-
ms.date: 10/19/2024
4+
ms.date: 7/23/2025
55
ms.topic: quickstart
66
ms.custom:
77
- ignite-2024
@@ -21,9 +21,9 @@ By default, the Flex Consumption plan follows a _pay-for-what-you-use_ billing m
2121

2222
+ An Azure account with an active subscription. [Create an account for free](https://azure.microsoft.com/free/?ref=microsoft.com&utm_source=microsoft.com&utm_medium=docs&utm_campaign=visualstudio).
2323

24-
+ [Azure Developer CLI](/azure/developer/azure-developer-cli/install-azd).
24+
+ [Azure Developer CLI](/azure/developer/azure-developer-cli/install-azd)
2525

26-
+ [Azure Functions Core Tools](functions-run-local.md#install-the-azure-functions-core-tools).
26+
+ [Azure Functions Core Tools](functions-run-local.md#install-the-azure-functions-core-tools)
2727

2828
[!INCLUDE [functions-requirements-azure-cli](../../includes/functions-requirements-azure-cli.md)]
2929

‎articles/azure-functions/functions-create-first-function-terraform.md

Lines changed: 51 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,18 @@
22
title: 'Quickstart: Create and deploy Azure Functions resources from Terraform'
33
description: In this quickstart article, you create a function app in a Flex Consumption plan, along with the resource group, storage account, and blob storage container required by the app.
44
ms.topic: quickstart
5-
ms.date: 05/01/2025
5+
ms.date: 07/22/2025
66
ms.custom: devx-track-terraform
77
ms.service: azure-functions
8-
author: ggailey777
9-
ms.author: glenga
108
#customer intent: As a Terraform user, I want to learn how to create a function app in a Flex Consumption plan along with required storage account and blob storage container used for deployments.
119
content_well_notification:
1210
- AI-contribution
11+
zone_pivot_groups: programming-languages-set-functions
1312
---
1413

1514
# Quickstart: Create and deploy Azure Functions resources from Terraform
1615

17-
In this quickstart, you use Terraform to create a function app in a Flex Consumption plan in Azure Functions, along with other required Azure resources. The Flex Consumption plan provides serverless hosting that lets you run your code on demand without explicitly provisioning or managing infrastructure. It's used for processing data, integrating systems, internet-of-things computing, and building simple APIs and microservices. The resources created in this configuration include a unique resource group, a storage account, a blob storage container, the Flex Consumption plan, and the function app itself. The function app runs on Linux and is configured to use blob storage for code deployments.
16+
In this quickstart, you use Terraform to create a function app in a Flex Consumption plan in Azure Functions, along with other required Azure resources. The Flex Consumption plan provides serverless hosting that lets you run your code on demand without explicitly provisioning or managing infrastructure. The function app runs on Linux and is configured to use Azure Blob storage for code deployments.
1817

1918
[!INCLUDE [About Terraform](~/azure-dev-docs-pr/articles/terraform/includes/abstract.md)]
2019

@@ -31,6 +30,7 @@ In this quickstart, you use Terraform to create a function app in a Flex Consump
3130

3231
- Create an Azure account with an active subscription. You can [create an account for free](https://azure.microsoft.com/free/?WT.mc_id=A261C142F).
3332
- [Install and configure Terraform](/azure/developer/terraform/quickstart-configure).
33+
- [Install the Azure CLI](/cli/azure/install-azure-cli) to obtain the subscription ID or run in [Azure Cloud Shell](/azure/cloud-shell/overview).
3434

3535
## Implement the Terraform code
3636

@@ -50,94 +50,69 @@ The sample code for this article is located in the [Azure Terraform GitHub repo]
5050
1. Create a file named `variables.tf`, and insert the following code:
5151
:::code language="Terraform" source="~/terraform_samples/quickstart/101-azure-functions/variables.tf":::
5252

53-
> [!IMPORTANT]
54-
> If you are 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.
55-
>
56-
> 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`.
57-
>
58-
> For more information, see the [Azure provider reference documentation](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs#argument-reference).
53+
1. Use this Azure CLI command to set the `ARM_SUBSCRIPTION_ID` environment variable to the ID of your current subscription:
54+
55+
```azurecli
56+
export ARM_SUBSCRIPTION_ID=$(az account show --query "id" --output tsv)
57+
```
58+
59+
You must have this variable set for Terraform to be able to authenticate to your Azure subscription.
5960
6061
## Initialize Terraform
6162
6263
[!INCLUDE [terraform-init.md](~/azure-dev-docs-pr/articles/terraform/includes/terraform-init.md)]
6364
6465
## Create a Terraform execution plan
6566
66-
[!INCLUDE [terraform-plan.md](~/azure-dev-docs-pr/articles/terraform/includes/terraform-plan.md)]
67+
Run [terraform plan](https://www.terraform.io/docs/commands/plan.html) to create an execution plan.
68+
69+
::: zone pivot="programming-language-csharp"
70+
```console
71+
terraform plan -out main.tfplan -var="runtime_name=dotnet-isolated" -var="runtime_version=8"
72+
```
73+
::: zone-end
74+
::: zone pivot="programming-language-powershell"
75+
```console
76+
terraform plan -out main.tfplan -var="runtime_name=powershell" -var="runtime_version=7.4"
77+
```
78+
::: zone-end
79+
::: zone pivot="programming-language-python"
80+
```console
81+
terraform plan -out main.tfplan -var="runtime_name=python" -var="runtime_version=3.12"
82+
```
83+
::: zone-end
84+
::: zone pivot="programming-language-java"
85+
```console
86+
terraform plan -out main.tfplan -var="runtime_name=java" -var="runtime_version=21"
87+
```
88+
::: zone-end
89+
::: zone pivot="programming-language-javascript,programming-language-typescript"
90+
```console
91+
terraform plan -out main.tfplan -var="runtime_name=node" -var="runtime_version=20"
92+
```
93+
::: zone-end
94+
95+
Make sure that `runtime_version` matches the language stack version you verified locally. Select your preferred language stack at the [top](#top) of the article.
96+
97+
[!INCLUDE [terraform-plan-notes.md](~/azure-dev-docs-pr/articles/terraform/includes/terraform-plan-notes.md)]
6798

6899
## Apply a Terraform execution plan
69100

70101
[!INCLUDE [terraform-apply-plan.md](~/azure-dev-docs-pr/articles/terraform/includes/terraform-apply-plan.md)]
71102

72103
## Verify the results
73104

74-
### [Azure CLI](#tab/azure-cli)
75-
76-
1. Get the Azure resource group name.
77-
78-
```console
79-
resource_group_name=$(terraform output -raw resource_group_name)
80-
```
81-
82-
1. Get the storage account name.
83-
84-
```console
85-
sa_name=$(terraform output -raw sa_name)
86-
```
105+
The `outputs.tf` file returns these values for your new function app:
87106

88-
1. Get the service plan name.
89-
90-
```console
91-
asp_name=$(terraform output -raw asp_name)
92-
```
93-
94-
1. Get the function app plan name.
95-
96-
```console
97-
fa_name=$(terraform output -raw fa_name)
98-
```
99-
100-
1. Run `az functionapp show` to view the Azure Functions Flex Consumption plan.
101-
102-
```azurecli
103-
az functionapp show --name $function_app_name --resource-group $resource_group_name
104-
```
105-
106-
### [Azure PowerShell](#tab/azure-powershell)
107-
108-
1. Get the Azure resource group name.
109-
110-
```console
111-
$resource_group_name=$(terraform output -raw resource_group_name)
112-
```
113-
114-
1. Get the storage account name.
115-
116-
```console
117-
$sa_name=$(terraform output -raw sa_name)
118-
```
119-
120-
1. Get the service plan name.
121-
122-
```console
123-
$asp_name=$(terraform output -raw asp_name)
124-
```
125-
126-
1. Get the function app plan name.
127-
128-
```console
129-
$fa_name=$(terraform output -raw fa_name)
130-
```
131-
132-
1. Run `Get-AzFunctionApp` to view the Azure Functions Flex Consumption plan.
133-
134-
```azurepowershell
135-
Get-AzFunctionApp -Name $function_app_name -ResourceGroupName $resource_group_name
136-
```
137-
138-
---
107+
| Value | Description |
108+
| --- | --- |
109+
| `resource_group_name` | The name of the resource group you created. |
110+
| `sa_name` | The name of the Azure storage account required by the Functions host. |
111+
| `asp_name` | The name of the Flex Consumption plan that hosts your new app. |
112+
| `fa_name` | The name of your new function app. |
113+
| `fa_url` | The URL of your new function app endpoint. |
139114

140-
Open a browser and enter the following URL: **https://<fa_name>.azurewebsites.net**. Replace the placeholder `<fa_name>` with the value output by Terraform.
115+
Open a browser and browse to the URL location in `fa_url`. You can also use the [terraform output](https://developer.hashicorp.com/terraform/cli/commands/output) command to review these values at a later time.
141116

142117
:::image type="content" source="media/functions-create-first-function-terraform/function-app-terraform.png" alt-text="Screenshot of Azure Functions app 'Welcome page'." border="false":::
143118

‎articles/azure-functions/how-to-create-function-azure-cli.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Create a function in Azure from the command line
33
description: Learn how to use command line tools, such as Azure Functions Core Tools, to create a function code project, create Azure resources, and publish function code to run in Azure Functions.
4-
ms.date: 07/11/2025
4+
ms.date: 07/22/2025
55
ms.topic: quickstart
66
ms.custom: devx-track-csharp, devx-track-azurecli, devx-track-azurepowershell, mode-other, devx-track-dotnet
77
zone_pivot_groups: programming-languages-set-functions
@@ -19,6 +19,8 @@ Completing this quickstart incurs a small cost of a few USD cents or less in you
1919

2020
[!INCLUDE [functions-requirements-azure-cli](../../includes/functions-requirements-azure-cli.md)]
2121

22+
+ [Azure CLI](/cli/azure/install-azure-cli)
23+
2224
+ The [`jq` command line JSON processor](https://jqlang.org/download/), used to parse JSON output, and is also available in Azure Cloud Shell.
2325

2426
[!INCLUDE [functions-install-core-tools](../../includes/functions-install-core-tools.md)]

‎articles/azure-resource-manager/templates/all-files-test-cases.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: All files test cases for Azure Resource Manager test toolkit
33
description: Describes the tests that are run for all files by the Azure Resource Manager template test toolkit.
44
ms.topic: how-to
55
ms.custom: devx-track-arm-template
6-
ms.date: 06/20/2024
6+
ms.date: 07/23/2025
77
---
88

99
# Test cases for all files

‎articles/azure-resource-manager/templates/child-resource-name-type.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Child resources in templates
33
description: Describes how to set the name and type for child resources in an Azure Resource Manager template (ARM template).
44
ms.topic: conceptual
55
ms.custom: devx-track-arm-template
6-
ms.date: 06/20/2024
6+
ms.date: 07/23/2025
77
---
88

99
# Set name and type for child resources
@@ -47,7 +47,7 @@ The following example shows a virtual network and with a subnet. Notice that the
4747
"resources": [
4848
{
4949
"type": "Microsoft.Network/virtualNetworks",
50-
"apiVersion": "2022-11-01",
50+
"apiVersion": "2024-07-01",
5151
"name": "VNet1",
5252
"location": "[parameters('location')]",
5353
"properties": {
@@ -60,7 +60,7 @@ The following example shows a virtual network and with a subnet. Notice that the
6060
"resources": [
6161
{
6262
"type": "subnets",
63-
"apiVersion": "2022-11-01",
63+
"apiVersion": "2024-07-01",
6464
"name": "Subnet1",
6565
"dependsOn": [
6666
"VNet1"
@@ -106,7 +106,7 @@ The following example shows a virtual network and subnet that are both defined a
106106
"resources": [
107107
{
108108
"type": "Microsoft.Network/virtualNetworks",
109-
"apiVersion": "2022-11-01",
109+
"apiVersion": "2024-07-01",
110110
"name": "VNet1",
111111
"location": "[parameters('location')]",
112112
"properties": {
@@ -119,7 +119,7 @@ The following example shows a virtual network and subnet that are both defined a
119119
},
120120
{
121121
"type": "Microsoft.Network/virtualNetworks/subnets",
122-
"apiVersion": "2022-11-01",
122+
"apiVersion": "2024-07-01",
123123
"name": "VNet1/Subnet1",
124124
"dependsOn": [
125125
"VNet1"

‎articles/azure-resource-manager/templates/conditional-resource-deployment.md

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Conditional deployment with templates
33
description: Describes how to conditionally deploy a resource in an Azure Resource Manager template (ARM template).
44
ms.topic: conceptual
55
ms.custom: devx-track-arm-template
6-
ms.date: 06/20/2024
6+
ms.date: 07/23/2025
77
---
88

99
# Conditional deployment in ARM templates
@@ -26,17 +26,21 @@ You can pass in a parameter value that indicates whether a resource is deployed.
2626
"contentVersion": "1.0.0.0",
2727
"parameters": {
2828
"deployZone": {
29-
"type": "bool"
29+
"type": "bool",
30+
"defaultValue": true
3031
}
3132
},
3233
"functions": [],
3334
"resources": [
3435
{
3536
"condition": "[parameters('deployZone')]",
3637
"type": "Microsoft.Network/dnsZones",
37-
"apiVersion": "2018-05-01",
38+
"apiVersion": "2024-07-01-preview",
3839
"name": "myZone",
39-
"location": "global"
40+
"location": "global",
41+
"properties": {
42+
"zoneType": "Public"
43+
}
4044
}
4145
]
4246
}
@@ -73,7 +77,7 @@ You can use conditional deployment to create a new resource or use an existing o
7377
{
7478
"condition": "[equals(parameters('newOrExisting'), 'new')]",
7579
"type": "Microsoft.Storage/storageAccounts",
76-
"apiVersion": "2022-09-01",
80+
"apiVersion": "2025-01-01",
7781
"name": "[parameters('storageAccountName')]",
7882
"location": "[parameters('location')]",
7983
"sku": {
@@ -84,7 +88,7 @@ You can use conditional deployment to create a new resource or use an existing o
8488
{
8589
"condition": "[equals(parameters('newOrExisting'), 'existing')]",
8690
"type": "Microsoft.Storage/storageAccounts",
87-
"apiVersion": "2022-09-01",
91+
"apiVersion": "2025-01-01",
8892
"name": "[parameters('storageAccountName')]"
8993
}
9094
],

‎articles/azure-resource-manager/templates/copy-outputs.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Define multiple instances of an output value
33
description: Use copy operation in an Azure Resource Manager template (ARM template) to iterate multiple times when returning a value from a deployment.
44
ms.topic: how-to
55
ms.custom: devx-track-arm-template
6-
ms.date: 06/20/2024
6+
ms.date: 07/23/2025
77
---
88

99
# Output iteration in ARM templates
@@ -71,7 +71,7 @@ The following example creates a variable number of storage accounts and returns
7171
"count": "[parameters('storageCount')]"
7272
},
7373
"type": "Microsoft.Storage/storageAccounts",
74-
"apiVersion": "2022-09-01",
74+
"apiVersion": "2025-01-01",
7575
"name": "[format('{0}{1}', copyIndex(), variables('baseName'))]",
7676
"location": "[parameters('location')]",
7777
"sku": {
@@ -128,7 +128,7 @@ The next example returns three properties from the new storage accounts.
128128
"count": "[length(range(0, parameters('storageCount')))]"
129129
},
130130
"type": "Microsoft.Storage/storageAccounts",
131-
"apiVersion": "2022-09-01",
131+
"apiVersion": "2025-01-01",
132132
"name": "[format('{0}{1}', range(0, parameters('storageCount'))[copyIndex()], variables('baseName'))]",
133133
"location": "[parameters('location')]",
134134
"sku": {

‎articles/azure-resource-manager/templates/createuidefinition-test-cases.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: createUiDefinition.json test cases for Azure Resource Manager test toolki
33
description: Describes the createUiDefinition.json tests that are run by the Azure Resource Manager template test toolkit.
44
ms.topic: conceptual
55
ms.custom: devx-track-arm-template
6-
ms.date: 06/20/2024
6+
ms.date: 07/23/2025
77
---
88

99
# Test cases for createUiDefinition.json

0 commit comments

Comments
 (0)