From dcf3b9dc92d5933d44ee3c6937e51ac3cd334cfb Mon Sep 17 00:00:00 2001 From: MrMCake Date: Mon, 19 Sep 2022 15:34:40 +0200 Subject: [PATCH 01/10] 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 81e3e0e7debf6234b6f0720f574bbb4df8e5be55 Mon Sep 17 00:00:00 2001 From: MrMCake Date: Tue, 20 Sep 2022 20:55:04 +0200 Subject: [PATCH 02/10] Updated Network Public IP Addresses to new dependencies approach --- .../ms.network.publicipaddresses.yml | 3 +- .../.test/common/dependencies.bicep | 14 ++++ .../.test/common/deploy.test.bicep | 80 +++++++++++++++++++ .../.test/min/deploy.test.bicep | 37 +++++++++ .../publicIPAddresses/.test/parameters.json | 50 ------------ .../publicIPAddresses/readme.md | 65 +++++++++++---- 6 files changed, 183 insertions(+), 66 deletions(-) create mode 100644 modules/Microsoft.Network/publicIPAddresses/.test/common/dependencies.bicep create mode 100644 modules/Microsoft.Network/publicIPAddresses/.test/common/deploy.test.bicep create mode 100644 modules/Microsoft.Network/publicIPAddresses/.test/min/deploy.test.bicep delete mode 100644 modules/Microsoft.Network/publicIPAddresses/.test/parameters.json diff --git a/.github/workflows/ms.network.publicipaddresses.yml b/.github/workflows/ms.network.publicipaddresses.yml index 6c396214d1..bf72c2c79b 100644 --- a/.github/workflows/ms.network.publicipaddresses.yml +++ b/.github/workflows/ms.network.publicipaddresses.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/publicIPAddresses/.test/common/dependencies.bicep b/modules/Microsoft.Network/publicIPAddresses/.test/common/dependencies.bicep new file mode 100644 index 0000000000..7371d4437b --- /dev/null +++ b/modules/Microsoft.Network/publicIPAddresses/.test/common/dependencies.bicep @@ -0,0 +1,14 @@ +@description('Optional. The location to deploy to.') +param location string = resourceGroup().location + +@description('Required. The name of the Managed Identity to create.') +param managedIdentityName string + +resource managedIdentity 'Microsoft.ManagedIdentity/userAssignedIdentities@2018-11-30' = { + name: managedIdentityName + location: location +} + +@description('The principal ID of the created Managed Identity.') +output managedIdentityPrincipalId string = managedIdentity.properties.principalId + diff --git a/modules/Microsoft.Network/publicIPAddresses/.test/common/deploy.test.bicep b/modules/Microsoft.Network/publicIPAddresses/.test/common/deploy.test.bicep new file mode 100644 index 0000000000..889883b79f --- /dev/null +++ b/modules/Microsoft.Network/publicIPAddresses/.test/common/deploy.test.bicep @@ -0,0 +1,80 @@ +targetScope = 'subscription' + +// ========== // +// Parameters // +// ========== // +@description('Optional. The name of the resource group to deploy for testing purposes') +@maxLength(90) +param resourceGroupName string = 'ms.network.publicipaddresses-${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 = 'npiacom' + +// =========== // +// 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: { + managedIdentityName: 'dep-<>-msi-${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' + diagnosticLogsRetentionInDays: 7 + diagnosticStorageAccountId: diagnosticDependencies.outputs.storageAccountResourceId + diagnosticWorkspaceId: diagnosticDependencies.outputs.logAnalyticsWorkspaceResourceId + diagnosticEventHubAuthorizationRuleId: diagnosticDependencies.outputs.eventHubAuthorizationRuleId + diagnosticEventHubName: diagnosticDependencies.outputs.eventHubNamespaceEventHubName + lock: 'CanNotDelete' + publicIPAllocationMethod: 'Static' + roleAssignments: [ + { + principalIds: [ + resourceGroupResources.outputs.managedIdentityPrincipalId + ] + roleDefinitionIdOrName: 'Reader' + } + ] + skuName: 'Standard' + zones: [ + '1' + '2' + '3' + ] + } +} diff --git a/modules/Microsoft.Network/publicIPAddresses/.test/min/deploy.test.bicep b/modules/Microsoft.Network/publicIPAddresses/.test/min/deploy.test.bicep new file mode 100644 index 0000000000..fe344647da --- /dev/null +++ b/modules/Microsoft.Network/publicIPAddresses/.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.publicipaddresses-${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 = 'npiamin' + +// =========== // +// 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/publicIPAddresses/.test/parameters.json b/modules/Microsoft.Network/publicIPAddresses/.test/parameters.json deleted file mode 100644 index 9a95bc279f..0000000000 --- a/modules/Microsoft.Network/publicIPAddresses/.test/parameters.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#", - "contentVersion": "1.0.0.0", - "parameters": { - "name": { - "value": "<>-az-pip-x-001" - }, - "lock": { - "value": "CanNotDelete" - }, - "skuName": { - "value": "Standard" - }, - "publicIPAllocationMethod": { - "value": "Static" - }, - "zones": { - "value": [ - "1", - "2", - "3" - ] - }, - "roleAssignments": { - "value": [ - { - "roleDefinitionIdOrName": "Reader", - "principalIds": [ - "<>" - ] - } - ] - }, - "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" - } - } -} diff --git a/modules/Microsoft.Network/publicIPAddresses/readme.md b/modules/Microsoft.Network/publicIPAddresses/readme.md index 3d9e49df16..28ec7ea956 100644 --- a/modules/Microsoft.Network/publicIPAddresses/readme.md +++ b/modules/Microsoft.Network/publicIPAddresses/readme.md @@ -169,7 +169,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: Parameters

+

Example 1: Common

@@ -177,22 +177,22 @@ The following module usage examples are retrieved from the content of the files ```bicep module publicIPAddresses './Microsoft.Network/publicIPAddresses/deploy.bicep' = { - name: '${uniqueString(deployment().name)}-PublicIPAddresses' + name: '${uniqueString(deployment().name)}-test-npiacom' params: { // Required parameters - name: '<>-az-pip-x-001' + name: '<>npiacom001' // Non-required parameters - 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: '' lock: 'CanNotDelete' publicIPAllocationMethod: 'Static' roleAssignments: [ { principalIds: [ - '<>' + '' ] roleDefinitionIdOrName: 'Reader' } @@ -221,23 +221,23 @@ module publicIPAddresses './Microsoft.Network/publicIPAddresses/deploy.bicep' = "parameters": { // Required parameters "name": { - "value": "<>-az-pip-x-001" + "value": "<>npiacom001" }, // Non-required parameters "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": "" }, "lock": { "value": "CanNotDelete" @@ -249,7 +249,7 @@ module publicIPAddresses './Microsoft.Network/publicIPAddresses/deploy.bicep' = "value": [ { "principalIds": [ - "<>" + "" ], "roleDefinitionIdOrName": "Reader" } @@ -271,3 +271,40 @@ module publicIPAddresses './Microsoft.Network/publicIPAddresses/deploy.bicep' =

+ +

Example 2: Min

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

+ +

+ +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": "<>npiamin001" + } + } +} +``` + +
+

From 47e74646b6e160b307af7c99e871991be5c37300 Mon Sep 17 00:00:00 2001 From: MrMCake Date: Tue, 20 Sep 2022 21:22:13 +0200 Subject: [PATCH 03/10] Updated template to work with min example --- .../Microsoft.Network/publicIPAddresses/deploy.bicep | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/modules/Microsoft.Network/publicIPAddresses/deploy.bicep b/modules/Microsoft.Network/publicIPAddresses/deploy.bicep index 32ce98b45c..db9c59d8c4 100644 --- a/modules/Microsoft.Network/publicIPAddresses/deploy.bicep +++ b/modules/Microsoft.Network/publicIPAddresses/deploy.bicep @@ -114,10 +114,6 @@ var diagnosticsMetrics = [for metric in diagnosticMetricsToEnable: { } }] -var publicIPPrefix = { - id: publicIPPrefixResourceId -} - resource defaultTelemetry 'Microsoft.Resources/deployments@2021-04-01' = if (enableDefaultTelemetry) { name: 'pid-47ed15a6-730a-4827-bcb4-0fd963ffbd82-${uniqueString(deployment().name, location)}' properties: { @@ -142,7 +138,9 @@ resource publicIpAddress 'Microsoft.Network/publicIPAddresses@2021-08-01' = { properties: { publicIPAddressVersion: publicIPAddressVersion publicIPAllocationMethod: publicIPAllocationMethod - publicIPPrefix: !empty(publicIPPrefixResourceId) ? publicIPPrefix : null + publicIPPrefix: !empty(publicIPPrefixResourceId) ? { + id: publicIPPrefixResourceId + } : null idleTimeoutInMinutes: 4 ipTags: [] } @@ -193,7 +191,7 @@ output name string = publicIpAddress.name output resourceId string = publicIpAddress.id @description('The public IP address of the public IP address resource.') -output ipAddress string = publicIpAddress.properties.ipAddress +output ipAddress string = contains(publicIpAddress.properties, 'ipAddress') ? publicIpAddress.properties.ipAddress : '' @description('The location the resource was deployed into.') output location string = publicIpAddress.location From cc749089b64aa85cb75250bcc59fda3065f58642 Mon Sep 17 00:00:00 2001 From: MrMCake Date: Tue, 20 Sep 2022 22:26:35 +0200 Subject: [PATCH 04/10] 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 b0caf175a4c284e16889b10db65a2bf8c7cbacfb Mon Sep 17 00:00:00 2001 From: Alexander Sehr Date: Wed, 28 Sep 2022 16:50:19 +0200 Subject: [PATCH 05/10] Update modules/Microsoft.Network/publicIPAddresses/.test/common/deploy.test.bicep Co-authored-by: Erika Gressi <56914614+eriqua@users.noreply.github.com> --- .../publicIPAddresses/.test/common/deploy.test.bicep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Microsoft.Network/publicIPAddresses/.test/common/deploy.test.bicep b/modules/Microsoft.Network/publicIPAddresses/.test/common/deploy.test.bicep index 889883b79f..fa3fb880a2 100644 --- a/modules/Microsoft.Network/publicIPAddresses/.test/common/deploy.test.bicep +++ b/modules/Microsoft.Network/publicIPAddresses/.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.publicipaddresses-${serviceShort}-rg' From 94aa9b74b1c2100ec587726f7ec4ddcacbff2b11 Mon Sep 17 00:00:00 2001 From: Alexander Sehr Date: Wed, 28 Sep 2022 16:50:26 +0200 Subject: [PATCH 06/10] Update modules/Microsoft.Network/publicIPAddresses/.test/common/deploy.test.bicep Co-authored-by: Erika Gressi <56914614+eriqua@users.noreply.github.com> --- .../publicIPAddresses/.test/common/deploy.test.bicep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Microsoft.Network/publicIPAddresses/.test/common/deploy.test.bicep b/modules/Microsoft.Network/publicIPAddresses/.test/common/deploy.test.bicep index fa3fb880a2..9ec347e95a 100644 --- a/modules/Microsoft.Network/publicIPAddresses/.test/common/deploy.test.bicep +++ b/modules/Microsoft.Network/publicIPAddresses/.test/common/deploy.test.bicep @@ -7,7 +7,7 @@ targetScope = 'subscription' @maxLength(90) param resourceGroupName string = 'ms.network.publicipaddresses-${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 f6c157f21428ecc36729ddb7a775c0e16a01c5b8 Mon Sep 17 00:00:00 2001 From: Alexander Sehr Date: Wed, 28 Sep 2022 16:50:34 +0200 Subject: [PATCH 07/10] Update modules/Microsoft.Network/publicIPAddresses/.test/common/deploy.test.bicep Co-authored-by: Erika Gressi <56914614+eriqua@users.noreply.github.com> --- .../publicIPAddresses/.test/common/deploy.test.bicep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Microsoft.Network/publicIPAddresses/.test/common/deploy.test.bicep b/modules/Microsoft.Network/publicIPAddresses/.test/common/deploy.test.bicep index 9ec347e95a..c2f05183e8 100644 --- a/modules/Microsoft.Network/publicIPAddresses/.test/common/deploy.test.bicep +++ b/modules/Microsoft.Network/publicIPAddresses/.test/common/deploy.test.bicep @@ -10,7 +10,7 @@ param resourceGroupName string = 'ms.network.publicipaddresses-${serviceShort}-r @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 = 'npiacom' // =========== // From f2b508a5b654b18f46fdd9f1ea910aa881f0e4a9 Mon Sep 17 00:00:00 2001 From: Alexander Sehr Date: Wed, 28 Sep 2022 16:50:40 +0200 Subject: [PATCH 08/10] Update modules/Microsoft.Network/publicIPAddresses/.test/min/deploy.test.bicep Co-authored-by: Erika Gressi <56914614+eriqua@users.noreply.github.com> --- .../publicIPAddresses/.test/min/deploy.test.bicep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Microsoft.Network/publicIPAddresses/.test/min/deploy.test.bicep b/modules/Microsoft.Network/publicIPAddresses/.test/min/deploy.test.bicep index fe344647da..1a7cc362a6 100644 --- a/modules/Microsoft.Network/publicIPAddresses/.test/min/deploy.test.bicep +++ b/modules/Microsoft.Network/publicIPAddresses/.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.publicipaddresses-${serviceShort}-rg' From 0053b5fe61dfb65473aaa78e62ca26f5abee7b6e Mon Sep 17 00:00:00 2001 From: Alexander Sehr Date: Wed, 28 Sep 2022 16:50:47 +0200 Subject: [PATCH 09/10] Update modules/Microsoft.Network/publicIPAddresses/.test/min/deploy.test.bicep Co-authored-by: Erika Gressi <56914614+eriqua@users.noreply.github.com> --- .../publicIPAddresses/.test/min/deploy.test.bicep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Microsoft.Network/publicIPAddresses/.test/min/deploy.test.bicep b/modules/Microsoft.Network/publicIPAddresses/.test/min/deploy.test.bicep index 1a7cc362a6..a45152a822 100644 --- a/modules/Microsoft.Network/publicIPAddresses/.test/min/deploy.test.bicep +++ b/modules/Microsoft.Network/publicIPAddresses/.test/min/deploy.test.bicep @@ -10,7 +10,7 @@ param resourceGroupName string = 'ms.network.publicipaddresses-${serviceShort}-r @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 = 'npiamin' // =========== // From 6ffc062b329528ca9d34d131d2a9c6c1a2fda583 Mon Sep 17 00:00:00 2001 From: Alexander Sehr Date: Wed, 28 Sep 2022 16:50:55 +0200 Subject: [PATCH 10/10] Update modules/Microsoft.Network/publicIPAddresses/.test/min/deploy.test.bicep Co-authored-by: Erika Gressi <56914614+eriqua@users.noreply.github.com> --- .../publicIPAddresses/.test/min/deploy.test.bicep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Microsoft.Network/publicIPAddresses/.test/min/deploy.test.bicep b/modules/Microsoft.Network/publicIPAddresses/.test/min/deploy.test.bicep index a45152a822..8ce6a88cfd 100644 --- a/modules/Microsoft.Network/publicIPAddresses/.test/min/deploy.test.bicep +++ b/modules/Microsoft.Network/publicIPAddresses/.test/min/deploy.test.bicep @@ -7,7 +7,7 @@ targetScope = 'subscription' @maxLength(90) param resourceGroupName string = 'ms.network.publicipaddresses-${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.')