Merge branches 'release-aio-2507' and 'release-aio-2507' of https://github.com/MicrosoftDocs/azure-docs-pr into jlian-release-aio-2507

Author: Pat Altimore

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

@@ -4,7 +4,7 @@ description: Learn about how Azure API Center can be a centralized registry for
 author: dlepow
 ms.service: azure-api-center
 ms.topic: concept-article
-ms.date: 04/28/2025
+ms.date: 07/22/2025
 ms.author: danlep 
 # Customer intent: As an API program manager, I want to register and discover  MCP servers as APIs in my API Center inventory.
 ms.custom:
@@ -27,6 +27,9 @@ To register an MCP server in your API center inventory, specify the API type as
 
 As described in the following sections, when you register an MCP server, you can specify an environment, deployment, and definition.
 
+> [!TIP]
+> 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).
+
 
 ### Environment and deployment for MCP server
 

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

@@ -4,7 +4,7 @@ description: Integrate an API Management instance to Azure API Center for automa
 author: dlepow
 ms.service: azure-api-center
 ms.topic: how-to
-ms.date: 06/25/2025
+ms.date: 07/22/2025
 ms.author: danlep 
 ms.custom: devx-track-azurecli
 # 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
 
 When you integrate an API Management instance as an API source, the following happens:
 
-1. All APIs, and optionally API definitions (specs), from the API Management instance are added to the API center inventory.
+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.
 1. You configure an [environment](key-concepts.md#environment) of type *Azure API Management* in the API center. 
 1. An associated [deployment](key-concepts.md#deployment) is created for each synchronized API definition from API Management. 
 
@@ -106,4 +106,5 @@ The API Management instance is integrated as an environment in your API center.
 
 * [Manage API inventory with Azure CLI commands](manage-apis-azure-cli.md)
 * [Import APIs from API Management to your Azure API center](import-api-management-apis.md)
+* [Register and discover MCP servers in your API center](register-discover-mcp-server.md)
 * [Azure API Management documentation](../api-management/index.yml)

articles/automation/automation-use-azure-ad.md

@@ -140,7 +140,7 @@ Workflow Workflowname
 
 ## Using Microsoft Graph with Powershell
 
-See [Get started with the Microsoft Graph PowerShell SDK](https://learn.microsoft.com/powershell/microsoftgraph/get-started?view=graph-powershell-1.0)
+See [Get started with the Microsoft Graph PowerShell SDK](/powershell/microsoftgraph/get-started)
 
 ## Next steps
 

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

@@ -1,7 +1,7 @@
 ---
 title: Create functions in Azure using the Azure Developer CLI
 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."
-ms.date: 10/19/2024
+ms.date: 7/23/2025
 ms.topic: quickstart
 ms.custom:
   - ignite-2024
@@ -21,9 +21,9 @@ By default, the Flex Consumption plan follows a _pay-for-what-you-use_ billing m
 
 + 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).
 
-+ [Azure Developer CLI](/azure/developer/azure-developer-cli/install-azd).
++ [Azure Developer CLI](/azure/developer/azure-developer-cli/install-azd)
 
-+ [Azure Functions Core Tools](functions-run-local.md#install-the-azure-functions-core-tools).
++ [Azure Functions Core Tools](functions-run-local.md#install-the-azure-functions-core-tools)
 
 [!INCLUDE [functions-requirements-azure-cli](../../includes/functions-requirements-azure-cli.md)]
 

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

@@ -2,19 +2,18 @@
 title: 'Quickstart: Create and deploy Azure Functions resources from Terraform'
 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.
 ms.topic: quickstart
-ms.date: 05/01/2025
+ms.date: 07/22/2025
 ms.custom: devx-track-terraform
 ms.service: azure-functions
-author: ggailey777
-ms.author: glenga
 #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.
 content_well_notification: 
   - AI-contribution
+zone_pivot_groups: programming-languages-set-functions
 ---
 
 # Quickstart: Create and deploy Azure Functions resources from Terraform
 
-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.
+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.
 
 [!INCLUDE [About Terraform](~/azure-dev-docs-pr/articles/terraform/includes/abstract.md)]
 
@@ -31,6 +30,7 @@ In this quickstart, you use Terraform to create a function app in a Flex Consump
 
 - Create an Azure account with an active subscription. You can [create an account for free](https://azure.microsoft.com/free/?WT.mc_id=A261C142F).
 - [Install and configure Terraform](/azure/developer/terraform/quickstart-configure).
+- [Install the Azure CLI](/cli/azure/install-azure-cli) to obtain the subscription ID or run in [Azure Cloud Shell](/azure/cloud-shell/overview).
 
 ## Implement the Terraform code
 
@@ -50,94 +50,69 @@ The sample code for this article is located in the [Azure Terraform GitHub repo]
 1. Create a file named `variables.tf`, and insert the following code:
     :::code language="Terraform" source="~/terraform_samples/quickstart/101-azure-functions/variables.tf":::
 
-> [!IMPORTANT]
-> 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.
->
-> 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`.
->
-> For more information, see the [Azure provider reference documentation](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs#argument-reference).
+1. Use this Azure CLI command to set the `ARM_SUBSCRIPTION_ID` environment variable to the ID of your current subscription:
+
+    ```azurecli
+    export ARM_SUBSCRIPTION_ID=$(az account show --query "id" --output tsv)
+    ```
+
+    You must have this variable set for Terraform to be able to authenticate to your Azure subscription.
 
 ## Initialize Terraform
 
 [!INCLUDE [terraform-init.md](~/azure-dev-docs-pr/articles/terraform/includes/terraform-init.md)]
 
 ## Create a Terraform execution plan
 
-[!INCLUDE [terraform-plan.md](~/azure-dev-docs-pr/articles/terraform/includes/terraform-plan.md)]
+Run [terraform plan](https://www.terraform.io/docs/commands/plan.html) to create an execution plan.
+
+::: zone pivot="programming-language-csharp" 
+```console
+terraform plan -out main.tfplan -var="runtime_name=dotnet-isolated" -var="runtime_version=8"
+```
+::: zone-end  
+::: zone pivot="programming-language-powershell" 
+```console
+terraform plan -out main.tfplan -var="runtime_name=powershell" -var="runtime_version=7.4"
+```
+::: zone-end 
+::: zone pivot="programming-language-python" 
+```console
+terraform plan -out main.tfplan -var="runtime_name=python" -var="runtime_version=3.12"
+```
+::: zone-end 
+::: zone pivot="programming-language-java"  
+```console
+terraform plan -out main.tfplan -var="runtime_name=java" -var="runtime_version=21"
+```
+::: zone-end  
+::: zone pivot="programming-language-javascript,programming-language-typescript"  
+```console
+terraform plan -out main.tfplan -var="runtime_name=node" -var="runtime_version=20"
+```
+::: zone-end  
+
+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.
+
+[!INCLUDE [terraform-plan-notes.md](~/azure-dev-docs-pr/articles/terraform/includes/terraform-plan-notes.md)]
 
 ## Apply a Terraform execution plan
 
 [!INCLUDE [terraform-apply-plan.md](~/azure-dev-docs-pr/articles/terraform/includes/terraform-apply-plan.md)]
 
 ## Verify the results
 
-### [Azure CLI](#tab/azure-cli)
-
-1. Get the Azure resource group name.
-
-    ```console
-    resource_group_name=$(terraform output -raw resource_group_name)
-    ```
-
-1. Get the storage account name.
-
-    ```console
-    sa_name=$(terraform output -raw sa_name)
-    ```
+The `outputs.tf` file returns these values for your new function app:
 
-1. Get the service plan name.
-
-    ```console
-    asp_name=$(terraform output -raw asp_name)
-    ```
-
-1. Get the function app plan name.
-
-    ```console
-    fa_name=$(terraform output -raw fa_name)
-    ```
-
-1. Run `az functionapp show` to view the Azure Functions Flex Consumption plan.
-
-    ```azurecli
-    az functionapp show --name $function_app_name --resource-group $resource_group_name  
-    ```
-
-### [Azure PowerShell](#tab/azure-powershell)
-
-1. Get the Azure resource group name.
-
-    ```console
-    $resource_group_name=$(terraform output -raw resource_group_name)
-    ```
-
-1. Get the storage account name.
-
-    ```console
-    $sa_name=$(terraform output -raw sa_name)
-    ```
-
-1. Get the service plan name.
-
-    ```console
-    $asp_name=$(terraform output -raw asp_name)
-    ```
-
-1. Get the function app plan name.
-
-    ```console
-    $fa_name=$(terraform output -raw fa_name)
-    ```
-
-1. Run `Get-AzFunctionApp` to view the Azure Functions Flex Consumption plan.
-
-    ```azurepowershell
-    Get-AzFunctionApp -Name $function_app_name -ResourceGroupName $resource_group_name 
-    ```
-
----
+| Value | Description |
+| --- | --- |
+| `resource_group_name` | The name of the resource group you created. |
+| `sa_name` | The name of the Azure storage account required by the Functions host. | 
+| `asp_name` | The name of the Flex Consumption plan that hosts your new app. |
+| `fa_name` | The name of your new function app. |
+| `fa_url` | The URL of your new function app endpoint. | 
 
-Open a browser and enter the following URL: **https://<fa_name>.azurewebsites.net**. Replace the placeholder `<fa_name>` with the value output by Terraform.
+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.
 
 :::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":::