[Modules/Utilities] Migrated PE from AVM + enabled UDT for nested res…

…ources (#4109) * Migrated PE from AVM + enabled UDT for nested resources * Re-added version.json * Updated PE ref * Updated more tests and added rule suppresion * Updated remaining tests * Moved paths * Regenerated all readmes * Small lock update * Adjusted how hash is detected * Update to latest * Added removed telemetry * Update to latest
Azure · Oct 19, 2023 · f114e26 · f114e26
1 parent 700f436
commit f114e26
Show file tree

Hide file tree

Showing 175 changed files with 8,052 additions and 9,548 deletions.
diff --git a/bicepconfig.json b/bicepconfig.json
@@ -7,6 +7,9 @@
  "rules": {
  "explicit-values-for-loc-params": {
  "level": "off" // Reason: Our modules default to e.g. the location of their parent resource group which is sufficient if deploying a self-contained solution
+ },
+ "no-deployments-resources": {
+ "level": "off" // Reason: The telemetry resource only has a single output and is self-contained in a deployment
  }
  }
  }

diff --git a/modules/app-configuration/configuration-store/.test/pe/dependencies.bicep b/modules/app-configuration/configuration-store/.test/pe/dependencies.bicep
@@ -46,4 +46,4 @@ resource privateDNSZone 'Microsoft.Network/privateDnsZones@2020-06-01' = {
 output subnetResourceId string = virtualNetwork.properties.subnets[0].id
 
 @description('The resource ID of the created Private DNS Zone.')
-output privateDNSResourceId string = privateDNSZone.id
+output privateDNSZoneResourceId string = privateDNSZone.id
diff --git a/modules/app-configuration/configuration-store/.test/pe/main.test.bicep b/modules/app-configuration/configuration-store/.test/pe/main.test.bicep
@@ -56,7 +56,7 @@ module testDeployment '../../main.bicep' = {
  {
  privateDnsZoneGroup: {
  privateDNSResourceIds: [
- nestedDependencies.outputs.privateDNSResourceId
+ nestedDependencies.outputs.privateDNSZoneResourceId
  ]
  }
  service: 'configurationStores'

diff --git a/modules/app-configuration/configuration-store/README.md b/modules/app-configuration/configuration-store/README.md
@@ -413,7 +413,7 @@ module configurationStore 'br:bicep/modules/app-configuration.configuration-stor
  {
  privateDnsZoneGroup: {
  privateDNSResourceIds: [
- '<privateDNSResourceId>'
+ '<privateDNSZoneResourceId>'
  ]
  }
  service: 'configurationStores'
@@ -469,7 +469,7 @@ module configurationStore 'br:bicep/modules/app-configuration.configuration-stor
  {
  "privateDnsZoneGroup": {
  "privateDNSResourceIds": [
- "<privateDNSResourceId>"
+ "<privateDNSZoneResourceId>"
  ]
  },
  "service": "configurationStores",

diff --git a/modules/app-configuration/configuration-store/main.bicep b/modules/app-configuration/configuration-store/main.bicep
@@ -250,14 +250,15 @@ module configurationStore_privateEndpoints '../../network/private-endpoint/main.
  subnetResourceId: privateEndpoint.subnetResourceId
  enableDefaultTelemetry: enableReferencedModulesTelemetry
  location: contains(privateEndpoint, 'location') ? privateEndpoint.location : reference(split(privateEndpoint.subnetResourceId, '/subnets/')[0], '2020-06-01', 'Full').location
- lock: contains(privateEndpoint, 'lock') ? privateEndpoint.lock : lock
- privateDnsZoneGroup: contains(privateEndpoint, 'privateDnsZoneGroup') ? privateEndpoint.privateDnsZoneGroup : {}
+ lock: contains(privateEndpoint, 'lock') ? privateEndpoint.lock : null
+ privateDnsZoneGroupName: contains(privateEndpoint, 'privateDnsZoneGroupName') ? privateEndpoint.privateDnsZoneGroupName : 'default'
+ privateDnsZoneResourceIds: contains(privateEndpoint, 'privateDnsZoneResourceIds') ? privateEndpoint.privateDnsZoneResourceIds : []
  roleAssignments: contains(privateEndpoint, 'roleAssignments') ? privateEndpoint.roleAssignments : []
  tags: contains(privateEndpoint, 'tags') ? privateEndpoint.tags : {}
  manualPrivateLinkServiceConnections: contains(privateEndpoint, 'manualPrivateLinkServiceConnections') ? privateEndpoint.manualPrivateLinkServiceConnections : []
  customDnsConfigs: contains(privateEndpoint, 'customDnsConfigs') ? privateEndpoint.customDnsConfigs : []
  ipConfigurations: contains(privateEndpoint, 'ipConfigurations') ? privateEndpoint.ipConfigurations : []
- applicationSecurityGroups: contains(privateEndpoint, 'applicationSecurityGroups') ? privateEndpoint.applicationSecurityGroups : []
+ applicationSecurityGroupResourceIds: contains(privateEndpoint, 'applicationSecurityGroupResourceIds') ? privateEndpoint.applicationSecurityGroupResourceIds : []
  customNetworkInterfaceName: contains(privateEndpoint, 'customNetworkInterfaceName') ? privateEndpoint.customNetworkInterfaceName : ''
  }
 }]

diff --git a/modules/app-configuration/configuration-store/main.json b/modules/app-configuration/configuration-store/main.json
diff --git a/modules/automation/automation-account/.test/common/main.test.bicep b/modules/automation/automation-account/.test/common/main.test.bicep
@@ -97,11 +97,9 @@ module testDeployment '../../main.bicep' = {
  ]
  privateEndpoints: [
  {
- privateDnsZoneGroup: {
- privateDNSResourceIds: [
- nestedDependencies.outputs.privateDNSZoneResourceId
- ]
- }
+ privateDnsZoneResourceIds: [
+ nestedDependencies.outputs.privateDNSZoneResourceId
+ ]
  service: 'Webhook'
  subnetResourceId: nestedDependencies.outputs.subnetResourceId
  tags: {
@@ -111,11 +109,9 @@ module testDeployment '../../main.bicep' = {
  }
  }
  {
- privateDnsZoneGroup: {
- privateDNSResourceIds: [
- nestedDependencies.outputs.privateDNSZoneResourceId
- ]
- }
+ privateDnsZoneResourceIds: [
+ nestedDependencies.outputs.privateDNSZoneResourceId
+ ]
  service: 'DSCAndHybridWorker'
  subnetResourceId: nestedDependencies.outputs.subnetResourceId
  tags: {

diff --git a/modules/automation/automation-account/README.md b/modules/automation/automation-account/README.md
@@ -87,11 +87,9 @@ module automationAccount 'br:bicep/modules/automation.automation-account:1.0.0'
  ]
  privateEndpoints: [
  {
- privateDnsZoneGroup: {
- privateDNSResourceIds: [
- '<privateDNSZoneResourceId>'
- ]
- }
+ privateDnsZoneResourceIds: [
+ '<privateDNSZoneResourceId>'
+ ]
  service: 'Webhook'
  subnetResourceId: '<subnetResourceId>'
  tags: {
@@ -101,11 +99,9 @@ module automationAccount 'br:bicep/modules/automation.automation-account:1.0.0'
  }
  }
  {
- privateDnsZoneGroup: {
- privateDNSResourceIds: [
- '<privateDNSZoneResourceId>'
- ]
- }
+ privateDnsZoneResourceIds: [
+ '<privateDNSZoneResourceId>'
+ ]
  service: 'DSCAndHybridWorker'
  subnetResourceId: '<subnetResourceId>'
  tags: {
@@ -312,11 +308,9 @@ module automationAccount 'br:bicep/modules/automation.automation-account:1.0.0'
  "privateEndpoints": {
  "value": [
  {
- "privateDnsZoneGroup": {
- "privateDNSResourceIds": [
- "<privateDNSZoneResourceId>"
- ]
- },
+ "privateDnsZoneResourceIds": [
+ "<privateDNSZoneResourceId>"
+ ],
  "service": "Webhook",
  "subnetResourceId": "<subnetResourceId>",
  "tags": {
@@ -326,11 +320,9 @@ module automationAccount 'br:bicep/modules/automation.automation-account:1.0.0'
  }
  },
  {
- "privateDnsZoneGroup": {
- "privateDNSResourceIds": [
- "<privateDNSZoneResourceId>"
- ]
- },
+ "privateDnsZoneResourceIds": [
+ "<privateDNSZoneResourceId>"
+ ],
  "service": "DSCAndHybridWorker",
  "subnetResourceId": "<subnetResourceId>",
  "tags": {

diff --git a/modules/automation/automation-account/main.bicep b/modules/automation/automation-account/main.bicep
@@ -381,14 +381,15 @@ module automationAccount_privateEndpoints '../../network/private-endpoint/main.b
  subnetResourceId: privateEndpoint.subnetResourceId
  enableDefaultTelemetry: enableReferencedModulesTelemetry
  location: contains(privateEndpoint, 'location') ? privateEndpoint.location : reference(split(privateEndpoint.subnetResourceId, '/subnets/')[0], '2020-06-01', 'Full').location
- lock: contains(privateEndpoint, 'lock') ? privateEndpoint.lock : lock
- privateDnsZoneGroup: contains(privateEndpoint, 'privateDnsZoneGroup') ? privateEndpoint.privateDnsZoneGroup : {}
+ lock: contains(privateEndpoint, 'lock') ? privateEndpoint.lock : null
+ privateDnsZoneGroupName: contains(privateEndpoint, 'privateDnsZoneGroupName') ? privateEndpoint.privateDnsZoneGroupName : 'default'
+ privateDnsZoneResourceIds: contains(privateEndpoint, 'privateDnsZoneResourceIds') ? privateEndpoint.privateDnsZoneResourceIds : []
  roleAssignments: contains(privateEndpoint, 'roleAssignments') ? privateEndpoint.roleAssignments : []
  tags: contains(privateEndpoint, 'tags') ? privateEndpoint.tags : {}
  manualPrivateLinkServiceConnections: contains(privateEndpoint, 'manualPrivateLinkServiceConnections') ? privateEndpoint.manualPrivateLinkServiceConnections : []
  customDnsConfigs: contains(privateEndpoint, 'customDnsConfigs') ? privateEndpoint.customDnsConfigs : []
  ipConfigurations: contains(privateEndpoint, 'ipConfigurations') ? privateEndpoint.ipConfigurations : []
- applicationSecurityGroups: contains(privateEndpoint, 'applicationSecurityGroups') ? privateEndpoint.applicationSecurityGroups : []
+ applicationSecurityGroupResourceIds: contains(privateEndpoint, 'applicationSecurityGroupResourceIds') ? privateEndpoint.applicationSecurityGroupResourceIds : []
  customNetworkInterfaceName: contains(privateEndpoint, 'customNetworkInterfaceName') ? privateEndpoint.customNetworkInterfaceName : ''
  }
 }]