From dcf3b9dc92d5933d44ee3c6937e51ac3cd334cfb Mon Sep 17 00:00:00 2001 From: MrMCake Date: Mon, 19 Sep 2022 15:34:40 +0200 Subject: [PATCH 01/12] First commit --- utilities/tools/REST2CARML/Set-ModuleFolderData.ps1 | 1 + 1 file changed, 1 insertion(+) create mode 100644 utilities/tools/REST2CARML/Set-ModuleFolderData.ps1 diff --git a/utilities/tools/REST2CARML/Set-ModuleFolderData.ps1 b/utilities/tools/REST2CARML/Set-ModuleFolderData.ps1 new file mode 100644 index 0000000000..5f282702bb --- /dev/null +++ b/utilities/tools/REST2CARML/Set-ModuleFolderData.ps1 @@ -0,0 +1 @@ + \ No newline at end of file From 203ae83d04f7568c4048abe12f23d8aa95032a05 Mon Sep 17 00:00:00 2001 From: MrMCake Date: Tue, 20 Sep 2022 21:29:22 +0200 Subject: [PATCH 02/12] Updated network PrivateDNSZones to new dependencies approach --- .../workflows/ms.network.privatednszones.yml | 3 +- .../.test/common/dependencies.bicep | 39 ++++ .../.test/common/deploy.test.bicep | 213 ++++++++++++++++++ .../privateDnsZones/.test/min.parameters.json | 9 - .../.test/min/deploy.test.bicep | 37 +++ .../privateDnsZones/.test/parameters.json | 198 ---------------- .../privateDnsZones/readme.md | 150 ++++++------ 7 files changed, 365 insertions(+), 284 deletions(-) create mode 100644 modules/Microsoft.Network/privateDnsZones/.test/common/dependencies.bicep create mode 100644 modules/Microsoft.Network/privateDnsZones/.test/common/deploy.test.bicep delete mode 100644 modules/Microsoft.Network/privateDnsZones/.test/min.parameters.json create mode 100644 modules/Microsoft.Network/privateDnsZones/.test/min/deploy.test.bicep delete mode 100644 modules/Microsoft.Network/privateDnsZones/.test/parameters.json diff --git a/.github/workflows/ms.network.privatednszones.yml b/.github/workflows/ms.network.privatednszones.yml index b7dc28d582..f47fbb3686 100644 --- a/.github/workflows/ms.network.privatednszones.yml +++ b/.github/workflows/ms.network.privatednszones.yml @@ -106,8 +106,7 @@ jobs: - name: 'Using test file [${{ matrix.moduleTestFilePaths }}]' uses: ./.github/actions/templates/validateModuleDeployment with: - templateFilePath: '${{ env.modulePath }}/deploy.bicep' - parameterFilePath: '${{ env.modulePath }}/${{ matrix.moduleTestFilePaths }}' + templateFilePath: '${{ env.modulePath }}/${{ matrix.moduleTestFilePaths }}' location: '${{ env.location }}' resourceGroupName: '${{ env.resourceGroupName }}' subscriptionId: '${{ secrets.ARM_SUBSCRIPTION_ID }}' diff --git a/modules/Microsoft.Network/privateDnsZones/.test/common/dependencies.bicep b/modules/Microsoft.Network/privateDnsZones/.test/common/dependencies.bicep new file mode 100644 index 0000000000..a3cab26da9 --- /dev/null +++ b/modules/Microsoft.Network/privateDnsZones/.test/common/dependencies.bicep @@ -0,0 +1,39 @@ +@description('Optional. The location to deploy to.') +param location string = resourceGroup().location + +@description('Required. The name of the Virtual Network to create.') +param virtualNetworkName string + +@description('Required. The name of the Managed Identity to create.') +param managedIdentityName string + +resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { + name: virtualNetworkName + location: location + properties: { + addressSpace: { + addressPrefixes: [ + '10.0.0.0/24' + ] + } + subnets: [ + { + name: 'defaultSubnet' + properties: { + addressPrefix: '10.0.0.0/24' + } + } + ] + } +} + +resource managedIdentity 'Microsoft.ManagedIdentity/userAssignedIdentities@2018-11-30' = { + name: managedIdentityName + location: location +} + +@description('The resource ID of the created Virtual Network.') +output virtualNetworkResourceId string = virtualNetwork.id + +@description('The principal ID of the created Managed Identity.') +output managedIdentityPrincipalId string = managedIdentity.properties.principalId diff --git a/modules/Microsoft.Network/privateDnsZones/.test/common/deploy.test.bicep b/modules/Microsoft.Network/privateDnsZones/.test/common/deploy.test.bicep new file mode 100644 index 0000000000..6a1eff0ad3 --- /dev/null +++ b/modules/Microsoft.Network/privateDnsZones/.test/common/deploy.test.bicep @@ -0,0 +1,213 @@ +targetScope = 'subscription' + +// ========== // +// Parameters // +// ========== // +@description('Optional. The name of the resource group to deploy for testing purposes') +@maxLength(90) +param resourceGroupName string = 'ms.network.privatednszones-${serviceShort}-rg' + +@description('Optional. The location to deploy resources to') +param location string = deployment().location + +@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints') +param serviceShort string = 'npdzcom' + +// =========== // +// Deployments // +// =========== // + +// General resources +// ================= +resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { + name: resourceGroupName + location: location +} + +module resourceGroupResources 'dependencies.bicep' = { + scope: resourceGroup + name: '${uniqueString(deployment().name, location)}-paramNested' + params: { + virtualNetworkName: 'dep-<>-vnet-${serviceShort}' + managedIdentityName: 'dep-<>-msi-${serviceShort}' + } +} + +// ============== // +// Test Execution // +// ============== // + +module testDeployment '../../deploy.bicep' = { + scope: resourceGroup + name: '${uniqueString(deployment().name)}-test-${serviceShort}' + params: { + name: '<>${serviceShort}001' + a: [ + { + aRecords: [ + { + ipv4Address: '10.240.4.4' + } + ] + name: 'A_10.240.4.4' + roleAssignments: [ + { + principalIds: [ + resourceGroupResources.outputs.managedIdentityPrincipalId + ] + roleDefinitionIdOrName: 'Reader' + } + ] + ttl: 3600 + } + ] + aaaa: [ + { + aaaaRecords: [ + { + ipv6Address: '2001:0db8:85a3:0000:0000:8a2e:0370:7334' + } + ] + name: 'AAAA_2001_0db8_85a3_0000_0000_8a2e_0370_7334' + ttl: 3600 + } + ] + cname: [ + { + cnameRecord: { + cname: 'test' + } + name: 'CNAME_test' + roleAssignments: [ + { + principalIds: [ + resourceGroupResources.outputs.managedIdentityPrincipalId + ] + roleDefinitionIdOrName: 'Reader' + } + ] + ttl: 3600 + } + ] + lock: 'CanNotDelete' + mx: [ + { + mxRecords: [ + { + exchange: 'contoso.com' + preference: 100 + } + ] + name: 'MX_contoso' + roleAssignments: [ + { + principalIds: [ + resourceGroupResources.outputs.managedIdentityPrincipalId + ] + roleDefinitionIdOrName: 'Reader' + } + ] + ttl: 3600 + } + ] + ptr: [ + { + name: 'PTR_contoso' + ptrRecords: [ + { + ptrdname: 'contoso.com' + } + ] + roleAssignments: [ + { + principalIds: [ + resourceGroupResources.outputs.managedIdentityPrincipalId + ] + roleDefinitionIdOrName: 'Reader' + } + ] + ttl: 3600 + } + ] + roleAssignments: [ + { + principalIds: [ + resourceGroupResources.outputs.managedIdentityPrincipalId + ] + roleDefinitionIdOrName: 'Reader' + } + ] + soa: [ + { + name: '@' + roleAssignments: [ + { + principalIds: [ + resourceGroupResources.outputs.managedIdentityPrincipalId + ] + roleDefinitionIdOrName: 'Reader' + } + ] + soaRecord: { + email: 'azureprivatedns-host.microsoft.com' + expireTime: 2419200 + host: 'azureprivatedns.net' + minimumTtl: 10 + refreshTime: 3600 + retryTime: 300 + serialNumber: '1' + } + ttl: 3600 + } + ] + srv: [ + { + name: 'SRV_contoso' + roleAssignments: [ + { + principalIds: [ + resourceGroupResources.outputs.managedIdentityPrincipalId + ] + roleDefinitionIdOrName: 'Reader' + } + ] + srvRecords: [ + { + port: 9332 + priority: 0 + target: 'test.contoso.com' + weight: 0 + } + ] + ttl: 3600 + } + ] + txt: [ + { + name: 'TXT_test' + roleAssignments: [ + { + principalIds: [ + resourceGroupResources.outputs.managedIdentityPrincipalId + ] + roleDefinitionIdOrName: 'Reader' + } + ] + ttl: 3600 + txtRecords: [ + { + value: [ + 'test' + ] + } + ] + } + ] + virtualNetworkLinks: [ + { + registrationEnabled: true + virtualNetworkResourceId: resourceGroupResources.outputs.virtualNetworkResourceId + } + ] + } +} diff --git a/modules/Microsoft.Network/privateDnsZones/.test/min.parameters.json b/modules/Microsoft.Network/privateDnsZones/.test/min.parameters.json deleted file mode 100644 index d33fbd032b..0000000000 --- a/modules/Microsoft.Network/privateDnsZones/.test/min.parameters.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#", - "contentVersion": "1.0.0.0", - "parameters": { - "name": { - "value": "<>-az-privdns-x-001.com" - } - } -} diff --git a/modules/Microsoft.Network/privateDnsZones/.test/min/deploy.test.bicep b/modules/Microsoft.Network/privateDnsZones/.test/min/deploy.test.bicep new file mode 100644 index 0000000000..6033b1bc99 --- /dev/null +++ b/modules/Microsoft.Network/privateDnsZones/.test/min/deploy.test.bicep @@ -0,0 +1,37 @@ +targetScope = 'subscription' + +// ========== // +// Parameters // +// ========== // +@description('Optional. The name of the resource group to deploy for testing purposes') +@maxLength(90) +param resourceGroupName string = 'ms.network.privatednszones-${serviceShort}-rg' + +@description('Optional. The location to deploy resources to') +param location string = deployment().location + +@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints') +param serviceShort string = 'npdzmin' + +// =========== // +// Deployments // +// =========== // + +// General resources +// ================= +resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { + name: resourceGroupName + location: location +} + +// ============== // +// Test Execution // +// ============== // + +module testDeployment '../../deploy.bicep' = { + scope: resourceGroup + name: '${uniqueString(deployment().name)}-test-${serviceShort}' + params: { + name: '<>${serviceShort}001' + } +} diff --git a/modules/Microsoft.Network/privateDnsZones/.test/parameters.json b/modules/Microsoft.Network/privateDnsZones/.test/parameters.json deleted file mode 100644 index 8b3662c1ee..0000000000 --- a/modules/Microsoft.Network/privateDnsZones/.test/parameters.json +++ /dev/null @@ -1,198 +0,0 @@ -{ - "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#", - "contentVersion": "1.0.0.0", - "parameters": { - "name": { - "value": "<>-az-privdns-x-002.com" - }, - "lock": { - "value": "CanNotDelete" - }, - "roleAssignments": { - "value": [ - { - "roleDefinitionIdOrName": "Reader", - "principalIds": [ - "<>" - ] - } - ] - }, - "AAAA": { - "value": [ - { - "name": "AAAA_2001_0db8_85a3_0000_0000_8a2e_0370_7334", - "ttl": 3600, - "aaaaRecords": [ - { - "ipv6Address": "2001:0db8:85a3:0000:0000:8a2e:0370:7334" - } - ] - } - ] - }, - "A": { - "value": [ - { - "name": "A_10.240.4.4", - "ttl": 3600, - "aRecords": [ - { - "ipv4Address": "10.240.4.4" - } - ], - "roleAssignments": [ - { - "roleDefinitionIdOrName": "Reader", - "principalIds": [ - "<>" - ] - } - ] - } - ] - }, - "CNAME": { - "value": [ - { - "name": "CNAME_test", - "ttl": 3600, - "cnameRecord": { - "cname": "test" - }, - "roleAssignments": [ - { - "roleDefinitionIdOrName": "Reader", - "principalIds": [ - "<>" - ] - } - ] - } - ] - }, - "MX": { - "value": [ - { - "name": "MX_contoso", - "ttl": 3600, - "mxRecords": [ - { - "exchange": "contoso.com", - "preference": 100 - } - ], - "roleAssignments": [ - { - "roleDefinitionIdOrName": "Reader", - "principalIds": [ - "<>" - ] - } - ] - } - ] - }, - "PTR": { - "value": [ - { - "name": "PTR_contoso", - "ttl": 3600, - "ptrRecords": [ - { - "ptrdname": "contoso.com" - } - ], - "roleAssignments": [ - { - "roleDefinitionIdOrName": "Reader", - "principalIds": [ - "<>" - ] - } - ] - } - ] - }, - "SOA": { - "value": [ - { - "name": "@", - "ttl": 3600, - "soaRecord": { - "email": "azureprivatedns-host.microsoft.com", - "expireTime": 2419200, - "host": "azureprivatedns.net", - "minimumTtl": 10, - "refreshTime": 3600, - "retryTime": 300, - "serialNumber": "1" - }, - "roleAssignments": [ - { - "roleDefinitionIdOrName": "Reader", - "principalIds": [ - "<>" - ] - } - ] - } - ] - }, - "SRV": { - "value": [ - { - "name": "SRV_contoso", - "ttl": 3600, - "srvRecords": [ - { - "port": 9332, - "priority": 0, - "target": "test.contoso.com", - "weight": 0 - } - ], - "roleAssignments": [ - { - "roleDefinitionIdOrName": "Reader", - "principalIds": [ - "<>" - ] - } - ] - } - ] - }, - "TXT": { - "value": [ - { - "name": "TXT_test", - "ttl": 3600, - "txtRecords": [ - { - "value": [ - "test" - ] - } - ], - "roleAssignments": [ - { - "roleDefinitionIdOrName": "Reader", - "principalIds": [ - "<>" - ] - } - ] - } - ] - }, - "virtualNetworkLinks": { - "value": [ - { - "virtualNetworkResourceId": "/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworks/adp-<>-az-vnet-x-001", - "registrationEnabled": true - } - ] - } - } -} diff --git a/modules/Microsoft.Network/privateDnsZones/readme.md b/modules/Microsoft.Network/privateDnsZones/readme.md index 7c90f9d89c..db7e2e1a08 100644 --- a/modules/Microsoft.Network/privateDnsZones/readme.md +++ b/modules/Microsoft.Network/privateDnsZones/readme.md @@ -173,7 +173,7 @@ The following module usage examples are retrieved from the content of the files >**Note**: Each example lists all the required parameters first, followed by the rest - each in alphabetical order. -

Example 1: Min

+

Example 1: Common

@@ -181,49 +181,12 @@ The following module usage examples are retrieved from the content of the files ```bicep module privateDnsZones './Microsoft.Network/privateDnsZones/deploy.bicep' = { - name: '${uniqueString(deployment().name)}-PrivateDnsZones' - params: { - name: '<>-az-privdns-x-001.com' - } -} -``` - -
-

- -

- -via JSON Parameter file - -```json -{ - "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#", - "contentVersion": "1.0.0.0", - "parameters": { - "name": { - "value": "<>-az-privdns-x-001.com" - } - } -} -``` - -
-

- -

Example 2: Parameters

- -
- -via Bicep module - -```bicep -module privateDnsZones './Microsoft.Network/privateDnsZones/deploy.bicep' = { - name: '${uniqueString(deployment().name)}-PrivateDnsZones' + name: '${uniqueString(deployment().name)}-test-npdzcom' params: { // Required parameters - name: '<>-az-privdns-x-002.com' + name: '<>npdzcom001' // Non-required parameters - A: [ + a: [ { aRecords: [ { @@ -234,7 +197,7 @@ module privateDnsZones './Microsoft.Network/privateDnsZones/deploy.bicep' = { roleAssignments: [ { principalIds: [ - '<>' + '' ] roleDefinitionIdOrName: 'Reader' } @@ -242,7 +205,7 @@ module privateDnsZones './Microsoft.Network/privateDnsZones/deploy.bicep' = { ttl: 3600 } ] - AAAA: [ + aaaa: [ { aaaaRecords: [ { @@ -253,7 +216,7 @@ module privateDnsZones './Microsoft.Network/privateDnsZones/deploy.bicep' = { ttl: 3600 } ] - CNAME: [ + cname: [ { cnameRecord: { cname: 'test' @@ -262,7 +225,7 @@ module privateDnsZones './Microsoft.Network/privateDnsZones/deploy.bicep' = { roleAssignments: [ { principalIds: [ - '<>' + '' ] roleDefinitionIdOrName: 'Reader' } @@ -271,7 +234,7 @@ module privateDnsZones './Microsoft.Network/privateDnsZones/deploy.bicep' = { } ] lock: 'CanNotDelete' - MX: [ + mx: [ { mxRecords: [ { @@ -283,7 +246,7 @@ module privateDnsZones './Microsoft.Network/privateDnsZones/deploy.bicep' = { roleAssignments: [ { principalIds: [ - '<>' + '' ] roleDefinitionIdOrName: 'Reader' } @@ -291,7 +254,7 @@ module privateDnsZones './Microsoft.Network/privateDnsZones/deploy.bicep' = { ttl: 3600 } ] - PTR: [ + ptr: [ { name: 'PTR_contoso' ptrRecords: [ @@ -302,7 +265,7 @@ module privateDnsZones './Microsoft.Network/privateDnsZones/deploy.bicep' = { roleAssignments: [ { principalIds: [ - '<>' + '' ] roleDefinitionIdOrName: 'Reader' } @@ -313,18 +276,18 @@ module privateDnsZones './Microsoft.Network/privateDnsZones/deploy.bicep' = { roleAssignments: [ { principalIds: [ - '<>' + '' ] roleDefinitionIdOrName: 'Reader' } ] - SOA: [ + soa: [ { name: '@' roleAssignments: [ { principalIds: [ - '<>' + '' ] roleDefinitionIdOrName: 'Reader' } @@ -341,13 +304,13 @@ module privateDnsZones './Microsoft.Network/privateDnsZones/deploy.bicep' = { ttl: 3600 } ] - SRV: [ + srv: [ { name: 'SRV_contoso' roleAssignments: [ { principalIds: [ - '<>' + '' ] roleDefinitionIdOrName: 'Reader' } @@ -363,13 +326,13 @@ module privateDnsZones './Microsoft.Network/privateDnsZones/deploy.bicep' = { ttl: 3600 } ] - TXT: [ + txt: [ { name: 'TXT_test' roleAssignments: [ { principalIds: [ - '<>' + '' ] roleDefinitionIdOrName: 'Reader' } @@ -387,7 +350,7 @@ module privateDnsZones './Microsoft.Network/privateDnsZones/deploy.bicep' = { virtualNetworkLinks: [ { registrationEnabled: true - virtualNetworkResourceId: '/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworks/adp-<>-az-vnet-x-001' + virtualNetworkResourceId: '' } ] } @@ -408,10 +371,10 @@ module privateDnsZones './Microsoft.Network/privateDnsZones/deploy.bicep' = { "parameters": { // Required parameters "name": { - "value": "<>-az-privdns-x-002.com" + "value": "<>npdzcom001" }, // Non-required parameters - "A": { + "a": { "value": [ { "aRecords": [ @@ -423,7 +386,7 @@ module privateDnsZones './Microsoft.Network/privateDnsZones/deploy.bicep' = { "roleAssignments": [ { "principalIds": [ - "<>" + "" ], "roleDefinitionIdOrName": "Reader" } @@ -432,7 +395,7 @@ module privateDnsZones './Microsoft.Network/privateDnsZones/deploy.bicep' = { } ] }, - "AAAA": { + "aaaa": { "value": [ { "aaaaRecords": [ @@ -445,7 +408,7 @@ module privateDnsZones './Microsoft.Network/privateDnsZones/deploy.bicep' = { } ] }, - "CNAME": { + "cname": { "value": [ { "cnameRecord": { @@ -455,7 +418,7 @@ module privateDnsZones './Microsoft.Network/privateDnsZones/deploy.bicep' = { "roleAssignments": [ { "principalIds": [ - "<>" + "" ], "roleDefinitionIdOrName": "Reader" } @@ -467,7 +430,7 @@ module privateDnsZones './Microsoft.Network/privateDnsZones/deploy.bicep' = { "lock": { "value": "CanNotDelete" }, - "MX": { + "mx": { "value": [ { "mxRecords": [ @@ -480,7 +443,7 @@ module privateDnsZones './Microsoft.Network/privateDnsZones/deploy.bicep' = { "roleAssignments": [ { "principalIds": [ - "<>" + "" ], "roleDefinitionIdOrName": "Reader" } @@ -489,7 +452,7 @@ module privateDnsZones './Microsoft.Network/privateDnsZones/deploy.bicep' = { } ] }, - "PTR": { + "ptr": { "value": [ { "name": "PTR_contoso", @@ -501,7 +464,7 @@ module privateDnsZones './Microsoft.Network/privateDnsZones/deploy.bicep' = { "roleAssignments": [ { "principalIds": [ - "<>" + "" ], "roleDefinitionIdOrName": "Reader" } @@ -514,20 +477,20 @@ module privateDnsZones './Microsoft.Network/privateDnsZones/deploy.bicep' = { "value": [ { "principalIds": [ - "<>" + "" ], "roleDefinitionIdOrName": "Reader" } ] }, - "SOA": { + "soa": { "value": [ { "name": "@", "roleAssignments": [ { "principalIds": [ - "<>" + "" ], "roleDefinitionIdOrName": "Reader" } @@ -545,14 +508,14 @@ module privateDnsZones './Microsoft.Network/privateDnsZones/deploy.bicep' = { } ] }, - "SRV": { + "srv": { "value": [ { "name": "SRV_contoso", "roleAssignments": [ { "principalIds": [ - "<>" + "" ], "roleDefinitionIdOrName": "Reader" } @@ -569,14 +532,14 @@ module privateDnsZones './Microsoft.Network/privateDnsZones/deploy.bicep' = { } ] }, - "TXT": { + "txt": { "value": [ { "name": "TXT_test", "roleAssignments": [ { "principalIds": [ - "<>" + "" ], "roleDefinitionIdOrName": "Reader" } @@ -596,7 +559,7 @@ module privateDnsZones './Microsoft.Network/privateDnsZones/deploy.bicep' = { "value": [ { "registrationEnabled": true, - "virtualNetworkResourceId": "/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworks/adp-<>-az-vnet-x-001" + "virtualNetworkResourceId": "" } ] } @@ -606,3 +569,40 @@ module privateDnsZones './Microsoft.Network/privateDnsZones/deploy.bicep' = {

+ +

Example 2: Min

+ +
+ +via Bicep module + +```bicep +module privateDnsZones './Microsoft.Network/privateDnsZones/deploy.bicep' = { + name: '${uniqueString(deployment().name)}-test-npdzmin' + params: { + name: '<>npdzmin001' + } +} +``` + +
+

+ +

+ +via JSON Parameter file + +```json +{ + "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#", + "contentVersion": "1.0.0.0", + "parameters": { + "name": { + "value": "<>npdzmin001" + } + } +} +``` + +
+

From f76411ece4eae18d43c6e698d25fa44a5916c446 Mon Sep 17 00:00:00 2001 From: MrMCake Date: Tue, 20 Sep 2022 21:46:59 +0200 Subject: [PATCH 03/12] Fixed name --- .../privateDnsZones/.test/common/deploy.test.bicep | 2 +- .../privateDnsZones/.test/min/deploy.test.bicep | 3 ++- modules/Microsoft.Network/privateDnsZones/readme.md | 8 ++++---- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/modules/Microsoft.Network/privateDnsZones/.test/common/deploy.test.bicep b/modules/Microsoft.Network/privateDnsZones/.test/common/deploy.test.bicep index 6a1eff0ad3..a62f5eda82 100644 --- a/modules/Microsoft.Network/privateDnsZones/.test/common/deploy.test.bicep +++ b/modules/Microsoft.Network/privateDnsZones/.test/common/deploy.test.bicep @@ -41,7 +41,7 @@ module testDeployment '../../deploy.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name)}-test-${serviceShort}' params: { - name: '<>${serviceShort}001' + name: '<>${serviceShort}001.com' a: [ { aRecords: [ diff --git a/modules/Microsoft.Network/privateDnsZones/.test/min/deploy.test.bicep b/modules/Microsoft.Network/privateDnsZones/.test/min/deploy.test.bicep index 6033b1bc99..d8a25e93f1 100644 --- a/modules/Microsoft.Network/privateDnsZones/.test/min/deploy.test.bicep +++ b/modules/Microsoft.Network/privateDnsZones/.test/min/deploy.test.bicep @@ -32,6 +32,7 @@ module testDeployment '../../deploy.bicep' = { scope: resourceGroup name: '${uniqueString(deployment().name)}-test-${serviceShort}' params: { - name: '<>${serviceShort}001' + name: '<>${serviceShort}001.com' + } } diff --git a/modules/Microsoft.Network/privateDnsZones/readme.md b/modules/Microsoft.Network/privateDnsZones/readme.md index db7e2e1a08..7e3a05160b 100644 --- a/modules/Microsoft.Network/privateDnsZones/readme.md +++ b/modules/Microsoft.Network/privateDnsZones/readme.md @@ -184,7 +184,7 @@ module privateDnsZones './Microsoft.Network/privateDnsZones/deploy.bicep' = { name: '${uniqueString(deployment().name)}-test-npdzcom' params: { // Required parameters - name: '<>npdzcom001' + name: '<>npdzcom001.com' // Non-required parameters a: [ { @@ -371,7 +371,7 @@ module privateDnsZones './Microsoft.Network/privateDnsZones/deploy.bicep' = { "parameters": { // Required parameters "name": { - "value": "<>npdzcom001" + "value": "<>npdzcom001.com" }, // Non-required parameters "a": { @@ -580,7 +580,7 @@ module privateDnsZones './Microsoft.Network/privateDnsZones/deploy.bicep' = { module privateDnsZones './Microsoft.Network/privateDnsZones/deploy.bicep' = { name: '${uniqueString(deployment().name)}-test-npdzmin' params: { - name: '<>npdzmin001' + name: '<>npdzmin001.com' } } ``` @@ -598,7 +598,7 @@ module privateDnsZones './Microsoft.Network/privateDnsZones/deploy.bicep' = { "contentVersion": "1.0.0.0", "parameters": { "name": { - "value": "<>npdzmin001" + "value": "<>npdzmin001.com" } } } From 4d7f3ccc97509e8c78f91a2dc466b42364b372dc Mon Sep 17 00:00:00 2001 From: MrMCake Date: Tue, 20 Sep 2022 22:27:29 +0200 Subject: [PATCH 04/12] Update to latest --- utilities/tools/REST2CARML/Set-ModuleFolderData.ps1 | 1 - 1 file changed, 1 deletion(-) delete mode 100644 utilities/tools/REST2CARML/Set-ModuleFolderData.ps1 diff --git a/utilities/tools/REST2CARML/Set-ModuleFolderData.ps1 b/utilities/tools/REST2CARML/Set-ModuleFolderData.ps1 deleted file mode 100644 index 5f282702bb..0000000000 --- a/utilities/tools/REST2CARML/Set-ModuleFolderData.ps1 +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file From 3b5c315bd6207dd33881efea41176d4212705cfb Mon Sep 17 00:00:00 2001 From: Alexander Sehr Date: Mon, 3 Oct 2022 22:23:31 +0200 Subject: [PATCH 05/12] Update modules/Microsoft.Network/privateDnsZones/.test/common/deploy.test.bicep Co-authored-by: Erika Gressi <56914614+eriqua@users.noreply.github.com> --- .../privateDnsZones/.test/common/deploy.test.bicep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Microsoft.Network/privateDnsZones/.test/common/deploy.test.bicep b/modules/Microsoft.Network/privateDnsZones/.test/common/deploy.test.bicep index a62f5eda82..d20f49df95 100644 --- a/modules/Microsoft.Network/privateDnsZones/.test/common/deploy.test.bicep +++ b/modules/Microsoft.Network/privateDnsZones/.test/common/deploy.test.bicep @@ -3,7 +3,7 @@ targetScope = 'subscription' // ========== // // Parameters // // ========== // -@description('Optional. The name of the resource group to deploy for testing purposes') +@description('Optional. The name of the resource group to deploy for testing purposes.') @maxLength(90) param resourceGroupName string = 'ms.network.privatednszones-${serviceShort}-rg' From 71dea3c93550999fc3077bad89586a040b2dcef1 Mon Sep 17 00:00:00 2001 From: Alexander Sehr Date: Mon, 3 Oct 2022 22:23:36 +0200 Subject: [PATCH 06/12] Update modules/Microsoft.Network/privateDnsZones/.test/common/deploy.test.bicep Co-authored-by: Erika Gressi <56914614+eriqua@users.noreply.github.com> --- .../privateDnsZones/.test/common/deploy.test.bicep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Microsoft.Network/privateDnsZones/.test/common/deploy.test.bicep b/modules/Microsoft.Network/privateDnsZones/.test/common/deploy.test.bicep index d20f49df95..9932bad767 100644 --- a/modules/Microsoft.Network/privateDnsZones/.test/common/deploy.test.bicep +++ b/modules/Microsoft.Network/privateDnsZones/.test/common/deploy.test.bicep @@ -7,7 +7,7 @@ targetScope = 'subscription' @maxLength(90) param resourceGroupName string = 'ms.network.privatednszones-${serviceShort}-rg' -@description('Optional. The location to deploy resources to') +@description('Optional. The location to deploy resources to.') param location string = deployment().location @description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints') From cbe7e2dffb5f783c9453fd4eac98e0c417e71590 Mon Sep 17 00:00:00 2001 From: Alexander Sehr Date: Mon, 3 Oct 2022 22:23:43 +0200 Subject: [PATCH 07/12] Update modules/Microsoft.Network/privateDnsZones/.test/common/deploy.test.bicep Co-authored-by: Erika Gressi <56914614+eriqua@users.noreply.github.com> --- .../privateDnsZones/.test/common/deploy.test.bicep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Microsoft.Network/privateDnsZones/.test/common/deploy.test.bicep b/modules/Microsoft.Network/privateDnsZones/.test/common/deploy.test.bicep index 9932bad767..14962e5240 100644 --- a/modules/Microsoft.Network/privateDnsZones/.test/common/deploy.test.bicep +++ b/modules/Microsoft.Network/privateDnsZones/.test/common/deploy.test.bicep @@ -10,7 +10,7 @@ param resourceGroupName string = 'ms.network.privatednszones-${serviceShort}-rg' @description('Optional. The location to deploy resources to.') param location string = deployment().location -@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints') +@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.') param serviceShort string = 'npdzcom' // =========== // From 63dd9cb741166a7302d6b3dfdf6cf425c4d803fe Mon Sep 17 00:00:00 2001 From: Alexander Sehr Date: Mon, 3 Oct 2022 22:23:49 +0200 Subject: [PATCH 08/12] Update modules/Microsoft.Network/privateDnsZones/.test/min/deploy.test.bicep Co-authored-by: Erika Gressi <56914614+eriqua@users.noreply.github.com> --- .../privateDnsZones/.test/min/deploy.test.bicep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Microsoft.Network/privateDnsZones/.test/min/deploy.test.bicep b/modules/Microsoft.Network/privateDnsZones/.test/min/deploy.test.bicep index d8a25e93f1..c41843e3ec 100644 --- a/modules/Microsoft.Network/privateDnsZones/.test/min/deploy.test.bicep +++ b/modules/Microsoft.Network/privateDnsZones/.test/min/deploy.test.bicep @@ -3,7 +3,7 @@ targetScope = 'subscription' // ========== // // Parameters // // ========== // -@description('Optional. The name of the resource group to deploy for testing purposes') +@description('Optional. The name of the resource group to deploy for testing purposes.') @maxLength(90) param resourceGroupName string = 'ms.network.privatednszones-${serviceShort}-rg' From 90c23cbb03a6191f7e68e3f9891027bca42d7ef4 Mon Sep 17 00:00:00 2001 From: Alexander Sehr Date: Mon, 3 Oct 2022 22:23:54 +0200 Subject: [PATCH 09/12] Update modules/Microsoft.Network/privateDnsZones/.test/min/deploy.test.bicep Co-authored-by: Erika Gressi <56914614+eriqua@users.noreply.github.com> --- .../privateDnsZones/.test/min/deploy.test.bicep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Microsoft.Network/privateDnsZones/.test/min/deploy.test.bicep b/modules/Microsoft.Network/privateDnsZones/.test/min/deploy.test.bicep index c41843e3ec..92b65687d4 100644 --- a/modules/Microsoft.Network/privateDnsZones/.test/min/deploy.test.bicep +++ b/modules/Microsoft.Network/privateDnsZones/.test/min/deploy.test.bicep @@ -7,7 +7,7 @@ targetScope = 'subscription' @maxLength(90) param resourceGroupName string = 'ms.network.privatednszones-${serviceShort}-rg' -@description('Optional. The location to deploy resources to') +@description('Optional. The location to deploy resources to.') param location string = deployment().location @description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints') From a226f0a2fcf1e8657587eea398a508ddc0c33bf3 Mon Sep 17 00:00:00 2001 From: Alexander Sehr Date: Mon, 3 Oct 2022 22:23:59 +0200 Subject: [PATCH 10/12] Update modules/Microsoft.Network/privateDnsZones/.test/min/deploy.test.bicep Co-authored-by: Erika Gressi <56914614+eriqua@users.noreply.github.com> --- .../privateDnsZones/.test/min/deploy.test.bicep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Microsoft.Network/privateDnsZones/.test/min/deploy.test.bicep b/modules/Microsoft.Network/privateDnsZones/.test/min/deploy.test.bicep index 92b65687d4..6a1dc1863b 100644 --- a/modules/Microsoft.Network/privateDnsZones/.test/min/deploy.test.bicep +++ b/modules/Microsoft.Network/privateDnsZones/.test/min/deploy.test.bicep @@ -10,7 +10,7 @@ param resourceGroupName string = 'ms.network.privatednszones-${serviceShort}-rg' @description('Optional. The location to deploy resources to.') param location string = deployment().location -@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints') +@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.') param serviceShort string = 'npdzmin' // =========== // From 902361354b8b8939ad30a10980f8b88818bfce6b Mon Sep 17 00:00:00 2001 From: Alexander Sehr Date: Mon, 3 Oct 2022 22:24:05 +0200 Subject: [PATCH 11/12] Update modules/Microsoft.Network/privateDnsZones/.test/min/deploy.test.bicep Co-authored-by: Erika Gressi <56914614+eriqua@users.noreply.github.com> --- .../privateDnsZones/.test/min/deploy.test.bicep | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/Microsoft.Network/privateDnsZones/.test/min/deploy.test.bicep b/modules/Microsoft.Network/privateDnsZones/.test/min/deploy.test.bicep index 6a1dc1863b..a0c32568d1 100644 --- a/modules/Microsoft.Network/privateDnsZones/.test/min/deploy.test.bicep +++ b/modules/Microsoft.Network/privateDnsZones/.test/min/deploy.test.bicep @@ -33,6 +33,5 @@ module testDeployment '../../deploy.bicep' = { name: '${uniqueString(deployment().name)}-test-${serviceShort}' params: { name: '<>${serviceShort}001.com' - } } From 140b8b61aa72f0d9d42992656518e3785c115575 Mon Sep 17 00:00:00 2001 From: MrMCake Date: Mon, 3 Oct 2022 22:25:03 +0200 Subject: [PATCH 12/12] Updated readme --- modules/Microsoft.Network/privateDnsZones/readme.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/Microsoft.Network/privateDnsZones/readme.md b/modules/Microsoft.Network/privateDnsZones/readme.md index 7e3a05160b..d408a62a71 100644 --- a/modules/Microsoft.Network/privateDnsZones/readme.md +++ b/modules/Microsoft.Network/privateDnsZones/readme.md @@ -30,11 +30,13 @@ This template deploys a private DNS zone. ## Parameters **Required parameters** + | Parameter Name | Type | Description | | :-- | :-- | :-- | | `name` | string | Private DNS zone name. | **Optional parameters** + | Parameter Name | Type | Default Value | Allowed Values | Description | | :-- | :-- | :-- | :-- | :-- | | `a` | _[a](a/readme.md)_ array | `[]` | | Array of A records. |