From 6f658443d6e147c4ae2d5f2cb507aa7cac15003a Mon Sep 17 00:00:00 2001 From: MrMCake Date: Sun, 4 Sep 2022 14:00:03 +0200 Subject: [PATCH 01/16] Updated NetApp to new dependency approach --- .../workflows/ms.netapp.netappaccounts.yml | 3 +- .../netAppAccounts/.test/min.parameters.json | 9 -- .../.test/min/deploy.test.bicep | 37 +++++ .../netAppAccounts/.test/nfs3.parameters.json | 99 ------------- .../.test/nfs3/dependencies.bicep | 40 +++++ .../.test/nfs3/deploy.test.bicep | 128 ++++++++++++++++ .../.test/nfs41.parameters.json | 106 -------------- .../.test/nfs41/dependencies.bicep | 40 +++++ .../.test/nfs41/deploy.test.bicep | 137 ++++++++++++++++++ .../Microsoft.NetApp/netAppAccounts/readme.md | 66 ++++----- 10 files changed, 416 insertions(+), 249 deletions(-) delete mode 100644 modules/Microsoft.NetApp/netAppAccounts/.test/min.parameters.json create mode 100644 modules/Microsoft.NetApp/netAppAccounts/.test/min/deploy.test.bicep delete mode 100644 modules/Microsoft.NetApp/netAppAccounts/.test/nfs3.parameters.json create mode 100644 modules/Microsoft.NetApp/netAppAccounts/.test/nfs3/dependencies.bicep create mode 100644 modules/Microsoft.NetApp/netAppAccounts/.test/nfs3/deploy.test.bicep delete mode 100644 modules/Microsoft.NetApp/netAppAccounts/.test/nfs41.parameters.json create mode 100644 modules/Microsoft.NetApp/netAppAccounts/.test/nfs41/dependencies.bicep create mode 100644 modules/Microsoft.NetApp/netAppAccounts/.test/nfs41/deploy.test.bicep diff --git a/.github/workflows/ms.netapp.netappaccounts.yml b/.github/workflows/ms.netapp.netappaccounts.yml index 78d240e171..4c3f7688d0 100644 --- a/.github/workflows/ms.netapp.netappaccounts.yml +++ b/.github/workflows/ms.netapp.netappaccounts.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.NetApp/netAppAccounts/.test/min.parameters.json b/modules/Microsoft.NetApp/netAppAccounts/.test/min.parameters.json deleted file mode 100644 index 029d5ebc09..0000000000 --- a/modules/Microsoft.NetApp/netAppAccounts/.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-anf-min-001" - } - } -} diff --git a/modules/Microsoft.NetApp/netAppAccounts/.test/min/deploy.test.bicep b/modules/Microsoft.NetApp/netAppAccounts/.test/min/deploy.test.bicep new file mode 100644 index 0000000000..7f850c9a5e --- /dev/null +++ b/modules/Microsoft.NetApp/netAppAccounts/.test/min/deploy.test.bicep @@ -0,0 +1,37 @@ +targetScope = 'subscription' + +// ========== // +// Parameters // +// ========== // +@description('Optional. The name of the resource group to deploy for a testing purposes') +@maxLength(90) +param resourceGroupName string = 'ms.netapp.netappaccounts-${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 = 'nanaamin' + +// =========== // +// 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.NetApp/netAppAccounts/.test/nfs3.parameters.json b/modules/Microsoft.NetApp/netAppAccounts/.test/nfs3.parameters.json deleted file mode 100644 index 8718b5fdab..0000000000 --- a/modules/Microsoft.NetApp/netAppAccounts/.test/nfs3.parameters.json +++ /dev/null @@ -1,99 +0,0 @@ -{ - "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#", - "contentVersion": "1.0.0.0", - "parameters": { - "name": { - "value": "<>-az-anf-nfs3-001" - }, - "lock": { - "value": "CanNotDelete" - }, - "capacityPools": { - "value": [ - { - "name": "<>-az-anfcp-x-001", - "serviceLevel": "Premium", - "size": 4398046511104, - "volumes": [ - { - "name": "anf3-vol01-nfsv3", - "usageThreshold": 107374182400, - "protocolTypes": [ - "NFSv3" - ], - "exportPolicyRules": [ - { - "ruleIndex": 1, - "unixReadOnly": false, - "unixReadWrite": true, - "nfsv3": true, - "nfsv41": false, - "allowedClients": "0.0.0.0/0" - } - ], - "subnetResourceId": "/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworks/adp-<>-az-vnet-x-001/subnets/<>-az-subnet-x-004", - "roleAssignments": [ - { - "roleDefinitionIdOrName": "Reader", - "principalIds": [ - "<>" - ] - } - ] - }, - { - "name": "anf3-vol02-nfsv3", - "usageThreshold": 107374182400, - "protocolTypes": [ - "NFSv3" - ], - "subnetResourceId": "/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworks/adp-<>-az-vnet-x-001/subnets/<>-az-subnet-x-004" - } - ], - "roleAssignments": [ - { - "roleDefinitionIdOrName": "Reader", - "principalIds": [ - "<>" - ] - } - ] - }, - { - "name": "<>-az-anfcp-x-002", - "serviceLevel": "Premium", - "size": 4398046511104, - "volumes": [], - "roleAssignments": [ - { - "roleDefinitionIdOrName": "Reader", - "principalIds": [ - "<>" - ] - } - ] - } - ] - }, - "roleAssignments": { - "value": [ - { - "roleDefinitionIdOrName": "Reader", - "principalIds": [ - "<>" - ] - } - ] - }, - "tags": { - "value": { - "Environment": "Non-Prod", - "Contact": "test.user@testcompany.com", - "PurchaseOrder": "1234", - "CostCenter": "7890", - "ServiceName": "DeploymentValidation", - "Role": "DeploymentValidation" - } - } - } -} diff --git a/modules/Microsoft.NetApp/netAppAccounts/.test/nfs3/dependencies.bicep b/modules/Microsoft.NetApp/netAppAccounts/.test/nfs3/dependencies.bicep new file mode 100644 index 0000000000..ef065fbe51 --- /dev/null +++ b/modules/Microsoft.NetApp/netAppAccounts/.test/nfs3/dependencies.bicep @@ -0,0 +1,40 @@ +@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 Subnet.') +output subnetResourceId string = virtualNetwork.properties.subnets[0].id + +@description('The principal ID of the created Managed Identity.') +output managedIdentityPrincipalId string = managedIdentity.properties.principalId + diff --git a/modules/Microsoft.NetApp/netAppAccounts/.test/nfs3/deploy.test.bicep b/modules/Microsoft.NetApp/netAppAccounts/.test/nfs3/deploy.test.bicep new file mode 100644 index 0000000000..a8b06edca3 --- /dev/null +++ b/modules/Microsoft.NetApp/netAppAccounts/.test/nfs3/deploy.test.bicep @@ -0,0 +1,128 @@ +targetScope = 'subscription' + +// ========== // +// Parameters // +// ========== // +@description('Optional. The name of the resource group to deploy for a testing purposes') +@maxLength(90) +param resourceGroupName string = 'ms.netapp.netappaccounts-${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 = 'nanaanfs3' + +// =========== // +// 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' + capacityPools: [ + { + name: '<>-az-anfcp-x-001' + roleAssignments: [ + { + principalIds: [ + resourceGroupResources.outputs.managedIdentityPrincipalId + ] + roleDefinitionIdOrName: 'Reader' + } + ] + serviceLevel: 'Premium' + size: 4398046511104 + volumes: [ + { + exportPolicyRules: [ + { + allowedClients: '0.0.0.0/0' + nfsv3: true + nfsv41: false + ruleIndex: 1 + unixReadOnly: false + unixReadWrite: true + } + ] + name: 'anf3-vol01-nfsv3' + protocolTypes: [ + 'NFSv3' + ] + roleAssignments: [ + { + principalIds: [ + resourceGroupResources.outputs.managedIdentityPrincipalId + ] + roleDefinitionIdOrName: 'Reader' + } + ] + subnetResourceId: resourceGroupResources.outputs.subnetResourceId + usageThreshold: 107374182400 + } + { + name: 'anf3-vol02-nfsv3' + protocolTypes: [ + 'NFSv3' + ] + subnetResourceId: resourceGroupResources.outputs.subnetResourceId + usageThreshold: 107374182400 + } + ] + } + { + name: '<>-az-anfcp-x-002' + roleAssignments: [ + { + principalIds: [ + resourceGroupResources.outputs.managedIdentityPrincipalId + ] + roleDefinitionIdOrName: 'Reader' + } + ] + serviceLevel: 'Premium' + size: 4398046511104 + volumes: [] + } + ] + lock: 'CanNotDelete' + roleAssignments: [ + { + principalIds: [ + resourceGroupResources.outputs.managedIdentityPrincipalId + ] + roleDefinitionIdOrName: 'Reader' + } + ] + tags: { + Contact: 'test.user@testcompany.com' + CostCenter: '7890' + Environment: 'Non-Prod' + PurchaseOrder: '1234' + Role: 'DeploymentValidation' + ServiceName: 'DeploymentValidation' + } + } +} diff --git a/modules/Microsoft.NetApp/netAppAccounts/.test/nfs41.parameters.json b/modules/Microsoft.NetApp/netAppAccounts/.test/nfs41.parameters.json deleted file mode 100644 index 2f961c1442..0000000000 --- a/modules/Microsoft.NetApp/netAppAccounts/.test/nfs41.parameters.json +++ /dev/null @@ -1,106 +0,0 @@ -{ - "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#", - "contentVersion": "1.0.0.0", - "parameters": { - "name": { - "value": "<>-az-anf-nfs41-001" - }, - "capacityPools": { - "value": [ - { - "name": "<>-az-anfcp-x-001", - "serviceLevel": "Premium", - "size": 4398046511104, - "volumes": [ - { - "name": "anf4-vol01-nfsv41", - "usageThreshold": 107374182400, - "protocolTypes": [ - "NFSv4.1" - ], - "exportPolicyRules": [ - { - "ruleIndex": 1, - "unixReadOnly": false, - "unixReadWrite": true, - "nfsv3": false, - "nfsv41": true, - "allowedClients": "0.0.0.0/0" - } - ], - "subnetResourceId": "/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworks/adp-<>-az-vnet-x-001/subnets/<>-az-subnet-x-004", - "roleAssignments": [ - { - "roleDefinitionIdOrName": "Reader", - "principalIds": [ - "<>" - ] - } - ] - }, - { - "name": "anf4-vol02-nfsv41", - "usageThreshold": 107374182400, - "protocolTypes": [ - "NFSv4.1" - ], - "exportPolicyRules": [ - { - "ruleIndex": 1, - "unixReadOnly": false, - "unixReadWrite": true, - "nfsv3": false, - "nfsv41": true, - "allowedClients": "0.0.0.0/0" - } - ], - "subnetResourceId": "/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworks/adp-<>-az-vnet-x-001/subnets/<>-az-subnet-x-004" - } - ], - "roleAssignments": [ - { - "roleDefinitionIdOrName": "Reader", - "principalIds": [ - "<>" - ] - } - ] - }, - { - "name": "<>-az-anfcp-x-002", - "serviceLevel": "Premium", - "size": 4398046511104, - "volumes": [], - "roleAssignments": [ - { - "roleDefinitionIdOrName": "Reader", - "principalIds": [ - "<>" - ] - } - ] - } - ] - }, - "roleAssignments": { - "value": [ - { - "roleDefinitionIdOrName": "Reader", - "principalIds": [ - "<>" - ] - } - ] - }, - "tags": { - "value": { - "Environment": "Non-Prod", - "Contact": "test.user@testcompany.com", - "PurchaseOrder": "1234", - "CostCenter": "7890", - "ServiceName": "DeploymentValidation", - "Role": "DeploymentValidation" - } - } - } -} diff --git a/modules/Microsoft.NetApp/netAppAccounts/.test/nfs41/dependencies.bicep b/modules/Microsoft.NetApp/netAppAccounts/.test/nfs41/dependencies.bicep new file mode 100644 index 0000000000..ef065fbe51 --- /dev/null +++ b/modules/Microsoft.NetApp/netAppAccounts/.test/nfs41/dependencies.bicep @@ -0,0 +1,40 @@ +@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 Subnet.') +output subnetResourceId string = virtualNetwork.properties.subnets[0].id + +@description('The principal ID of the created Managed Identity.') +output managedIdentityPrincipalId string = managedIdentity.properties.principalId + diff --git a/modules/Microsoft.NetApp/netAppAccounts/.test/nfs41/deploy.test.bicep b/modules/Microsoft.NetApp/netAppAccounts/.test/nfs41/deploy.test.bicep new file mode 100644 index 0000000000..56b146a211 --- /dev/null +++ b/modules/Microsoft.NetApp/netAppAccounts/.test/nfs41/deploy.test.bicep @@ -0,0 +1,137 @@ +targetScope = 'subscription' + +// ========== // +// Parameters // +// ========== // +@description('Optional. The name of the resource group to deploy for a testing purposes') +@maxLength(90) +param resourceGroupName string = 'ms.netapp.netappaccounts-${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 = 'nanaanfs41' + +// =========== // +// 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' + capacityPools: [ + { + name: '<>-az-anfcp-x-001' + roleAssignments: [ + { + principalIds: [ + resourceGroupResources.outputs.managedIdentityPrincipalId + ] + roleDefinitionIdOrName: 'Reader' + } + ] + serviceLevel: 'Premium' + size: 4398046511104 + volumes: [ + { + exportPolicyRules: [ + { + allowedClients: '0.0.0.0/0' + nfsv3: false + nfsv41: true + ruleIndex: 1 + unixReadOnly: false + unixReadWrite: true + } + ] + name: 'anf4-vol01-nfsv41' + protocolTypes: [ + 'NFSv4.1' + ] + roleAssignments: [ + { + principalIds: [ + resourceGroupResources.outputs.managedIdentityPrincipalId + ] + roleDefinitionIdOrName: 'Reader' + } + ] + subnetResourceId: resourceGroupResources.outputs.subnetResourceId + usageThreshold: 107374182400 + } + { + exportPolicyRules: [ + { + allowedClients: '0.0.0.0/0' + nfsv3: false + nfsv41: true + ruleIndex: 1 + unixReadOnly: false + unixReadWrite: true + } + ] + name: 'anf4-vol02-nfsv41' + protocolTypes: [ + 'NFSv4.1' + ] + subnetResourceId: resourceGroupResources.outputs.subnetResourceId + usageThreshold: 107374182400 + } + ] + } + { + name: '<>-az-anfcp-x-002' + roleAssignments: [ + { + principalIds: [ + resourceGroupResources.outputs.managedIdentityPrincipalId + ] + roleDefinitionIdOrName: 'Reader' + } + ] + serviceLevel: 'Premium' + size: 4398046511104 + volumes: [] + } + ] + roleAssignments: [ + { + principalIds: [ + resourceGroupResources.outputs.managedIdentityPrincipalId + ] + roleDefinitionIdOrName: 'Reader' + } + ] + tags: { + Contact: 'test.user@testcompany.com' + CostCenter: '7890' + Environment: 'Non-Prod' + PurchaseOrder: '1234' + Role: 'DeploymentValidation' + ServiceName: 'DeploymentValidation' + } + } +} diff --git a/modules/Microsoft.NetApp/netAppAccounts/readme.md b/modules/Microsoft.NetApp/netAppAccounts/readme.md index c54462f119..4b860cadc8 100644 --- a/modules/Microsoft.NetApp/netAppAccounts/readme.md +++ b/modules/Microsoft.NetApp/netAppAccounts/readme.md @@ -171,9 +171,9 @@ The following module usage examples are retrieved from the content of the files ```bicep module netAppAccounts './Microsoft.NetApp/netAppAccounts/deploy.bicep' = { - name: '${uniqueString(deployment().name)}-NetAppAccounts' + name: '${uniqueString(deployment().name)}-test-nanaamin' params: { - name: '<>-az-anf-min-001' + name: '<>nanaamin001' } } ``` @@ -191,7 +191,7 @@ module netAppAccounts './Microsoft.NetApp/netAppAccounts/deploy.bicep' = { "contentVersion": "1.0.0.0", "parameters": { "name": { - "value": "<>-az-anf-min-001" + "value": "<>nanaamin001" } } } @@ -208,10 +208,10 @@ module netAppAccounts './Microsoft.NetApp/netAppAccounts/deploy.bicep' = { ```bicep module netAppAccounts './Microsoft.NetApp/netAppAccounts/deploy.bicep' = { - name: '${uniqueString(deployment().name)}-NetAppAccounts' + name: '${uniqueString(deployment().name)}-test-nanaanfs3' params: { // Required parameters - name: '<>-az-anf-nfs3-001' + name: '<>nanaanfs3001' // Non-required parameters capacityPools: [ { @@ -219,7 +219,7 @@ module netAppAccounts './Microsoft.NetApp/netAppAccounts/deploy.bicep' = { roleAssignments: [ { principalIds: [ - '<>' + '' ] roleDefinitionIdOrName: 'Reader' } @@ -245,12 +245,12 @@ module netAppAccounts './Microsoft.NetApp/netAppAccounts/deploy.bicep' = { roleAssignments: [ { principalIds: [ - '<>' + '' ] roleDefinitionIdOrName: 'Reader' } ] - subnetResourceId: '/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworks/adp-<>-az-vnet-x-001/subnets/<>-az-subnet-x-004' + subnetResourceId: '' usageThreshold: 107374182400 } { @@ -258,7 +258,7 @@ module netAppAccounts './Microsoft.NetApp/netAppAccounts/deploy.bicep' = { protocolTypes: [ 'NFSv3' ] - subnetResourceId: '/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworks/adp-<>-az-vnet-x-001/subnets/<>-az-subnet-x-004' + subnetResourceId: '' usageThreshold: 107374182400 } ] @@ -268,7 +268,7 @@ module netAppAccounts './Microsoft.NetApp/netAppAccounts/deploy.bicep' = { roleAssignments: [ { principalIds: [ - '<>' + '' ] roleDefinitionIdOrName: 'Reader' } @@ -282,7 +282,7 @@ module netAppAccounts './Microsoft.NetApp/netAppAccounts/deploy.bicep' = { roleAssignments: [ { principalIds: [ - '<>' + '' ] roleDefinitionIdOrName: 'Reader' } @@ -313,7 +313,7 @@ module netAppAccounts './Microsoft.NetApp/netAppAccounts/deploy.bicep' = { "parameters": { // Required parameters "name": { - "value": "<>-az-anf-nfs3-001" + "value": "<>nanaanfs3001" }, // Non-required parameters "capacityPools": { @@ -323,7 +323,7 @@ module netAppAccounts './Microsoft.NetApp/netAppAccounts/deploy.bicep' = { "roleAssignments": [ { "principalIds": [ - "<>" + "" ], "roleDefinitionIdOrName": "Reader" } @@ -349,12 +349,12 @@ module netAppAccounts './Microsoft.NetApp/netAppAccounts/deploy.bicep' = { "roleAssignments": [ { "principalIds": [ - "<>" + "" ], "roleDefinitionIdOrName": "Reader" } ], - "subnetResourceId": "/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworks/adp-<>-az-vnet-x-001/subnets/<>-az-subnet-x-004", + "subnetResourceId": "", "usageThreshold": 107374182400 }, { @@ -362,7 +362,7 @@ module netAppAccounts './Microsoft.NetApp/netAppAccounts/deploy.bicep' = { "protocolTypes": [ "NFSv3" ], - "subnetResourceId": "/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworks/adp-<>-az-vnet-x-001/subnets/<>-az-subnet-x-004", + "subnetResourceId": "", "usageThreshold": 107374182400 } ] @@ -372,7 +372,7 @@ module netAppAccounts './Microsoft.NetApp/netAppAccounts/deploy.bicep' = { "roleAssignments": [ { "principalIds": [ - "<>" + "" ], "roleDefinitionIdOrName": "Reader" } @@ -390,7 +390,7 @@ module netAppAccounts './Microsoft.NetApp/netAppAccounts/deploy.bicep' = { "value": [ { "principalIds": [ - "<>" + "" ], "roleDefinitionIdOrName": "Reader" } @@ -421,10 +421,10 @@ module netAppAccounts './Microsoft.NetApp/netAppAccounts/deploy.bicep' = { ```bicep module netAppAccounts './Microsoft.NetApp/netAppAccounts/deploy.bicep' = { - name: '${uniqueString(deployment().name)}-NetAppAccounts' + name: '${uniqueString(deployment().name)}-test-nanaanfs41' params: { // Required parameters - name: '<>-az-anf-nfs41-001' + name: '<>nanaanfs41001' // Non-required parameters capacityPools: [ { @@ -432,7 +432,7 @@ module netAppAccounts './Microsoft.NetApp/netAppAccounts/deploy.bicep' = { roleAssignments: [ { principalIds: [ - '<>' + '' ] roleDefinitionIdOrName: 'Reader' } @@ -458,12 +458,12 @@ module netAppAccounts './Microsoft.NetApp/netAppAccounts/deploy.bicep' = { roleAssignments: [ { principalIds: [ - '<>' + '' ] roleDefinitionIdOrName: 'Reader' } ] - subnetResourceId: '/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworks/adp-<>-az-vnet-x-001/subnets/<>-az-subnet-x-004' + subnetResourceId: '' usageThreshold: 107374182400 } { @@ -481,7 +481,7 @@ module netAppAccounts './Microsoft.NetApp/netAppAccounts/deploy.bicep' = { protocolTypes: [ 'NFSv4.1' ] - subnetResourceId: '/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworks/adp-<>-az-vnet-x-001/subnets/<>-az-subnet-x-004' + subnetResourceId: '' usageThreshold: 107374182400 } ] @@ -491,7 +491,7 @@ module netAppAccounts './Microsoft.NetApp/netAppAccounts/deploy.bicep' = { roleAssignments: [ { principalIds: [ - '<>' + '' ] roleDefinitionIdOrName: 'Reader' } @@ -504,7 +504,7 @@ module netAppAccounts './Microsoft.NetApp/netAppAccounts/deploy.bicep' = { roleAssignments: [ { principalIds: [ - '<>' + '' ] roleDefinitionIdOrName: 'Reader' } @@ -535,7 +535,7 @@ module netAppAccounts './Microsoft.NetApp/netAppAccounts/deploy.bicep' = { "parameters": { // Required parameters "name": { - "value": "<>-az-anf-nfs41-001" + "value": "<>nanaanfs41001" }, // Non-required parameters "capacityPools": { @@ -545,7 +545,7 @@ module netAppAccounts './Microsoft.NetApp/netAppAccounts/deploy.bicep' = { "roleAssignments": [ { "principalIds": [ - "<>" + "" ], "roleDefinitionIdOrName": "Reader" } @@ -571,12 +571,12 @@ module netAppAccounts './Microsoft.NetApp/netAppAccounts/deploy.bicep' = { "roleAssignments": [ { "principalIds": [ - "<>" + "" ], "roleDefinitionIdOrName": "Reader" } ], - "subnetResourceId": "/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworks/adp-<>-az-vnet-x-001/subnets/<>-az-subnet-x-004", + "subnetResourceId": "", "usageThreshold": 107374182400 }, { @@ -594,7 +594,7 @@ module netAppAccounts './Microsoft.NetApp/netAppAccounts/deploy.bicep' = { "protocolTypes": [ "NFSv4.1" ], - "subnetResourceId": "/subscriptions/<>/resourceGroups/validation-rg/providers/Microsoft.Network/virtualNetworks/adp-<>-az-vnet-x-001/subnets/<>-az-subnet-x-004", + "subnetResourceId": "", "usageThreshold": 107374182400 } ] @@ -604,7 +604,7 @@ module netAppAccounts './Microsoft.NetApp/netAppAccounts/deploy.bicep' = { "roleAssignments": [ { "principalIds": [ - "<>" + "" ], "roleDefinitionIdOrName": "Reader" } @@ -619,7 +619,7 @@ module netAppAccounts './Microsoft.NetApp/netAppAccounts/deploy.bicep' = { "value": [ { "principalIds": [ - "<>" + "" ], "roleDefinitionIdOrName": "Reader" } From 30bb18543950d2af8c5ff1393ae118bf96709e04 Mon Sep 17 00:00:00 2001 From: MrMCake Date: Sun, 4 Sep 2022 14:32:52 +0200 Subject: [PATCH 02/16] Added netapp delegation --- .../netAppAccounts/.test/nfs3/dependencies.bicep | 11 +++++++++-- .../netAppAccounts/.test/nfs41/dependencies.bicep | 11 +++++++++-- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/modules/Microsoft.NetApp/netAppAccounts/.test/nfs3/dependencies.bicep b/modules/Microsoft.NetApp/netAppAccounts/.test/nfs3/dependencies.bicep index ef065fbe51..1e484ccd9a 100644 --- a/modules/Microsoft.NetApp/netAppAccounts/.test/nfs3/dependencies.bicep +++ b/modules/Microsoft.NetApp/netAppAccounts/.test/nfs3/dependencies.bicep @@ -13,7 +13,7 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { properties: { addressSpace: { addressPrefixes: [ - '10.0.0.0/24' + '10.0.0.0/24' ] } subnets: [ @@ -21,6 +21,14 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { name: 'defaultSubnet' properties: { addressPrefix: '10.0.0.0/24' + delegations: [ + { + name: 'netappDel' + properties: { + serviceName: 'Microsoft.Netapp/volumes' + } + } + ] } } ] @@ -37,4 +45,3 @@ output subnetResourceId string = virtualNetwork.properties.subnets[0].id @description('The principal ID of the created Managed Identity.') output managedIdentityPrincipalId string = managedIdentity.properties.principalId - diff --git a/modules/Microsoft.NetApp/netAppAccounts/.test/nfs41/dependencies.bicep b/modules/Microsoft.NetApp/netAppAccounts/.test/nfs41/dependencies.bicep index ef065fbe51..1e484ccd9a 100644 --- a/modules/Microsoft.NetApp/netAppAccounts/.test/nfs41/dependencies.bicep +++ b/modules/Microsoft.NetApp/netAppAccounts/.test/nfs41/dependencies.bicep @@ -13,7 +13,7 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { properties: { addressSpace: { addressPrefixes: [ - '10.0.0.0/24' + '10.0.0.0/24' ] } subnets: [ @@ -21,6 +21,14 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-01-01' = { name: 'defaultSubnet' properties: { addressPrefix: '10.0.0.0/24' + delegations: [ + { + name: 'netappDel' + properties: { + serviceName: 'Microsoft.Netapp/volumes' + } + } + ] } } ] @@ -37,4 +45,3 @@ output subnetResourceId string = virtualNetwork.properties.subnets[0].id @description('The principal ID of the created Managed Identity.') output managedIdentityPrincipalId string = managedIdentity.properties.principalId - From 477c290a4526407d4411302d62374be5c9148e2d Mon Sep 17 00:00:00 2001 From: MrMCake Date: Fri, 9 Sep 2022 12:51:18 +0200 Subject: [PATCH 03/16] Update to latest --- .../Microsoft.NetApp/netAppAccounts/.test/min/deploy.test.bicep | 2 +- .../netAppAccounts/.test/nfs3/deploy.test.bicep | 2 +- .../netAppAccounts/.test/nfs41/deploy.test.bicep | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/Microsoft.NetApp/netAppAccounts/.test/min/deploy.test.bicep b/modules/Microsoft.NetApp/netAppAccounts/.test/min/deploy.test.bicep index 7f850c9a5e..1fc9fa7568 100644 --- a/modules/Microsoft.NetApp/netAppAccounts/.test/min/deploy.test.bicep +++ b/modules/Microsoft.NetApp/netAppAccounts/.test/min/deploy.test.bicep @@ -10,7 +10,7 @@ param resourceGroupName string = 'ms.netapp.netappaccounts-${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 = 'nanaamin' // =========== // diff --git a/modules/Microsoft.NetApp/netAppAccounts/.test/nfs3/deploy.test.bicep b/modules/Microsoft.NetApp/netAppAccounts/.test/nfs3/deploy.test.bicep index a8b06edca3..616da483bc 100644 --- a/modules/Microsoft.NetApp/netAppAccounts/.test/nfs3/deploy.test.bicep +++ b/modules/Microsoft.NetApp/netAppAccounts/.test/nfs3/deploy.test.bicep @@ -10,7 +10,7 @@ param resourceGroupName string = 'ms.netapp.netappaccounts-${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 = 'nanaanfs3' // =========== // diff --git a/modules/Microsoft.NetApp/netAppAccounts/.test/nfs41/deploy.test.bicep b/modules/Microsoft.NetApp/netAppAccounts/.test/nfs41/deploy.test.bicep index 56b146a211..0f69a3209a 100644 --- a/modules/Microsoft.NetApp/netAppAccounts/.test/nfs41/deploy.test.bicep +++ b/modules/Microsoft.NetApp/netAppAccounts/.test/nfs41/deploy.test.bicep @@ -10,7 +10,7 @@ param resourceGroupName string = 'ms.netapp.netappaccounts-${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 = 'nanaanfs41' // =========== // From faef9a256875645eacafedc5f2d3ac3a83d8676e Mon Sep 17 00:00:00 2001 From: MrMCake Date: Fri, 9 Sep 2022 13:04:18 +0200 Subject: [PATCH 04/16] Update to latest --- .../netAppAccounts/.test/min/deploy.test.bicep | 6 +++--- .../netAppAccounts/.test/nfs3/deploy.test.bicep | 6 +++--- .../netAppAccounts/.test/nfs41/deploy.test.bicep | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/modules/Microsoft.NetApp/netAppAccounts/.test/min/deploy.test.bicep b/modules/Microsoft.NetApp/netAppAccounts/.test/min/deploy.test.bicep index 1fc9fa7568..e5cc5b0623 100644 --- a/modules/Microsoft.NetApp/netAppAccounts/.test/min/deploy.test.bicep +++ b/modules/Microsoft.NetApp/netAppAccounts/.test/min/deploy.test.bicep @@ -3,14 +3,14 @@ targetScope = 'subscription' // ========== // // Parameters // // ========== // -@description('Optional. The name of the resource group to deploy for a testing purposes') +@description('Optional. The name of the resource group to deploy for a testing purposes.') @maxLength(90) param resourceGroupName string = 'ms.netapp.netappaccounts-${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') +@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 = 'nanaamin' // =========== // diff --git a/modules/Microsoft.NetApp/netAppAccounts/.test/nfs3/deploy.test.bicep b/modules/Microsoft.NetApp/netAppAccounts/.test/nfs3/deploy.test.bicep index 616da483bc..ae6d2b4afc 100644 --- a/modules/Microsoft.NetApp/netAppAccounts/.test/nfs3/deploy.test.bicep +++ b/modules/Microsoft.NetApp/netAppAccounts/.test/nfs3/deploy.test.bicep @@ -3,14 +3,14 @@ targetScope = 'subscription' // ========== // // Parameters // // ========== // -@description('Optional. The name of the resource group to deploy for a testing purposes') +@description('Optional. The name of the resource group to deploy for a testing purposes.') @maxLength(90) param resourceGroupName string = 'ms.netapp.netappaccounts-${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') +@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 = 'nanaanfs3' // =========== // diff --git a/modules/Microsoft.NetApp/netAppAccounts/.test/nfs41/deploy.test.bicep b/modules/Microsoft.NetApp/netAppAccounts/.test/nfs41/deploy.test.bicep index 0f69a3209a..bfc7f0e9b1 100644 --- a/modules/Microsoft.NetApp/netAppAccounts/.test/nfs41/deploy.test.bicep +++ b/modules/Microsoft.NetApp/netAppAccounts/.test/nfs41/deploy.test.bicep @@ -3,14 +3,14 @@ targetScope = 'subscription' // ========== // // Parameters // // ========== // -@description('Optional. The name of the resource group to deploy for a testing purposes') +@description('Optional. The name of the resource group to deploy for a testing purposes.') @maxLength(90) param resourceGroupName string = 'ms.netapp.netappaccounts-${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') +@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 = 'nanaanfs41' // =========== // From c3fbbb74b5854b011532d0f361429870e230fd41 Mon Sep 17 00:00:00 2001 From: Alexander Sehr Date: Mon, 19 Sep 2022 08:11:07 +0200 Subject: [PATCH 05/16] Update modules/Microsoft.NetApp/netAppAccounts/.test/min/deploy.test.bicep --- .../Microsoft.NetApp/netAppAccounts/.test/min/deploy.test.bicep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Microsoft.NetApp/netAppAccounts/.test/min/deploy.test.bicep b/modules/Microsoft.NetApp/netAppAccounts/.test/min/deploy.test.bicep index e5cc5b0623..e18c83aa83 100644 --- a/modules/Microsoft.NetApp/netAppAccounts/.test/min/deploy.test.bicep +++ b/modules/Microsoft.NetApp/netAppAccounts/.test/min/deploy.test.bicep @@ -3,7 +3,7 @@ targetScope = 'subscription' // ========== // // Parameters // // ========== // -@description('Optional. The name of the resource group to deploy for a testing purposes.') +@description('Optional. The name of the resource group to deploy for testing purposes.') @maxLength(90) param resourceGroupName string = 'ms.netapp.netappaccounts-${serviceShort}-rg' From 19e168755161595a0e7eb483aa7100f984b09b1f Mon Sep 17 00:00:00 2001 From: Alexander Sehr Date: Mon, 19 Sep 2022 08:11:11 +0200 Subject: [PATCH 06/16] Update modules/Microsoft.NetApp/netAppAccounts/.test/nfs41/deploy.test.bicep --- .../netAppAccounts/.test/nfs41/deploy.test.bicep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Microsoft.NetApp/netAppAccounts/.test/nfs41/deploy.test.bicep b/modules/Microsoft.NetApp/netAppAccounts/.test/nfs41/deploy.test.bicep index bfc7f0e9b1..fd82b606c5 100644 --- a/modules/Microsoft.NetApp/netAppAccounts/.test/nfs41/deploy.test.bicep +++ b/modules/Microsoft.NetApp/netAppAccounts/.test/nfs41/deploy.test.bicep @@ -3,7 +3,7 @@ targetScope = 'subscription' // ========== // // Parameters // // ========== // -@description('Optional. The name of the resource group to deploy for a testing purposes.') +@description('Optional. The name of the resource group to deploy for testing purposes.') @maxLength(90) param resourceGroupName string = 'ms.netapp.netappaccounts-${serviceShort}-rg' From 4e866a515062518e6f1f7c66976ec51e53c9f623 Mon Sep 17 00:00:00 2001 From: Alexander Sehr Date: Mon, 19 Sep 2022 08:11:16 +0200 Subject: [PATCH 07/16] Update modules/Microsoft.NetApp/netAppAccounts/.test/nfs3/deploy.test.bicep --- .../netAppAccounts/.test/nfs3/deploy.test.bicep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Microsoft.NetApp/netAppAccounts/.test/nfs3/deploy.test.bicep b/modules/Microsoft.NetApp/netAppAccounts/.test/nfs3/deploy.test.bicep index ae6d2b4afc..a0fe0c1f8c 100644 --- a/modules/Microsoft.NetApp/netAppAccounts/.test/nfs3/deploy.test.bicep +++ b/modules/Microsoft.NetApp/netAppAccounts/.test/nfs3/deploy.test.bicep @@ -3,7 +3,7 @@ targetScope = 'subscription' // ========== // // Parameters // // ========== // -@description('Optional. The name of the resource group to deploy for a testing purposes.') +@description('Optional. The name of the resource group to deploy for testing purposes.') @maxLength(90) param resourceGroupName string = 'ms.netapp.netappaccounts-${serviceShort}-rg' From 16b660a0c6ea1a8a34c6a30990762bd0a65d016d Mon Sep 17 00:00:00 2001 From: Alexander Sehr Date: Wed, 12 Oct 2022 11:22:30 +0200 Subject: [PATCH 08/16] Update modules/Microsoft.NetApp/netAppAccounts/.test/nfs3/deploy.test.bicep Co-authored-by: Erika Gressi <56914614+eriqua@users.noreply.github.com> --- .../netAppAccounts/.test/nfs3/deploy.test.bicep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Microsoft.NetApp/netAppAccounts/.test/nfs3/deploy.test.bicep b/modules/Microsoft.NetApp/netAppAccounts/.test/nfs3/deploy.test.bicep index a0fe0c1f8c..76a8cb5c5f 100644 --- a/modules/Microsoft.NetApp/netAppAccounts/.test/nfs3/deploy.test.bicep +++ b/modules/Microsoft.NetApp/netAppAccounts/.test/nfs3/deploy.test.bicep @@ -44,7 +44,7 @@ module testDeployment '../../deploy.bicep' = { name: '<>${serviceShort}001' capacityPools: [ { - name: '<>-az-anfcp-x-001' + name: '<>-${serviceShort}-cp-001' roleAssignments: [ { principalIds: [ From 343408886d9dfab0b7e5d26417b39dce76e01953 Mon Sep 17 00:00:00 2001 From: Alexander Sehr Date: Wed, 12 Oct 2022 11:22:39 +0200 Subject: [PATCH 09/16] Update modules/Microsoft.NetApp/netAppAccounts/.test/nfs3/deploy.test.bicep Co-authored-by: Erika Gressi <56914614+eriqua@users.noreply.github.com> --- .../netAppAccounts/.test/nfs3/deploy.test.bicep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Microsoft.NetApp/netAppAccounts/.test/nfs3/deploy.test.bicep b/modules/Microsoft.NetApp/netAppAccounts/.test/nfs3/deploy.test.bicep index 76a8cb5c5f..bb531b5556 100644 --- a/modules/Microsoft.NetApp/netAppAccounts/.test/nfs3/deploy.test.bicep +++ b/modules/Microsoft.NetApp/netAppAccounts/.test/nfs3/deploy.test.bicep @@ -67,7 +67,7 @@ module testDeployment '../../deploy.bicep' = { unixReadWrite: true } ] - name: 'anf3-vol01-nfsv3' + name: '<>-${serviceShort}-vol-001' protocolTypes: [ 'NFSv3' ] From ec9fab4274c28985fa0993ebba5933ec35626c1b Mon Sep 17 00:00:00 2001 From: Alexander Sehr Date: Wed, 12 Oct 2022 11:22:46 +0200 Subject: [PATCH 10/16] Update modules/Microsoft.NetApp/netAppAccounts/.test/nfs3/deploy.test.bicep Co-authored-by: Erika Gressi <56914614+eriqua@users.noreply.github.com> --- .../netAppAccounts/.test/nfs3/deploy.test.bicep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Microsoft.NetApp/netAppAccounts/.test/nfs3/deploy.test.bicep b/modules/Microsoft.NetApp/netAppAccounts/.test/nfs3/deploy.test.bicep index bb531b5556..9407cfc52a 100644 --- a/modules/Microsoft.NetApp/netAppAccounts/.test/nfs3/deploy.test.bicep +++ b/modules/Microsoft.NetApp/netAppAccounts/.test/nfs3/deploy.test.bicep @@ -83,7 +83,7 @@ module testDeployment '../../deploy.bicep' = { usageThreshold: 107374182400 } { - name: 'anf3-vol02-nfsv3' + name: '<>-${serviceShort}-vol-002' protocolTypes: [ 'NFSv3' ] From fcfe596eed9bdf5ddd47160fc5573e8df1aa1374 Mon Sep 17 00:00:00 2001 From: Alexander Sehr Date: Wed, 12 Oct 2022 11:22:52 +0200 Subject: [PATCH 11/16] Update modules/Microsoft.NetApp/netAppAccounts/.test/nfs41/deploy.test.bicep Co-authored-by: Erika Gressi <56914614+eriqua@users.noreply.github.com> --- .../netAppAccounts/.test/nfs41/deploy.test.bicep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Microsoft.NetApp/netAppAccounts/.test/nfs41/deploy.test.bicep b/modules/Microsoft.NetApp/netAppAccounts/.test/nfs41/deploy.test.bicep index fd82b606c5..3b6b077457 100644 --- a/modules/Microsoft.NetApp/netAppAccounts/.test/nfs41/deploy.test.bicep +++ b/modules/Microsoft.NetApp/netAppAccounts/.test/nfs41/deploy.test.bicep @@ -44,7 +44,7 @@ module testDeployment '../../deploy.bicep' = { name: '<>${serviceShort}001' capacityPools: [ { - name: '<>-az-anfcp-x-001' + name: '<>-${serviceShort}-cp-001' roleAssignments: [ { principalIds: [ From ab34cfc44b886cfa1c70c957a7ff0f553d83f3f3 Mon Sep 17 00:00:00 2001 From: Alexander Sehr Date: Wed, 12 Oct 2022 11:22:58 +0200 Subject: [PATCH 12/16] Update modules/Microsoft.NetApp/netAppAccounts/.test/nfs41/deploy.test.bicep Co-authored-by: Erika Gressi <56914614+eriqua@users.noreply.github.com> --- .../netAppAccounts/.test/nfs41/deploy.test.bicep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Microsoft.NetApp/netAppAccounts/.test/nfs41/deploy.test.bicep b/modules/Microsoft.NetApp/netAppAccounts/.test/nfs41/deploy.test.bicep index 3b6b077457..f2da70d482 100644 --- a/modules/Microsoft.NetApp/netAppAccounts/.test/nfs41/deploy.test.bicep +++ b/modules/Microsoft.NetApp/netAppAccounts/.test/nfs41/deploy.test.bicep @@ -67,7 +67,7 @@ module testDeployment '../../deploy.bicep' = { unixReadWrite: true } ] - name: 'anf4-vol01-nfsv41' + name: '<>-${serviceShort}-vol-001' protocolTypes: [ 'NFSv4.1' ] From 20697a2aba57e838f8a54cf3c29e4fd753fbf753 Mon Sep 17 00:00:00 2001 From: Alexander Sehr Date: Wed, 12 Oct 2022 11:23:04 +0200 Subject: [PATCH 13/16] Update modules/Microsoft.NetApp/netAppAccounts/.test/nfs41/deploy.test.bicep Co-authored-by: Erika Gressi <56914614+eriqua@users.noreply.github.com> --- .../netAppAccounts/.test/nfs41/deploy.test.bicep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Microsoft.NetApp/netAppAccounts/.test/nfs41/deploy.test.bicep b/modules/Microsoft.NetApp/netAppAccounts/.test/nfs41/deploy.test.bicep index f2da70d482..1ba076081a 100644 --- a/modules/Microsoft.NetApp/netAppAccounts/.test/nfs41/deploy.test.bicep +++ b/modules/Microsoft.NetApp/netAppAccounts/.test/nfs41/deploy.test.bicep @@ -93,7 +93,7 @@ module testDeployment '../../deploy.bicep' = { unixReadWrite: true } ] - name: 'anf4-vol02-nfsv41' + name: '<>-${serviceShort}-vol-002' protocolTypes: [ 'NFSv4.1' ] From 55c073bfc2e8f9bf4e1b604cb1823820b3724ff6 Mon Sep 17 00:00:00 2001 From: Alexander Sehr Date: Wed, 12 Oct 2022 11:23:11 +0200 Subject: [PATCH 14/16] Update modules/Microsoft.NetApp/netAppAccounts/.test/nfs41/deploy.test.bicep Co-authored-by: Erika Gressi <56914614+eriqua@users.noreply.github.com> --- .../netAppAccounts/.test/nfs41/deploy.test.bicep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Microsoft.NetApp/netAppAccounts/.test/nfs41/deploy.test.bicep b/modules/Microsoft.NetApp/netAppAccounts/.test/nfs41/deploy.test.bicep index 1ba076081a..2dfbba8ce2 100644 --- a/modules/Microsoft.NetApp/netAppAccounts/.test/nfs41/deploy.test.bicep +++ b/modules/Microsoft.NetApp/netAppAccounts/.test/nfs41/deploy.test.bicep @@ -103,7 +103,7 @@ module testDeployment '../../deploy.bicep' = { ] } { - name: '<>-az-anfcp-x-002' + name: '<>-${serviceShort}-cp-002' roleAssignments: [ { principalIds: [ From 4093bf53dec807437d103ab39fc895767039fc51 Mon Sep 17 00:00:00 2001 From: Alexander Sehr Date: Wed, 12 Oct 2022 11:23:18 +0200 Subject: [PATCH 15/16] Update modules/Microsoft.NetApp/netAppAccounts/.test/nfs3/deploy.test.bicep Co-authored-by: Erika Gressi <56914614+eriqua@users.noreply.github.com> --- .../netAppAccounts/.test/nfs3/deploy.test.bicep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Microsoft.NetApp/netAppAccounts/.test/nfs3/deploy.test.bicep b/modules/Microsoft.NetApp/netAppAccounts/.test/nfs3/deploy.test.bicep index 9407cfc52a..912db036be 100644 --- a/modules/Microsoft.NetApp/netAppAccounts/.test/nfs3/deploy.test.bicep +++ b/modules/Microsoft.NetApp/netAppAccounts/.test/nfs3/deploy.test.bicep @@ -93,7 +93,7 @@ module testDeployment '../../deploy.bicep' = { ] } { - name: '<>-az-anfcp-x-002' + name: '<>-${serviceShort}-cp-002' roleAssignments: [ { principalIds: [ From fb01c267f98941c26e89f329770fbabb5b797e5b Mon Sep 17 00:00:00 2001 From: MrMCake Date: Wed, 12 Oct 2022 11:24:39 +0200 Subject: [PATCH 16/16] Updated readme --- .../Microsoft.NetApp/netAppAccounts/readme.md | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/modules/Microsoft.NetApp/netAppAccounts/readme.md b/modules/Microsoft.NetApp/netAppAccounts/readme.md index 62e60d70bf..fa56712ca7 100644 --- a/modules/Microsoft.NetApp/netAppAccounts/readme.md +++ b/modules/Microsoft.NetApp/netAppAccounts/readme.md @@ -216,7 +216,7 @@ module netAppAccounts './Microsoft.NetApp/netAppAccounts/deploy.bicep' = { // Non-required parameters capacityPools: [ { - name: '<>-az-anfcp-x-001' + name: '<>-nanaanfs3-cp-001' roleAssignments: [ { principalIds: [ @@ -239,7 +239,7 @@ module netAppAccounts './Microsoft.NetApp/netAppAccounts/deploy.bicep' = { unixReadWrite: true } ] - name: 'anf3-vol01-nfsv3' + name: '<>-nanaanfs3-vol-001' protocolTypes: [ 'NFSv3' ] @@ -255,7 +255,7 @@ module netAppAccounts './Microsoft.NetApp/netAppAccounts/deploy.bicep' = { usageThreshold: 107374182400 } { - name: 'anf3-vol02-nfsv3' + name: '<>-nanaanfs3-vol-002' protocolTypes: [ 'NFSv3' ] @@ -265,7 +265,7 @@ module netAppAccounts './Microsoft.NetApp/netAppAccounts/deploy.bicep' = { ] } { - name: '<>-az-anfcp-x-002' + name: '<>-nanaanfs3-cp-002' roleAssignments: [ { principalIds: [ @@ -320,7 +320,7 @@ module netAppAccounts './Microsoft.NetApp/netAppAccounts/deploy.bicep' = { "capacityPools": { "value": [ { - "name": "<>-az-anfcp-x-001", + "name": "<>-nanaanfs3-cp-001", "roleAssignments": [ { "principalIds": [ @@ -343,7 +343,7 @@ module netAppAccounts './Microsoft.NetApp/netAppAccounts/deploy.bicep' = { "unixReadWrite": true } ], - "name": "anf3-vol01-nfsv3", + "name": "<>-nanaanfs3-vol-001", "protocolTypes": [ "NFSv3" ], @@ -359,7 +359,7 @@ module netAppAccounts './Microsoft.NetApp/netAppAccounts/deploy.bicep' = { "usageThreshold": 107374182400 }, { - "name": "anf3-vol02-nfsv3", + "name": "<>-nanaanfs3-vol-002", "protocolTypes": [ "NFSv3" ], @@ -369,7 +369,7 @@ module netAppAccounts './Microsoft.NetApp/netAppAccounts/deploy.bicep' = { ] }, { - "name": "<>-az-anfcp-x-002", + "name": "<>-nanaanfs3-cp-002", "roleAssignments": [ { "principalIds": [ @@ -429,7 +429,7 @@ module netAppAccounts './Microsoft.NetApp/netAppAccounts/deploy.bicep' = { // Non-required parameters capacityPools: [ { - name: '<>-az-anfcp-x-001' + name: '<>-nanaanfs41-cp-001' roleAssignments: [ { principalIds: [ @@ -452,7 +452,7 @@ module netAppAccounts './Microsoft.NetApp/netAppAccounts/deploy.bicep' = { unixReadWrite: true } ] - name: 'anf4-vol01-nfsv41' + name: '<>-nanaanfs41-vol-001' protocolTypes: [ 'NFSv4.1' ] @@ -478,7 +478,7 @@ module netAppAccounts './Microsoft.NetApp/netAppAccounts/deploy.bicep' = { unixReadWrite: true } ] - name: 'anf4-vol02-nfsv41' + name: '<>-nanaanfs41-vol-002' protocolTypes: [ 'NFSv4.1' ] @@ -488,7 +488,7 @@ module netAppAccounts './Microsoft.NetApp/netAppAccounts/deploy.bicep' = { ] } { - name: '<>-az-anfcp-x-002' + name: '<>-nanaanfs41-cp-002' roleAssignments: [ { principalIds: [ @@ -542,7 +542,7 @@ module netAppAccounts './Microsoft.NetApp/netAppAccounts/deploy.bicep' = { "capacityPools": { "value": [ { - "name": "<>-az-anfcp-x-001", + "name": "<>-nanaanfs41-cp-001", "roleAssignments": [ { "principalIds": [ @@ -565,7 +565,7 @@ module netAppAccounts './Microsoft.NetApp/netAppAccounts/deploy.bicep' = { "unixReadWrite": true } ], - "name": "anf4-vol01-nfsv41", + "name": "<>-nanaanfs41-vol-001", "protocolTypes": [ "NFSv4.1" ], @@ -591,7 +591,7 @@ module netAppAccounts './Microsoft.NetApp/netAppAccounts/deploy.bicep' = { "unixReadWrite": true } ], - "name": "anf4-vol02-nfsv41", + "name": "<>-nanaanfs41-vol-002", "protocolTypes": [ "NFSv4.1" ], @@ -601,7 +601,7 @@ module netAppAccounts './Microsoft.NetApp/netAppAccounts/deploy.bicep' = { ] }, { - "name": "<>-az-anfcp-x-002", + "name": "<>-nanaanfs41-cp-002", "roleAssignments": [ { "principalIds": [