Merge pull request #269690 from MicrosoftDocs/repo_sync_working_branch

Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)

Author: Taojunshen

articles/azure-resource-manager/bicep/add-template-to-azure-pipelines.md

@@ -1,9 +1,9 @@
 ---
-title: CI/CD with Azure Pipelines and Bicep files
-description: In this quickstart, you learn how to configure continuous integration in Azure Pipelines by using Bicep files. It shows how to use an Azure CLI task to deploy a Bicep file.
+title: CI/CD with Azure Pipelines, Bicep, and bicepparam files
+description: In this quickstart, you learn how to configure continuous integration in Azure Pipelines by using Bicep and bicepparam files. It shows how to use an Azure CLI task to deploy a bicepparam file.
 ms.topic: quickstart
 ms.custom: devx-track-bicep, devx-track-azurecli
-ms.date: 06/21/2023
+ms.date: 02/29/2024
 ---
 
 # Quickstart: Integrate Bicep with Azure Pipelines
@@ -22,6 +22,8 @@ You need to have configured a [service connection](/azure/devops/pipelines/libra
 
 You need a [Bicep file](./quickstart-create-bicep-use-visual-studio-code.md) that defines the infrastructure for your project. This file is in a repository.
 
+You need a [bicepparam file](/azure/azure-resource-manager/bicep/parameter-files) that defines the parameters used by your bicep file. This file is in a repository.
+
 ## Create pipeline
 
 1. From your Azure DevOps organization, select **Pipelines** and **Create pipeline**.
@@ -47,88 +49,101 @@ You can use Azure Resource Group Deployment task or Azure CLI task to deploy a B
 ### Use Azure Resource Manager Template Deployment task
 
 > [!NOTE]
-> *AzureResourceManagerTemplateDeployment@3* task won't work if you have a *bicepparam* file.
+> As of version 3.235.0 of the [Azure Resource Manager Template Deployment task](/azure/devops/pipelines/tasks/reference/azure-resource-manager-template-deployment-v3), usage of [bicepparam](/azure/azure-resource-manager/bicep/parameter-files) files is supported.
+
+> [!NOTE]
+> The `AzureResourceManagerTemplateDeployment@3` task requires both Bicep and bicepparam files be provided when using bicepparam. The Bicep file can reference all supported locations for module references. The bicepparam file must reference the local Bicep file in the `using` statement.
 
-1. Replace your starter pipeline with the following YAML. It creates a resource group and deploys a Bicep file by using an [Azure Resource Manager Template Deployment task](/azure/devops/pipelines/tasks/reference/azure-resource-manager-template-deployment-v3).
+1. Replace your starter pipeline with the following YAML. It creates a resource group and deploys a Bicep and bicepparam file by using the Azure Resource Manager Template Deployment task.
 
     ```yml
     trigger:
     - main
 
     name: Deploy Bicep files
 
+    parameters:
+      azureServiceConnection: '<your-connection-name>'
+
     variables:
       vmImageName: 'ubuntu-latest'
-
-      azureServiceConnection: '<your-connection-name>'
       resourceGroupName: 'exampleRG'
       location: '<your-resource-group-location>'
       templateFile: './main.bicep'
+      csmParametersFile: './main.bicepparam'
+
     pool:
       vmImage: $(vmImageName)
 
     steps:
     - task: AzureResourceManagerTemplateDeployment@3
       inputs:
         deploymentScope: 'Resource Group'
-        azureResourceManagerConnection: '$(azureServiceConnection)'
+        azureSubscription: '${{ parameters.azureServiceConnection }}'
         action: 'Create Or Update Resource Group'
         resourceGroupName: '$(resourceGroupName)'
         location: '$(location)'
         templateLocation: 'Linked artifact'
         csmFile: '$(templateFile)'
+        csmParametersFile: '$(csmParametersFile)'
         overrideParameters: '-storageAccountType Standard_LRS'
         deploymentMode: 'Incremental'
         deploymentName: 'DeployPipelineTemplate'
     ```
 
 1. Update the values of `azureServiceConnection` and `location`.
-1. Verify you have a `main.bicep` in your repo, and the content of the Bicep file.
+1. Verify you have a valid `main.bicep` file in your repo.
+1. Verify you have a valid `main.bicepparam` file in your repo that contains a [using](/azure/azure-resource-manager/bicep/bicep-using) statement.
 1. Select **Save**. The build pipeline automatically runs. Go back to the summary for your build pipeline, and watch the status.
 
 ### Use Azure CLI task
 
-1. Replace your starter pipeline with the following YAML. It creates a resource group and deploys a Bicep file by using an [Azure CLI task](/azure/devops/pipelines/tasks/reference/azure-cli-v2):
+> [!NOTE]
+> The [az deployment group create](/cli/azure/deployment/group?view=azure-cli-latest#az-deployment-group-create&preserve-view=true) command requires only a bicepparam file. The `using` statement in the bicepparam file can target any supported location to reference the Bicep file. A Bicep file is only required in your repository when `using` from a local disk path with Azure CLI.
+
+> [!NOTE]
+> When you use a *[bicepparam](/azure/azure-resource-manager/bicep/parameter-files)* file with the [az deployment group create](/cli/azure/deployment/group?view=azure-cli-latest#az-deployment-group-create&preserve-view=true) command, you can't override parameters.
+
+1. Replace your starter pipeline with the following YAML. It creates a resource group and deploys a [bicepparam](/azure/azure-resource-manager/bicep/parameter-files) file by using an [Azure CLI task](/azure/devops/pipelines/tasks/reference/azure-cli-v2):
 
     ```yml
     trigger:
     - main
 
     name: Deploy Bicep files
 
+    parameters:
+      azureServiceConnection: '<your-connection-name>'
+
     variables:
       vmImageName: 'ubuntu-latest'
-
-      azureServiceConnection: '<your-connection-name>'
       resourceGroupName: 'exampleRG'
       location: '<your-resource-group-location>'
-      templateFile: 'main.bicep'
+      bicepParamFile: './main.bicepparam'
+
     pool:
       vmImage: $(vmImageName)
 
     steps:
     - task: AzureCLI@2
       inputs:
-        azureSubscription: $(azureServiceConnection)
+        azureSubscription: '${{ parameters.azureServiceConnection }}'
         scriptType: bash
         scriptLocation: inlineScript
         useGlobalConfig: false
         inlineScript: |
           az --version
           az group create --name $(resourceGroupName) --location $(location)
-          az deployment group create --resource-group $(resourceGroupName) --template-file $(templateFile)
-    ```
-
-    To override the parameters, update the last line of `inlineScript` to:
-
-    ```bicep
-    az deployment group create --resource-group $(resourceGroupName) --template-file $(templateFile) --parameters storageAccountType='Standard_GRS' location='eastus'
+          az deployment group create `
+            --resource-group $(resourceGroupName) `
+            --parameters $(bicepParamFile) `
+            --name DeployPipelineTemplate
     ```
 
     For the descriptions of the task inputs, see [Azure CLI task](/azure/devops/pipelines/tasks/reference/azure-cli-v2). When using the task on air-gapped cloud, you must set the `useGlobalConfig` property of the task to `true`. The default value is `false`.
 
 1. Update the values of `azureServiceConnection` and `location`.
-1. Verify you have a `main.bicep` in your repo, and the content of the Bicep file.
+1. Verify you have a valid `main.bicepparam` file in your repo that contains a [using](/azure/azure-resource-manager/bicep/bicep-using) statement.
 1. Select **Save**. The build pipeline automatically runs. Go back to the summary for your build pipeline, and watch the status.
 
 ## Clean up resources

articles/container-apps/tutorial-dev-services-kafka.md

@@ -394,7 +394,7 @@ Azure CLI commands and Bicep template fragments are featured in this tutorial. I
     ```
 
     > [!TIP]
-    > The output `kafkaLogs` outputs a CLI command to help you view the logs of postgres after deployment is complete. You can run the command to view the initialization logs of the new Postgres service.
+    > The output `kafkaLogs` outputs a CLI command to help you view the logs of kafka after deployment is complete. You can run the command to view the initialization logs of the new Kafka service.
 
     # [azd](#tab/azd)
 
@@ -457,7 +457,7 @@ Azure CLI commands and Bicep template fragments are featured in this tutorial. I
 
 When you create the app, you'll set it up to use `./kafka-topics.sh`, `./kafka-console-producer.sh`, and `kafka-console-consumer.sh` to connect to the Kafka instance.
 
-1. Create a `kafka-cli-app` app that binds to the PostgreSQL service.
+1. Create a `kafka-cli-app` app that binds to the Kafka service.
 
     # [Bash](#tab/bash)
 
@@ -475,7 +475,7 @@ When you create the app, you'll set it up to use `./kafka-topics.sh`, `./kafka-c
 
     # [Bicep](#tab/bicep)
 
-    Add the following to values `postgres-dev.bicep`.
+    Add the following to values `kafka-dev.bicep`.
 
     ```bicep
     resource kafkaCli 'Microsoft.App/containerApps@2023-04-01-preview' = {
@@ -837,7 +837,7 @@ azd up
 
 ---
 
-:::image type="content" source="media/tutorial-dev-services-kafka/azure-container-apps-kafka-ui-data.png" alt-text="Screenshot of pgweb Container App connecting to PostgreSQL service.":::
+:::image type="content" source="media/tutorial-dev-services-kafka/azure-container-apps-kafka-ui-data.png" alt-text="Screenshot of pgweb Container App connecting to Kafka service.":::
 
 ## Deploy all resources
 
@@ -847,7 +847,7 @@ Use the following examples to if you want to deploy all resources at once.
 
 The following Bicep template contains all the resources in this tutorial.
 
-You can create a `postgres-dev.bicep` file with this content.
+You can create a `kafka-dev.bicep` file with this content.
 
 ```bicep
 targetScope = 'resourceGroup'

articles/storage-actions/storage-tasks/storage-task-quickstart-portal.md

@@ -24,6 +24,8 @@ In this quickstart, you learn how to use the [Azure portal](https://portal.azure
 - An Azure subscription. See [create an account for free](https://azure.microsoft.com/free/?WT.mc_id=A261C142F).
 
 - An Azure storage account. See [create a storage account](../../storage/common/storage-account-create.md). As you create the account, make sure to enable version-level immutability support and that you don't enable the hierarchical namespace feature.
+  
+   During the public preview, you can target only storage accounts that are in the same region as the storage tasks.
 
 - The [Storage Blob Data Owner](../../role-based-access-control/built-in-roles.md#storage-blob-data-owner) role is assigned to your user identity in the context of the storage account or resource group.
 
@@ -167,4 +169,4 @@ After the task completes running, you can view the results of the run.
 
 ## Next steps
 
-[Create a storage task](storage-task-create.md)
+[Create a storage task](storage-task-create.md)