Fixed tags

Azure · Dec 26, 2024 · a81f7f9 · a81f7f9
1 parent 566fe51
commit a81f7f9
Show file tree

Hide file tree

Showing 17 changed files with 21 additions and 24 deletions.
diff --git a/src/bicep/add-ons/esri-enterprise/modules/certificates.bicep b/src/bicep/add-ons/esri-enterprise/modules/certificates.bicep
@@ -22,7 +22,7 @@ resource customScriptExtension 'Microsoft.Compute/virtualMachines/extensions@202
   parent: virtualMachine
   name: 'CustomScriptExtension'
   location: location
-  tags: contains(tags, 'Microsoft.Compute/virtualMachines') ? tags['Microsoft.Compute/virtualMachines'] : {}
+  tags: tags[?'Microsoft.Compute/virtualMachines'] ?? {}
   properties: {
     publisher: 'Microsoft.Compute'
     type: 'CustomScriptExtension'

diff --git a/src/bicep/add-ons/esri-enterprise/modules/desiredStateConfiguration.bicep b/src/bicep/add-ons/esri-enterprise/modules/desiredStateConfiguration.bicep
@@ -61,7 +61,7 @@ resource extension_DSC 'Microsoft.Compute/virtualMachines/extensions@2018-10-01'
   parent: virtualMachine
   name: 'DSCConfiguration'
   location: location
-  tags: contains(tags, 'Microsoft.Compute/virtualMachines') ? tags['Microsoft.Compute/virtualMachines'] : {}
+  tags: tags[?'Microsoft.Compute/virtualMachines'] ?? {}
   properties: {
     autoUpgradeMinorVersion: true
     publisher: 'Microsoft.Powershell'

diff --git a/src/bicep/add-ons/esri-enterprise/modules/dscEsriDataStore.bicep b/src/bicep/add-ons/esri-enterprise/modules/dscEsriDataStore.bicep
@@ -49,7 +49,7 @@ resource dscEsriDataStore 'Microsoft.Compute/virtualMachines/extensions@2018-10-
   parent: virtualMachine
   name: 'DSCConfiguration'
   location: location
-  tags: contains(tags, 'Microsoft.Compute/virtualMachines') ? tags['Microsoft.Compute/virtualMachines'] : {}
+  tags: tags[?'Microsoft.Compute/virtualMachines'] ?? {}
   properties: {
     autoUpgradeMinorVersion: true
     publisher: 'Microsoft.Powershell'

diff --git a/src/bicep/add-ons/esri-enterprise/modules/dscEsriFileShare.bicep b/src/bicep/add-ons/esri-enterprise/modules/dscEsriFileShare.bicep
@@ -44,7 +44,7 @@ resource dscEsriFileShare 'Microsoft.Compute/virtualMachines/extensions@2018-06-
   parent: fileShareVirtualMachine
   name: 'DSCConfiguration'
   location: location
-  tags: contains(tags, 'Microsoft.Compute/virtualMachines') ? tags['Microsoft.Compute/virtualMachines'] : {}
+  tags: tags[?'Microsoft.Compute/virtualMachines'] ?? {}
   properties: {
     autoUpgradeMinorVersion: true
     publisher: 'Microsoft.Powershell'

diff --git a/src/bicep/add-ons/esri-enterprise/modules/dscEsriGraphDataStore.bicep b/src/bicep/add-ons/esri-enterprise/modules/dscEsriGraphDataStore.bicep
@@ -45,7 +45,7 @@ resource dscEsriGraphDataStore 'Microsoft.Compute/virtualMachines/extensions@201
   parent: virtualMachine
   name: 'DSCConfiguration'
   location: location
-  tags: contains(tags, 'Microsoft.Compute/virtualMachines') ? tags['Microsoft.Compute/virtualMachines'] : {}
+  tags: tags[?'Microsoft.Compute/virtualMachines'] ?? {}
   properties: {
     autoUpgradeMinorVersion: true
     publisher: 'Microsoft.Powershell'

diff --git a/src/bicep/add-ons/esri-enterprise/modules/dscEsriObjectDataStore.bicep b/src/bicep/add-ons/esri-enterprise/modules/dscEsriObjectDataStore.bicep
@@ -47,7 +47,7 @@ resource extension_DSC 'Microsoft.Compute/virtualMachines/extensions@2018-10-01'
   parent: virtualMachine
   name: 'DSCConfiguration'
   location: location
-  tags: contains(tags, 'Microsoft.Compute/virtualMachines') ? tags['Microsoft.Compute/virtualMachines'] : {}
+  tags: tags[?'Microsoft.Compute/virtualMachines'] ?? {}
   properties: {
     autoUpgradeMinorVersion: true
     publisher: 'Microsoft.Powershell'

diff --git a/src/bicep/add-ons/esri-enterprise/modules/dscEsriPortal.bicep b/src/bicep/add-ons/esri-enterprise/modules/dscEsriPortal.bicep
@@ -58,7 +58,7 @@ resource dscEsriPortal 'Microsoft.Compute/virtualMachines/extensions@2018-10-01'
   parent: virtualMachine
   name: 'DSCConfiguration'
   location: location
-  tags: contains(tags, 'Microsoft.Compute/virtualMachines') ? tags['Microsoft.Compute/virtualMachines'] : {}
+  tags: tags[?'Microsoft.Compute/virtualMachines'] ?? {}
   properties: {
     autoUpgradeMinorVersion: true
     publisher: 'Microsoft.Powershell'

diff --git a/src/bicep/add-ons/esri-enterprise/modules/dscEsriServer.bicep b/src/bicep/add-ons/esri-enterprise/modules/dscEsriServer.bicep
@@ -56,7 +56,7 @@ resource dscEsriServer 'Microsoft.Compute/virtualMachines/extensions@2018-10-01'
   parent: virtualMachine
   name: 'DSCConfiguration'
   location: location
-  tags: contains(tags, 'Microsoft.Compute/virtualMachines') ? tags['Microsoft.Compute/virtualMachines'] : {}
+  tags: tags[?'Microsoft.Compute/virtualMachines'] ?? {}
   properties: {
     autoUpgradeMinorVersion: true
     publisher: 'Microsoft.Powershell'

diff --git a/src/bicep/add-ons/esri-enterprise/modules/dscEsriSpatioTemporal.bicep b/src/bicep/add-ons/esri-enterprise/modules/dscEsriSpatioTemporal.bicep
@@ -45,7 +45,7 @@ resource extension_DSC 'Microsoft.Compute/virtualMachines/extensions@2018-10-01'
   parent: virtualMachine
   name: 'DSCConfiguration'
   location: location
-  tags: contains(tags, 'Microsoft.Compute/virtualMachines') ? tags['Microsoft.Compute/virtualMachines'] : {}
+  tags: tags[?'Microsoft.Compute/virtualMachines'] ?? {}
   properties: {
     autoUpgradeMinorVersion: true
     publisher: 'Microsoft.Powershell'

diff --git a/src/bicep/add-ons/esri-enterprise/modules/dscEsriTileCache.bicep b/src/bicep/add-ons/esri-enterprise/modules/dscEsriTileCache.bicep
@@ -49,7 +49,7 @@ resource extension_DSC 'Microsoft.Compute/virtualMachines/extensions@2018-10-01'
   parent: virtualMachine
   name: 'DSCConfiguration'
   location: location
-  tags: contains(tags, 'Microsoft.Compute/virtualMachines') ? tags['Microsoft.Compute/virtualMachines'] : {}
+  tags: tags[?'Microsoft.Compute/virtualMachines'] ?? {}
   properties: {
     autoUpgradeMinorVersion: true
     publisher: 'Microsoft.Powershell'

diff --git a/src/bicep/add-ons/esri-enterprise/modules/esriEnterpriseMultiTier.bicep b/src/bicep/add-ons/esri-enterprise/modules/esriEnterpriseMultiTier.bicep
@@ -334,7 +334,6 @@ module dscEsriGraphDataStoreServers 'dscEsriGraphDataStore.bicep' = [for (server
   dependsOn:[
     dscEsriServers
     dscEsriDataStoreServers
-    dscFileShare
     dscEsriObjectDataStoreServers
     dscEsriSpatioTemporalServers
     applicationGateway
@@ -370,7 +369,6 @@ module dscEsriObjectDataStoreServers 'dscEsriObjectDataStore.bicep' = [for (serv
   dependsOn:[
     dscEsriServers
     dscEsriDataStoreServers
-    dscFileShare
     applicationGateway
     // privateDnsZone
   ]

diff --git a/src/bicep/add-ons/esri-enterprise/modules/publicIpAddress.bicep b/src/bicep/add-ons/esri-enterprise/modules/publicIpAddress.bicep
@@ -7,7 +7,7 @@ param publicIpAllocationMethod string
 resource publicIp 'Microsoft.Network/publicIPAddresses@2023-04-01' = {
   name: publicIpAddressName
   location: location
-  tags: contains(tags, 'Microsoft.Network/publicIPAddresses') ? tags['Microsoft.Network/publicIPAddresses'] : {}
+  tags: tags[?'Microsoft.Network/publicIPAddresses'] ?? {}
   sku: {
     name: 'Standard'
     tier: 'Regional'

diff --git a/src/bicep/add-ons/esri-enterprise/modules/resourceGroup.bicep b/src/bicep/add-ons/esri-enterprise/modules/resourceGroup.bicep
@@ -7,7 +7,7 @@ param tags object = {}
 resource resourceGroup 'Microsoft.Resources/resourceGroups@2019-05-01' = {
   name: name
   location: location
-  tags: tags
+  tags: tags[?'Microsoft.Resources/resourceGroups'] ?? {}
 }
 
 output id string = resourceGroup.id

diff --git a/src/bicep/add-ons/esri-enterprise/modules/route-table.bicep b/src/bicep/add-ons/esri-enterprise/modules/route-table.bicep
@@ -14,8 +14,7 @@ param routeTableRouteNextHopType string = 'VirtualAppliance'
 resource routeTable 'Microsoft.Network/routeTables@2021-02-01' = {
   name: name
   location: location
-  tags: tags
-
+  tags: tags[?'Microsoft.Network/routeTables'] ?? {}
   properties: {
     routes: [
       {

diff --git a/src/bicep/add-ons/esri-enterprise/modules/storageAccount.bicep b/src/bicep/add-ons/esri-enterprise/modules/storageAccount.bicep
@@ -31,7 +31,7 @@ var zones = [
 resource storageAccount 'Microsoft.Storage/storageAccounts@2023-01-01' = {
   name: '${resourcePrefix}saesri${uniqueStorageName}'
   location: location
-  tags: contains(tags, 'Microsoft.Storage/storageAccounts') ? tags['Microsoft.Storage/storageAccounts'] : {}
+  tags: tags[?'Microsoft.Storage/storageAccounts'] ?? {}
   sku: {
     name: storageSKU
   }

diff --git a/src/bicep/add-ons/esri-enterprise/modules/userAssignedManagedIdentity.bicep b/src/bicep/add-ons/esri-enterprise/modules/userAssignedManagedIdentity.bicep
@@ -5,7 +5,7 @@ param tags object
 resource userAssignedIdentity 'Microsoft.ManagedIdentity/userAssignedIdentities@2018-11-30' = {
   name: name
   location: location
-  tags: contains(tags, 'Microsoft.ManagedIdentity/userAssignedIdentities') ? tags['Microsoft.ManagedIdentity/userAssignedIdentities'] : {}
+  tags: tags[?'Microsoft.ManagedIdentity/userAssignedIdentities'] ?? {}
 }
 
 output clientId string = userAssignedIdentity.properties.clientId

diff --git a/src/bicep/add-ons/esri-enterprise/modules/virtualMachine.bicep b/src/bicep/add-ons/esri-enterprise/modules/virtualMachine.bicep
@@ -38,7 +38,7 @@ resource availabilitySet 'Microsoft.Compute/availabilitySets@2023-09-01' existin
 resource networkInterface 'Microsoft.Network/networkInterfaces@2023-04-01' = {
   name: networkInterfaceName
   location: location
-  tags: contains(tags, 'Microsoft.Network/networkInterfaces') ? tags['Microsoft.Network/networkInterfaces'] : {}
+  tags: tags[?'Microsoft.Network/networkInterfaces'] ?? {}
   properties: {
     ipConfigurations: [
       {
@@ -68,7 +68,7 @@ resource networkInterface 'Microsoft.Network/networkInterfaces@2023-04-01' = {
 resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = {
   name: virtualMachineName
   location: location
-  tags: contains(tags, 'Microsoft.Compute/virtualMachines') ? tags['Microsoft.Compute/virtualMachines'] : {}
+  tags: tags[?'Microsoft.Compute/virtualMachines'] ?? {}
   identity: {
     type: 'SystemAssigned'
   }
@@ -147,7 +147,7 @@ resource aadLoginForWindows 'Microsoft.Compute/virtualMachines/extensions@2021-0
   parent: virtualMachine
   name: 'AADLoginForWindows'
   location: location
-  tags: contains(tags, 'Microsoft.Compute/virtualMachines') ? tags['Microsoft.Compute/virtualMachines'] : {}
+  tags: tags[?'Microsoft.Compute/virtualMachines'] ?? {}
   properties: {
     publisher: 'Microsoft.Azure.ActiveDirectory'
     type: 'AADLoginForWindows'
@@ -163,7 +163,7 @@ resource jsonADDomainExtension 'Microsoft.Compute/virtualMachines/extensions@202
   parent: virtualMachine
   name: 'joindomain'
   location: location
-  tags: contains(tags, 'Microsoft.Compute/virtualMachines') ? tags['Microsoft.Compute/virtualMachines'] : {}
+  tags: tags[?'Microsoft.Compute/virtualMachines'] ?? {}
   properties: {
     publisher: 'Microsoft.Compute'
     type: 'JsonADDomainExtension'
@@ -248,7 +248,7 @@ resource azureMonitorWindowsAgent 'Microsoft.Compute/virtualMachines/extensions@
   parent: virtualMachine
   name: 'AzureMonitorWindowsAgent'
   location: location
-  tags: contains(tags, 'Microsoft.Compute/virtualMachines') ? tags['Microsoft.Compute/virtualMachines'] : {}
+  tags: tags[?'Microsoft.Compute/virtualMachines'] ?? {}
   properties: {
     publisher: 'Microsoft.Azure.Monitor'
     type: 'AzureMonitorWindowsAgent'
@@ -269,7 +269,7 @@ resource azureMonitorWindowsAgent 'Microsoft.Compute/virtualMachines/extensions@
 resource dnsSuffix 'Microsoft.Compute/virtualMachines/runCommands@2023-03-01' = if (joinEntraDomain && (!joinWindowsDomain)) {
   name: 'rc-esriDnsSuffix'
   location: location
-  tags: contains(tags, 'Microsoft.Compute/virtualMachines') ? tags['Microsoft.Compute/virtualMachines'] : {}
+  tags: tags[?'Microsoft.Compute/virtualMachines'] ?? {}
   parent: virtualMachine
   properties: {
     treatFailureAsDeploymentFailure: true