diff --git a/arm/Microsoft.NetApp/netAppAccounts/capacityPools/deploy.bicep b/arm/Microsoft.NetApp/netAppAccounts/capacityPools/deploy.bicep index 784f14c8bb..84e8ab398a 100644 --- a/arm/Microsoft.NetApp/netAppAccounts/capacityPools/deploy.bicep +++ b/arm/Microsoft.NetApp/netAppAccounts/capacityPools/deploy.bicep @@ -91,10 +91,10 @@ module capacityPool_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, inde }] @description('The name of the Capacity Pool.') -output capacityPoolName string = capacityPool.name +output name string = capacityPool.name @description('The resource ID of the Capacity Pool.') -output capacityPoolResourceId string = capacityPool.id +output resourceId string = capacityPool.id @description('The name of the Resource Group the Capacity Pool was created in.') -output capacityPoolResourceGroup string = resourceGroup().name +output resourceGroupName string = resourceGroup().name diff --git a/arm/Microsoft.NetApp/netAppAccounts/capacityPools/readme.md b/arm/Microsoft.NetApp/netAppAccounts/capacityPools/readme.md index cb94472a45..168d13f026 100644 --- a/arm/Microsoft.NetApp/netAppAccounts/capacityPools/readme.md +++ b/arm/Microsoft.NetApp/netAppAccounts/capacityPools/readme.md @@ -69,12 +69,12 @@ Tag names and tag values can be provided as needed. A tag can be left without a | Output Name | Type | Description | | :-- | :-- | :-- | -| `capacityPoolName` | string | The name of the Capacity Pool. | -| `capacityPoolResourceGroup` | string | The name of the Resource Group the Capacity Pool was created in. | -| `capacityPoolResourceId` | string | The resource ID of the Capacity Pool. | +| `name` | string | The name of the Capacity Pool. | +| `resourceGroupName` | string | The name of the Resource Group the Capacity Pool was created in. | +| `resourceId` | string | The resource ID of the Capacity Pool. | ## Template references - [Netappaccounts/Capacitypools](https://docs.microsoft.com/en-us/azure/templates/Microsoft.NetApp/2021-06-01/netAppAccounts/capacityPools) - [Netappaccounts/Capacitypools/Volumes](https://docs.microsoft.com/en-us/azure/templates/Microsoft.NetApp/2021-06-01/netAppAccounts/capacityPools/volumes) -- [Roleassignments](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2021-04-01-preview/roleAssignments) +- [Roleassignments](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/roleAssignments) diff --git a/arm/Microsoft.NetApp/netAppAccounts/capacityPools/volumes/deploy.bicep b/arm/Microsoft.NetApp/netAppAccounts/capacityPools/volumes/deploy.bicep index 7b33c49f70..cd74e0b861 100644 --- a/arm/Microsoft.NetApp/netAppAccounts/capacityPools/volumes/deploy.bicep +++ b/arm/Microsoft.NetApp/netAppAccounts/capacityPools/volumes/deploy.bicep @@ -79,10 +79,10 @@ module volume_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, index) in }] @description('The name of the Volume.') -output volumeName string = volume.name +output name string = volume.name @description('The Resource ID of the Volume.') -output volumeResourceId string = volume.id +output resourceId string = volume.id @description('The name of the Resource Group the Volume was created in.') -output volumeResourceGroup string = resourceGroup().name +output resourceGroupName string = resourceGroup().name diff --git a/arm/Microsoft.NetApp/netAppAccounts/capacityPools/volumes/readme.md b/arm/Microsoft.NetApp/netAppAccounts/capacityPools/volumes/readme.md index 099a99e1ee..4a72c73f3a 100644 --- a/arm/Microsoft.NetApp/netAppAccounts/capacityPools/volumes/readme.md +++ b/arm/Microsoft.NetApp/netAppAccounts/capacityPools/volumes/readme.md @@ -52,11 +52,11 @@ This template deploys volumes in a capacity pool of an Azure NetApp files. | Output Name | Type | Description | | :-- | :-- | :-- | -| `volumeName` | string | The name of the Volume. | -| `volumeResourceGroup` | string | The name of the Resource Group the Volume was created in. | -| `volumeResourceId` | string | The Resource ID of the Volume. | +| `name` | string | The name of the Volume. | +| `resourceGroupName` | string | The name of the Resource Group the Volume was created in. | +| `resourceId` | string | The Resource ID of the Volume. | ## Template references - [Netappaccounts/Capacitypools/Volumes](https://docs.microsoft.com/en-us/azure/templates/Microsoft.NetApp/2021-06-01/netAppAccounts/capacityPools/volumes) -- [Roleassignments](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2021-04-01-preview/roleAssignments) +- [Roleassignments](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/roleAssignments) diff --git a/arm/Microsoft.NetApp/netAppAccounts/deploy.bicep b/arm/Microsoft.NetApp/netAppAccounts/deploy.bicep index 7119d4a611..53f90f7338 100644 --- a/arm/Microsoft.NetApp/netAppAccounts/deploy.bicep +++ b/arm/Microsoft.NetApp/netAppAccounts/deploy.bicep @@ -103,10 +103,10 @@ module netAppAccount_capacityPools 'capacityPools/deploy.bicep' = [for (capacity }] @description('The name of the NetApp account.') -output netAppAccountName string = netAppAccount.name +output name string = netAppAccount.name @description('The Resource ID of the NetApp account.') -output netAppAccountResourceId string = netAppAccount.id +output resourceId string = netAppAccount.id @description('The name of the Resource Group the NetApp account was created in.') -output netAppAccountResourceGroup string = resourceGroup().name +output resourceGroupName string = resourceGroup().name diff --git a/arm/Microsoft.NetApp/netAppAccounts/readme.md b/arm/Microsoft.NetApp/netAppAccounts/readme.md index cbf45e579c..0c071071d4 100644 --- a/arm/Microsoft.NetApp/netAppAccounts/readme.md +++ b/arm/Microsoft.NetApp/netAppAccounts/readme.md @@ -73,9 +73,9 @@ Tag names and tag values can be provided as needed. A tag can be left without a | Output Name | Type | Description | | :-- | :-- | :-- | -| `netAppAccountName` | string | The name of the NetApp account. | -| `netAppAccountResourceGroup` | string | The name of the Resource Group the NetApp account was created in. | -| `netAppAccountResourceId` | string | The Resource ID of the NetApp account. | +| `name` | string | The name of the NetApp account. | +| `resourceGroupName` | string | The name of the Resource Group the NetApp account was created in. | +| `resourceId` | string | The Resource ID of the NetApp account. | ## Template references @@ -83,4 +83,4 @@ Tag names and tag values can be provided as needed. A tag can be left without a - [Netappaccounts](https://docs.microsoft.com/en-us/azure/templates/Microsoft.NetApp/2021-04-01/netAppAccounts) - [Netappaccounts/Capacitypools](https://docs.microsoft.com/en-us/azure/templates/Microsoft.NetApp/2021-06-01/netAppAccounts/capacityPools) - [Netappaccounts/Capacitypools/Volumes](https://docs.microsoft.com/en-us/azure/templates/Microsoft.NetApp/2021-06-01/netAppAccounts/capacityPools/volumes) -- [Roleassignments](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2021-04-01-preview/roleAssignments) +- [Roleassignments](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/roleAssignments) diff --git a/arm/Microsoft.Network/applicationGateways/deploy.bicep b/arm/Microsoft.Network/applicationGateways/deploy.bicep index 57af3861cb..1e9db49110 100644 --- a/arm/Microsoft.Network/applicationGateways/deploy.bicep +++ b/arm/Microsoft.Network/applicationGateways/deploy.bicep @@ -151,8 +151,8 @@ var diagnosticsMetrics = [for metric in metricsToEnable: { } }] -var applicationGatewayResourceId = resourceId('Microsoft.Network/applicationGateways', name) -var subnetResourceId = resourceId(vNetSubscriptionId, vNetResourceGroup, 'Microsoft.Network/virtualNetworks/subnets', vNetName, subnetName) +var applicationGatewayResourceId = az.resourceId('Microsoft.Network/applicationGateways', name) +var subnetResourceId = az.resourceId(vNetSubscriptionId, vNetResourceGroup, 'Microsoft.Network/virtualNetworks/subnets', vNetName, subnetName) var frontendPublicIPConfigurationName = 'public' var frontendPrivateIPConfigurationName = 'private' var frontendPrivateIPDynamicConfiguration = { @@ -423,10 +423,10 @@ module applicationGateway_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment }] @description('The name of the application gateway') -output applicationGatewayName string = applicationGateway.name +output name string = applicationGateway.name @description('The resource ID of the application gateway') -output applicationGatewayResourceId string = applicationGateway.id +output resourceId string = applicationGateway.id @description('The resource group the application gateway was deployed into') -output applicationGatewayResourceGroup string = resourceGroup().name +output resourceGroupName string = resourceGroup().name diff --git a/arm/Microsoft.Network/applicationGateways/readme.md b/arm/Microsoft.Network/applicationGateways/readme.md index b95fa7ebc2..0256d3e85d 100644 --- a/arm/Microsoft.Network/applicationGateways/readme.md +++ b/arm/Microsoft.Network/applicationGateways/readme.md @@ -235,13 +235,13 @@ You can specify multiple user assigned identities to a resource by providing add | Output Name | Type | Description | | :-- | :-- | :-- | -| `applicationGatewayName` | string | The name of the application gateway | -| `applicationGatewayResourceGroup` | string | The resource group the application gateway was deployed into | -| `applicationGatewayResourceId` | string | The resource ID of the application gateway | +| `name` | string | The name of the application gateway | +| `resourceGroupName` | string | The resource group the application gateway was deployed into | +| `resourceId` | string | The resource ID of the application gateway | ## Template references - [Applicationgateways](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Network/2021-03-01/applicationGateways) - [Diagnosticsettings](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Insights/2021-05-01-preview/diagnosticSettings) - [Locks](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2017-04-01/locks) -- [Roleassignments](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2021-04-01-preview/roleAssignments) +- [Roleassignments](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/roleAssignments) diff --git a/arm/Microsoft.Network/applicationSecurityGroups/deploy.bicep b/arm/Microsoft.Network/applicationSecurityGroups/deploy.bicep index 8b49ebdcf1..07157a8334 100644 --- a/arm/Microsoft.Network/applicationSecurityGroups/deploy.bicep +++ b/arm/Microsoft.Network/applicationSecurityGroups/deploy.bicep @@ -52,10 +52,10 @@ module applicationSecurityGroup_rbac '.bicep/nested_rbac.bicep' = [for (roleAssi }] @description('The resource group the application security group was deployed into') -output applicationSecurityGroupResourceGroup string = resourceGroup().name +output resourceGroupName string = resourceGroup().name @description('The resource ID of the application security group') -output applicationSecurityGroupResourceId string = applicationSecurityGroup.id +output resourceId string = applicationSecurityGroup.id @description('The name of the application security group') -output applicationSecurityGroupName string = applicationSecurityGroup.name +output name string = applicationSecurityGroup.name diff --git a/arm/Microsoft.Network/applicationSecurityGroups/readme.md b/arm/Microsoft.Network/applicationSecurityGroups/readme.md index badbccbc37..d3d1175d7f 100644 --- a/arm/Microsoft.Network/applicationSecurityGroups/readme.md +++ b/arm/Microsoft.Network/applicationSecurityGroups/readme.md @@ -64,12 +64,12 @@ Tag names and tag values can be provided as needed. A tag can be left without a | Output Name | Type | Description | | :-- | :-- | :-- | -| `applicationSecurityGroupName` | string | The name of the application security group | -| `applicationSecurityGroupResourceGroup` | string | The resource group the application security group was deployed into | -| `applicationSecurityGroupResourceId` | string | The resource ID of the application security group | +| `name` | string | The name of the application security group | +| `resourceGroupName` | string | The resource group the application security group was deployed into | +| `resourceId` | string | The resource ID of the application security group | ## Template references - [Applicationsecuritygroups](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Network/2021-02-01/applicationSecurityGroups) - [Locks](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2017-04-01/locks) -- [Roleassignments](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2021-04-01-preview/roleAssignments) +- [Roleassignments](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/roleAssignments) diff --git a/arm/Microsoft.Network/azureFirewalls/deploy.bicep b/arm/Microsoft.Network/azureFirewalls/deploy.bicep index d5cd69d0e3..3388f582cf 100644 --- a/arm/Microsoft.Network/azureFirewalls/deploy.bicep +++ b/arm/Microsoft.Network/azureFirewalls/deploy.bicep @@ -191,16 +191,16 @@ module azureFirewall_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, ind }] @description('The resource ID of the Azure firewall') -output azureFirewallResourceId string = azureFirewall.id +output resourceId string = azureFirewall.id @description('The name of the Azure firewall') -output azureFirewallName string = azureFirewall.name +output name string = azureFirewall.name -@description('The resource group the azure firewall was deployed into') -output azureFirewallResourceGroup string = resourceGroup().name +@description('The resource group the Azure firewall was deployed into') +output resourceGroupName string = resourceGroup().name -@description('The private IP of the Azure Firewall') -output azureFirewallPrivateIp string = azureFirewall.properties.ipConfigurations[0].properties.privateIPAddress +@description('The private IP of the Azure firewall') +output privateIp string = azureFirewall.properties.ipConfigurations[0].properties.privateIPAddress @description('List of Application Rule Collections') output applicationRuleCollections array = applicationRuleCollections diff --git a/arm/Microsoft.Network/azureFirewalls/readme.md b/arm/Microsoft.Network/azureFirewalls/readme.md index 1abf1e131e..3abb12c497 100644 --- a/arm/Microsoft.Network/azureFirewalls/readme.md +++ b/arm/Microsoft.Network/azureFirewalls/readme.md @@ -82,12 +82,12 @@ Tag names and tag values can be provided as needed. A tag can be left without a | Output Name | Type | Description | | :-- | :-- | :-- | | `applicationRuleCollections` | array | List of Application Rule Collections | -| `azureFirewallName` | string | The name of the Azure firewall | -| `azureFirewallPrivateIp` | string | The private IP of the Azure Firewall | -| `azureFirewallResourceGroup` | string | The resource group the azure firewall was deployed into | -| `azureFirewallResourceId` | string | The resource ID of the Azure firewall | +| `name` | string | The name of the Azure firewall | | `natRuleCollections` | array | Collection of NAT rule collections used by Azure Firewall | | `networkRuleCollections` | array | List of Network Rule Collections | +| `privateIp` | string | The private IP of the Azure firewall | +| `resourceGroupName` | string | The resource group the Azure firewall was deployed into | +| `resourceId` | string | The resource ID of the Azure firewall | ## Considerations diff --git a/arm/Microsoft.Network/bastionHosts/.bicep/nested_publicIPAddress.bicep b/arm/Microsoft.Network/bastionHosts/.bicep/nested_publicIPAddress.bicep index 3190605988..a89fcae977 100644 --- a/arm/Microsoft.Network/bastionHosts/.bicep/nested_publicIPAddress.bicep +++ b/arm/Microsoft.Network/bastionHosts/.bicep/nested_publicIPAddress.bicep @@ -139,10 +139,10 @@ module publicIpAddress_rbac 'nested_publicIPAddress_rbac.bicep' = [for (roleAssi }] @description('The resource group the public IP address was deployed into') -output publicIPAddressResourceGroup string = resourceGroup().name +output resourceGroupName string = resourceGroup().name @description('The name of the public IP address') -output publicIPAddressName string = publicIpAddress.name +output name string = publicIpAddress.name @description('The resource ID of the public IP address') -output publicIPAddressResourceId string = publicIpAddress.id +output resourceId string = publicIpAddress.id diff --git a/arm/Microsoft.Network/bastionHosts/deploy.bicep b/arm/Microsoft.Network/bastionHosts/deploy.bicep index 6c3792b0c5..af2962aed8 100644 --- a/arm/Microsoft.Network/bastionHosts/deploy.bicep +++ b/arm/Microsoft.Network/bastionHosts/deploy.bicep @@ -121,7 +121,7 @@ resource azureBastion 'Microsoft.Network/bastionHosts@2021-02-01' = { id: '${vNetId}/subnets/AzureBastionSubnet' } publicIPAddress: { - id: !(empty(publicIPAddressId)) ? publicIPAddressId : publicIPAddress.outputs.publicIPAddressResourceId + id: !(empty(publicIPAddressId)) ? publicIPAddressId : publicIPAddress.outputs.resourceId } } } @@ -160,10 +160,10 @@ module azureBastion_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, inde }] @description('The resource group the Azure Bastion was deployed into') -output azureBastionResourceGroup string = resourceGroup().name +output resourceGroupName string = resourceGroup().name @description('The name the Azure Bastion') -output azureBastionName string = azureBastion.name +output name string = azureBastion.name @description('The resource ID the Azure Bastion') -output azureBastionResourceId string = azureBastion.id +output resourceId string = azureBastion.id diff --git a/arm/Microsoft.Network/bastionHosts/readme.md b/arm/Microsoft.Network/bastionHosts/readme.md index 07f64754a5..8654a631cd 100644 --- a/arm/Microsoft.Network/bastionHosts/readme.md +++ b/arm/Microsoft.Network/bastionHosts/readme.md @@ -75,9 +75,9 @@ Tag names and tag values can be provided as needed. A tag can be left without a | Output Name | Type | Description | | :-- | :-- | :-- | -| `azureBastionName` | string | The name the Azure Bastion | -| `azureBastionResourceGroup` | string | The resource group the Azure Bastion was deployed into | -| `azureBastionResourceId` | string | The resource ID the Azure Bastion | +| `name` | string | The name the Azure Bastion | +| `resourceGroupName` | string | The resource group the Azure Bastion was deployed into | +| `resourceId` | string | The resource ID the Azure Bastion | ## Template references @@ -85,4 +85,4 @@ Tag names and tag values can be provided as needed. A tag can be left without a - [Diagnosticsettings](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Insights/2021-05-01-preview/diagnosticSettings) - [Locks](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2017-04-01/locks) - [Publicipaddresses](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Network/2021-02-01/publicIPAddresses) -- [Roleassignments](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2021-04-01-preview/roleAssignments) +- [Roleassignments](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/roleAssignments) diff --git a/arm/Microsoft.Network/connections/deploy.bicep b/arm/Microsoft.Network/connections/deploy.bicep index c780a20c32..e3f47910eb 100644 --- a/arm/Microsoft.Network/connections/deploy.bicep +++ b/arm/Microsoft.Network/connections/deploy.bicep @@ -63,17 +63,17 @@ param tags object = {} @description('Optional. Customer Usage Attribution ID (GUID). This GUID must be previously registered') param cuaId string = '' -var localVirtualNetworkGatewayId = resourceId(resourceGroup().name, 'Microsoft.Network/virtualNetworkGateways', localVirtualNetworkGatewayName) +var localVirtualNetworkGatewayId = az.resourceId(resourceGroup().name, 'Microsoft.Network/virtualNetworkGateways', localVirtualNetworkGatewayName) var remoteEntitySubscriptionId_var = (empty(remoteEntitySubscriptionId) ? subscription().subscriptionId : remoteEntitySubscriptionId) var remoteEntityResourceGroup_var = (empty(remoteEntityResourceGroup) ? resourceGroup().name : remoteEntityResourceGroup) var virtualNetworkGateway2Id = { - id: resourceId(remoteEntitySubscriptionId_var, remoteEntityResourceGroup_var, 'Microsoft.Network/virtualNetworkGateways', remoteEntityName) + id: az.resourceId(remoteEntitySubscriptionId_var, remoteEntityResourceGroup_var, 'Microsoft.Network/virtualNetworkGateways', remoteEntityName) } var localNetworkGateway2Id = { - id: resourceId(remoteEntitySubscriptionId_var, remoteEntityResourceGroup_var, 'Microsoft.Network/localNetworkGateways', remoteEntityName) + id: az.resourceId(remoteEntitySubscriptionId_var, remoteEntityResourceGroup_var, 'Microsoft.Network/localNetworkGateways', remoteEntityName) } var peer = { - id: resourceId(remoteEntitySubscriptionId_var, remoteEntityResourceGroup_var, 'Microsoft.Network/expressRouteCircuits', remoteEntityName) + id: az.resourceId(remoteEntitySubscriptionId_var, remoteEntityResourceGroup_var, 'Microsoft.Network/expressRouteCircuits', remoteEntityName) } var customIPSecPolicy_var = [ { @@ -123,10 +123,10 @@ resource connection_lock 'Microsoft.Authorization/locks@2017-04-01' = if (lock ! } @description('The resource group the remote connection was deployed into') -output remoteConnectionResourceGroup string = resourceGroup().name +output resourceGroupName string = resourceGroup().name @description('The name of the remote connection') -output connectionName string = connection.name +output name string = connection.name @description('The resource ID of the remote connection') -output remoteConnectionResourceId string = connection.id +output resourceId string = connection.id diff --git a/arm/Microsoft.Network/connections/readme.md b/arm/Microsoft.Network/connections/readme.md index 9090c7624f..46ec426f00 100644 --- a/arm/Microsoft.Network/connections/readme.md +++ b/arm/Microsoft.Network/connections/readme.md @@ -86,9 +86,9 @@ Tag names and tag values can be provided as needed. A tag can be left without a | Output Name | Type | Description | | :-- | :-- | :-- | -| `connectionName` | string | The name of the remote connection | -| `remoteConnectionResourceGroup` | string | The resource group the remote connection was deployed into | -| `remoteConnectionResourceId` | string | The resource ID of the remote connection | +| `name` | string | The name of the remote connection | +| `resourceGroupName` | string | The resource group the remote connection was deployed into | +| `resourceId` | string | The resource ID of the remote connection | ## Template references diff --git a/arm/Microsoft.Network/ddosProtectionPlans/deploy.bicep b/arm/Microsoft.Network/ddosProtectionPlans/deploy.bicep index 402c245252..570fb209b4 100644 --- a/arm/Microsoft.Network/ddosProtectionPlans/deploy.bicep +++ b/arm/Microsoft.Network/ddosProtectionPlans/deploy.bicep @@ -53,10 +53,10 @@ module ddosProtectionPlan_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment }] @description('The resource group the DDOS protection plan was deployed into') -output ddosProtectionPlanResourceGroup string = resourceGroup().name +output resourceGroupName string = resourceGroup().name @description('The resource ID of the DDOS protection plan') -output ddosProtectionPlanResourceId string = ddosProtectionPlan.id +output resourceId string = ddosProtectionPlan.id @description('The name of the DDOS protection plan') -output ddosProtectionPlanName string = ddosProtectionPlan.name +output name string = ddosProtectionPlan.name diff --git a/arm/Microsoft.Network/ddosProtectionPlans/readme.md b/arm/Microsoft.Network/ddosProtectionPlans/readme.md index 7282785758..f04b54f443 100644 --- a/arm/Microsoft.Network/ddosProtectionPlans/readme.md +++ b/arm/Microsoft.Network/ddosProtectionPlans/readme.md @@ -64,12 +64,12 @@ Tag names and tag values can be provided as needed. A tag can be left without a | Output Name | Type | Description | | :-- | :-- | :-- | -| `ddosProtectionPlanName` | string | The name of the DDOS protection plan | -| `ddosProtectionPlanResourceGroup` | string | The resource group the DDOS protection plan was deployed into | -| `ddosProtectionPlanResourceId` | string | The resource ID of the DDOS protection plan | +| `name` | string | The name of the DDOS protection plan | +| `resourceGroupName` | string | The resource group the DDOS protection plan was deployed into | +| `resourceId` | string | The resource ID of the DDOS protection plan | ## Template references - [Ddosprotectionplans](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Network/2021-02-01/ddosProtectionPlans) - [Locks](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2017-04-01/locks) -- [Roleassignments](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2021-04-01-preview/roleAssignments) +- [Roleassignments](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/roleAssignments) diff --git a/arm/Microsoft.Network/expressRouteCircuits/deploy.bicep b/arm/Microsoft.Network/expressRouteCircuits/deploy.bicep index 1b67c176c2..9160afa632 100644 --- a/arm/Microsoft.Network/expressRouteCircuits/deploy.bicep +++ b/arm/Microsoft.Network/expressRouteCircuits/deploy.bicep @@ -196,13 +196,13 @@ module expressRouteCircuits_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignme }] @description('The resource ID of express route curcuit') -output expressRouteCircuitResourceId string = expressRouteCircuits.id +output resourceId string = expressRouteCircuits.id @description('The resource group the express route curcuit was deployed into') -output expressRouteCircuitResourceGroup string = resourceGroup().name +output resourceGroupName string = resourceGroup().name @description('The name of express route curcuit') -output expressRouteCircuitName string = expressRouteCircuits.name +output name string = expressRouteCircuits.name @description('The service key of the express route circuit') -output expressRouteCircuitServiceKey string = reference(expressRouteCircuits.id, '2021-02-01').serviceKey +output serviceKey string = reference(expressRouteCircuits.id, '2021-02-01').serviceKey diff --git a/arm/Microsoft.Network/expressRouteCircuits/readme.md b/arm/Microsoft.Network/expressRouteCircuits/readme.md index a66938ce1f..d5ad83ca55 100644 --- a/arm/Microsoft.Network/expressRouteCircuits/readme.md +++ b/arm/Microsoft.Network/expressRouteCircuits/readme.md @@ -84,14 +84,14 @@ Tag names and tag values can be provided as needed. A tag can be left without a | Output Name | Type | Description | | :-- | :-- | :-- | -| `expressRouteCircuitName` | string | The name of express route curcuit | -| `expressRouteCircuitResourceGroup` | string | The resource group the express route curcuit was deployed into | -| `expressRouteCircuitResourceId` | string | The resource ID of express route curcuit | -| `expressRouteCircuitServiceKey` | string | The service key of the express route circuit | +| `name` | string | The name of express route curcuit | +| `resourceGroupName` | string | The resource group the express route curcuit was deployed into | +| `resourceId` | string | The resource ID of express route curcuit | +| `serviceKey` | string | The service key of the express route circuit | ## Template references - [Diagnosticsettings](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Insights/2021-05-01-preview/diagnosticSettings) - [Expressroutecircuits](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Network/2021-02-01/expressRouteCircuits) - [Locks](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2017-04-01/locks) -- [Roleassignments](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2021-04-01-preview/roleAssignments) +- [Roleassignments](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/roleAssignments) diff --git a/arm/Microsoft.Network/firewallPolicies/deploy.bicep b/arm/Microsoft.Network/firewallPolicies/deploy.bicep index 1d297e008e..944c81c728 100644 --- a/arm/Microsoft.Network/firewallPolicies/deploy.bicep +++ b/arm/Microsoft.Network/firewallPolicies/deploy.bicep @@ -172,10 +172,10 @@ module firewallPolicy_ruleGroups 'ruleGroups/deploy.bicep' = [for (ruleGroup, in }] @description('The name of the deployed firewall policy') -output firewallPolicyName string = firewallPolicy.name +output name string = firewallPolicy.name @description('The resource ID of the deployed firewall policy') -output firewallPolicyResourceId string = firewallPolicy.id +output resourceId string = firewallPolicy.id @description('The resource group of the deployed firewall policy') -output firewallPolicyResourceGroup string = resourceGroup().name +output resourceGroupName string = resourceGroup().name diff --git a/arm/Microsoft.Network/firewallPolicies/readme.md b/arm/Microsoft.Network/firewallPolicies/readme.md index 64d892892b..9b5e4a3eef 100644 --- a/arm/Microsoft.Network/firewallPolicies/readme.md +++ b/arm/Microsoft.Network/firewallPolicies/readme.md @@ -74,9 +74,9 @@ You can specify multiple user assigned identities to a resource by providing add | Output Name | Type | Description | | :-- | :-- | :-- | -| `firewallPolicyName` | string | The name of the deployed firewall policy | -| `firewallPolicyResourceGroup` | string | The resource group of the deployed firewall policy | -| `firewallPolicyResourceId` | string | The resource ID of the deployed firewall policy | +| `name` | string | The name of the deployed firewall policy | +| `resourceGroupName` | string | The resource group of the deployed firewall policy | +| `resourceId` | string | The resource ID of the deployed firewall policy | ## Template references diff --git a/arm/Microsoft.Network/firewallPolicies/ruleCollectionGroups/deploy.bicep b/arm/Microsoft.Network/firewallPolicies/ruleCollectionGroups/deploy.bicep index e34b330d2c..8570325827 100644 --- a/arm/Microsoft.Network/firewallPolicies/ruleCollectionGroups/deploy.bicep +++ b/arm/Microsoft.Network/firewallPolicies/ruleCollectionGroups/deploy.bicep @@ -32,10 +32,10 @@ resource ruleCollectionGroup 'Microsoft.Network/firewallPolicies/ruleCollectionG } @description('The name of the deployed rule collection group') -output ruleCollectionGroupName string = ruleCollectionGroup.name +output name string = ruleCollectionGroup.name @description('The resource ID of the deployed rule collection group') -output ruleCollectionGroupResourceId string = ruleCollectionGroup.id +output resourceId string = ruleCollectionGroup.id @description('The resource group of the deployed rule collection group') -output ruleCollectionGroupResourceGroup string = resourceGroup().name +output resourceGroupName string = resourceGroup().name diff --git a/arm/Microsoft.Network/firewallPolicies/ruleCollectionGroups/readme.md b/arm/Microsoft.Network/firewallPolicies/ruleCollectionGroups/readme.md index 058596d729..feb9b570cd 100644 --- a/arm/Microsoft.Network/firewallPolicies/ruleCollectionGroups/readme.md +++ b/arm/Microsoft.Network/firewallPolicies/ruleCollectionGroups/readme.md @@ -37,9 +37,9 @@ For remaining properties, see [FirewallPolicyRuleCollection objects](https://doc | Output Name | Type | Description | | :-- | :-- | :-- | -| `ruleCollectionGroupName` | string | The name of the deployed rule collection group | -| `ruleCollectionGroupResourceGroup` | string | The resource group of the deployed rule collection group | -| `ruleCollectionGroupResourceId` | string | The resource ID of the deployed rule collection group | +| `name` | string | The name of the deployed rule collection group | +| `resourceGroupName` | string | The resource group of the deployed rule collection group | +| `resourceId` | string | The resource ID of the deployed rule collection group | ## Template references diff --git a/arm/Microsoft.Network/firewallPolicies/ruleGroups/deploy.bicep b/arm/Microsoft.Network/firewallPolicies/ruleGroups/deploy.bicep index f5e365f7df..93fb4a00ff 100644 --- a/arm/Microsoft.Network/firewallPolicies/ruleGroups/deploy.bicep +++ b/arm/Microsoft.Network/firewallPolicies/ruleGroups/deploy.bicep @@ -32,10 +32,10 @@ resource ruleGroup 'Microsoft.Network/firewallPolicies/ruleGroups@2020-04-01' = } @description('The name of the deployed rule group') -output ruleGroupName string = ruleGroup.name +output name string = ruleGroup.name @description('The resource ID of the deployed rule group') -output ruleGroupResourceId string = ruleGroup.id +output resourceId string = ruleGroup.id @description('The resource group of the deployed rule group') -output ruleGroupResourceGroup string = resourceGroup().name +output resourceGroupName string = resourceGroup().name diff --git a/arm/Microsoft.Network/firewallPolicies/ruleGroups/readme.md b/arm/Microsoft.Network/firewallPolicies/ruleGroups/readme.md index 348848102d..a4fe36d022 100644 --- a/arm/Microsoft.Network/firewallPolicies/ruleGroups/readme.md +++ b/arm/Microsoft.Network/firewallPolicies/ruleGroups/readme.md @@ -37,9 +37,9 @@ For remaining properties, see [FirewallPolicyRule objects](https://docs.microsof | Output Name | Type | Description | | :-- | :-- | :-- | -| `ruleGroupName` | string | The name of the deployed rule group | -| `ruleGroupResourceGroup` | string | The resource group of the deployed rule group | -| `ruleGroupResourceId` | string | The resource ID of the deployed rule group | +| `name` | string | The name of the deployed rule group | +| `resourceGroupName` | string | The resource group of the deployed rule group | +| `resourceId` | string | The resource ID of the deployed rule group | ## Template references diff --git a/arm/Microsoft.Network/ipGroups/deploy.bicep b/arm/Microsoft.Network/ipGroups/deploy.bicep index 1424e1775f..d759d4d1bf 100644 --- a/arm/Microsoft.Network/ipGroups/deploy.bicep +++ b/arm/Microsoft.Network/ipGroups/deploy.bicep @@ -58,10 +58,10 @@ module ipGroup_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, index) in }] @description('The resource ID of the IP group') -output ipGroupsResourceId string = ipGroup.id +output resourceId string = ipGroup.id @description('The resource group of the IP group was deployed into') -output ipGroupsResourceGroup string = resourceGroup().name +output resourceGroupName string = resourceGroup().name @description('The name of the IP group') -output ipGroupName string = ipGroup.name +output name string = ipGroup.name diff --git a/arm/Microsoft.Network/ipGroups/readme.md b/arm/Microsoft.Network/ipGroups/readme.md index 28370e1f19..bead9844f0 100644 --- a/arm/Microsoft.Network/ipGroups/readme.md +++ b/arm/Microsoft.Network/ipGroups/readme.md @@ -65,12 +65,12 @@ Tag names and tag values can be provided as needed. A tag can be left without a | Output Name | Type | Description | | :-- | :-- | :-- | -| `ipGroupName` | string | The name of the IP group | -| `ipGroupsResourceGroup` | string | The resource group of the IP group was deployed into | -| `ipGroupsResourceId` | string | The resource ID of the IP group | +| `name` | string | The name of the IP group | +| `resourceGroupName` | string | The resource group of the IP group was deployed into | +| `resourceId` | string | The resource ID of the IP group | ## Template references - [Ipgroups](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Network/2021-02-01/ipGroups) - [Locks](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2017-04-01/locks) -- [Roleassignments](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2021-04-01-preview/roleAssignments) +- [Roleassignments](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/roleAssignments) diff --git a/arm/Microsoft.Network/loadBalancers/backendAddressPools/deploy.bicep b/arm/Microsoft.Network/loadBalancers/backendAddressPools/deploy.bicep index 800052e3fb..5d610ac59f 100644 --- a/arm/Microsoft.Network/loadBalancers/backendAddressPools/deploy.bicep +++ b/arm/Microsoft.Network/loadBalancers/backendAddressPools/deploy.bicep @@ -32,10 +32,10 @@ resource backendAddressPool 'Microsoft.Network/loadBalancers/backendAddressPools } @description('The name of the backend address pool') -output inboundNatRuleName string = backendAddressPool.name +output name string = backendAddressPool.name @description('The resource ID of the backend address pool') -output inboundNatRuleResourceId string = backendAddressPool.id +output resourceId string = backendAddressPool.id @description('The resource group the backend address pool was deployed into') -output inboundNatRuleResourceGroupName string = resourceGroup().name +output resourceGroupName string = resourceGroup().name diff --git a/arm/Microsoft.Network/loadBalancers/backendAddressPools/readme.md b/arm/Microsoft.Network/loadBalancers/backendAddressPools/readme.md index 3f5c874f0d..b7930145a7 100644 --- a/arm/Microsoft.Network/loadBalancers/backendAddressPools/readme.md +++ b/arm/Microsoft.Network/loadBalancers/backendAddressPools/readme.md @@ -22,9 +22,9 @@ This module deploys load balancer backend address pools. | Output Name | Type | Description | | :-- | :-- | :-- | -| `inboundNatRuleName` | string | The name of the backend address pool | -| `inboundNatRuleResourceGroupName` | string | The resource group the backend address pool was deployed into | -| `inboundNatRuleResourceId` | string | The resource ID of the backend address pool | +| `name` | string | The name of the backend address pool | +| `resourceGroupName` | string | The resource group the backend address pool was deployed into | +| `resourceId` | string | The resource ID of the backend address pool | ## Template references diff --git a/arm/Microsoft.Network/loadBalancers/deploy.bicep b/arm/Microsoft.Network/loadBalancers/deploy.bicep index ff6a91c1f0..af3695de4a 100644 --- a/arm/Microsoft.Network/loadBalancers/deploy.bicep +++ b/arm/Microsoft.Network/loadBalancers/deploy.bicep @@ -89,20 +89,20 @@ var loadBalancingRules_var = [for loadBalancingRule in loadBalancingRules: { name: loadBalancingRule.name properties: { backendAddressPool: { - id: resourceId('Microsoft.Network/loadBalancers/backendAddressPools', name, loadBalancingRule.backendAddressPoolName) + id: az.resourceId('Microsoft.Network/loadBalancers/backendAddressPools', name, loadBalancingRule.backendAddressPoolName) } backendPort: loadBalancingRule.backendPort disableOutboundSnat: contains(loadBalancingRule, 'disableOutboundSnat') ? loadBalancingRule.disableOutboundSnat : true enableFloatingIP: contains(loadBalancingRule, 'enableFloatingIP') ? loadBalancingRule.enableFloatingIP : false enableTcpReset: contains(loadBalancingRule, 'enableTcpReset') ? loadBalancingRule.enableTcpReset : false frontendIPConfiguration: { - id: resourceId('Microsoft.Network/loadBalancers/frontendIPConfigurations', name, loadBalancingRule.frontendIPConfigurationName) + id: az.resourceId('Microsoft.Network/loadBalancers/frontendIPConfigurations', name, loadBalancingRule.frontendIPConfigurationName) } frontendPort: loadBalancingRule.frontendPort idleTimeoutInMinutes: contains(loadBalancingRule, 'idleTimeoutInMinutes') ? loadBalancingRule.idleTimeoutInMinutes : 4 loadDistribution: contains(loadBalancingRule, 'loadDistribution') ? loadBalancingRule.loadDistribution : 'Default' probe: { - id: '${resourceId('Microsoft.Network/loadBalancers', name)}/probes/${loadBalancingRule.probeName}' + id: '${az.resourceId('Microsoft.Network/loadBalancers', name)}/probes/${loadBalancingRule.probeName}' } protocol: contains(loadBalancingRule, 'protocol') ? loadBalancingRule.protocol : 'Tcp' } @@ -113,11 +113,11 @@ var outboundRules_var = [for outboundRule in outboundRules: { properties: { frontendIPConfigurations: [ { - id: resourceId('Microsoft.Network/loadBalancers/frontendIPConfigurations', name, outboundRule.frontendIPConfigurationName) + id: az.resourceId('Microsoft.Network/loadBalancers/frontendIPConfigurations', name, outboundRule.frontendIPConfigurationName) } ] backendAddressPool: { - id: resourceId('Microsoft.Network/loadBalancers/backendAddressPools', name, outboundRule.backendAddressPoolName) + id: az.resourceId('Microsoft.Network/loadBalancers/backendAddressPools', name, outboundRule.backendAddressPoolName) } protocol: contains(outboundRule, 'protocol') ? outboundRule.protocol : 'All' allocatedOutboundPorts: contains(outboundRule, 'allocatedOutboundPorts') ? outboundRule.allocatedOutboundPorts : 63984 @@ -238,10 +238,10 @@ module loadBalancer_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, inde }] @description('The name of the load balancer') -output loadBalancerName string = loadBalancer.name +output name string = loadBalancer.name @description('The resource ID of the load balancer') -output loadBalancerResourceId string = loadBalancer.id +output resourceId string = loadBalancer.id @description('The resource group the load balancer was deployed into') -output loadBalancerResourceGroup string = resourceGroup().name +output resourceGroupName string = resourceGroup().name diff --git a/arm/Microsoft.Network/loadBalancers/inboundNatRules/deploy.bicep b/arm/Microsoft.Network/loadBalancers/inboundNatRules/deploy.bicep index c24f8b97a7..cd20e269a3 100644 --- a/arm/Microsoft.Network/loadBalancers/inboundNatRules/deploy.bicep +++ b/arm/Microsoft.Network/loadBalancers/inboundNatRules/deploy.bicep @@ -65,7 +65,7 @@ resource inboundNatRule 'Microsoft.Network/loadBalancers/inboundNatRules@2021-05 frontendPort: frontendPort backendPort: backendPort backendAddressPool: !empty(backendAddressPoolName) ? { - id: resourceId('Microsoft.Network/loadBalancers/backendAddressPools', name, backendAddressPoolName) + id: az.resourceId('Microsoft.Network/loadBalancers/backendAddressPools', name, backendAddressPoolName) } : null enableFloatingIP: enableFloatingIP enableTcpReset: enableTcpReset @@ -81,10 +81,10 @@ resource inboundNatRule 'Microsoft.Network/loadBalancers/inboundNatRules@2021-05 } @description('The name of the inbound NAT rule') -output inboundNatRuleName string = inboundNatRule.name +output name string = inboundNatRule.name @description('The resource ID of the inbound NAT rule') -output inboundNatRuleResourceId string = inboundNatRule.id +output resourceId string = inboundNatRule.id @description('The resource group the inbound NAT rule was deployed into') -output inboundNatRuleResourceGroupName string = resourceGroup().name +output resourceGroupName string = resourceGroup().name diff --git a/arm/Microsoft.Network/loadBalancers/inboundNatRules/readme.md b/arm/Microsoft.Network/loadBalancers/inboundNatRules/readme.md index c33987048e..644da6d40b 100644 --- a/arm/Microsoft.Network/loadBalancers/inboundNatRules/readme.md +++ b/arm/Microsoft.Network/loadBalancers/inboundNatRules/readme.md @@ -30,9 +30,9 @@ This module deploys load balancers inbound NAT rules. | Output Name | Type | Description | | :-- | :-- | :-- | -| `inboundNatRuleName` | string | The name of the inbound NAT rule | -| `inboundNatRuleResourceGroupName` | string | The resource group the inbound NAT rule was deployed into | -| `inboundNatRuleResourceId` | string | The resource ID of the inbound NAT rule | +| `name` | string | The name of the inbound NAT rule | +| `resourceGroupName` | string | The resource group the inbound NAT rule was deployed into | +| `resourceId` | string | The resource ID of the inbound NAT rule | ## Template references diff --git a/arm/Microsoft.Network/loadBalancers/readme.md b/arm/Microsoft.Network/loadBalancers/readme.md index ae23863c40..ca9f7c0a6a 100644 --- a/arm/Microsoft.Network/loadBalancers/readme.md +++ b/arm/Microsoft.Network/loadBalancers/readme.md @@ -210,9 +210,9 @@ Tag names and tag values can be provided as needed. A tag can be left without a | Output Name | Type | Description | | :-- | :-- | :-- | -| `loadBalancerName` | string | The name of the load balancer | -| `loadBalancerResourceGroup` | string | The resource group the load balancer was deployed into | -| `loadBalancerResourceId` | string | The resource ID of the load balancer | +| `name` | string | The name of the load balancer | +| `resourceGroupName` | string | The resource group the load balancer was deployed into | +| `resourceId` | string | The resource ID of the load balancer | ## Template references @@ -221,4 +221,4 @@ Tag names and tag values can be provided as needed. A tag can be left without a - [Loadbalancers/Backendaddresspools](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Network/2021-05-01/loadBalancers/backendAddressPools) - [Loadbalancers/Inboundnatrules](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Network/2021-05-01/loadBalancers/inboundNatRules) - [Locks](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2017-04-01/locks) -- [Roleassignments](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2021-04-01-preview/roleAssignments) +- [Roleassignments](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/roleAssignments) diff --git a/arm/Microsoft.Network/localNetworkGateways/deploy.bicep b/arm/Microsoft.Network/localNetworkGateways/deploy.bicep index d427df77c5..4edbcd10ea 100644 --- a/arm/Microsoft.Network/localNetworkGateways/deploy.bicep +++ b/arm/Microsoft.Network/localNetworkGateways/deploy.bicep @@ -84,10 +84,10 @@ module localNetworkGateway_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignmen }] @description('The resource ID of the local network gateway') -output localNetworkGatewayResourceId string = localNetworkGateway.id +output resourceId string = localNetworkGateway.id @description('The resource group the local network gateway was deployed into') -output localNetworkGatewayResourceGroup string = resourceGroup().name +output resourceGroupName string = resourceGroup().name @description('The name of the local network gateway') -output localNetworkGatewayName string = localNetworkGateway.name +output name string = localNetworkGateway.name diff --git a/arm/Microsoft.Network/localNetworkGateways/readme.md b/arm/Microsoft.Network/localNetworkGateways/readme.md index 59b83613c6..93a4adbbfd 100644 --- a/arm/Microsoft.Network/localNetworkGateways/readme.md +++ b/arm/Microsoft.Network/localNetworkGateways/readme.md @@ -70,12 +70,12 @@ Tag names and tag values can be provided as needed. A tag can be left without a | Output Name | Type | Description | | :-- | :-- | :-- | -| `localNetworkGatewayName` | string | The name of the local network gateway | -| `localNetworkGatewayResourceGroup` | string | The resource group the local network gateway was deployed into | -| `localNetworkGatewayResourceId` | string | The resource ID of the local network gateway | +| `name` | string | The name of the local network gateway | +| `resourceGroupName` | string | The resource group the local network gateway was deployed into | +| `resourceId` | string | The resource ID of the local network gateway | ## Template references - [Localnetworkgateways](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Network/2021-02-01/localNetworkGateways) - [Locks](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2017-04-01/locks) -- [Roleassignments](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2021-04-01-preview/roleAssignments) +- [Roleassignments](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/roleAssignments) diff --git a/arm/Microsoft.Network/natGateways/deploy.bicep b/arm/Microsoft.Network/natGateways/deploy.bicep index 2dac24b1df..e17862ef47 100644 --- a/arm/Microsoft.Network/natGateways/deploy.bicep +++ b/arm/Microsoft.Network/natGateways/deploy.bicep @@ -107,10 +107,10 @@ var natGatewayPublicIPPrefix = { } var natGatewayPropertyPublicIPPrefixes = [for publicIpPrefix in publicIpPrefixes: { - id: resourceId('Microsoft.Network/publicIPPrefixes', publicIpPrefix) + id: az.resourceId('Microsoft.Network/publicIPPrefixes', publicIpPrefix) }] var natGatewayPropertyPublicIPAddresses = [for publicIpAddress in publicIpAddresses: { - id: resourceId('Microsoft.Network/publicIPAddresses', publicIpAddress) + id: az.resourceId('Microsoft.Network/publicIPAddresses', publicIpAddress) }] var natGatewayProperties = { idleTimeoutInMinutes: idleTimeoutInMinutes @@ -193,10 +193,10 @@ module natGateway_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, index) }] @description('The name of the NAT Gateway') -output natGatewayName string = natGateway.name +output name string = natGateway.name @description('The resource ID of the NAT Gateway') -output natGatewayResourceId string = natGateway.id +output resourceId string = natGateway.id @description('The resource group the NAT Gateway was deployed into') -output natGatewayResourceGroup string = resourceGroup().name +output resourceGroupName string = resourceGroup().name diff --git a/arm/Microsoft.Network/natGateways/readme.md b/arm/Microsoft.Network/natGateways/readme.md index 16e195294e..ffde503e6d 100644 --- a/arm/Microsoft.Network/natGateways/readme.md +++ b/arm/Microsoft.Network/natGateways/readme.md @@ -81,9 +81,9 @@ Tag names and tag values can be provided as needed. A tag can be left without a | Output Name | Type | Description | | :-- | :-- | :-- | -| `natGatewayName` | string | The name of the NAT Gateway | -| `natGatewayResourceGroup` | string | The resource group the NAT Gateway was deployed into | -| `natGatewayResourceId` | string | The resource ID of the NAT Gateway | +| `name` | string | The name of the NAT Gateway | +| `resourceGroupName` | string | The resource group the NAT Gateway was deployed into | +| `resourceId` | string | The resource ID of the NAT Gateway | ## Template references @@ -91,4 +91,4 @@ Tag names and tag values can be provided as needed. A tag can be left without a - [Locks](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2017-04-01/locks) - [Natgateways](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Network/2021-02-01/natGateways) - [Publicipaddresses](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Network/2021-02-01/publicIPAddresses) -- [Roleassignments](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2021-04-01-preview/roleAssignments) +- [Roleassignments](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/roleAssignments) diff --git a/arm/Microsoft.Network/networkSecurityGroups/deploy.bicep b/arm/Microsoft.Network/networkSecurityGroups/deploy.bicep index 0082a6445d..efc071e10c 100644 --- a/arm/Microsoft.Network/networkSecurityGroups/deploy.bicep +++ b/arm/Microsoft.Network/networkSecurityGroups/deploy.bicep @@ -124,10 +124,10 @@ module networkSecurityGroup_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignme }] @description('The resource group the network security group was deployed into') -output networkSecurityGroupResourceGroup string = resourceGroup().name +output resourceGroupName string = resourceGroup().name @description('The resource ID of the network security group') -output networkSecurityGroupResourceId string = networkSecurityGroup.id +output resourceId string = networkSecurityGroup.id @description('The name of the network security group') -output networkSecurityGroupName string = networkSecurityGroup.name +output name string = networkSecurityGroup.name diff --git a/arm/Microsoft.Network/networkSecurityGroups/readme.md b/arm/Microsoft.Network/networkSecurityGroups/readme.md index e8a31ac9a4..5d9cb99f10 100644 --- a/arm/Microsoft.Network/networkSecurityGroups/readme.md +++ b/arm/Microsoft.Network/networkSecurityGroups/readme.md @@ -152,13 +152,13 @@ Tag names and tag values can be provided as needed. A tag can be left without a | Output Name | Type | Description | | :-- | :-- | :-- | -| `networkSecurityGroupName` | string | The name of the network security group | -| `networkSecurityGroupResourceGroup` | string | The resource group the network security group was deployed into | -| `networkSecurityGroupResourceId` | string | The resource ID of the network security group | +| `name` | string | The name of the network security group | +| `resourceGroupName` | string | The resource group the network security group was deployed into | +| `resourceId` | string | The resource ID of the network security group | ## Template references - [Diagnosticsettings](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Insights/2021-05-01-preview/diagnosticSettings) - [Locks](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2017-04-01/locks) - [Networksecuritygroups](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Network/2021-02-01/networkSecurityGroups) -- [Roleassignments](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2021-04-01-preview/roleAssignments) +- [Roleassignments](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/roleAssignments) diff --git a/arm/Microsoft.Network/networkWatchers/connectionMonitors/deploy.bicep b/arm/Microsoft.Network/networkWatchers/connectionMonitors/deploy.bicep index 747893925d..d1fa6a69ab 100644 --- a/arm/Microsoft.Network/networkWatchers/connectionMonitors/deploy.bicep +++ b/arm/Microsoft.Network/networkWatchers/connectionMonitors/deploy.bicep @@ -57,10 +57,10 @@ resource connectionMonitor 'Microsoft.Network/networkWatchers/connectionMonitors } @description('The name of the deployed connection monitor') -output connectionMonitorName string = connectionMonitor.name +output name string = connectionMonitor.name @description('The resource ID of the deployed connection monitor') -output connectionMonitorResourceId string = connectionMonitor.id +output resourceId string = connectionMonitor.id @description('The resource group the connection monitor was deployed into') -output connectionMonitorResourceGroup string = resourceGroup().name +output resourceGroupName string = resourceGroup().name diff --git a/arm/Microsoft.Network/networkWatchers/connectionMonitors/readme.md b/arm/Microsoft.Network/networkWatchers/connectionMonitors/readme.md index 22a0f026dd..173ae5a314 100644 --- a/arm/Microsoft.Network/networkWatchers/connectionMonitors/readme.md +++ b/arm/Microsoft.Network/networkWatchers/connectionMonitors/readme.md @@ -43,9 +43,9 @@ Tag names and tag values can be provided as needed. A tag can be left without a | Output Name | Type | Description | | :-- | :-- | :-- | -| `connectionMonitorName` | string | The name of the deployed connection monitor | -| `connectionMonitorResourceGroup` | string | The resource group the connection monitor was deployed into | -| `connectionMonitorResourceId` | string | The resource ID of the deployed connection monitor | +| `name` | string | The name of the deployed connection monitor | +| `resourceGroupName` | string | The resource group the connection monitor was deployed into | +| `resourceId` | string | The resource ID of the deployed connection monitor | ## Template references diff --git a/arm/Microsoft.Network/networkWatchers/deploy.bicep b/arm/Microsoft.Network/networkWatchers/deploy.bicep index 003ca34c4e..3cc42624e3 100644 --- a/arm/Microsoft.Network/networkWatchers/deploy.bicep +++ b/arm/Microsoft.Network/networkWatchers/deploy.bicep @@ -87,10 +87,10 @@ module networkWatcher_flowLogs 'flowLogs/deploy.bicep' = [for (flowLog, index) i }] @description('The name of the deployed network watcher') -output networkWatcherName string = networkWatcher.name +output name string = networkWatcher.name @description('The resource ID of the deployed network watcher') -output networkWatcherResourceId string = networkWatcher.id +output resourceId string = networkWatcher.id @description('The resource group the network watcher was deployed into') -output networkWatcherResourceGroup string = resourceGroup().name +output resourceGroupName string = resourceGroup().name diff --git a/arm/Microsoft.Network/networkWatchers/flowLogs/deploy.bicep b/arm/Microsoft.Network/networkWatchers/flowLogs/deploy.bicep index c206a1e523..5518c735e3 100644 --- a/arm/Microsoft.Network/networkWatchers/flowLogs/deploy.bicep +++ b/arm/Microsoft.Network/networkWatchers/flowLogs/deploy.bicep @@ -86,10 +86,10 @@ resource flowLog 'Microsoft.Network/networkWatchers/flowLogs@2021-03-01' = { } } @description('The name of the flow log') -output flowLogName string = flowLog.name +output name string = flowLog.name @description('The resource ID of the flow log') -output flowLogResourceId string = flowLog.id +output resourceId string = flowLog.id @description('The resource group the flow log was deployed into') -output flowLogResourceGroup string = resourceGroup().name +output resourceGroupName string = resourceGroup().name diff --git a/arm/Microsoft.Network/networkWatchers/flowLogs/readme.md b/arm/Microsoft.Network/networkWatchers/flowLogs/readme.md index 5df0c9c05a..af84dadbfc 100644 --- a/arm/Microsoft.Network/networkWatchers/flowLogs/readme.md +++ b/arm/Microsoft.Network/networkWatchers/flowLogs/readme.md @@ -47,9 +47,9 @@ Tag names and tag values can be provided as needed. A tag can be left without a | Output Name | Type | Description | | :-- | :-- | :-- | -| `flowLogName` | string | The name of the flow log | -| `flowLogResourceGroup` | string | The resource group the flow log was deployed into | -| `flowLogResourceId` | string | The resource ID of the flow log | +| `name` | string | The name of the flow log | +| `resourceGroupName` | string | The resource group the flow log was deployed into | +| `resourceId` | string | The resource ID of the flow log | ## Template references diff --git a/arm/Microsoft.Network/networkWatchers/readme.md b/arm/Microsoft.Network/networkWatchers/readme.md index daf5e9a17b..0ad4e879ff 100644 --- a/arm/Microsoft.Network/networkWatchers/readme.md +++ b/arm/Microsoft.Network/networkWatchers/readme.md @@ -69,9 +69,9 @@ Tag names and tag values can be provided as needed. A tag can be left without a | Output Name | Type | Description | | :-- | :-- | :-- | -| `networkWatcherName` | string | The name of the deployed network watcher | -| `networkWatcherResourceGroup` | string | The resource group the network watcher was deployed into | -| `networkWatcherResourceId` | string | The resource ID of the deployed network watcher | +| `name` | string | The name of the deployed network watcher | +| `resourceGroupName` | string | The resource group the network watcher was deployed into | +| `resourceId` | string | The resource ID of the deployed network watcher | ## Template references @@ -79,4 +79,4 @@ Tag names and tag values can be provided as needed. A tag can be left without a - [Networkwatchers](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Network/2021-02-01/networkWatchers) - [Networkwatchers/Connectionmonitors](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Network/2021-03-01/networkWatchers/connectionMonitors) - [Networkwatchers/Flowlogs](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Network/2021-03-01/networkWatchers/flowLogs) -- [Roleassignments](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2021-04-01-preview/roleAssignments) +- [Roleassignments](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/roleAssignments) diff --git a/arm/Microsoft.Network/privateDnsZones/deploy.bicep b/arm/Microsoft.Network/privateDnsZones/deploy.bicep index 366549354a..7e38140e61 100644 --- a/arm/Microsoft.Network/privateDnsZones/deploy.bicep +++ b/arm/Microsoft.Network/privateDnsZones/deploy.bicep @@ -66,10 +66,10 @@ module privateDnsZone_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, in }] @description('The resource group the private DNS zone was deployed into') -output privateDnsZoneResourceGroup string = resourceGroup().name +output resourceGroupName string = resourceGroup().name @description('The name of the private DNS zone') -output privateDnsZoneName string = privateDnsZone.name +output name string = privateDnsZone.name @description('The resource ID of the private DNS zone') -output privateDnsZoneResourceId string = privateDnsZone.id +output resourceId string = privateDnsZone.id diff --git a/arm/Microsoft.Network/privateDnsZones/readme.md b/arm/Microsoft.Network/privateDnsZones/readme.md index 2da8f59ac2..76894a628c 100644 --- a/arm/Microsoft.Network/privateDnsZones/readme.md +++ b/arm/Microsoft.Network/privateDnsZones/readme.md @@ -66,13 +66,13 @@ Tag names and tag values can be provided as needed. A tag can be left without a | Output Name | Type | Description | | :-- | :-- | :-- | -| `privateDnsZoneName` | string | The name of the private DNS zone | -| `privateDnsZoneResourceGroup` | string | The resource group the private DNS zone was deployed into | -| `privateDnsZoneResourceId` | string | The resource ID of the private DNS zone | +| `name` | string | The name of the private DNS zone | +| `resourceGroupName` | string | The resource group the private DNS zone was deployed into | +| `resourceId` | string | The resource ID of the private DNS zone | ## Template references - [Locks](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2017-04-01/locks) - [Privatednszones](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Network/2020-06-01/privateDnsZones) - [Privatednszones/Virtualnetworklinks](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Network/2020-06-01/privateDnsZones/virtualNetworkLinks) -- [Roleassignments](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2021-04-01-preview/roleAssignments) +- [Roleassignments](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/roleAssignments) diff --git a/arm/Microsoft.Network/privateDnsZones/virtualNetworkLinks/deploy.bicep b/arm/Microsoft.Network/privateDnsZones/virtualNetworkLinks/deploy.bicep index aeac283431..220355de95 100644 --- a/arm/Microsoft.Network/privateDnsZones/virtualNetworkLinks/deploy.bicep +++ b/arm/Microsoft.Network/privateDnsZones/virtualNetworkLinks/deploy.bicep @@ -42,10 +42,10 @@ resource virtualNetworkLink 'Microsoft.Network/privateDnsZones/virtualNetworkLin } @description('The name of the deployed virtual network link') -output virtualNetworkLinkName string = virtualNetworkLink.name +output name string = virtualNetworkLink.name @description('The resource ID of the deployed virtual network link') -output virtualNetworkLinkResourceId string = virtualNetworkLink.id +output resourceId string = virtualNetworkLink.id @description('The resource group of the deployed virtual network link') -output virtualNetworkLinkResourceGroup string = resourceGroup().name +output resourceGroupName string = resourceGroup().name diff --git a/arm/Microsoft.Network/privateDnsZones/virtualNetworkLinks/readme.md b/arm/Microsoft.Network/privateDnsZones/virtualNetworkLinks/readme.md index 51e29f2320..da5b3a590f 100644 --- a/arm/Microsoft.Network/privateDnsZones/virtualNetworkLinks/readme.md +++ b/arm/Microsoft.Network/privateDnsZones/virtualNetworkLinks/readme.md @@ -41,9 +41,9 @@ Tag names and tag values can be provided as needed. A tag can be left without a | Output Name | Type | Description | | :-- | :-- | :-- | -| `virtualNetworkLinkName` | string | The name of the deployed virtual network link | -| `virtualNetworkLinkResourceGroup` | string | The resource group of the deployed virtual network link | -| `virtualNetworkLinkResourceId` | string | The resource ID of the deployed virtual network link | +| `name` | string | The name of the deployed virtual network link | +| `resourceGroupName` | string | The resource group of the deployed virtual network link | +| `resourceId` | string | The resource ID of the deployed virtual network link | ## Template references diff --git a/arm/Microsoft.Network/privateEndpoints/deploy.bicep b/arm/Microsoft.Network/privateEndpoints/deploy.bicep index c2db6a2abf..4542adde86 100644 --- a/arm/Microsoft.Network/privateEndpoints/deploy.bicep +++ b/arm/Microsoft.Network/privateEndpoints/deploy.bicep @@ -87,10 +87,10 @@ module privateEndpoint_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, i }] @description('The resource group the private endpoint was deployed into') -output privateEndpointResourceGroup string = resourceGroup().name +output resourceGroupName string = resourceGroup().name @description('The resource ID of the private endpoint') -output privateEndpointResourceId string = privateEndpoint.id +output resourceId string = privateEndpoint.id @description('The name of the private endpoint') -output privateEndpointName string = privateEndpoint.name +output name string = privateEndpoint.name diff --git a/arm/Microsoft.Network/privateEndpoints/privateDnsZoneGroups/deploy.bicep b/arm/Microsoft.Network/privateEndpoints/privateDnsZoneGroups/deploy.bicep index 65dec2719c..561dbb48c6 100644 --- a/arm/Microsoft.Network/privateEndpoints/privateDnsZoneGroups/deploy.bicep +++ b/arm/Microsoft.Network/privateEndpoints/privateDnsZoneGroups/deploy.bicep @@ -35,10 +35,10 @@ resource privateDnsZoneGroup 'Microsoft.Network/privateEndpoints/privateDnsZoneG } @description('The name of the private endpoint DNS zone group') -output privateDnsZoneGroupName string = privateDnsZoneGroup.name +output name string = privateDnsZoneGroup.name @description('The resource ID of the private endpoint DNS zone group') -output privateDnsZoneGroupResourceId string = privateDnsZoneGroup.id +output resourceId string = privateDnsZoneGroup.id @description('The resource group the private endpoint DNS zone group was deployed into') -output privateDnsZoneGroupResourceGroup string = resourceGroup().name +output resourceGroupName string = resourceGroup().name diff --git a/arm/Microsoft.Network/privateEndpoints/privateDnsZoneGroups/readme.md b/arm/Microsoft.Network/privateEndpoints/privateDnsZoneGroups/readme.md index 765e567808..11c5f7cf08 100644 --- a/arm/Microsoft.Network/privateEndpoints/privateDnsZoneGroups/readme.md +++ b/arm/Microsoft.Network/privateEndpoints/privateDnsZoneGroups/readme.md @@ -21,9 +21,9 @@ This module deploys a private endpoint private DNS zone group | Output Name | Type | Description | | :-- | :-- | :-- | -| `privateDnsZoneGroupName` | string | The name of the private endpoint DNS zone group | -| `privateDnsZoneGroupResourceGroup` | string | The resource group the private endpoint DNS zone group was deployed into | -| `privateDnsZoneGroupResourceId` | string | The resource ID of the private endpoint DNS zone group | +| `name` | string | The name of the private endpoint DNS zone group | +| `resourceGroupName` | string | The resource group the private endpoint DNS zone group was deployed into | +| `resourceId` | string | The resource ID of the private endpoint DNS zone group | ## Template references diff --git a/arm/Microsoft.Network/privateEndpoints/readme.md b/arm/Microsoft.Network/privateEndpoints/readme.md index 8f176f2012..6dd7fcd884 100644 --- a/arm/Microsoft.Network/privateEndpoints/readme.md +++ b/arm/Microsoft.Network/privateEndpoints/readme.md @@ -79,13 +79,13 @@ Tag names and tag values can be provided as needed. A tag can be left without a | Output Name | Type | Description | | :-- | :-- | :-- | -| `privateEndpointName` | string | The name of the private endpoint | -| `privateEndpointResourceGroup` | string | The resource group the private endpoint was deployed into | -| `privateEndpointResourceId` | string | The resource ID of the private endpoint | +| `name` | string | The name of the private endpoint | +| `resourceGroupName` | string | The resource group the private endpoint was deployed into | +| `resourceId` | string | The resource ID of the private endpoint | ## Template references - [Locks](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2017-04-01/locks) - [Privateendpoints](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Network/2021-03-01/privateEndpoints) - [Privateendpoints/Privatednszonegroups](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Network/2021-03-01/privateEndpoints/privateDnsZoneGroups) -- [Roleassignments](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2021-04-01-preview/roleAssignments) +- [Roleassignments](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/roleAssignments) diff --git a/arm/Microsoft.Network/publicIPAddresses/deploy.bicep b/arm/Microsoft.Network/publicIPAddresses/deploy.bicep index 9d872aa55c..b7ccd8bbd9 100644 --- a/arm/Microsoft.Network/publicIPAddresses/deploy.bicep +++ b/arm/Microsoft.Network/publicIPAddresses/deploy.bicep @@ -170,13 +170,13 @@ module publicIpAddress_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, i }] @description('The resource group the public IP address was deployed into') -output publicIPAddressResourceGroup string = resourceGroup().name +output resourceGroupName string = resourceGroup().name @description('The name of the public IP address') -output publicIPAddressName string = publicIpAddress.name +output name string = publicIpAddress.name @description('The resource ID of the public IP address') -output publicIPAddressResourceId string = publicIpAddress.id +output resourceId string = publicIpAddress.id @description('The public IP address of the of the public IP address resource') -output publicIpAddress string = publicIpAddress.properties.ipAddress +output ipAddress string = publicIpAddress.properties.ipAddress diff --git a/arm/Microsoft.Network/publicIPAddresses/readme.md b/arm/Microsoft.Network/publicIPAddresses/readme.md index fd286780f4..3c0e2eae8c 100644 --- a/arm/Microsoft.Network/publicIPAddresses/readme.md +++ b/arm/Microsoft.Network/publicIPAddresses/readme.md @@ -76,10 +76,10 @@ Tag names and tag values can be provided as needed. A tag can be left without a | Output Name | Type | Description | | :-- | :-- | :-- | -| `publicIpAddress` | string | The public IP address of the of the public IP address resource | -| `publicIPAddressName` | string | The name of the public IP address | -| `publicIPAddressResourceGroup` | string | The resource group the public IP address was deployed into | -| `publicIPAddressResourceId` | string | The resource ID of the public IP address | +| `ipAddress` | string | The public IP address of the of the public IP address resource | +| `name` | string | The name of the public IP address | +| `resourceGroupName` | string | The resource group the public IP address was deployed into | +| `resourceId` | string | The resource ID of the public IP address | ## Template references diff --git a/arm/Microsoft.Network/publicIPPrefixes/deploy.bicep b/arm/Microsoft.Network/publicIPPrefixes/deploy.bicep index 305aa0bed5..b2b54c0098 100644 --- a/arm/Microsoft.Network/publicIPPrefixes/deploy.bicep +++ b/arm/Microsoft.Network/publicIPPrefixes/deploy.bicep @@ -64,10 +64,10 @@ module publicIpPrefix_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, in }] @description('The resource ID of the public IP prefix') -output publicIpPrefixResourceId string = publicIpPrefix.id +output resourceId string = publicIpPrefix.id @description('The resource group the public IP prefix was deployed into') -output publicIpPrefixResourceGroup string = resourceGroup().name +output resourceGroupName string = resourceGroup().name @description('The name of the public IP prefix') -output publicIpPrefixName string = publicIpPrefix.name +output name string = publicIpPrefix.name diff --git a/arm/Microsoft.Network/publicIPPrefixes/readme.md b/arm/Microsoft.Network/publicIPPrefixes/readme.md index ab0e357f3b..cf4903b2a5 100644 --- a/arm/Microsoft.Network/publicIPPrefixes/readme.md +++ b/arm/Microsoft.Network/publicIPPrefixes/readme.md @@ -65,12 +65,12 @@ Tag names and tag values can be provided as needed. A tag can be left without a | Output Name | Type | Description | | :-- | :-- | :-- | -| `publicIpPrefixName` | string | The name of the public IP prefix | -| `publicIpPrefixResourceGroup` | string | The resource group the public IP prefix was deployed into | -| `publicIpPrefixResourceId` | string | The resource ID of the public IP prefix | +| `name` | string | The name of the public IP prefix | +| `resourceGroupName` | string | The resource group the public IP prefix was deployed into | +| `resourceId` | string | The resource ID of the public IP prefix | ## Template references - [Locks](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2017-04-01/locks) - [Publicipprefixes](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Network/2021-02-01/publicIPPrefixes) -- [Roleassignments](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2021-04-01-preview/roleAssignments) +- [Roleassignments](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/roleAssignments) diff --git a/arm/Microsoft.Network/routeTables/deploy.bicep b/arm/Microsoft.Network/routeTables/deploy.bicep index 96aa332be0..62b04284b2 100644 --- a/arm/Microsoft.Network/routeTables/deploy.bicep +++ b/arm/Microsoft.Network/routeTables/deploy.bicep @@ -61,10 +61,10 @@ module routeTable_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, index) }] @description('The resource group the route table was deployed into') -output routeTableResourceGroup string = resourceGroup().name +output resourceGroupName string = resourceGroup().name @description('The name of the route table') -output routeTableName string = routeTable.name +output name string = routeTable.name @description('The resource ID of the route table') -output routeTableResourceId string = routeTable.id +output resourceId string = routeTable.id diff --git a/arm/Microsoft.Network/routeTables/readme.md b/arm/Microsoft.Network/routeTables/readme.md index 10c50ebe95..47815bf409 100644 --- a/arm/Microsoft.Network/routeTables/readme.md +++ b/arm/Microsoft.Network/routeTables/readme.md @@ -108,12 +108,12 @@ Tag names and tag values can be provided as needed. A tag can be left without a | Output Name | Type | Description | | :-- | :-- | :-- | -| `routeTableName` | string | The name of the route table | -| `routeTableResourceGroup` | string | The resource group the route table was deployed into | -| `routeTableResourceId` | string | The resource ID of the route table | +| `name` | string | The name of the route table | +| `resourceGroupName` | string | The resource group the route table was deployed into | +| `resourceId` | string | The resource ID of the route table | ## Template references - [Locks](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2017-04-01/locks) -- [Roleassignments](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2021-04-01-preview/roleAssignments) +- [Roleassignments](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/roleAssignments) - [Routetables](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Network/2021-02-01/routeTables) diff --git a/arm/Microsoft.Network/trafficmanagerprofiles/deploy.bicep b/arm/Microsoft.Network/trafficmanagerprofiles/deploy.bicep index 2e45ec0ef1..f74ba3d9f6 100644 --- a/arm/Microsoft.Network/trafficmanagerprofiles/deploy.bicep +++ b/arm/Microsoft.Network/trafficmanagerprofiles/deploy.bicep @@ -170,10 +170,10 @@ module trafficManagerProfile_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignm }] @description('The resource ID of the traffix manager') -output trafficManagerResourceId string = trafficManagerProfile.id +output resourceId string = trafficManagerProfile.id @description('The resource group the traffix manager was deployed into') -output trafficManagerResourceGroup string = resourceGroup().name +output resourceGroupName string = resourceGroup().name @description('The name of the traffix manager was deployed into') -output trafficManagerName string = trafficManagerProfile.name +output name string = trafficManagerProfile.name diff --git a/arm/Microsoft.Network/trafficmanagerprofiles/readme.md b/arm/Microsoft.Network/trafficmanagerprofiles/readme.md index 8843e9d0cd..d0d27ac79f 100644 --- a/arm/Microsoft.Network/trafficmanagerprofiles/readme.md +++ b/arm/Microsoft.Network/trafficmanagerprofiles/readme.md @@ -117,13 +117,13 @@ Tag names and tag values can be provided as needed. A tag can be left without a | Output Name | Type | Description | | :-- | :-- | :-- | -| `trafficManagerName` | string | The name of the traffix manager was deployed into | -| `trafficManagerResourceGroup` | string | The resource group the traffix manager was deployed into | -| `trafficManagerResourceId` | string | The resource ID of the traffix manager | +| `name` | string | The name of the traffix manager was deployed into | +| `resourceGroupName` | string | The resource group the traffix manager was deployed into | +| `resourceId` | string | The resource ID of the traffix manager | ## Template references - [Diagnosticsettings](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Insights/2021-05-01-preview/diagnosticSettings) - [Locks](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2017-04-01/locks) -- [Roleassignments](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2021-04-01-preview/roleAssignments) +- [Roleassignments](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/roleAssignments) - [Trafficmanagerprofiles](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Network/2018-08-01/trafficmanagerprofiles) diff --git a/arm/Microsoft.Network/virtualNetworkGateways/deploy.bicep b/arm/Microsoft.Network/virtualNetworkGateways/deploy.bicep index 88ae4eaea8..381f6b946b 100644 --- a/arm/Microsoft.Network/virtualNetworkGateways/deploy.bicep +++ b/arm/Microsoft.Network/virtualNetworkGateways/deploy.bicep @@ -179,11 +179,11 @@ var zoneRedundantSkus = [ var gatewayPipSku = contains(zoneRedundantSkus, virtualNetworkGatewaySku) ? 'Standard' : 'Basic' var gatewayPipAllocationMethod = contains(zoneRedundantSkus, virtualNetworkGatewaySku) ? 'Static' : 'Dynamic' var gatewaySubnetId = '${vNetResourceId}/subnets/GatewaySubnet' -var activeActive_var = (virtualNetworkGatewayType == 'ExpressRoute') ? bool('false') : activeActive +var activeActive_var = virtualNetworkGatewayType == 'ExpressRoute' ? false : activeActive // Public IP variables -var gatewayPipName1 = (length(gatewayPipName) == 0) ? '${name}-pip1' : gatewayPipName[0] -var gatewayPipName2 = activeActive_var ? ((length(gatewayPipName) == 1) ? '${name}-pip2' : gatewayPipName[1]) : '' +var gatewayPipName1 = length(gatewayPipName) == 0 ? '${name}-pip1' : gatewayPipName[0] +var gatewayPipName2 = activeActive_var ? (length(gatewayPipName) == 1 ? '${name}-pip2' : gatewayPipName[1]) : '' var gatewayMultiPipArray = [ gatewayPipName1 @@ -192,12 +192,12 @@ var gatewayMultiPipArray = [ var gatewaySinglePipArray = [ gatewayPipName1 ] -var virtualGatewayPipName_var = (!empty(gatewayPipName2)) ? gatewayMultiPipArray : gatewaySinglePipArray -var gatewayPipId1 = resourceId('Microsoft.Network/publicIPAddresses', gatewayPipName1) -var gatewayPipId2 = activeActive_var ? resourceId('Microsoft.Network/publicIPAddresses', gatewayPipName2) : resourceId('Microsoft.Network/publicIPAddresses', gatewayPipName1) +var virtualGatewayPipName_var = !empty(gatewayPipName2) ? gatewayMultiPipArray : gatewaySinglePipArray +var gatewayPipId1 = az.resourceId('Microsoft.Network/publicIPAddresses', gatewayPipName1) +var gatewayPipId2 = activeActive_var ? az.resourceId('Microsoft.Network/publicIPAddresses', gatewayPipName2) : az.resourceId('Microsoft.Network/publicIPAddresses', gatewayPipName1) -var enableBgp_var = (virtualNetworkGatewayType == 'ExpressRoute') ? bool('false') : enableBgp -var vpnType_var = (virtualNetworkGatewayType == 'ExpressRoute') ? 'PolicyBased' : vpnType +var enableBgp_var = virtualNetworkGatewayType == 'ExpressRoute' ? false : enableBgp +var vpnType_var = virtualNetworkGatewayType == 'ExpressRoute' ? 'PolicyBased' : vpnType var bgpSettings = { asn: asn } @@ -266,8 +266,8 @@ var vpnClientConfiguration = { vpnClientAddressPoolPrefix ] } - vpnClientRootCertificates: empty(clientRootCertData) ? null : vpnClientRootCertificates - vpnClientRevokedCertificates: empty(clientRevokedCertThumbprint) ? null : vpmClientRevokedCertificates + vpnClientRootCertificates: !empty(clientRootCertData) ? vpnClientRootCertificates : null + vpnClientRevokedCertificates: !empty(clientRevokedCertThumbprint) ? vpmClientRevokedCertificates : null } module pid_cuaId '.bicep/nested_cuaId.bicep' = if (!empty(cuaId)) { @@ -288,7 +288,9 @@ resource virtualGatewayPublicIP 'Microsoft.Network/publicIPAddresses@2021-02-01' properties: { publicIPAllocationMethod: gatewayPipAllocationMethod publicIPPrefix: !empty(publicIPPrefixResourceId) ? publicIPPrefix : null - dnsSettings: length(virtualGatewayPipName_var) == length(domainNameLabel) ? json('{"domainNameLabel": "${domainNameLabel[index]}"}') : null + dnsSettings: length(virtualGatewayPipName_var) == length(domainNameLabel) ? { + domainNameLabel: domainNameLabel[index] + } : null } zones: contains(zoneRedundantSkus, virtualNetworkGatewaySku) ? publicIpZones : null }] @@ -334,7 +336,7 @@ resource virtualNetworkGateway 'Microsoft.Network/virtualNetworkGateways@2021-02 } gatewayType: virtualNetworkGatewayType vpnType: vpnType_var - vpnClientConfiguration: empty(vpnClientAddressPoolPrefix) ? null : vpnClientConfiguration + vpnClientConfiguration: !empty(vpnClientAddressPoolPrefix) ? vpnClientConfiguration : null } dependsOn: [ virtualGatewayPublicIP @@ -373,13 +375,13 @@ module virtualNetworkGateway_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignm }] @description('The resource group the virtual network gateway was deployed') -output virtualNetworkGatewayResourceGroup string = resourceGroup().name +output resourceGroupName string = resourceGroup().name @description('The name of the virtual network gateway') -output virtualNetworkGatewayName string = virtualNetworkGateway.name +output name string = virtualNetworkGateway.name @description('The resource ID of the virtual network gateway') -output virtualNetworkGatewayResourceId string = virtualNetworkGateway.id +output resourceId string = virtualNetworkGateway.id @description('Shows if the virtual network gateway is configured in active-active mode') output activeActive bool = virtualNetworkGateway.properties.activeActive diff --git a/arm/Microsoft.Network/virtualNetworkGateways/readme.md b/arm/Microsoft.Network/virtualNetworkGateways/readme.md index 8a1f1d7e4f..1e0ed25450 100644 --- a/arm/Microsoft.Network/virtualNetworkGateways/readme.md +++ b/arm/Microsoft.Network/virtualNetworkGateways/readme.md @@ -120,14 +120,14 @@ Tag names and tag values can be provided as needed. A tag can be left without a | Output Name | Type | Description | | :-- | :-- | :-- | | `activeActive` | bool | Shows if the virtual network gateway is configured in active-active mode | -| `virtualNetworkGatewayName` | string | The name of the virtual network gateway | -| `virtualNetworkGatewayResourceGroup` | string | The resource group the virtual network gateway was deployed | -| `virtualNetworkGatewayResourceId` | string | The resource ID of the virtual network gateway | +| `name` | string | The name of the virtual network gateway | +| `resourceGroupName` | string | The resource group the virtual network gateway was deployed | +| `resourceId` | string | The resource ID of the virtual network gateway | ## Template references - [Diagnosticsettings](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Insights/2021-05-01-preview/diagnosticSettings) - [Locks](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2017-04-01/locks) - [Publicipaddresses](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Network/2021-02-01/publicIPAddresses) -- [Roleassignments](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2021-04-01-preview/roleAssignments) +- [Roleassignments](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/roleAssignments) - [Virtualnetworkgateways](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Network/2021-02-01/virtualNetworkGateways) diff --git a/arm/Microsoft.Network/virtualNetworks/deploy.bicep b/arm/Microsoft.Network/virtualNetworks/deploy.bicep index a8393f5d85..16c072d5ae 100644 --- a/arm/Microsoft.Network/virtualNetworks/deploy.bicep +++ b/arm/Microsoft.Network/virtualNetworks/deploy.bicep @@ -215,16 +215,16 @@ module virtualNetwork_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, in }] @description('The resource group the virtual network was deployed into') -output virtualNetworkResourceGroup string = resourceGroup().name +output resourceGroupName string = resourceGroup().name @description('The resource ID of the virtual network') -output virtualNetworkResourceId string = virtualNetwork.id +output resourceId string = virtualNetwork.id @description('The name of the virtual network') -output virtualNetworkName string = virtualNetwork.name +output name string = virtualNetwork.name @description('The names of the deployed subnets') output subnetNames array = [for subnet in subnets: subnet.name] @description('The resource IDs of the deployed subnets') -output subnetResourceIds array = [for subnet in subnets: resourceId('Microsoft.Network/virtualNetworks/subnets', name, subnet.name)] +output subnetResourceIds array = [for subnet in subnets: az.resourceId('Microsoft.Network/virtualNetworks/subnets', name, subnet.name)] diff --git a/arm/Microsoft.Network/virtualNetworks/readme.md b/arm/Microsoft.Network/virtualNetworks/readme.md index 1631ef1365..d82bb1e069 100644 --- a/arm/Microsoft.Network/virtualNetworks/readme.md +++ b/arm/Microsoft.Network/virtualNetworks/readme.md @@ -111,17 +111,17 @@ The network security group and route table resources must reside in the same res | Output Name | Type | Description | | :-- | :-- | :-- | +| `name` | string | The name of the virtual network | +| `resourceGroupName` | string | The resource group the virtual network was deployed into | +| `resourceId` | string | The resource ID of the virtual network | | `subnetNames` | array | The names of the deployed subnets | | `subnetResourceIds` | array | The resource IDs of the deployed subnets | -| `virtualNetworkName` | string | The name of the virtual network | -| `virtualNetworkResourceGroup` | string | The resource group the virtual network was deployed into | -| `virtualNetworkResourceId` | string | The resource ID of the virtual network | ## Template references - [Diagnosticsettings](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Insights/2021-05-01-preview/diagnosticSettings) - [Locks](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2017-04-01/locks) -- [Roleassignments](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2021-04-01-preview/roleAssignments) +- [Roleassignments](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/roleAssignments) - [Virtualnetworks](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Network/2021-03-01/virtualNetworks) - [Virtualnetworks/Subnets](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Network/2021-03-01/virtualNetworks/subnets) - [Virtualnetworks/Virtualnetworkpeerings](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Network/2021-02-01/virtualNetworks/virtualNetworkPeerings) diff --git a/arm/Microsoft.Network/virtualNetworks/subnets/deploy.bicep b/arm/Microsoft.Network/virtualNetworks/subnets/deploy.bicep index 55668a3878..d6c0d37c8f 100644 --- a/arm/Microsoft.Network/virtualNetworks/subnets/deploy.bicep +++ b/arm/Microsoft.Network/virtualNetworks/subnets/deploy.bicep @@ -109,13 +109,13 @@ resource subnet 'Microsoft.Network/virtualNetworks/subnets@2021-03-01' = { } @description('The resource group the virtual network peering was deployed into') -output subnetResourceGroup string = resourceGroup().name +output resourceGroupName string = resourceGroup().name @description('The name of the virtual network peering') -output subnetName string = subnet.name +output name string = subnet.name @description('The resource ID of the virtual network peering') -output subnetResourceId string = subnet.id +output resourceId string = subnet.id @description('The address prefix for the subnet') output subnetAddressPrefix string = subnet.properties.addressPrefix diff --git a/arm/Microsoft.Network/virtualNetworks/subnets/readme.md b/arm/Microsoft.Network/virtualNetworks/subnets/readme.md index 5664403ec2..15167901fa 100644 --- a/arm/Microsoft.Network/virtualNetworks/subnets/readme.md +++ b/arm/Microsoft.Network/virtualNetworks/subnets/readme.md @@ -62,11 +62,11 @@ The `privateEndpointNetworkPolicies` property must be set to disabled for subnet | Output Name | Type | Description | | :-- | :-- | :-- | +| `name` | string | The name of the virtual network peering | +| `resourceGroupName` | string | The resource group the virtual network peering was deployed into | +| `resourceId` | string | The resource ID of the virtual network peering | | `subnetAddressPrefix` | string | The address prefix for the subnet | | `subnetAddressPrefixes` | array | List of address prefixes for the subnet | -| `subnetName` | string | The name of the virtual network peering | -| `subnetResourceGroup` | string | The resource group the virtual network peering was deployed into | -| `subnetResourceId` | string | The resource ID of the virtual network peering | ## Template references diff --git a/arm/Microsoft.Network/virtualNetworks/virtualNetworkPeerings/deploy.bicep b/arm/Microsoft.Network/virtualNetworks/virtualNetworkPeerings/deploy.bicep index 733ce6c1bc..dab2bbe153 100644 --- a/arm/Microsoft.Network/virtualNetworks/virtualNetworkPeerings/deploy.bicep +++ b/arm/Microsoft.Network/virtualNetworks/virtualNetworkPeerings/deploy.bicep @@ -50,10 +50,10 @@ resource virtualNetworkPeering 'Microsoft.Network/virtualNetworks/virtualNetwork } @description('The resource group the virtual network peering was deployed into') -output virtualNetworkPeeringResourceGroup string = resourceGroup().name +output resourceGroupName string = resourceGroup().name @description('The name of the virtual network peering') -output virtualNetworkPeeringName string = virtualNetworkPeering.name +output name string = virtualNetworkPeering.name @description('The resource ID of the virtual network peering') -output virtualNetworkPeeringResourceId string = virtualNetworkPeering.id +output resourceId string = virtualNetworkPeering.id diff --git a/arm/Microsoft.Network/virtualNetworks/virtualNetworkPeerings/readme.md b/arm/Microsoft.Network/virtualNetworks/virtualNetworkPeerings/readme.md index 15b0fbd9c0..0ab6d795a7 100644 --- a/arm/Microsoft.Network/virtualNetworks/virtualNetworkPeerings/readme.md +++ b/arm/Microsoft.Network/virtualNetworks/virtualNetworkPeerings/readme.md @@ -33,9 +33,9 @@ The following resources are required to be able to deploy this resource. | Output Name | Type | Description | | :-- | :-- | :-- | -| `virtualNetworkPeeringName` | string | The name of the virtual network peering | -| `virtualNetworkPeeringResourceGroup` | string | The resource group the virtual network peering was deployed into | -| `virtualNetworkPeeringResourceId` | string | The resource ID of the virtual network peering | +| `name` | string | The name of the virtual network peering | +| `resourceGroupName` | string | The resource group the virtual network peering was deployed into | +| `resourceId` | string | The resource ID of the virtual network peering | ## Template references diff --git a/arm/Microsoft.Network/virtualWans/deploy.bicep b/arm/Microsoft.Network/virtualWans/deploy.bicep index f29b91a82a..968b410208 100644 --- a/arm/Microsoft.Network/virtualWans/deploy.bicep +++ b/arm/Microsoft.Network/virtualWans/deploy.bicep @@ -180,10 +180,10 @@ module virtualWan_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, index) }] @description('The name of the virtual WAN') -output virtualWanName string = virtualWan.name +output name string = virtualWan.name @description('The resource ID of the virtual WAN') -output virtualWanResourceId string = virtualWan.id +output resourceId string = virtualWan.id @description('The resource group the virtual WAN was deployed into') -output virtualWanResourceGroup string = resourceGroup().name +output resourceGroupName string = resourceGroup().name diff --git a/arm/Microsoft.Network/virtualWans/readme.md b/arm/Microsoft.Network/virtualWans/readme.md index 57e87d1b73..24278f39c3 100644 --- a/arm/Microsoft.Network/virtualWans/readme.md +++ b/arm/Microsoft.Network/virtualWans/readme.md @@ -78,14 +78,14 @@ Tag names and tag values can be provided as needed. A tag can be left without a | Output Name | Type | Description | | :-- | :-- | :-- | -| `virtualWanName` | string | The name of the virtual WAN | -| `virtualWanResourceGroup` | string | The resource group the virtual WAN was deployed into | -| `virtualWanResourceId` | string | The resource ID of the virtual WAN | +| `name` | string | The name of the virtual WAN | +| `resourceGroupName` | string | The resource group the virtual WAN was deployed into | +| `resourceId` | string | The resource ID of the virtual WAN | ## Template references - [Locks](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2017-04-01/locks) -- [Roleassignments](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/2021-04-01-preview/roleAssignments) +- [Roleassignments](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Authorization/roleAssignments) - [Virtualhubs](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Network/2021-03-01/virtualHubs) - [Virtualwans](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Network/2021-03-01/virtualWans) - [Vpngateways](https://docs.microsoft.com/en-us/azure/templates/Microsoft.Network/2021-03-01/vpnGateways)