Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ param location string = deployment().location
@sys.description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).')
param enableDefaultTelemetry bool = true

var identity_var = identity == 'SystemAssigned' ? {
var identityVar = identity == 'SystemAssigned' ? {
type: identity
} : identity == 'UserAssigned' ? {
type: identity
Expand Down Expand Up @@ -91,7 +91,7 @@ resource policyAssignment 'Microsoft.Authorization/policyAssignments@2021-06-01'
enforcementMode: enforcementMode
notScopes: !empty(notScopes) ? notScopes : []
}
identity: identity_var
identity: identityVar
}

resource roleAssignment 'Microsoft.Authorization/roleAssignments@2022-04-01' = [for roleDefinitionId in roleDefinitionIds: if (!empty(roleDefinitionIds) && identity == 'SystemAssigned') {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (ena
}
}

var identity_var = identity == 'SystemAssigned' ? {
var identityVar = identity == 'SystemAssigned' ? {
type: identity
} : identity == 'UserAssigned' ? {
type: identity
Expand All @@ -93,7 +93,7 @@ resource policyAssignment 'Microsoft.Authorization/policyAssignments@2021-06-01'
enforcementMode: enforcementMode
notScopes: !empty(notScopes) ? notScopes : []
}
identity: identity_var
identity: identityVar
}

resource roleAssignment 'Microsoft.Authorization/roleAssignments@2022-04-01' = [for roleDefinitionId in roleDefinitionIds: if (!empty(roleDefinitionIds) && identity == 'SystemAssigned') {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ param subscriptionId string = subscription().subscriptionId
@sys.description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).')
param enableDefaultTelemetry bool = true

var identity_var = identity == 'SystemAssigned' ? {
var identityVar = identity == 'SystemAssigned' ? {
type: identity
} : identity == 'UserAssigned' ? {
type: identity
Expand Down Expand Up @@ -91,7 +91,7 @@ resource policyAssignment 'Microsoft.Authorization/policyAssignments@2021-06-01'
enforcementMode: enforcementMode
notScopes: !empty(notScopes) ? notScopes : []
}
identity: identity_var
identity: identityVar
}

resource roleAssignment 'Microsoft.Authorization/roleAssignments@2022-04-01' = [for roleDefinitionId in roleDefinitionIds: if (!empty(roleDefinitionIds) && identity == 'SystemAssigned') {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ param enableDefaultTelemetry bool = true
@sys.description('Optional. Location deployment metadata.')
param location string = deployment().location

var builtInRoleNames_var = {
var builtInRoleNamesVar = {
'AcrPush': '/providers/Microsoft.Authorization/roleDefinitions/8311e382-0749-4cb8-b61a-304f252e45ec'
'API Management Service Contributor': '/providers/Microsoft.Authorization/roleDefinitions/312a565d-c81f-4fd8-895a-4e21e48d571c'
'AcrPull': '/providers/Microsoft.Authorization/roleDefinitions/7f951dda-4ed3-4680-a7ca-43fe172d538d'
Expand Down Expand Up @@ -325,7 +325,7 @@ var builtInRoleNames_var = {
'Azure Maps Contributor': '/providers/Microsoft.Authorization/roleDefinitions/dba33070-676a-4fb0-87fa-064dc56ff7fb'
}

var roleDefinitionId_var = (contains(builtInRoleNames_var, roleDefinitionIdOrName) ? builtInRoleNames_var[roleDefinitionIdOrName] : roleDefinitionIdOrName)
var roleDefinitionIdVar = (contains(builtInRoleNamesVar, roleDefinitionIdOrName) ? builtInRoleNamesVar[roleDefinitionIdOrName] : roleDefinitionIdOrName)

resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) {
name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name, location)}'
Expand All @@ -341,9 +341,9 @@ resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (ena
}

resource roleAssignment 'Microsoft.Authorization/roleAssignments@2022-04-01' = {
name: guid(managementGroupId, roleDefinitionId_var, principalId)
name: guid(managementGroupId, roleDefinitionIdVar, principalId)
properties: {
roleDefinitionId: roleDefinitionId_var
roleDefinitionId: roleDefinitionIdVar
principalId: principalId
description: !empty(description) ? description : null
principalType: !empty(principalType) ? any(principalType) : null
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ param principalType string = ''
@sys.description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).')
param enableDefaultTelemetry bool = true

var builtInRoleNames_var = {
var builtInRoleNamesVar = {
'AcrPush': '/providers/Microsoft.Authorization/roleDefinitions/8311e382-0749-4cb8-b61a-304f252e45ec'
'API Management Service Contributor': '/providers/Microsoft.Authorization/roleDefinitions/312a565d-c81f-4fd8-895a-4e21e48d571c'
'AcrPull': '/providers/Microsoft.Authorization/roleDefinitions/7f951dda-4ed3-4680-a7ca-43fe172d538d'
Expand Down Expand Up @@ -325,7 +325,7 @@ var builtInRoleNames_var = {
'Azure Maps Contributor': '/providers/Microsoft.Authorization/roleDefinitions/dba33070-676a-4fb0-87fa-064dc56ff7fb'
}

var roleDefinitionId_var = (contains(builtInRoleNames_var, roleDefinitionIdOrName) ? builtInRoleNames_var[roleDefinitionIdOrName] : roleDefinitionIdOrName)
var roleDefinitionIdVar = (contains(builtInRoleNamesVar, roleDefinitionIdOrName) ? builtInRoleNamesVar[roleDefinitionIdOrName] : roleDefinitionIdOrName)

resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) {
name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}'
Expand All @@ -340,9 +340,9 @@ resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (ena
}

resource roleAssignment 'Microsoft.Authorization/roleAssignments@2022-04-01' = {
name: guid(subscriptionId, resourceGroupName, roleDefinitionId_var, principalId)
name: guid(subscriptionId, resourceGroupName, roleDefinitionIdVar, principalId)
properties: {
roleDefinitionId: roleDefinitionId_var
roleDefinitionId: roleDefinitionIdVar
principalId: principalId
description: !empty(description) ? description : null
principalType: !empty(principalType) ? any(principalType) : null
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ param principalType string = ''
@sys.description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).')
param enableDefaultTelemetry bool = true

var builtInRoleNames_var = {
var builtInRoleNamesVar = {
'AcrPush': '/providers/Microsoft.Authorization/roleDefinitions/8311e382-0749-4cb8-b61a-304f252e45ec'
'API Management Service Contributor': '/providers/Microsoft.Authorization/roleDefinitions/312a565d-c81f-4fd8-895a-4e21e48d571c'
'AcrPull': '/providers/Microsoft.Authorization/roleDefinitions/7f951dda-4ed3-4680-a7ca-43fe172d538d'
Expand Down Expand Up @@ -338,12 +338,12 @@ resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (ena
}
}

var roleDefinitionId_var = (contains(builtInRoleNames_var, roleDefinitionIdOrName) ? builtInRoleNames_var[roleDefinitionIdOrName] : roleDefinitionIdOrName)
var roleDefinitionIdVar = (contains(builtInRoleNamesVar, roleDefinitionIdOrName) ? builtInRoleNamesVar[roleDefinitionIdOrName] : roleDefinitionIdOrName)

resource roleAssignment 'Microsoft.Authorization/roleAssignments@2022-04-01' = {
name: guid(subscriptionId, roleDefinitionId_var, principalId)
name: guid(subscriptionId, roleDefinitionIdVar, principalId)
properties: {
roleDefinitionId: roleDefinitionId_var
roleDefinitionId: roleDefinitionIdVar
principalId: principalId
description: !empty(description) ? description : null
principalType: !empty(principalType) ? any(principalType) : null
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ param baseTime string = utcNow('u')
@description('Optional. Enable telemetry via the Customer Usage Attribution ID (GUID).')
param enableDefaultTelemetry bool = true

var updateClassifications_var = replace(replace(replace(replace(string(updateClassifications), ',', ', '), '[', ''), ']', ''), '"', '')
var updateClassificationsVar = replace(replace(replace(replace(string(updateClassifications), ',', ', '), '[', ''), ']', ''), '"', '')

resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) {
name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name)}'
Expand Down Expand Up @@ -208,13 +208,13 @@ resource softwareUpdateConfiguration 'Microsoft.Automation/automationAccounts/so
linux: ((operatingSystem == 'Linux') ? {
excludedPackageNameMasks: excludeUpdates
includedPackageNameMasks: includeUpdates
includedPackageClassifications: updateClassifications_var
includedPackageClassifications: updateClassificationsVar
rebootSetting: rebootSetting
} : null)
windows: ((operatingSystem == 'Windows') ? {
excludedKbNumbers: excludeUpdates
includedKbNumbers: includeUpdates
includedUpdateClassifications: updateClassifications_var
includedUpdateClassifications: updateClassificationsVar
rebootSetting: rebootSetting
} : null)
targets: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (ena
}
}

var managedVirtualNetwork_var = {
var managedVirtualNetworkVar = {
referenceName: type == 'Managed' ? managedVirtualNetworkName : null
type: type == 'Managed' ? 'ManagedVirtualNetworkReference' : null
}
Expand All @@ -46,7 +46,7 @@ resource integrationRuntime 'Microsoft.DataFactory/factories/integrationRuntimes
parent: dataFactory
properties: type == 'Managed' ? {
type: type
managedVirtualNetwork: managedVirtualNetwork_var
managedVirtualNetwork: managedVirtualNetworkVar
typeProperties: typeProperties
} : {
type: type
Expand Down
4 changes: 2 additions & 2 deletions modules/Microsoft.Databricks/workspaces/deploy.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ var diagnosticsLogs = [for category in diagnosticLogCategoriesToEnable: {
}]

var managedResourceGroupName = '${name}-rg'
var managedResourceGroupId_var = '${subscription().id}/resourceGroups/${managedResourceGroupName}'
var managedResourceGroupIdVar = '${subscription().id}/resourceGroups/${managedResourceGroupName}'

resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) {
name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name, location)}'
Expand All @@ -113,7 +113,7 @@ resource workspace 'Microsoft.Databricks/workspaces@2018-04-01' = {
name: pricingTier
}
properties: {
managedResourceGroupId: (empty(managedResourceGroupId) ? managedResourceGroupId_var : managedResourceGroupId)
managedResourceGroupId: (empty(managedResourceGroupId) ? managedResourceGroupIdVar : managedResourceGroupId)
parameters: workspaceParameters
}
}
Expand Down
4 changes: 2 additions & 2 deletions modules/Microsoft.EventHub/namespaces/deploy.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ param diagnosticMetricsToEnable array = [
'AllMetrics'
]

var maximumThroughputUnits_var = !isAutoInflateEnabled ? 0 : maximumThroughputUnits
var maximumThroughputUnitsVar = !isAutoInflateEnabled ? 0 : maximumThroughputUnits

@description('Optional. The name of the diagnostic setting, if deployed.')
param diagnosticSettingsName string = '${name}-diagnosticSettings'
Expand Down Expand Up @@ -182,7 +182,7 @@ resource eventHubNamespace 'Microsoft.EventHub/namespaces@2021-11-01' = {
properties: {
zoneRedundant: zoneRedundant
isAutoInflateEnabled: isAutoInflateEnabled
maximumThroughputUnits: maximumThroughputUnits_var
maximumThroughputUnits: maximumThroughputUnitsVar
}
}

Expand Down
8 changes: 4 additions & 4 deletions modules/Microsoft.Network/azureFirewalls/deploy.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ param diagnosticMetricsToEnable array = [
@description('Optional. The name of the diagnostic setting, if deployed.')
param diagnosticSettingsName string = '${name}-diagnosticSettings'

var additionalPublicIpConfigurations_var = [for ipConfiguration in additionalPublicIpConfigurations: {
var additionalPublicIpConfigurationsVar = [for ipConfiguration in additionalPublicIpConfigurations: {
name: ipConfiguration.name
properties: {
publicIPAddress: contains(ipConfiguration, 'publicIPAddressResourceId') ? {
Expand All @@ -132,7 +132,7 @@ var additionalPublicIpConfigurations_var = [for ipConfiguration in additionalPub
// 2. Use new public ip created in this module
// 3. Do not use a public ip if isCreateDefaultPublicIP is false

var subnet_var = {
var subnetVar = {
subnet: {
id: '${vNetId}/subnets/AzureFirewallSubnet' // The subnet name must be AzureFirewallSubnet
}
Expand All @@ -152,9 +152,9 @@ var ipConfigurations = concat([
{
name: !empty(azureFirewallSubnetPublicIpId) ? last(split(azureFirewallSubnetPublicIpId, '/')) : publicIPAddress.outputs.name
//Use existing public ip, new public ip created in this module, or none if isCreateDefaultPublicIP is false
properties: union(subnet_var, !empty(azureFirewallSubnetPublicIpId) ? existingPip : {}, (isCreateDefaultPublicIP ? newPip : {}))
properties: union(subnetVar, !empty(azureFirewallSubnetPublicIpId) ? existingPip : {}, (isCreateDefaultPublicIP ? newPip : {}))
}
], additionalPublicIpConfigurations_var)
], additionalPublicIpConfigurationsVar)

// ----------------------------------------------------------------------------

Expand Down
14 changes: 7 additions & 7 deletions modules/Microsoft.Network/bastionHosts/deploy.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -94,14 +94,14 @@ var diagnosticsLogs = [for category in diagnosticLogCategoriesToEnable: {

var enableTunneling = skuType == 'Standard' ? true : null

var scaleUnits_var = skuType == 'Basic' ? 2 : scaleUnits
var scaleUnitsVar = skuType == 'Basic' ? 2 : scaleUnits

// ----------------------------------------------------------------------------
// Prep ipConfigurations object AzureBastionSubnet for different uses cases:
// 1. Use existing public ip
// 2. Use new public ip created in this module
// 3. Do not use a public ip if isCreateDefaultPublicIP is false
var subnet_var = {
var subnetVar = {
subnet: {
id: '${vNetId}/subnets/AzureBastionSubnet' // The subnet name must be AzureBastionSubnet
}
Expand All @@ -121,7 +121,7 @@ var ipConfigurations = [
{
name: 'IpConfAzureBastionSubnet'
//Use existing public ip, new public ip created in this module, or none if isCreateDefaultPublicIP is false
properties: union(subnet_var, !empty(azureBastionSubnetPublicIpId) ? existingPip : {}, (isCreateDefaultPublicIP ? newPip : {}))
properties: union(subnetVar, !empty(azureBastionSubnetPublicIpId) ? existingPip : {}, (isCreateDefaultPublicIP ? newPip : {}))
}
]

Expand Down Expand Up @@ -170,16 +170,16 @@ module publicIPAddress '../publicIPAddresses/deploy.bicep' = if (empty(azureBast
}
}

var bastionproperties_var = skuType == 'Standard' ? {
scaleUnits: scaleUnits_var
var bastionpropertiesVar = skuType == 'Standard' ? {
scaleUnits: scaleUnitsVar
ipConfigurations: ipConfigurations
enableTunneling: enableTunneling
disableCopyPaste: disableCopyPaste
enableFileCopy: enableFileCopy
enableIpConnect: enableIpConnect
enableShareableLink: enableShareableLink
} : {
scaleUnits: scaleUnits_var
scaleUnits: scaleUnitsVar
ipConfigurations: ipConfigurations
}

Expand All @@ -190,7 +190,7 @@ resource azureBastion 'Microsoft.Network/bastionHosts@2022-01-01' = {
sku: {
name: skuType
}
properties: bastionproperties_var
properties: bastionpropertiesVar
}

resource azureBastion_lock 'Microsoft.Authorization/locks@2017-04-01' = if (!empty(lock)) {
Expand Down
4 changes: 2 additions & 2 deletions modules/Microsoft.Network/connections/deploy.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ param peer object = {}
@description('Optional. The local network gateway. Used for connection type [IPsec].')
param localNetworkGateway2 object = {}

var customIPSecPolicy_var = [
var customIPSecPolicyVar = [
{
saLifeTimeSeconds: customIPSecPolicy.saLifeTimeSeconds
saDataSizeKilobytes: customIPSecPolicy.saDataSizeKilobytes
Expand Down Expand Up @@ -100,7 +100,7 @@ resource connection 'Microsoft.Network/connections@2021-08-01' = {
peer: virtualNetworkGatewayConnectionType == 'ExpressRoute' ? peer : null
sharedKey: virtualNetworkGatewayConnectionType != 'ExpressRoute' ? vpnSharedKey : null
usePolicyBasedTrafficSelectors: usePolicyBasedTrafficSelectors
ipsecPolicies: !empty(customIPSecPolicy.ipsecEncryption) ? customIPSecPolicy_var : customIPSecPolicy.ipsecEncryption
ipsecPolicies: !empty(customIPSecPolicy.ipsecEncryption) ? customIPSecPolicyVar : customIPSecPolicy.ipsecEncryption
routingWeight: routingWeight != -1 ? routingWeight : null
enableBgp: enableBgp
}
Expand Down
16 changes: 8 additions & 8 deletions modules/Microsoft.Network/loadBalancers/deploy.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ param inboundNatRules array = []
@description('Optional. The outbound rules.')
param outboundRules array = []

var frontendIPConfigurations_var = [for (frontendIPConfiguration, index) in frontendIPConfigurations: {
var frontendIPConfigurationsVar = [for (frontendIPConfiguration, index) in frontendIPConfigurations: {
name: frontendIPConfiguration.name
properties: {
subnet: contains(frontendIPConfiguration, 'subnetId') && !empty(frontendIPConfiguration.subnetId) ? {
Expand All @@ -85,7 +85,7 @@ var frontendIPConfigurations_var = [for (frontendIPConfiguration, index) in fron
}
}]

var loadBalancingRules_var = [for loadBalancingRule in loadBalancingRules: {
var loadBalancingRulesVar = [for loadBalancingRule in loadBalancingRules: {
name: loadBalancingRule.name
properties: {
backendAddressPool: {
Expand All @@ -108,7 +108,7 @@ var loadBalancingRules_var = [for loadBalancingRule in loadBalancingRules: {
}
}]

var outboundRules_var = [for outboundRule in outboundRules: {
var outboundRulesVar = [for outboundRule in outboundRules: {
name: outboundRule.name
properties: {
frontendIPConfigurations: [
Expand All @@ -126,7 +126,7 @@ var outboundRules_var = [for outboundRule in outboundRules: {
}
}]

var probes_var = [for probe in probes: {
var probesVar = [for probe in probes: {
name: probe.name
properties: {
protocol: contains(probe, 'protocol') ? probe.protocol : 'Tcp'
Expand Down Expand Up @@ -184,11 +184,11 @@ resource loadBalancer 'Microsoft.Network/loadBalancers@2021-08-01' = {
name: loadBalancerSku
}
properties: {
frontendIPConfigurations: frontendIPConfigurations_var
loadBalancingRules: loadBalancingRules_var
frontendIPConfigurations: frontendIPConfigurationsVar
loadBalancingRules: loadBalancingRulesVar
backendAddressPools: backendAddressPoolNames
outboundRules: outboundRules_var
probes: probes_var
outboundRules: outboundRulesVar
probes: probesVar
}
}

Expand Down
4 changes: 2 additions & 2 deletions modules/Microsoft.Network/natGateways/deploy.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ var diagnosticsMetrics = [for metric in diagnosticMetricsToEnable: {
}
}]

var natGatewayPipName_var = (empty(natGatewayPipName) ? '${name}-pip' : natGatewayPipName)
var natGatewayPipNameVar = (empty(natGatewayPipName) ? '${name}-pip' : natGatewayPipName)
var natGatewayPublicIPPrefix = {
id: natGatewayPublicIPPrefixId
}
Expand Down Expand Up @@ -136,7 +136,7 @@ resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (ena
// PUBLIC IP
// =========
resource publicIP 'Microsoft.Network/publicIPAddresses@2021-08-01' = if (natGatewayPublicIpAddress) {
name: natGatewayPipName_var
name: natGatewayPipNameVar
location: location
tags: tags
sku: {
Expand Down
Loading