-
Notifications
You must be signed in to change notification settings - Fork 437
[Modules] Updated VirtualNetwork to new dependency approach #1884
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
AlexanderSehr
merged 13 commits into
main
from
users/alsehr/1791_Network_virtualNetworks
Sep 19, 2022
Merged
Changes from all commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
8eb6136
Updated VirtualNetwork to new dependency approach
AlexanderSehr 564ef49
Updated VirtualNetwork to new dependency approach
AlexanderSehr 950e684
Update to latest
AlexanderSehr 2366b0d
Update to latest
AlexanderSehr f75b999
Updated folder default to common.
AlexanderSehr fb1c07e
Merge branch 'main' into users/alsehr/1791_Network_virtualNetworks
AlexanderSehr f9249ea
Update to latest
AlexanderSehr d017f8b
Update to latest
AlexanderSehr 5572427
Update to latest
AlexanderSehr 30e55dd
Update modules/Microsoft.Network/virtualNetworks/.test/common/deploy.…
AlexanderSehr f315357
Update modules/Microsoft.Network/virtualNetworks/.test/min/deploy.tes…
AlexanderSehr 0de87bc
Update modules/Microsoft.Network/virtualNetworks/.test/vnetPeering/de…
AlexanderSehr 70f8383
Update modules/Microsoft.Network/virtualNetworks/.test/common/depende…
AlexanderSehr File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
35 changes: 35 additions & 0 deletions
35
modules/Microsoft.Network/virtualNetworks/.test/common/dependencies.bicep
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| @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 | ||
|
|
||
| @description('Required. The name of the Route Table to create.') | ||
| param routeTableName string | ||
|
|
||
| @description('Required. The name of the Network Security Group to create.') | ||
| param networkSecurityGroupName string | ||
|
|
||
| resource managedIdentity 'Microsoft.ManagedIdentity/userAssignedIdentities@2018-11-30' = { | ||
| name: managedIdentityName | ||
| location: location | ||
| } | ||
|
|
||
| resource routeTable 'Microsoft.Network/routeTables@2022-01-01' = { | ||
| name: routeTableName | ||
| location: location | ||
| } | ||
|
|
||
| resource networkSecurityGroup 'Microsoft.Network/networkSecurityGroups@2022-01-01' = { | ||
| name: networkSecurityGroupName | ||
| location: location | ||
| } | ||
|
|
||
| @description('The resource ID of the created Route Table.') | ||
| output routeTableResourceId string = routeTable.id | ||
|
|
||
| @description('The resource ID of the created Network Security Group.') | ||
| output networkSecurityGroupResourceId string = networkSecurityGroup.id | ||
|
|
||
| @description('The principal ID of the created Managed Identity.') | ||
| output managedIdentityPrincipalId string = managedIdentity.properties.principalId |
128 changes: 128 additions & 0 deletions
128
modules/Microsoft.Network/virtualNetworks/.test/common/deploy.test.bicep
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,128 @@ | ||
| targetScope = 'subscription' | ||
|
|
||
| // ========== // | ||
| // Parameters // | ||
| // ========== // | ||
| @description('Optional. The name of the resource group to deploy for testing purposes.') | ||
| @maxLength(90) | ||
| param resourceGroupName string = 'ms.network.virtualnetworks-${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 = 'nvncom' | ||
|
|
||
| // =========== // | ||
| // 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-<<namePrefix>>-msi-${serviceShort}' | ||
| routeTableName: 'dep-<<namePrefix>>-rt-${serviceShort}' | ||
| networkSecurityGroupName: 'dep-<<namePrefix>>-nsg-${serviceShort}' | ||
| } | ||
| } | ||
|
|
||
| // Diagnostics | ||
| // =========== | ||
| module diagnosticDependencies '../../../../.shared/dependencyConstructs/diagnostic.dependencies.bicep' = { | ||
| scope: resourceGroup | ||
| name: '${uniqueString(deployment().name, location)}-diagnosticDependencies' | ||
| params: { | ||
| storageAccountName: 'dep<<namePrefix>>diasa${serviceShort}01' | ||
| logAnalyticsWorkspaceName: 'dep-<<namePrefix>>-law-${serviceShort}' | ||
| eventHubNamespaceEventHubName: 'dep-<<namePrefix>>-evh-${serviceShort}' | ||
| eventHubNamespaceName: 'dep-<<namePrefix>>-evhns-${serviceShort}' | ||
| location: location | ||
| } | ||
| } | ||
|
|
||
| // ============== // | ||
| // Test Execution // | ||
| // ============== // | ||
|
|
||
| module testDeployment '../../deploy.bicep' = { | ||
| scope: resourceGroup | ||
| name: '${uniqueString(deployment().name)}-test-${serviceShort}' | ||
| params: { | ||
| name: '<<namePrefix>>${serviceShort}001' | ||
| addressPrefixes: [ | ||
| '10.0.0.0/16' | ||
| ] | ||
| diagnosticLogsRetentionInDays: 7 | ||
| diagnosticStorageAccountId: diagnosticDependencies.outputs.storageAccountResourceId | ||
| diagnosticWorkspaceId: diagnosticDependencies.outputs.logAnalyticsWorkspaceResourceId | ||
| diagnosticEventHubAuthorizationRuleId: diagnosticDependencies.outputs.eventHubAuthorizationRuleId | ||
| diagnosticEventHubName: diagnosticDependencies.outputs.eventHubNamespaceEventHubName | ||
| dnsServers: [ | ||
| '10.0.1.4' | ||
| '10.0.1.5' | ||
| ] | ||
| lock: 'CanNotDelete' | ||
| roleAssignments: [ | ||
| { | ||
| principalIds: [ | ||
| resourceGroupResources.outputs.managedIdentityPrincipalId | ||
| ] | ||
| roleDefinitionIdOrName: 'Reader' | ||
| } | ||
| ] | ||
| subnets: [ | ||
| { | ||
| addressPrefix: '10.0.255.0/24' | ||
| name: 'GatewaySubnet' | ||
| } | ||
| { | ||
| addressPrefix: '10.0.0.0/24' | ||
| name: '<<namePrefix>>-az-subnet-x-001' | ||
| networkSecurityGroupId: resourceGroupResources.outputs.networkSecurityGroupResourceId | ||
| roleAssignments: [ | ||
| { | ||
| principalIds: [ | ||
| resourceGroupResources.outputs.managedIdentityPrincipalId | ||
| ] | ||
| roleDefinitionIdOrName: 'Reader' | ||
| } | ||
| ] | ||
| routeTableId: resourceGroupResources.outputs.routeTableResourceId | ||
| serviceEndpoints: [ | ||
| { | ||
| service: 'Microsoft.Storage' | ||
| } | ||
| { | ||
| service: 'Microsoft.Sql' | ||
| } | ||
| ] | ||
| } | ||
| { | ||
| addressPrefix: '10.0.3.0/24' | ||
| delegations: [ | ||
| { | ||
| name: 'netappDel' | ||
| properties: { | ||
| serviceName: 'Microsoft.Netapp/volumes' | ||
| } | ||
| } | ||
| ] | ||
| name: '<<namePrefix>>-az-subnet-x-002' | ||
| } | ||
| { | ||
| addressPrefix: '10.0.6.0/24' | ||
| name: '<<namePrefix>>-az-subnet-x-003' | ||
| privateEndpointNetworkPolicies: 'Disabled' | ||
| privateLinkServiceNetworkPolicies: 'Enabled' | ||
| } | ||
| ] | ||
| } | ||
| } | ||
14 changes: 0 additions & 14 deletions
14
modules/Microsoft.Network/virtualNetworks/.test/min.parameters.json
This file was deleted.
Oops, something went wrong.
40 changes: 40 additions & 0 deletions
40
modules/Microsoft.Network/virtualNetworks/.test/min/deploy.test.bicep
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| targetScope = 'subscription' | ||
|
|
||
| // ========== // | ||
| // Parameters // | ||
| // ========== // | ||
| @description('Optional. The name of the resource group to deploy for testing purposes.') | ||
| @maxLength(90) | ||
| param resourceGroupName string = 'ms.network.virtualnetworks-${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 = 'nvnmin' | ||
|
|
||
| // =========== // | ||
| // 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: '<<namePrefix>>${serviceShort}001' | ||
| addressPrefixes: [ | ||
| '10.0.0.0/16' | ||
| ] | ||
| } | ||
| } |
96 changes: 0 additions & 96 deletions
96
modules/Microsoft.Network/virtualNetworks/.test/parameters.json
This file was deleted.
Oops, something went wrong.
52 changes: 0 additions & 52 deletions
52
modules/Microsoft.Network/virtualNetworks/.test/vnetPeering.parameters.json
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.