Updated KVLT + Purview

Azure · Oct 20, 2023 · 70360b6 · 70360b6
1 parent 8c78397
commit 70360b6
Show file tree

Hide file tree

Showing 5 changed files with 57 additions and 95 deletions.
diff --git a/modules/key-vault/vault/.test/common/main.test.bicep b/modules/key-vault/vault/.test/common/main.test.bicep
@@ -136,9 +136,7 @@ module testDeployment '../../main.bicep' = {
     privateEndpoints: [
       {
         privateDnsZoneResourceIds: [
-
           nestedDependencies.outputs.privateDNSZoneResourceId
-
         ]
         service: 'vault'
         subnetResourceId: nestedDependencies.outputs.subnetResourceId

diff --git a/modules/key-vault/vault/.test/pe/main.test.bicep b/modules/key-vault/vault/.test/pe/main.test.bicep
@@ -87,12 +87,10 @@ module testDeployment '../../main.bicep' = {
     }
     privateEndpoints: [
       {
-        privateDnsZoneGroup: {
-          privateDNSResourceIds: [
-            nestedDependencies.outputs.privateDNSZoneResourceId
-          ]
-          privateEndpointName: 'dep-${namePrefix}-pe-${serviceShort}'
-        }
+        privateDnsZoneResourceIds: [
+          nestedDependencies.outputs.privateDNSZoneResourceId
+        ]
+        name: 'dep-${namePrefix}-pe-${serviceShort}'
         service: 'vault'
         subnetResourceId: nestedDependencies.outputs.subnetResourceId
         tags: {

diff --git a/modules/key-vault/vault/README.md b/modules/key-vault/vault/README.md
@@ -599,12 +599,10 @@ module vault 'br:bicep/modules/key-vault.vault:1.0.0' = {
     }
     privateEndpoints: [
       {
-        privateDnsZoneGroup: {
-          privateDNSResourceIds: [
-            '<privateDNSZoneResourceId>'
-          ]
-          privateEndpointName: 'dep-pe-kvvpe'
-        }
+        name: 'dep-pe-kvvpe'
+        privateDnsZoneResourceIds: [
+          '<privateDNSZoneResourceId>'
+        ]
         service: 'vault'
         subnetResourceId: '<subnetResourceId>'
         tags: {
@@ -681,12 +679,10 @@ module vault 'br:bicep/modules/key-vault.vault:1.0.0' = {
     "privateEndpoints": {
       "value": [
         {
-          "privateDnsZoneGroup": {
-            "privateDNSResourceIds": [
-              "<privateDNSZoneResourceId>"
-            ],
-            "privateEndpointName": "dep-pe-kvvpe"
-          },
+          "name": "dep-pe-kvvpe",
+          "privateDnsZoneResourceIds": [
+            "<privateDNSZoneResourceId>"
+          ],
           "service": "vault",
           "subnetResourceId": "<subnetResourceId>",
           "tags": {

diff --git a/modules/purview/account/.test/common/main.test.bicep b/modules/purview/account/.test/common/main.test.bicep
@@ -92,11 +92,9 @@ module testDeployment '../../main.bicep' = {
     ]
     accountPrivateEndpoints: [
       {
-        privateDnsZoneGroup: {
-          privateDNSResourceIds: [
-            nestedDependencies.outputs.purviewAccountPrivateDNSResourceId
-          ]
-        }
+        privateDnsZoneResourceIds: [
+          nestedDependencies.outputs.purviewAccountPrivateDNSResourceId
+        ]
         service: 'account'
         subnetResourceId: nestedDependencies.outputs.subnetResourceId
         tags: {
@@ -108,11 +106,9 @@ module testDeployment '../../main.bicep' = {
     ]
     portalPrivateEndpoints: [
       {
-        privateDnsZoneGroup: {
-          privateDNSResourceIds: [
-            nestedDependencies.outputs.purviewPortalPrivateDNSResourceId
-          ]
-        }
+        privateDnsZoneResourceIds: [
+          nestedDependencies.outputs.purviewPortalPrivateDNSResourceId
+        ]
         service: 'portal'
         subnetResourceId: nestedDependencies.outputs.subnetResourceId
         tags: {
@@ -124,11 +120,9 @@ module testDeployment '../../main.bicep' = {
     ]
     storageBlobPrivateEndpoints: [
       {
-        privateDnsZoneGroup: {
-          privateDNSResourceIds: [
-            nestedDependencies.outputs.storageBlobPrivateDNSResourceId
-          ]
-        }
+        privateDnsZoneResourceIds: [
+          nestedDependencies.outputs.storageBlobPrivateDNSResourceId
+        ]
         service: 'blob'
         subnetResourceId: nestedDependencies.outputs.subnetResourceId
         tags: {
@@ -140,11 +134,9 @@ module testDeployment '../../main.bicep' = {
     ]
     storageQueuePrivateEndpoints: [
       {
-        privateDnsZoneGroup: {
-          privateDNSResourceIds: [
-            nestedDependencies.outputs.storageQueuePrivateDNSResourceId
-          ]
-        }
+        privateDnsZoneResourceIds: [
+          nestedDependencies.outputs.storageQueuePrivateDNSResourceId
+        ]
         service: 'queue'
         subnetResourceId: nestedDependencies.outputs.subnetResourceId
         tags: {
@@ -156,11 +148,9 @@ module testDeployment '../../main.bicep' = {
     ]
     eventHubPrivateEndpoints: [
       {
-        privateDnsZoneGroup: {
-          privateDNSResourceIds: [
-            nestedDependencies.outputs.eventHubPrivateDNSResourceId
-          ]
-        }
+        privateDnsZoneResourceIds: [
+          nestedDependencies.outputs.eventHubPrivateDNSResourceId
+        ]
         service: 'namespace'
         subnetResourceId: nestedDependencies.outputs.subnetResourceId
         tags: {

diff --git a/modules/purview/account/README.md b/modules/purview/account/README.md
@@ -50,11 +50,9 @@ module account 'br:bicep/modules/purview.account:1.0.0' = {
     // Non-required parameters
     accountPrivateEndpoints: [
       {
-        privateDnsZoneGroup: {
-          privateDNSResourceIds: [
-            '<purviewAccountPrivateDNSResourceId>'
-          ]
-        }
+        privateDnsZoneResourceIds: [
+          '<purviewAccountPrivateDNSResourceId>'
+        ]
         service: 'account'
         subnetResourceId: '<subnetResourceId>'
         tags: {
@@ -77,11 +75,9 @@ module account 'br:bicep/modules/purview.account:1.0.0' = {
     enableDefaultTelemetry: '<enableDefaultTelemetry>'
     eventHubPrivateEndpoints: [
       {
-        privateDnsZoneGroup: {
-          privateDNSResourceIds: [
-            '<eventHubPrivateDNSResourceId>'
-          ]
-        }
+        privateDnsZoneResourceIds: [
+          '<eventHubPrivateDNSResourceId>'
+        ]
         service: 'namespace'
         subnetResourceId: '<subnetResourceId>'
         tags: {
@@ -99,11 +95,9 @@ module account 'br:bicep/modules/purview.account:1.0.0' = {
     managedResourceGroupName: 'pvacom001-managed-rg'
     portalPrivateEndpoints: [
       {
-        privateDnsZoneGroup: {
-          privateDNSResourceIds: [
-            '<purviewPortalPrivateDNSResourceId>'
-          ]
-        }
+        privateDnsZoneResourceIds: [
+          '<purviewPortalPrivateDNSResourceId>'
+        ]
         service: 'portal'
         subnetResourceId: '<subnetResourceId>'
         tags: {
@@ -125,11 +119,9 @@ module account 'br:bicep/modules/purview.account:1.0.0' = {
     ]
     storageBlobPrivateEndpoints: [
       {
-        privateDnsZoneGroup: {
-          privateDNSResourceIds: [
-            '<storageBlobPrivateDNSResourceId>'
-          ]
-        }
+        privateDnsZoneResourceIds: [
+          '<storageBlobPrivateDNSResourceId>'
+        ]
         service: 'blob'
         subnetResourceId: '<subnetResourceId>'
         tags: {
@@ -141,11 +133,9 @@ module account 'br:bicep/modules/purview.account:1.0.0' = {
     ]
     storageQueuePrivateEndpoints: [
       {
-        privateDnsZoneGroup: {
-          privateDNSResourceIds: [
-            '<storageQueuePrivateDNSResourceId>'
-          ]
-        }
+        privateDnsZoneResourceIds: [
+          '<storageQueuePrivateDNSResourceId>'
+        ]
         service: 'queue'
         subnetResourceId: '<subnetResourceId>'
         tags: {
@@ -187,11 +177,9 @@ module account 'br:bicep/modules/purview.account:1.0.0' = {
     "accountPrivateEndpoints": {
       "value": [
         {
-          "privateDnsZoneGroup": {
-            "privateDNSResourceIds": [
-              "<purviewAccountPrivateDNSResourceId>"
-            ]
-          },
+          "privateDnsZoneResourceIds": [
+            "<purviewAccountPrivateDNSResourceId>"
+          ],
           "service": "account",
           "subnetResourceId": "<subnetResourceId>",
           "tags": {
@@ -230,11 +218,9 @@ module account 'br:bicep/modules/purview.account:1.0.0' = {
     "eventHubPrivateEndpoints": {
       "value": [
         {
-          "privateDnsZoneGroup": {
-            "privateDNSResourceIds": [
-              "<eventHubPrivateDNSResourceId>"
-            ]
-          },
+          "privateDnsZoneResourceIds": [
+            "<eventHubPrivateDNSResourceId>"
+          ],
           "service": "namespace",
           "subnetResourceId": "<subnetResourceId>",
           "tags": {
@@ -260,11 +246,9 @@ module account 'br:bicep/modules/purview.account:1.0.0' = {
     "portalPrivateEndpoints": {
       "value": [
         {
-          "privateDnsZoneGroup": {
-            "privateDNSResourceIds": [
-              "<purviewPortalPrivateDNSResourceId>"
-            ]
-          },
+          "privateDnsZoneResourceIds": [
+            "<purviewPortalPrivateDNSResourceId>"
+          ],
           "service": "portal",
           "subnetResourceId": "<subnetResourceId>",
           "tags": {
@@ -292,11 +276,9 @@ module account 'br:bicep/modules/purview.account:1.0.0' = {
     "storageBlobPrivateEndpoints": {
       "value": [
         {
-          "privateDnsZoneGroup": {
-            "privateDNSResourceIds": [
-              "<storageBlobPrivateDNSResourceId>"
-            ]
-          },
+          "privateDnsZoneResourceIds": [
+            "<storageBlobPrivateDNSResourceId>"
+          ],
           "service": "blob",
           "subnetResourceId": "<subnetResourceId>",
           "tags": {
@@ -310,11 +292,9 @@ module account 'br:bicep/modules/purview.account:1.0.0' = {
     "storageQueuePrivateEndpoints": {
       "value": [
         {
-          "privateDnsZoneGroup": {
-            "privateDNSResourceIds": [
-              "<storageQueuePrivateDNSResourceId>"
-            ]
-          },
+          "privateDnsZoneResourceIds": [
+            "<storageQueuePrivateDNSResourceId>"
+          ],
           "service": "queue",
           "subnetResourceId": "<subnetResourceId>",
           "tags": {