-
Notifications
You must be signed in to change notification settings - Fork 437
[Modules] Updated KeyVault vaults to new dependencies approach #2002
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
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
74757a6
Updated KeyVault vaults to new dependencies approach
AlexanderSehr a679395
Weird test fix
AlexanderSehr 485da45
Added service endpoint for kvlt
AlexanderSehr 3061cc5
Update modules/Microsoft.KeyVault/vaults/.test/common/dependencies.bicep
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
63 changes: 63 additions & 0 deletions
63
modules/Microsoft.KeyVault/vaults/.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,63 @@ | ||
| @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' | ||
| serviceEndpoints: [ | ||
| { | ||
| service: 'Microsoft.KeyVault' | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| } | ||
|
|
||
| resource managedIdentity 'Microsoft.ManagedIdentity/userAssignedIdentities@2018-11-30' = { | ||
| name: managedIdentityName | ||
| location: location | ||
| } | ||
|
|
||
| resource privateDNSZone 'Microsoft.Network/privateDnsZones@2020-06-01' = { | ||
| name: 'privatelink.vaultcore.azure.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 principal ID of the created Managed Identity.') | ||
| output managedIdentityPrincipalId string = managedIdentity.properties.principalId | ||
|
|
||
| @description('The resource ID of the created Private DNS Zone.') | ||
| output privateDNSResourceId string = privateDNSZone.id |
161 changes: 161 additions & 0 deletions
161
modules/Microsoft.KeyVault/vaults/.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,161 @@ | ||
| targetScope = 'subscription' | ||
|
|
||
| // ========== // | ||
| // Parameters // | ||
| // ========== // | ||
| @description('Optional. The name of the resource group to deploy for a testing purposes') | ||
| @maxLength(90) | ||
| param resourceGroupName string = 'ms.keyvault.vaults-${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 = 'kvvcom' | ||
|
|
||
| // =========== // | ||
| // Deployments // | ||
eriqua marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| // =========== // | ||
|
|
||
| // 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-<<namePrefix>>-vnet-${serviceShort}' | ||
| managedIdentityName: 'dep-<<namePrefix>>-msi-${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' | ||
| accessPolicies: [ | ||
| { | ||
| objectId: resourceGroupResources.outputs.managedIdentityPrincipalId | ||
| permissions: { | ||
| keys: [ | ||
| 'get' | ||
| 'list' | ||
| 'update' | ||
| ] | ||
| secrets: [ | ||
| 'all' | ||
| ] | ||
| } | ||
| tenantId: tenant().tenantId | ||
| } | ||
| { | ||
| objectId: resourceGroupResources.outputs.managedIdentityPrincipalId | ||
| permissions: { | ||
| certificates: [ | ||
| 'backup' | ||
| 'create' | ||
| 'delete' | ||
| ] | ||
| secrets: [ | ||
| 'all' | ||
| ] | ||
| } | ||
| } | ||
| ] | ||
| diagnosticLogsRetentionInDays: 7 | ||
| diagnosticStorageAccountId: diagnosticDependencies.outputs.storageAccountResourceId | ||
| diagnosticWorkspaceId: diagnosticDependencies.outputs.logAnalyticsWorkspaceResourceId | ||
| diagnosticEventHubAuthorizationRuleId: diagnosticDependencies.outputs.eventHubAuthorizationRuleId | ||
| diagnosticEventHubName: diagnosticDependencies.outputs.eventHubNamespaceEventHubName | ||
| enableRbacAuthorization: false | ||
| keys: [ | ||
| { | ||
| attributesExp: 1702648632 | ||
| attributesNbf: 10000 | ||
| name: 'keyName' | ||
| roleAssignments: [ | ||
| { | ||
| principalIds: [ | ||
| resourceGroupResources.outputs.managedIdentityPrincipalId | ||
| ] | ||
| roleDefinitionIdOrName: 'Reader' | ||
| } | ||
| ] | ||
| } | ||
| ] | ||
| lock: 'CanNotDelete' | ||
| networkAcls: { | ||
| bypass: 'AzureServices' | ||
| defaultAction: 'Deny' | ||
| ipRules: [] | ||
| virtualNetworkRules: [ | ||
| { | ||
| action: 'Allow' | ||
| id: resourceGroupResources.outputs.subnetResourceId | ||
| } | ||
| ] | ||
| } | ||
| privateEndpoints: [ | ||
| { | ||
| privateDnsZoneGroup: { | ||
| privateDNSResourceIds: [ | ||
| resourceGroupResources.outputs.privateDNSResourceId | ||
| ] | ||
| } | ||
| service: 'vault' | ||
| subnetResourceId: resourceGroupResources.outputs.subnetResourceId | ||
| } | ||
| ] | ||
| roleAssignments: [ | ||
| { | ||
| principalIds: [ | ||
| resourceGroupResources.outputs.managedIdentityPrincipalId | ||
| ] | ||
| roleDefinitionIdOrName: 'Reader' | ||
| } | ||
| ] | ||
| secrets: { | ||
| secureList: [ | ||
| { | ||
| attributesExp: 1702648632 | ||
| attributesNbf: 10000 | ||
| contentType: 'Something' | ||
| name: 'secretName' | ||
| roleAssignments: [ | ||
| { | ||
| principalIds: [ | ||
| resourceGroupResources.outputs.managedIdentityPrincipalId | ||
| ] | ||
| roleDefinitionIdOrName: 'Reader' | ||
| } | ||
| ] | ||
| value: 'secretValue' | ||
| } | ||
| ] | ||
| } | ||
| softDeleteRetentionInDays: 7 | ||
| } | ||
| } | ||
This file was deleted.
Oops, something went wrong.
37 changes: 37 additions & 0 deletions
37
modules/Microsoft.KeyVault/vaults/.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,37 @@ | ||
| targetScope = 'subscription' | ||
|
|
||
| // ========== // | ||
| // Parameters // | ||
| // ========== // | ||
| @description('Optional. The name of the resource group to deploy for a testing purposes') | ||
| @maxLength(90) | ||
| param resourceGroupName string = 'ms.keyvault.vaults-${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 = 'kvvmin' | ||
|
|
||
| // =========== // | ||
| // 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' | ||
| } | ||
| } |
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.