From dcf3b9dc92d5933d44ee3c6937e51ac3cd334cfb Mon Sep 17 00:00:00 2001 From: MrMCake Date: Mon, 19 Sep 2022 15:34:40 +0200 Subject: [PATCH 01/15] 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 3bbc9335f25ee99803ea339033892af30904cad2 Mon Sep 17 00:00:00 2001 From: MrMCake Date: Tue, 20 Sep 2022 22:22:24 +0200 Subject: [PATCH 02/15] Updated EventHub Namespaes to new dependencies approach --- .github/workflows/ms.eventhub.namespaces.yml | 3 +- .../.test/common/dependencies.bicep | 81 ++++++++ .../namespaces/.test/common/deploy.test.bicep | 175 ++++++++++++++++++ .../namespaces/.test/min.parameters.json | 5 - .../namespaces/.test/min/deploy.test.bicep | 36 ++++ .../namespaces/.test/parameters.json | 148 --------------- .../namespaces/.test/pe.parameters.json | 22 --- .../namespaces/.test/pe/dependencies.bicep | 52 ++++++ .../namespaces/.test/pe/deploy.test.bicep | 56 ++++++ .../Microsoft.EventHub/namespaces/readme.md | 131 +++++++------ .../tools/REST2CARML/Set-ModuleFolderData.ps1 | 1 - utilities/tools/Set-ModuleReadMe.ps1 | 22 ++- 12 files changed, 485 insertions(+), 247 deletions(-) create mode 100644 modules/Microsoft.EventHub/namespaces/.test/common/dependencies.bicep create mode 100644 modules/Microsoft.EventHub/namespaces/.test/common/deploy.test.bicep delete mode 100644 modules/Microsoft.EventHub/namespaces/.test/min.parameters.json create mode 100644 modules/Microsoft.EventHub/namespaces/.test/min/deploy.test.bicep delete mode 100644 modules/Microsoft.EventHub/namespaces/.test/parameters.json delete mode 100644 modules/Microsoft.EventHub/namespaces/.test/pe.parameters.json create mode 100644 modules/Microsoft.EventHub/namespaces/.test/pe/dependencies.bicep create mode 100644 modules/Microsoft.EventHub/namespaces/.test/pe/deploy.test.bicep delete mode 100644 utilities/tools/REST2CARML/Set-ModuleFolderData.ps1 diff --git a/.github/workflows/ms.eventhub.namespaces.yml b/.github/workflows/ms.eventhub.namespaces.yml index b3fcba58b8..bc88657c25 100644 --- a/.github/workflows/ms.eventhub.namespaces.yml +++ b/.github/workflows/ms.eventhub.namespaces.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.EventHub/namespaces/.test/common/dependencies.bicep b/modules/Microsoft.EventHub/namespaces/.test/common/dependencies.bicep new file mode 100644 index 0000000000..d04b499e87 --- /dev/null +++ b/modules/Microsoft.EventHub/namespaces/.test/common/dependencies.bicep @@ -0,0 +1,81 @@ +@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 + +@description('Required. The name of the Storage Account to create.') +param storageAccountName 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' + serviceEndpoints: [ + { + service: 'Microsoft.EventHub' + } + ] + } + } + ] + } +} + +resource privateDNSZone 'Microsoft.Network/privateDnsZones@2020-06-01' = { + name: 'privatelink.servicebus.windows.net' + location: 'global' + + resource virtualNetworkLinks 'virtualNetworkLinks@2020-06-01' = { + name: '${virtualNetwork.name}-vnetlink' + location: 'global' + properties: { + virtualNetwork: { + id: virtualNetwork.id + } + registrationEnabled: false + } + } +} + +resource managedIdentity 'Microsoft.ManagedIdentity/userAssignedIdentities@2018-11-30' = { + name: managedIdentityName + location: location +} + +resource storageAccount 'Microsoft.Storage/storageAccounts@2022-05-01' = { + name: storageAccountName + location: location + sku: { + name: 'Standard_LRS' + } + kind: 'StorageV2' +} + +@description('The resource ID of the created Virtual Network Subnet.') +output subnetResourceId string = virtualNetwork.properties.subnets[0].id + +@description('The principal ID of the created Managed Identity.') +output managedIdentityPrincipalId string = managedIdentity.properties.principalId + +@description('The resource ID of the created Managed Identity.') +output managedIdentityResourceId string = managedIdentity.id + +@description('The resource ID of the created Private DNS Zone.') +output privateDNSZoneResourceId string = privateDNSZone.id + +@description('The resource ID of the created Storage Account.') +output storageAccountResourceId string = storageAccount.id diff --git a/modules/Microsoft.EventHub/namespaces/.test/common/deploy.test.bicep b/modules/Microsoft.EventHub/namespaces/.test/common/deploy.test.bicep new file mode 100644 index 0000000000..6a2e23ee8c --- /dev/null +++ b/modules/Microsoft.EventHub/namespaces/.test/common/deploy.test.bicep @@ -0,0 +1,175 @@ +targetScope = 'subscription' + +// ========== // +// Parameters // +// ========== // +@description('Optional. The name of the resource group to deploy for testing purposes') +@maxLength(90) +param resourceGroupName string = 'ms.eventhub.namespaces-${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 = 'ehncom' + +// =========== // +// 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}' + storageAccountName: 'dep<>sa${serviceShort}' + } +} + +// Diagnostics +// =========== +module diagnosticDependencies '../../../../.shared/dependencyConstructs/diagnostic.dependencies.bicep' = { + scope: resourceGroup + name: '${uniqueString(deployment().name, location)}-diagnosticDependencies' + params: { + storageAccountName: 'dep<>diasa${serviceShort}01' + logAnalyticsWorkspaceName: 'dep-<>-law-${serviceShort}' + eventHubNamespaceEventHubName: 'dep-<>-evh-${serviceShort}' + eventHubNamespaceName: 'dep-<>-evhns-${serviceShort}' + location: location + } +} + +// ============== // +// Test Execution // +// ============== // + +module testDeployment '../../deploy.bicep' = { + scope: resourceGroup + name: '${uniqueString(deployment().name)}-test-${serviceShort}' + params: { + name: '<>${serviceShort}001' + + authorizationRules: [ + { + name: 'RootManageSharedAccessKey' + rights: [ + 'Listen' + 'Manage' + 'Send' + ] + } + { + name: 'SendListenAccess' + rights: [ + 'Listen' + 'Send' + ] + } + ] + diagnosticLogsRetentionInDays: 7 + diagnosticStorageAccountId: diagnosticDependencies.outputs.storageAccountResourceId + diagnosticWorkspaceId: diagnosticDependencies.outputs.logAnalyticsWorkspaceResourceId + diagnosticEventHubAuthorizationRuleId: diagnosticDependencies.outputs.eventHubAuthorizationRuleId + diagnosticEventHubName: diagnosticDependencies.outputs.eventHubNamespaceEventHubName + eventHubs: [ + { + name: '<>-az-evh-x-001' + } + { + authorizationRules: [ + { + name: 'RootManageSharedAccessKey' + rights: [ + 'Listen' + 'Manage' + 'Send' + ] + } + { + name: 'SendListenAccess' + rights: [ + 'Listen' + 'Send' + ] + } + ] + captureDescriptionDestinationArchiveNameFormat: '{Namespace}/{EventHub}/{PartitionId}/{Year}/{Month}/{Day}/{Hour}/{Minute}/{Second}' + captureDescriptionDestinationBlobContainer: 'eventhub' + captureDescriptionDestinationName: 'EventHubArchive.AzureBlockBlob' + captureDescriptionDestinationStorageAccountResourceId: resourceGroupResources.outputs.storageAccountResourceId + captureDescriptionEnabled: true + captureDescriptionEncoding: 'Avro' + captureDescriptionIntervalInSeconds: 300 + captureDescriptionSizeLimitInBytes: 314572800 + captureDescriptionSkipEmptyArchives: true + consumerGroups: [ + { + name: 'custom' + userMetadata: 'customMetadata' + } + ] + messageRetentionInDays: 1 + name: '<>-az-evh-x-002' + partitionCount: 2 + roleAssignments: [ + { + principalIds: [ + resourceGroupResources.outputs.managedIdentityPrincipalId + ] + roleDefinitionIdOrName: 'Reader' + } + ] + status: 'Active' + } + ] + lock: 'CanNotDelete' + networkRuleSets: { + defaultAction: 'Deny' + ipRules: [ + { + action: 'Allow' + ipMask: '10.10.10.10' + } + ] + trustedServiceAccessEnabled: false + virtualNetworkRules: [ + { + ignoreMissingVnetServiceEndpoint: true + subnetResourceId: resourceGroupResources.outputs.subnetResourceId + } + ] + } + privateEndpoints: [ + { + privateDnsZoneGroups: { + privateDNSResourceIds: [ + resourceGroupResources.outputs.privateDNSZoneResourceId + ] + } + service: 'namespace' + subnetResourceId: resourceGroupResources.outputs.subnetResourceId + } + ] + roleAssignments: [ + { + principalIds: [ + resourceGroupResources.outputs.managedIdentityPrincipalId + ] + roleDefinitionIdOrName: 'Reader' + } + ] + systemAssignedIdentity: true + userAssignedIdentities: { + '${resourceGroupResources.outputs.managedIdentityResourceId}': {} + } + } +} diff --git a/modules/Microsoft.EventHub/namespaces/.test/min.parameters.json b/modules/Microsoft.EventHub/namespaces/.test/min.parameters.json deleted file mode 100644 index d90c44f3fb..0000000000 --- a/modules/Microsoft.EventHub/namespaces/.test/min.parameters.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#", - "contentVersion": "1.0.0.0", - "parameters": {} -} diff --git a/modules/Microsoft.EventHub/namespaces/.test/min/deploy.test.bicep b/modules/Microsoft.EventHub/namespaces/.test/min/deploy.test.bicep new file mode 100644 index 0000000000..ac88cac73d --- /dev/null +++ b/modules/Microsoft.EventHub/namespaces/.test/min/deploy.test.bicep @@ -0,0 +1,36 @@ +targetScope = 'subscription' + +// ========== // +// Parameters // +// ========== // +@description('Optional. The name of the resource group to deploy for testing purposes') +@maxLength(90) +param resourceGroupName string = 'ms.eventhub.namespaces-${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 = 'ehnmin' + +// =========== // +// 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: { + } +} diff --git a/modules/Microsoft.EventHub/namespaces/.test/parameters.json b/modules/Microsoft.EventHub/namespaces/.test/parameters.json deleted file mode 100644 index e997fb3c7f..0000000000 --- a/modules/Microsoft.EventHub/namespaces/.test/parameters.json +++ /dev/null @@ -1,148 +0,0 @@ -{ - "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#", - "contentVersion": "1.0.0.0", - "parameters": { - "name": { - "value": "<>-az-evhns-x-001" - }, - "lock": { - "value": "CanNotDelete" - }, - "authorizationRules": { - "value": [ - { - "name": "RootManageSharedAccessKey", - "rights": [ - "Listen", - "Manage", - "Send" - ] - }, - { - "name": "SendListenAccess", - "rights": [ - "Listen", - "Send" - ] - } - ] - }, - "roleAssignments": { - "value": [ - { - "roleDefinitionIdOrName": "Reader", - "principalIds": [ - "<>" - ] - } - ] - }, - "eventHubs": { - "value": [ - { - "name": "<>-az-evh-x-001" - }, - { - "name": "<>-az-evh-x-002", - "authorizationRules": [ - { - "name": "RootManageSharedAccessKey", - "rights": [ - "Listen", - "Manage", - "Send" - ] - }, - { - "name": "SendListenAccess", - "rights": [ - "Listen", - "Send" - ] - } - ], - "roleAssignments": [ - { - "roleDefinitionIdOrName": "Reader", - "principalIds": [ - "<>" - ] - } - ], - "messageRetentionInDays": 1, - "partitionCount": 2, - "status": "Active", - "captureDescriptionEnabled": true, - "captureDescriptionEncoding": "Avro", - "captureDescriptionIntervalInSeconds": 300, - "captureDescriptionSizeLimitInBytes": 314572800, - "captureDescriptionDestinationName": "EventHubArchive.AzureBlockBlob", - "captureDescriptionDestinationStorageAccountResourceId": "/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.Storage/storageAccounts/adp<>azsax001", - "captureDescriptionDestinationBlobContainer": "eventhub", - "captureDescriptionDestinationArchiveNameFormat": "{Namespace}/{EventHub}/{PartitionId}/{Year}/{Month}/{Day}/{Hour}/{Minute}/{Second}", - "captureDescriptionSkipEmptyArchives": true, - "consumerGroups": [ - { - "name": "custom", - "userMetadata": "customMetadata" - } - ] - } - ] - }, - "privateEndpoints": { - "value": [ - { - "subnetResourceId": "/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworks/adp-<>-az-vnet-x-001/subnets/<>-az-subnet-x-005-privateEndpoints", - "service": "namespace", - "privateDnsZoneGroups": { - "privateDNSResourceIds": [ - "/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.Network/privateDnsZones/privatelink.servicebus.windows.net" - ] - } - } - ] - }, - "diagnosticLogsRetentionInDays": { - "value": 7 - }, - "diagnosticStorageAccountId": { - "value": "/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.Storage/storageAccounts/adp<>azsax001" - }, - "diagnosticWorkspaceId": { - "value": "/subscriptions/<>/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-<>-az-law-x-001" - }, - "diagnosticEventHubAuthorizationRuleId": { - "value": "/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.EventHub/namespaces/adp-<>-az-evhns-x-001/AuthorizationRules/RootManageSharedAccessKey" - }, - "diagnosticEventHubName": { - "value": "adp-<>-az-evh-x-001" - }, - "systemAssignedIdentity": { - "value": true - }, - "networkRuleSets": { - "value": { - "defaultAction": "Deny", - "ipRules": [ - { - "action": "Allow", - "ipMask": "10.10.10.10" - } - ], - "virtualNetworkRules": [ - { - "subnetResourceId": "/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworks/adp-<>-az-vnet-x-001/subnets/<>-az-subnet-x-001", - "ignoreMissingVnetServiceEndpoint": true - } - ], - "trustedServiceAccessEnabled": false - } - }, - "userAssignedIdentities": { - "value": { - "/subscriptions/<>/resourcegroups/validation-rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/adp-<>-az-msi-x-001": {} - } - } - } -} diff --git a/modules/Microsoft.EventHub/namespaces/.test/pe.parameters.json b/modules/Microsoft.EventHub/namespaces/.test/pe.parameters.json deleted file mode 100644 index 27acd28265..0000000000 --- a/modules/Microsoft.EventHub/namespaces/.test/pe.parameters.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#", - "contentVersion": "1.0.0.0", - "parameters": { - "name": { - "value": "<>-az-evhns-pe-001" - }, - "privateEndpoints": { - "value": [ - { - "subnetResourceId": "/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworks/adp-<>-az-vnet-x-001/subnets/<>-az-subnet-x-005-privateEndpoints", - "service": "namespace", - "privateDnsZoneGroups": { - "privateDNSResourceIds": [ - "/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.Network/privateDnsZones/privatelink.servicebus.windows.net" - ] - } - } - ] - } - } -} diff --git a/modules/Microsoft.EventHub/namespaces/.test/pe/dependencies.bicep b/modules/Microsoft.EventHub/namespaces/.test/pe/dependencies.bicep new file mode 100644 index 0000000000..4e869fa70c --- /dev/null +++ b/modules/Microsoft.EventHub/namespaces/.test/pe/dependencies.bicep @@ -0,0 +1,52 @@ +@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 + +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' + serviceEndpoints: [ + { + service: 'Microsoft.EventHub' + } + ] + } + } + ] + } +} + +resource privateDNSZone 'Microsoft.Network/privateDnsZones@2020-06-01' = { + name: 'privatelink.servicebus.windows.net' + location: 'global' + + resource virtualNetworkLinks 'virtualNetworkLinks@2020-06-01' = { + name: '${virtualNetwork.name}-vnetlink' + location: 'global' + properties: { + virtualNetwork: { + id: virtualNetwork.id + } + registrationEnabled: false + } + } +} + +@description('The resource ID of the created Virtual Network Subnet.') +output subnetResourceId string = virtualNetwork.properties.subnets[0].id + +@description('The resource ID of the created Private DNS Zone.') +output privateDNSZoneResourceId string = privateDNSZone.id diff --git a/modules/Microsoft.EventHub/namespaces/.test/pe/deploy.test.bicep b/modules/Microsoft.EventHub/namespaces/.test/pe/deploy.test.bicep new file mode 100644 index 0000000000..11cd894a46 --- /dev/null +++ b/modules/Microsoft.EventHub/namespaces/.test/pe/deploy.test.bicep @@ -0,0 +1,56 @@ +targetScope = 'subscription' + +// ========== // +// Parameters // +// ========== // +@description('Optional. The name of the resource group to deploy for testing purposes') +@maxLength(90) +param resourceGroupName string = 'ms.eventhub.namespaces-${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 = 'ehnpe' + +// =========== // +// 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}' + } +} + +// ============== // +// Test Execution // +// ============== // + +module testDeployment '../../deploy.bicep' = { + scope: resourceGroup + name: '${uniqueString(deployment().name)}-test-${serviceShort}' + params: { + name: '<>${serviceShort}001' + privateEndpoints: [ + { + privateDnsZoneGroups: { + privateDNSResourceIds: [ + resourceGroupResources.outputs.privateDNSZoneResourceId + ] + } + service: 'namespace' + subnetResourceId: resourceGroupResources.outputs.subnetResourceId + } + ] + } +} diff --git a/modules/Microsoft.EventHub/namespaces/readme.md b/modules/Microsoft.EventHub/namespaces/readme.md index 0db1a666d3..35acc9649a 100644 --- a/modules/Microsoft.EventHub/namespaces/readme.md +++ b/modules/Microsoft.EventHub/namespaces/readme.md @@ -299,7 +299,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

@@ -307,40 +307,7 @@ The following module usage examples are retrieved from the content of the files ```bicep module namespaces './Microsoft.EventHub/namespaces/deploy.bicep' = { - name: '${uniqueString(deployment().name)}-Namespaces' - params: { - - } -} -``` - -
-

- -

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

- -

Example 2: Parameters

- -
- -via Bicep module - -```bicep -module namespaces './Microsoft.EventHub/namespaces/deploy.bicep' = { - name: '${uniqueString(deployment().name)}-Namespaces' + name: '${uniqueString(deployment().name)}-test-ehncom' params: { authorizationRules: [ { @@ -359,11 +326,11 @@ module namespaces './Microsoft.EventHub/namespaces/deploy.bicep' = { ] } ] - diagnosticEventHubAuthorizationRuleId: '/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.EventHub/namespaces/adp-<>-az-evhns-x-001/AuthorizationRules/RootManageSharedAccessKey' - diagnosticEventHubName: 'adp-<>-az-evh-x-001' + diagnosticEventHubAuthorizationRuleId: '' + diagnosticEventHubName: '' diagnosticLogsRetentionInDays: 7 - diagnosticStorageAccountId: '/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.Storage/storageAccounts/adp<>azsax001' - diagnosticWorkspaceId: '/subscriptions/<>/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-<>-az-law-x-001' + diagnosticStorageAccountId: '' + diagnosticWorkspaceId: '' eventHubs: [ { name: '<>-az-evh-x-001' @@ -389,7 +356,7 @@ module namespaces './Microsoft.EventHub/namespaces/deploy.bicep' = { captureDescriptionDestinationArchiveNameFormat: '{Namespace}/{EventHub}/{PartitionId}/{Year}/{Month}/{Day}/{Hour}/{Minute}/{Second}' captureDescriptionDestinationBlobContainer: 'eventhub' captureDescriptionDestinationName: 'EventHubArchive.AzureBlockBlob' - captureDescriptionDestinationStorageAccountResourceId: '/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.Storage/storageAccounts/adp<>azsax001' + captureDescriptionDestinationStorageAccountResourceId: '' captureDescriptionEnabled: true captureDescriptionEncoding: 'Avro' captureDescriptionIntervalInSeconds: 300 @@ -407,7 +374,7 @@ module namespaces './Microsoft.EventHub/namespaces/deploy.bicep' = { roleAssignments: [ { principalIds: [ - '<>' + '' ] roleDefinitionIdOrName: 'Reader' } @@ -416,7 +383,7 @@ module namespaces './Microsoft.EventHub/namespaces/deploy.bicep' = { } ] lock: 'CanNotDelete' - name: '<>-az-evhns-x-001' + name: '<>ehncom001' networkRuleSets: { defaultAction: 'Deny' ipRules: [ @@ -429,7 +396,7 @@ module namespaces './Microsoft.EventHub/namespaces/deploy.bicep' = { virtualNetworkRules: [ { ignoreMissingVnetServiceEndpoint: true - subnetResourceId: '/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworks/adp-<>-az-vnet-x-001/subnets/<>-az-subnet-x-001' + subnetResourceId: '' } ] } @@ -437,24 +404,24 @@ module namespaces './Microsoft.EventHub/namespaces/deploy.bicep' = { { privateDnsZoneGroups: { privateDNSResourceIds: [ - '/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.Network/privateDnsZones/privatelink.servicebus.windows.net' + '' ] } service: 'namespace' - subnetResourceId: '/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworks/adp-<>-az-vnet-x-001/subnets/<>-az-subnet-x-005-privateEndpoints' + subnetResourceId: '' } ] roleAssignments: [ { principalIds: [ - '<>' + '' ] roleDefinitionIdOrName: 'Reader' } ] systemAssignedIdentity: true userAssignedIdentities: { - '/subscriptions/<>/resourcegroups/validation-rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/adp-<>-az-msi-x-001': {} + '': {} } } } @@ -492,19 +459,19 @@ module namespaces './Microsoft.EventHub/namespaces/deploy.bicep' = { ] }, "diagnosticEventHubAuthorizationRuleId": { - "value": "/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.EventHub/namespaces/adp-<>-az-evhns-x-001/AuthorizationRules/RootManageSharedAccessKey" + "value": "" }, "diagnosticEventHubName": { - "value": "adp-<>-az-evh-x-001" + "value": "" }, "diagnosticLogsRetentionInDays": { "value": 7 }, "diagnosticStorageAccountId": { - "value": "/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.Storage/storageAccounts/adp<>azsax001" + "value": "" }, "diagnosticWorkspaceId": { - "value": "/subscriptions/<>/resourcegroups/validation-rg/providers/microsoft.operationalinsights/workspaces/adp-<>-az-law-x-001" + "value": "" }, "eventHubs": { "value": [ @@ -532,7 +499,7 @@ module namespaces './Microsoft.EventHub/namespaces/deploy.bicep' = { "captureDescriptionDestinationArchiveNameFormat": "{Namespace}/{EventHub}/{PartitionId}/{Year}/{Month}/{Day}/{Hour}/{Minute}/{Second}", "captureDescriptionDestinationBlobContainer": "eventhub", "captureDescriptionDestinationName": "EventHubArchive.AzureBlockBlob", - "captureDescriptionDestinationStorageAccountResourceId": "/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.Storage/storageAccounts/adp<>azsax001", + "captureDescriptionDestinationStorageAccountResourceId": "", "captureDescriptionEnabled": true, "captureDescriptionEncoding": "Avro", "captureDescriptionIntervalInSeconds": 300, @@ -550,7 +517,7 @@ module namespaces './Microsoft.EventHub/namespaces/deploy.bicep' = { "roleAssignments": [ { "principalIds": [ - "<>" + "" ], "roleDefinitionIdOrName": "Reader" } @@ -563,7 +530,7 @@ module namespaces './Microsoft.EventHub/namespaces/deploy.bicep' = { "value": "CanNotDelete" }, "name": { - "value": "<>-az-evhns-x-001" + "value": "<>ehncom001" }, "networkRuleSets": { "value": { @@ -578,7 +545,7 @@ module namespaces './Microsoft.EventHub/namespaces/deploy.bicep' = { "virtualNetworkRules": [ { "ignoreMissingVnetServiceEndpoint": true, - "subnetResourceId": "/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworks/adp-<>-az-vnet-x-001/subnets/<>-az-subnet-x-001" + "subnetResourceId": "" } ] } @@ -588,11 +555,11 @@ module namespaces './Microsoft.EventHub/namespaces/deploy.bicep' = { { "privateDnsZoneGroups": { "privateDNSResourceIds": [ - "/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.Network/privateDnsZones/privatelink.servicebus.windows.net" + "" ] }, "service": "namespace", - "subnetResourceId": "/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworks/adp-<>-az-vnet-x-001/subnets/<>-az-subnet-x-005-privateEndpoints" + "subnetResourceId": "" } ] }, @@ -600,7 +567,7 @@ module namespaces './Microsoft.EventHub/namespaces/deploy.bicep' = { "value": [ { "principalIds": [ - "<>" + "" ], "roleDefinitionIdOrName": "Reader" } @@ -611,7 +578,7 @@ module namespaces './Microsoft.EventHub/namespaces/deploy.bicep' = { }, "userAssignedIdentities": { "value": { - "/subscriptions/<>/resourcegroups/validation-rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/adp-<>-az-msi-x-001": {} + "": {} } } } @@ -621,6 +588,38 @@ module namespaces './Microsoft.EventHub/namespaces/deploy.bicep' = {

+

Example 2: Min

+ +
+ +via Bicep module + +```bicep +module namespaces './Microsoft.EventHub/namespaces/deploy.bicep' = { + name: '${uniqueString(deployment().name)}-test-ehnmin' + params: { + } +} +``` + +
+

+ +

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

+

Example 3: Pe

@@ -629,18 +628,18 @@ module namespaces './Microsoft.EventHub/namespaces/deploy.bicep' = { ```bicep module namespaces './Microsoft.EventHub/namespaces/deploy.bicep' = { - name: '${uniqueString(deployment().name)}-Namespaces' + name: '${uniqueString(deployment().name)}-test-ehnpe' params: { - name: '<>-az-evhns-pe-001' + name: '<>ehnpe001' privateEndpoints: [ { privateDnsZoneGroups: { privateDNSResourceIds: [ - '/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.Network/privateDnsZones/privatelink.servicebus.windows.net' + '' ] } service: 'namespace' - subnetResourceId: '/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworks/adp-<>-az-vnet-x-001/subnets/<>-az-subnet-x-005-privateEndpoints' + subnetResourceId: '' } ] } @@ -660,18 +659,18 @@ module namespaces './Microsoft.EventHub/namespaces/deploy.bicep' = { "contentVersion": "1.0.0.0", "parameters": { "name": { - "value": "<>-az-evhns-pe-001" + "value": "<>ehnpe001" }, "privateEndpoints": { "value": [ { "privateDnsZoneGroups": { "privateDNSResourceIds": [ - "/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.Network/privateDnsZones/privatelink.servicebus.windows.net" + "" ] }, "service": "namespace", - "subnetResourceId": "/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworks/adp-<>-az-vnet-x-001/subnets/<>-az-subnet-x-005-privateEndpoints" + "subnetResourceId": "" } ] } 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 diff --git a/utilities/tools/Set-ModuleReadMe.ps1 b/utilities/tools/Set-ModuleReadMe.ps1 index 25923c3d62..4850cd4c97 100644 --- a/utilities/tools/Set-ModuleReadMe.ps1 +++ b/utilities/tools/Set-ModuleReadMe.ps1 @@ -649,6 +649,11 @@ function ConvertTo-FormattedJSONParameterObject { [string] $BicepParamBlock ) + if ([String]::IsNullOrEmpty($BicepParamBlock)) { + # Case: No mandatory parameters + return @{} + } + # [1/4] Detect top level params for later processing $bicepParamBlockArray = $BicepParamBlock -split '\n' $topLevelParamIndent = ([regex]::Match($bicepParamBlockArray[0], '^(\s+).*')).Captures.Groups[1].Value.Length @@ -965,8 +970,14 @@ function Set-DeploymentExamplesSection { $rawBicepExampleArray = $rawBicepExample -split '\n' $moduleDeploymentPropertyIndent = ([regex]::Match($rawBicepExampleArray[1], '^(\s+).*')).Captures.Groups[1].Value.Length $paramsStartIndex = ($rawBicepExampleArray | Select-String ("^[\s]{$moduleDeploymentPropertyIndent}params:[\s]*\{") | ForEach-Object { $_.LineNumber - 1 })[0] + 1 - $paramsEndIndex = ($rawBicepExampleArray[($paramsStartIndex + 1)..($rawBicepExampleArray.Count)] | Select-String "^[\s]{$moduleDeploymentPropertyIndent}\}" | ForEach-Object { $_.LineNumber - 1 })[0] + $paramsStartIndex - $paramBlock = ($rawBicepExampleArray[$paramsStartIndex..$paramsEndIndex] | Out-String).TrimEnd() + if ($rawBicepExampleArray[($paramsStartIndex + 1)].Trim() -ne '}') { + # Handle case where param block is empty + $paramsEndIndex = ($rawBicepExampleArray[($paramsStartIndex + 1)..($rawBicepExampleArray.Count)] | Select-String "^[\s]{$moduleDeploymentPropertyIndent}\}" | ForEach-Object { $_.LineNumber - 1 })[0] + $paramsStartIndex + $paramBlock = ($rawBicepExampleArray[$paramsStartIndex..$paramsEndIndex] | Out-String).TrimEnd() + } else { + $paramBlock = '' + $paramsEndIndex = $paramsStartIndex + } # [5/6] Convert Bicep parameter block to JSON parameter block to enable processing $conversionInputObject = @{ @@ -986,7 +997,12 @@ function Set-DeploymentExamplesSection { # --------------------- # if ($addBicep) { - $formattedBicepExample = $rawBicepExample[0..($paramsStartIndex - 1)] + ($bicepExample -split '\n') + $rawBicepExample[($paramsEndIndex + 1)..($rawBicepExample.Count)] + if ([String]::IsNullOrEmpty($paramBlock)) { + # Handle case where param block is empty + $formattedBicepExample = $rawBicepExample[0..($paramsStartIndex - 1)] + $rawBicepExample[($paramsEndIndex)..($rawBicepExample.Count)] + } else { + $formattedBicepExample = $rawBicepExample[0..($paramsStartIndex - 1)] + ($bicepExample -split '\n') + $rawBicepExample[($paramsEndIndex + 1)..($rawBicepExample.Count)] + } $SectionContent += @( '', From e772ac79bee67192d6fa696cf4d7c763ab295170 Mon Sep 17 00:00:00 2001 From: MrMCake Date: Tue, 27 Sep 2022 19:24:29 +0200 Subject: [PATCH 03/15] Latest troubleshooted version --- utilities/tools/Set-ModuleReadMe.ps1 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/utilities/tools/Set-ModuleReadMe.ps1 b/utilities/tools/Set-ModuleReadMe.ps1 index 4850cd4c97..2a097d2015 100644 --- a/utilities/tools/Set-ModuleReadMe.ps1 +++ b/utilities/tools/Set-ModuleReadMe.ps1 @@ -166,6 +166,7 @@ function Set-ParametersSection { # 2. Create header including optional columns $newSectionContent += @( ('**{0} parameters**' -f $category), + '', ('| Parameter Name | Type | {0}{1}Description |' -f ($hasDefault ? 'Default Value | ' : ''), ($hasAllowed ? 'Allowed Values | ' : '')), ('| :-- | :-- | {0}{1}:-- |' -f ($hasDefault ? ':-- | ' : ''), ($hasAllowed ? ':-- | ' : '')) ) @@ -970,7 +971,7 @@ function Set-DeploymentExamplesSection { $rawBicepExampleArray = $rawBicepExample -split '\n' $moduleDeploymentPropertyIndent = ([regex]::Match($rawBicepExampleArray[1], '^(\s+).*')).Captures.Groups[1].Value.Length $paramsStartIndex = ($rawBicepExampleArray | Select-String ("^[\s]{$moduleDeploymentPropertyIndent}params:[\s]*\{") | ForEach-Object { $_.LineNumber - 1 })[0] + 1 - if ($rawBicepExampleArray[($paramsStartIndex + 1)].Trim() -ne '}') { + if ($rawBicepExampleArray[$paramsStartIndex].Trim() -ne '}') { # Handle case where param block is empty $paramsEndIndex = ($rawBicepExampleArray[($paramsStartIndex + 1)..($rawBicepExampleArray.Count)] | Select-String "^[\s]{$moduleDeploymentPropertyIndent}\}" | ForEach-Object { $_.LineNumber - 1 })[0] + $paramsStartIndex $paramBlock = ($rawBicepExampleArray[$paramsStartIndex..$paramsEndIndex] | Out-String).TrimEnd() From 7d30db6194f028fc3025ab2c38dc5366e89dd306 Mon Sep 17 00:00:00 2001 From: MrMCake Date: Tue, 27 Sep 2022 19:27:04 +0200 Subject: [PATCH 04/15] Small update --- modules/Microsoft.EventHub/namespaces/readme.md | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/Microsoft.EventHub/namespaces/readme.md b/modules/Microsoft.EventHub/namespaces/readme.md index 35acc9649a..be59a7034d 100644 --- a/modules/Microsoft.EventHub/namespaces/readme.md +++ b/modules/Microsoft.EventHub/namespaces/readme.md @@ -30,6 +30,7 @@ This module deploys an event hub namespace. ## Parameters **Optional parameters** + | Parameter Name | Type | Default Value | Allowed Values | Description | | :-- | :-- | :-- | :-- | :-- | | `authorizationRules` | _[authorizationRules](authorizationRules/readme.md)_ array | `[System.Collections.Hashtable]` | | Authorization Rules for the Event Hub namespace. | From c30f35fab9990a87327f83af3c8670908ce89b20 Mon Sep 17 00:00:00 2001 From: Alexander Sehr Date: Wed, 28 Sep 2022 17:06:12 +0200 Subject: [PATCH 05/15] Update modules/Microsoft.EventHub/namespaces/.test/common/deploy.test.bicep Co-authored-by: Erika Gressi <56914614+eriqua@users.noreply.github.com> --- .../namespaces/.test/common/deploy.test.bicep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Microsoft.EventHub/namespaces/.test/common/deploy.test.bicep b/modules/Microsoft.EventHub/namespaces/.test/common/deploy.test.bicep index 6a2e23ee8c..8e41690363 100644 --- a/modules/Microsoft.EventHub/namespaces/.test/common/deploy.test.bicep +++ b/modules/Microsoft.EventHub/namespaces/.test/common/deploy.test.bicep @@ -150,7 +150,7 @@ module testDeployment '../../deploy.bicep' = { } privateEndpoints: [ { - privateDnsZoneGroups: { + privateDnsZoneGroup: { privateDNSResourceIds: [ resourceGroupResources.outputs.privateDNSZoneResourceId ] From 0f4fff5893a86ce841e7e4a6a481fd025e257db5 Mon Sep 17 00:00:00 2001 From: Alexander Sehr Date: Wed, 28 Sep 2022 17:06:19 +0200 Subject: [PATCH 06/15] Update modules/Microsoft.EventHub/namespaces/.test/pe/deploy.test.bicep Co-authored-by: Erika Gressi <56914614+eriqua@users.noreply.github.com> --- .../Microsoft.EventHub/namespaces/.test/pe/deploy.test.bicep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Microsoft.EventHub/namespaces/.test/pe/deploy.test.bicep b/modules/Microsoft.EventHub/namespaces/.test/pe/deploy.test.bicep index 11cd894a46..2464b3d412 100644 --- a/modules/Microsoft.EventHub/namespaces/.test/pe/deploy.test.bicep +++ b/modules/Microsoft.EventHub/namespaces/.test/pe/deploy.test.bicep @@ -43,7 +43,7 @@ module testDeployment '../../deploy.bicep' = { name: '<>${serviceShort}001' privateEndpoints: [ { - privateDnsZoneGroups: { + privateDnsZoneGroup: { privateDNSResourceIds: [ resourceGroupResources.outputs.privateDNSZoneResourceId ] From 167f520a9f8d442b70cb3ecb4fedecd0121b47ec Mon Sep 17 00:00:00 2001 From: Alexander Sehr Date: Tue, 4 Oct 2022 19:08:46 +0200 Subject: [PATCH 07/15] Update modules/Microsoft.EventHub/namespaces/.test/common/deploy.test.bicep Co-authored-by: Erika Gressi <56914614+eriqua@users.noreply.github.com> --- .../namespaces/.test/common/deploy.test.bicep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Microsoft.EventHub/namespaces/.test/common/deploy.test.bicep b/modules/Microsoft.EventHub/namespaces/.test/common/deploy.test.bicep index 8e41690363..ea0bca6ba2 100644 --- a/modules/Microsoft.EventHub/namespaces/.test/common/deploy.test.bicep +++ b/modules/Microsoft.EventHub/namespaces/.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.eventhub.namespaces-${serviceShort}-rg' From eb1e6644303ab503bfc0de17b373515d748a6a53 Mon Sep 17 00:00:00 2001 From: Alexander Sehr Date: Tue, 4 Oct 2022 19:08:52 +0200 Subject: [PATCH 08/15] Update modules/Microsoft.EventHub/namespaces/.test/common/deploy.test.bicep Co-authored-by: Erika Gressi <56914614+eriqua@users.noreply.github.com> --- .../namespaces/.test/common/deploy.test.bicep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Microsoft.EventHub/namespaces/.test/common/deploy.test.bicep b/modules/Microsoft.EventHub/namespaces/.test/common/deploy.test.bicep index ea0bca6ba2..80ad2f3c56 100644 --- a/modules/Microsoft.EventHub/namespaces/.test/common/deploy.test.bicep +++ b/modules/Microsoft.EventHub/namespaces/.test/common/deploy.test.bicep @@ -7,7 +7,7 @@ targetScope = 'subscription' @maxLength(90) param resourceGroupName string = 'ms.eventhub.namespaces-${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 dd45bd5d3fb157202a419999aedb24b1319f7439 Mon Sep 17 00:00:00 2001 From: Alexander Sehr Date: Tue, 4 Oct 2022 19:09:00 +0200 Subject: [PATCH 09/15] Update modules/Microsoft.EventHub/namespaces/.test/common/deploy.test.bicep Co-authored-by: Erika Gressi <56914614+eriqua@users.noreply.github.com> --- .../namespaces/.test/common/deploy.test.bicep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Microsoft.EventHub/namespaces/.test/common/deploy.test.bicep b/modules/Microsoft.EventHub/namespaces/.test/common/deploy.test.bicep index 80ad2f3c56..67112d5eea 100644 --- a/modules/Microsoft.EventHub/namespaces/.test/common/deploy.test.bicep +++ b/modules/Microsoft.EventHub/namespaces/.test/common/deploy.test.bicep @@ -10,7 +10,7 @@ param resourceGroupName string = 'ms.eventhub.namespaces-${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 = 'ehncom' // =========== // From 27931e66e376730793513d1ed3a23a1f1a85e16b Mon Sep 17 00:00:00 2001 From: Alexander Sehr Date: Tue, 4 Oct 2022 19:09:06 +0200 Subject: [PATCH 10/15] Update modules/Microsoft.EventHub/namespaces/.test/min/deploy.test.bicep Co-authored-by: Erika Gressi <56914614+eriqua@users.noreply.github.com> --- .../Microsoft.EventHub/namespaces/.test/min/deploy.test.bicep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Microsoft.EventHub/namespaces/.test/min/deploy.test.bicep b/modules/Microsoft.EventHub/namespaces/.test/min/deploy.test.bicep index ac88cac73d..2c75d6c782 100644 --- a/modules/Microsoft.EventHub/namespaces/.test/min/deploy.test.bicep +++ b/modules/Microsoft.EventHub/namespaces/.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.eventhub.namespaces-${serviceShort}-rg' From d435662c7d434b5872654603c24a2fee7c9a292a Mon Sep 17 00:00:00 2001 From: Alexander Sehr Date: Tue, 4 Oct 2022 19:09:14 +0200 Subject: [PATCH 11/15] Update modules/Microsoft.EventHub/namespaces/.test/min/deploy.test.bicep Co-authored-by: Erika Gressi <56914614+eriqua@users.noreply.github.com> --- .../Microsoft.EventHub/namespaces/.test/min/deploy.test.bicep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Microsoft.EventHub/namespaces/.test/min/deploy.test.bicep b/modules/Microsoft.EventHub/namespaces/.test/min/deploy.test.bicep index 2c75d6c782..a91999f706 100644 --- a/modules/Microsoft.EventHub/namespaces/.test/min/deploy.test.bicep +++ b/modules/Microsoft.EventHub/namespaces/.test/min/deploy.test.bicep @@ -7,7 +7,7 @@ targetScope = 'subscription' @maxLength(90) param resourceGroupName string = 'ms.eventhub.namespaces-${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 60aae85586367b23ad2cac34d0ca2560650f0e07 Mon Sep 17 00:00:00 2001 From: Alexander Sehr Date: Tue, 4 Oct 2022 19:09:24 +0200 Subject: [PATCH 12/15] Update modules/Microsoft.EventHub/namespaces/.test/min/deploy.test.bicep Co-authored-by: Erika Gressi <56914614+eriqua@users.noreply.github.com> --- .../Microsoft.EventHub/namespaces/.test/min/deploy.test.bicep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Microsoft.EventHub/namespaces/.test/min/deploy.test.bicep b/modules/Microsoft.EventHub/namespaces/.test/min/deploy.test.bicep index a91999f706..e2bdf42324 100644 --- a/modules/Microsoft.EventHub/namespaces/.test/min/deploy.test.bicep +++ b/modules/Microsoft.EventHub/namespaces/.test/min/deploy.test.bicep @@ -10,7 +10,7 @@ param resourceGroupName string = 'ms.eventhub.namespaces-${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 = 'ehnmin' // =========== // From 69466a320d60f50190abc45a6a814f2e8005458f Mon Sep 17 00:00:00 2001 From: Alexander Sehr Date: Tue, 4 Oct 2022 19:09:38 +0200 Subject: [PATCH 13/15] Update modules/Microsoft.EventHub/namespaces/.test/pe/deploy.test.bicep Co-authored-by: Erika Gressi <56914614+eriqua@users.noreply.github.com> --- .../Microsoft.EventHub/namespaces/.test/pe/deploy.test.bicep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Microsoft.EventHub/namespaces/.test/pe/deploy.test.bicep b/modules/Microsoft.EventHub/namespaces/.test/pe/deploy.test.bicep index 2464b3d412..303dc592f3 100644 --- a/modules/Microsoft.EventHub/namespaces/.test/pe/deploy.test.bicep +++ b/modules/Microsoft.EventHub/namespaces/.test/pe/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.eventhub.namespaces-${serviceShort}-rg' From 35634a097a871970b3c8b233f1fbc49bd54ca70c Mon Sep 17 00:00:00 2001 From: Alexander Sehr Date: Tue, 4 Oct 2022 19:09:47 +0200 Subject: [PATCH 14/15] Update modules/Microsoft.EventHub/namespaces/.test/pe/deploy.test.bicep Co-authored-by: Erika Gressi <56914614+eriqua@users.noreply.github.com> --- .../Microsoft.EventHub/namespaces/.test/pe/deploy.test.bicep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Microsoft.EventHub/namespaces/.test/pe/deploy.test.bicep b/modules/Microsoft.EventHub/namespaces/.test/pe/deploy.test.bicep index 303dc592f3..15f5768cfc 100644 --- a/modules/Microsoft.EventHub/namespaces/.test/pe/deploy.test.bicep +++ b/modules/Microsoft.EventHub/namespaces/.test/pe/deploy.test.bicep @@ -7,7 +7,7 @@ targetScope = 'subscription' @maxLength(90) param resourceGroupName string = 'ms.eventhub.namespaces-${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 7a9df24da97f90673da0bfa35e5ea05026b8f399 Mon Sep 17 00:00:00 2001 From: Alexander Sehr Date: Tue, 4 Oct 2022 19:10:11 +0200 Subject: [PATCH 15/15] Update modules/Microsoft.EventHub/namespaces/.test/pe/deploy.test.bicep Co-authored-by: Erika Gressi <56914614+eriqua@users.noreply.github.com> --- .../Microsoft.EventHub/namespaces/.test/pe/deploy.test.bicep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Microsoft.EventHub/namespaces/.test/pe/deploy.test.bicep b/modules/Microsoft.EventHub/namespaces/.test/pe/deploy.test.bicep index 15f5768cfc..e9951782a0 100644 --- a/modules/Microsoft.EventHub/namespaces/.test/pe/deploy.test.bicep +++ b/modules/Microsoft.EventHub/namespaces/.test/pe/deploy.test.bicep @@ -10,7 +10,7 @@ param resourceGroupName string = 'ms.eventhub.namespaces-${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 = 'ehnpe' // =========== //