Skip to content

Commit b1a01a6

Browse files
authored
Merge pull request #291630 from MicrosoftDocs/main
Publish to live, Sunday 4 AM PST, 12/8
2 parents f834118 + 2c6d44d commit b1a01a6

File tree

100 files changed

+450
-156
lines changed

Some content is hidden

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

100 files changed

+450
-156
lines changed

articles/api-management/inject-vnet-v2.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,11 @@ The subnet needs to be delegated to the **Microsoft.Web/hostingEnvironments** se
6868
6969
For more information about configuring subnet delegation, see [Add or remove a subnet delegation](../virtual-network/manage-subnet-delegation.md).
7070

71+
[!INCLUDE [api-management-virtual-network-address-prefix](../../includes/api-management-virtual-network-address-prefix.md)]
72+
7173
### Permissions
7274

73-
You must have at least the following role-based access control permissions on the subnet or at a higher level to configure virtual network integration:
75+
You must have at least the following role-based access control permissions on the subnet or at a higher level to configure virtual network injection:
7476

7577
| Action | Description |
7678
|-|-|
@@ -86,13 +88,11 @@ When you [create](get-started-create-service-instance.md) a Premium v2 instance
8688

8789
1. In the **Create API Management service** wizard, select the **Networking** tab.
8890
1. In **Connectivity type**, select **Virtual network**.
89-
1. In **Type**, select **Internal**.
90-
1. In **Configure virtual networks**, select the virtual network and the delegated subnet that you want to integrate.
91-
92-
Optionally, provide a public IP address resource if you want to own and control an IP address that's used only for outbound connection to the internet.
91+
1. In **Type**, select **Injection**.
92+
1. In **Configure virtual networks**, select the virtual network and the delegated subnet that you want to inject.
9393
1. Complete the wizard to create the API Management instance.
9494

95-
## DNS settings for integration with private IP address
95+
## DNS settings for access to private IP address
9696

9797
When a Premium v2 API Management instance is injected in a virtual network, you have to manage your own DNS to enable inbound access to API Management.
9898

articles/azure-cache-for-redis/managed-redis/managed-redis-architecture.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ Each SKU of Azure Managed Redis is configured to run a specific number of Redis
7171
> The number of shards and vCPUs used on each SKU can change over time as performance is optimized by the Azure Managed Redis team.
7272
>
7373
74-
| Tiers | Flash Optimized | Memory Optimized | General Purpose | Compute Optimized |
74+
| Tiers | Flash Optimized | Memory Optimized | Balanced | Compute Optimized |
7575
|:-----------:|:-------------------:|:--------------------:|:--------------------:|:--------------------:|
7676
| Size (GB) | vCPUs/primary shards | vCPUs/primary shards | vCPUs/primary shards | vCPUs/primary shards |
7777
| 0.5 | - | - | 2/1 | - |

articles/azure-resource-manager/bicep/bicep-cli.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Bicep CLI commands and overview
33
description: Describes the commands that you can use in the Bicep CLI. These commands include building Azure Resource Manager templates from Bicep.
44
ms.topic: reference
55
ms.custom: devx-track-azurecli, devx-track-bicep, devx-track-arm-template
6-
ms.date: 10/30/2024
6+
ms.date: 12/06/2024
77
---
88

99
# Bicep CLI commands
@@ -116,13 +116,13 @@ The `generate-params` command builds a parameters file from the given Bicep file
116116
az bicep generate-params --file main.bicep --output-format bicepparam --include-params all
117117
```
118118

119-
The command creates a Bicep parameters file named _main.bicepparam_. The parameter file contains all parameters in the Bicep file, whether configured with default values or not.
119+
The command creates a Bicep parameters file named _main.bicepparam_. The parameters file contains all parameters in the Bicep file, whether configured with default values or not.
120120

121121
```azurecli
122122
az bicep generate-params --file main.bicep --outfile main.parameters.json
123123
```
124124

125-
The command creates a parameter file named _main.parameters.json_. The parameter file only contains the parameters without default values configured in the Bicep file.
125+
The command creates a parameters file named _main.parameters.json_. The parameters file only contains the parameters without default values configured in the Bicep file.
126126

127127
## install
128128

articles/azure-resource-manager/bicep/bicep-functions-parameters-file.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
---
22
title: Bicep functions - parameters file
3-
description: This article describes the Bicep functions to be used in Bicep parameter files.
3+
description: This article describes the Bicep functions to be used in Bicep parameters files.
44
ms.topic: reference
55
ms.custom: devx-track-bicep
6-
ms.date: 08/09/2024
6+
ms.date: 12/06/2024
77
---
88

99
# Parameters file function for Bicep

articles/azure-resource-manager/bicep/bicep-functions.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Bicep functions
33
description: Describes the functions to use in a Bicep file to retrieve values, work with strings and numerics, and retrieve deployment information.
44
ms.topic: reference
55
ms.custom: devx-track-bicep
6-
ms.date: 05/21/2024
6+
ms.date: 12/06/2024
77
---
88

99
# Bicep functions
@@ -128,7 +128,7 @@ The following functions are available for working with objects. All of these fun
128128

129129
## Parameters file functions
130130

131-
The following functions are available to be used in Bicep parameter files. All of these functions are in the `sys` namespace.
131+
The following functions are available to be used in Bicep parameters files. All of these functions are in the `sys` namespace.
132132

133133
* [getSecret](./bicep-functions-parameters-file.md)
134134
* [readEnvironmentVariable](./bicep-functions-parameters-file.md)

articles/azure-resource-manager/bicep/bicep-using.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ title: Using statement
33
description: Describes how to use the using statement in Bicep.
44
ms.topic: conceptual
55
ms.custom: devx-track-bicep
6-
ms.date: 06/28/2024
6+
ms.date: 12/06/2024
77
---
88

99
# Using statement
1010

11-
The `using` statement in [Bicep parameter files](./parameter-files.md) ties the [Bicep parameters file](./parameter-files.md) to a [Bicep file](./file.md), an [ARM JSON template](../templates/syntax.md), or a [Bicep module](./modules.md), or a [template spec](./template-specs.md). A `using` declaration must be present in any Bicep parameters file.
11+
The `using` statement in [Bicep parameters files](./parameter-files.md) ties the [Bicep parameters file](./parameter-files.md) to a [Bicep file](./file.md), an [ARM JSON template](../templates/syntax.md), or a [Bicep module](./modules.md), or a [template spec](./template-specs.md). A `using` declaration must be present in any Bicep parameters file.
1212

1313
> [!NOTE]
1414
> The Bicep parameters file is only supported in [Bicep CLI](./install.md) version 0.18.4 or newer, [Azure CLI](/cli/azure/install-azure-cli) version 2.47.0 or newer, and [Azure PowerShell](/powershell/azure/install-azure-powershell) version 9.7.1 or newer.

articles/azure-resource-manager/bicep/data-types.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Data types in Bicep
33
description: This article describes the data types that are available in Bicep.
44
ms.topic: reference
55
ms.custom: devx-track-bicep
6-
ms.date: 11/12/2024
6+
ms.date: 12/06/2024
77
---
88

99
# Data types in Bicep
@@ -111,7 +111,7 @@ When you specify integer values, don't use quotation marks.
111111
param exampleInt int = 1
112112
```
113113

114-
Bicep integers are 64-bit integers. When they're passed as inline parameters, the SDK or command-line tool you use for deployment can limit the range of values. For example, when you use PowerShell to deploy Bicep, integer types can range from -2147483648 to 2147483647. To avoid this limitation, specify large integer values in a [parameter file](parameter-files.md). Resource types apply their own limits for integer properties.
114+
Bicep integers are 64-bit integers. When they're passed as inline parameters, the SDK or command-line tool you use for deployment can limit the range of values. For example, when you use PowerShell to deploy Bicep, integer types can range from -2147483648 to 2147483647. To avoid this limitation, specify large integer values in a [parameters file](parameter-files.md). Resource types apply their own limits for integer properties.
115115

116116
Bicep supports an integer literal type that refers to a specific value that's an exact integer. In the following example, `1` is an integer literal type, and `foo` can only be assigned the value `1` and no other value.
117117

articles/azure-resource-manager/bicep/deploy-cli.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Deploy resources with Azure CLI and Bicep files | Microsoft Docs
33
description: Use Azure Resource Manager and Azure CLI to deploy resources to Azure. The resources are defined in a Bicep file.
44
ms.topic: how-to
5-
ms.date: 03/22/2024
5+
ms.date: 12/06/2024
66
ms.custom: devx-track-azurecli, seo-azure-cli, devx-track-arm-template, devx-track-bicep
77
---
88

@@ -93,7 +93,7 @@ Currently, Azure CLI doesn't support deploying remote Bicep files. You can use [
9393

9494
## Parameters
9595

96-
To pass parameter values, you can use either inline parameters or a parameters file. The parameters file can be either a [Bicep parameters file](#bicep-parameter-files) or a [JSON parameters file](#json-parameter-files).
96+
To pass parameter values, you can use either inline parameters or a parameters file. The parameters file can be either a [Bicep parameters file](#bicep-parameters-files) or a [JSON parameters file](#json-parameters-files).
9797

9898
### Inline parameters
9999

@@ -174,11 +174,11 @@ However, if you're using Azure CLI with Windows Command Prompt (CMD) or PowerShe
174174

175175
The evaluation of parameters follows a sequential order, meaning that if a value is assigned multiple times, only the last assigned value is used. To ensure proper parameter assignment, it's advised to provide your parameters file initially and selectively override specific parameters using the _KEY=VALUE_ syntax. It's important to mention that if you're supplying a `bicepparam` parameters file, you can use this argument only once.
176176

177-
### Bicep parameter files
177+
### Bicep parameters files
178178

179-
Rather than passing parameters as inline values in your script, you might find it easier to use a parameters file, either a [Bicep parameters file](#bicep-parameter-files) or a [JSON parameters file](#json-parameter-files) that contains the parameter values. The parameters file must be a local file. External parameters files aren't supported with Azure CLI. For more information about the parameters file, see [Create Resource Manager parameters file](./parameter-files.md).
179+
Rather than passing parameters as inline values in your script, you might find it easier to use a parameters file, either a [Bicep parameters file](#bicep-parameters-files) or a [JSON parameters file](#json-parameters-files) that contains the parameter values. The parameters file must be a local file. External parameters files aren't supported with Azure CLI. For more information about the parameters file, see [Create Resource Manager parameters file](./parameter-files.md).
180180

181-
With Azure CLI version 2.53.0 or later, and [Bicep CLI version 0.22.X or higher](./install.md), you can deploy a Bicep file by utilizing a Bicep parameter file. With the `using` statement within the Bicep parameters file, there's no need to provide the `--template-file` switch when specifying a Bicep parameter file for the `--parameters` switch. Including the `--template-file` switch will result in an "Only a .bicep template is allowed with a .bicepparam file" error.
181+
With Azure CLI version 2.53.0 or later, and [Bicep CLI version 0.22.X or higher](./install.md), you can deploy a Bicep file by utilizing a Bicep parameters file. With the `using` statement within the Bicep parameters file, there's no need to provide the `--template-file` switch when specifying a Bicep parameters file for the `--parameters` switch. Including the `--template-file` switch will result in an "Only a .bicep template is allowed with a .bicepparam file" error.
182182

183183
The following example shows a parameters file named _storage.bicepparam_. The file is in the same directory where the command is run.
184184

@@ -189,7 +189,7 @@ az deployment group create \
189189
--parameters storage.bicepparam
190190
```
191191

192-
### JSON parameter files
192+
### JSON parameters files
193193

194194
The following example shows a parameters file named _storage.parameters.json_. The file is in the same directory where the command is run.
195195

articles/azure-resource-manager/bicep/deploy-powershell.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Deploy resources with PowerShell and Bicep
33
description: Use Azure Resource Manager and Azure PowerShell to deploy resources to Azure. The resources are defined in a Bicep file.
44
ms.topic: how-to
55
ms.custom: devx-track-arm-template, devx-track-bicep, devx-track-azurepowershell
6-
ms.date: 06/14/2024
6+
ms.date: 12/06/2024
77
---
88

99
# Deploy resources with Bicep and Azure PowerShell
@@ -87,7 +87,7 @@ Currently, Azure PowerShell doesn't support deploying remote Bicep files. Use [B
8787

8888
## Parameters
8989

90-
To pass parameter values, you can use either inline parameters or a parameters file. The parameters file can be either a [Bicep parameters file](#bicep-parameter-files) or a [JSON parameters file](#json-parameters-files).
90+
To pass parameter values, you can use either inline parameters or a parameters file. The parameters file can be either a [Bicep parameters file](#bicep-parameters-files) or a [JSON parameters file](#json-parameters-files).
9191

9292
### Inline parameters
9393

@@ -137,11 +137,11 @@ New-AzResourceGroupDeployment -ResourceGroupName testgroup `
137137
-exampleArray $subnetArray
138138
```
139139

140-
### Bicep parameter files
140+
### Bicep parameters files
141141

142142
Rather than passing parameters as inline values in your script, you might find it easier to use a parameters file, either a `.bicepparam` file or a JSON parameters file, that contains the parameter values. The Bicep parameters file must be a local file.
143143

144-
With Azure PowerShell version 10.4.0 or later, and [Bicep CLI version 0.22.X or higher](./install.md), you can deploy a Bicep file by utilizing a Bicep parameter file. With the `using` statement within the Bicep parameters file, there is no need to provide the `-TemplateFile` switch when specifying a Bicep parameter file for the `-TemplateParameterFile` switch.
144+
With Azure PowerShell version 10.4.0 or later, and [Bicep CLI version 0.22.X or higher](./install.md), you can deploy a Bicep file by utilizing a Bicep parameters file. With the `using` statement within the Bicep parameters file, there is no need to provide the `-TemplateFile` switch when specifying a Bicep parameters file for the `-TemplateParameterFile` switch.
145145

146146
The following example shows a parameters file named _storage.bicepparam_. The file is in the same directory where the command is run.
147147

articles/azure-resource-manager/bicep/deploy-vscode.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Deploy Bicep files with Visual Studio Code
33
description: Deploy Bicep files from Visual Studio Code.
44
ms.topic: how-to
55
ms.custom: devx-track-bicep
6-
ms.date: 12/03/2024
6+
ms.date: 12/06/2024
77
---
88

99
# Deploy Bicep files from Visual Studio Code
@@ -32,19 +32,19 @@ After you select the command, you follow the wizard to enter the values:
3232

3333
1. Select or create a resource group.
3434

35-
1. Select a parameter file or select **None** to enter the parameter values.
35+
1. Select a parameters file or select **None** to enter the parameter values.
3636

37-
:::image type="content" source="./media/deploy-vscode/bicep-deploy-select-parameter-file.png" alt-text="Screenshot of Select parameter file.":::
37+
:::image type="content" source="./media/deploy-vscode/bicep-deploy-select-parameter-file.png" alt-text="Screenshot of Select parameters file.":::
3838

3939
1. If you choose **None**, enter the parameter values.
4040

4141
:::image type="content" source="./media/deploy-vscode/bicep-deploy-enter-parameter-values.png" alt-text="Screenshot of Enter parameter values.":::
4242

4343
After you enter the values, you have the option to create a parameters file from values used in this deployment:
4444

45-
:::image type="content" source="./media/deploy-vscode/bicep-deploy-create-parameter-file.png" alt-text="Screenshot of Create parameter file.":::
45+
:::image type="content" source="./media/deploy-vscode/bicep-deploy-create-parameter-file.png" alt-text="Screenshot of Create parameters file.":::
4646

47-
If you select **Yes**, a parameter file with the file name **<Bicep-file-name>.parameters.json** is created in the same folder.
47+
If you select **Yes**, a parameters file with the file name **<Bicep-file-name>.parameters.json** is created in the same folder.
4848

4949
For more information about VS Code commands, see [Visual Studio Code](./visual-studio-code.md).
5050

0 commit comments

Comments
 (0)