Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Moved CMK resources to HUB #842

Merged
merged 1 commit into from
Feb 6, 2024
Merged

Moved CMK resources to HUB #842

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 52 additions & 0 deletions src/bicep/core/hub-customer-managed-keys.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
/*
Copyright (c) Microsoft Corporation.
Licensed under the MIT License.
*/

param diskEncryptionSetName string
param deploymentNameSuffix string
param keyVaultName string
param keyVaultPrivateDnsZoneResourceId string
param location string
param resourcePrefix string
param subnetResourceId string
param tags object
param userAssignedIdentityName string

module keyVault '../modules/key-vault.bicep' = {
name: 'deploy-key-vault-${deploymentNameSuffix}'
params: {
keyVaultName: keyVaultName
keyVaultPrivateDnsZoneResourceId: keyVaultPrivateDnsZoneResourceId
location: location
resourcePrefix: resourcePrefix
subnetResourceId: subnetResourceId
tags: tags
}
}

module diskEncryptionSet '../modules/disk-encryption-set.bicep' = {
name: 'deploy-disk-encryption-set_${deploymentNameSuffix}'
params: {
deploymentNameSuffix: deploymentNameSuffix
diskEncryptionSetName: diskEncryptionSetName
keyUrl: keyVault.outputs.keyUriWithVersion
keyVaultResourceId: keyVault.outputs.keyVaultResourceId
location: location
tags: contains(tags, 'Microsoft.Compute/diskEncryptionSets') ? tags['Microsoft.Compute/diskEncryptionSets'] : {}
}
}

module userAssignedIdentity '../modules/user-assigned-identity.bicep' = {
name: 'deploy-user-assigned-identity-${deploymentNameSuffix}'
params: {
location: location
name: userAssignedIdentityName
tags: tags
}
}

output diskEncryptionSetResourceId string = diskEncryptionSet.outputs.resourceId
output keyVaultUri string = keyVault.outputs.keyVaultUri
output storageKeyName string = keyVault.outputs.storageKeyName
output userAssignedIdentityResourceId string = userAssignedIdentity.outputs.resourceId
44 changes: 21 additions & 23 deletions src/bicep/mlz.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -564,6 +564,10 @@ var virtualNetworkNamingConvention = replace(namingConvention, resourceToken, 'v

var hubName = 'hub'
var hubShortName = 'hub'
var hubDiskEncryptionSetName = replace(diskEncryptionSetNamingConvention, nameToken, hubName)
var hubKeyVaultName = take(hubKeyVaultUniqueName, 24)
var hubKeyVaultShortName = replace(keyVaultNamingConvention, nameToken, hubShortName)
var hubKeyVaultUniqueName = replace(hubKeyVaultShortName, 'unique_token', uniqueString(resourcePrefix, resourceSuffix, hubSubscriptionId))
var hubLogStorageAccountName = take(hubLogStorageAccountUniqueName, 24)
var hubLogStorageAccountShortName = replace(storageAccountNamingConvention, nameToken, hubShortName)
var hubLogStorageAccountUniqueName = replace(hubLogStorageAccountShortName, 'unique_token', uniqueString(resourcePrefix, resourceSuffix, hubSubscriptionId))
Expand All @@ -572,6 +576,7 @@ var hubNetworkSecurityGroupName = replace(networkSecurityGroupNamingConvention,
var hubResourceGroupName = replace(resourceGroupNamingConvention, nameToken, hubName)
var hubRouteTableName = replace(routeTableNamingConvention, nameToken, hubName)
var hubSubnetName = replace(subnetNamingConvention, nameToken, hubName)
var hubUserAssignedIdentityName = replace(userAssignedIdentityNamingConvention, nameToken, hubName)
var hubVirtualNetworkName = replace(virtualNetworkNamingConvention, nameToken, hubName)

// IDENTITY NAMES
Expand All @@ -591,18 +596,14 @@ var identityVirtualNetworkName = replace(virtualNetworkNamingConvention, nameTok

var operationsName = 'operations'
var operationsShortName = 'ops'
var operationsDiskEncryptionSetName = replace(diskEncryptionSetNamingConvention, nameToken, operationsName)
var operationsKeyVaultName = take(operationsKeyVaultUniqueName, 24)
var operationsKeyVaultShortName = replace(keyVaultNamingConvention, nameToken, operationsShortName)
var operationsKeyVaultUniqueName = replace(operationsKeyVaultShortName, 'unique_token', uniqueString(resourcePrefix, resourceSuffix, operationsSubscriptionId))
var operationsLogStorageAccountName = take(operationsLogStorageAccountUniqueName, 24)
var operationsLogStorageAccountShortName = replace(storageAccountNamingConvention, nameToken, operationsShortName)
var operationsLogStorageAccountUniqueName = replace(operationsLogStorageAccountShortName, 'unique_token', uniqueString(resourcePrefix, resourceSuffix, operationsSubscriptionId))
var operationsNetworkSecurityGroupName = replace(networkSecurityGroupNamingConvention, nameToken, operationsName)
var operationsResourceGroupName = replace(resourceGroupNamingConvention, nameToken, operationsName)
var operationsRouteTableName = replace(routeTableNamingConvention, nameToken, operationsName)
var operationsSubnetName = replace(subnetNamingConvention, nameToken, operationsName)
var operationsUserAssignedIdentityName = replace(userAssignedIdentityNamingConvention, nameToken, operationsName)

var operationsVirtualNetworkName = replace(virtualNetworkNamingConvention, nameToken, operationsName)

// SHARED SERVICES NAMES
Expand Down Expand Up @@ -904,25 +905,22 @@ module privateDnsZones './modules/private-dns.bicep' = {
]
}

// OPERATIONS CMK DEPENDANCIES
// CUSTOMER MANAGED KEYS

module operationsCustomerManagedKeys './core/operations-customer-managed-keys.bicep' = {
name: 'deploy-cmk-ops-${deploymentNameSuffix}'
scope: resourceGroup(operationsSubscriptionId, operationsResourceGroupName)
module customerManagedKeys './core/hub-customer-managed-keys.bicep' = {
name: 'deploy-cmk-hub-${deploymentNameSuffix}'
scope: resourceGroup(hubSubscriptionId, hubResourceGroupName)
params: {
deploymentNameSuffix: deploymentNameSuffix
diskEncryptionSetName: operationsDiskEncryptionSetName
keyVaultName: operationsKeyVaultName
diskEncryptionSetName: hubDiskEncryptionSetName
keyVaultName: hubKeyVaultName
keyVaultPrivateDnsZoneResourceId: privateDnsZones.outputs.keyvaultDnsPrivateDnsZoneId
location: location
resourcePrefix: resourcePrefix
subnetResourceId: spokeNetworks[0].outputs.subnetResourceId
subnetResourceId: hubNetwork.outputs.subnetResourceId
tags: calculatedTags
userAssignedIdentityName: operationsUserAssignedIdentityName
userAssignedIdentityName: hubUserAssignedIdentityName
}
dependsOn: [
spokeNetworks
]
}

// AZURE MONITOR
Expand Down Expand Up @@ -994,7 +992,7 @@ module remoteAccess './core/remote-access.bicep' = if (deployRemoteAccess) {
windowsVmSku: windowsVmSku
windowsVmStorageAccountType: windowsVmStorageAccountType
windowsVmVersion: windowsVmVersion
diskEncryptionSetResourceId: operationsCustomerManagedKeys.outputs.diskEncryptionSetResourceId
diskEncryptionSetResourceId: customerManagedKeys.outputs.diskEncryptionSetResourceId
hybridUseBenefit: hybridUseBenefit
linuxDiskName: linuxDiskName
windowsDiskName: windowsDiskName
Expand All @@ -1011,16 +1009,16 @@ module hubStorage './core/hub-storage.bicep' = {
scope: resourceGroup(hubSubscriptionId, hubResourceGroupName)
params: {
blobsPrivateDnsZoneResourceId: privateDnsZones.outputs.blobPrivateDnsZoneId
keyVaultUri: operationsCustomerManagedKeys.outputs.keyVaultUri
keyVaultUri: customerManagedKeys.outputs.keyVaultUri
location: location
logStorageAccountName: hubLogStorageAccountName
logStorageSkuName: logStorageSkuName
resourcePrefix: resourcePrefix
storageEncryptionKeyName: operationsCustomerManagedKeys.outputs.storageKeyName
storageEncryptionKeyName: customerManagedKeys.outputs.storageKeyName
subnetResourceId: hubNetwork.outputs.subnetResourceId
tablesPrivateDnsZoneResourceId: privateDnsZones.outputs.tablePrivateDnsZoneId
tags: calculatedTags
userAssignedIdentityResourceId: operationsCustomerManagedKeys.outputs.userAssignedIdentityResourceId
userAssignedIdentityResourceId: customerManagedKeys.outputs.userAssignedIdentityResourceId
}
dependsOn: [
remoteAccess
Expand All @@ -1034,16 +1032,16 @@ module spokeStorage './core/spoke-storage.bicep' = [for (spoke, i) in spokes: {
scope: resourceGroup(spoke.subscriptionId, spoke.resourceGroupName)
params: {
blobsPrivateDnsZoneResourceId: privateDnsZones.outputs.blobPrivateDnsZoneId
keyVaultUri: operationsCustomerManagedKeys.outputs.keyVaultUri
keyVaultUri: customerManagedKeys.outputs.keyVaultUri
location: location
logStorageAccountName: spoke.logStorageAccountName
logStorageSkuName: logStorageSkuName
resourcePrefix: resourcePrefix
storageEncryptionKeyName: operationsCustomerManagedKeys.outputs.storageKeyName
storageEncryptionKeyName: customerManagedKeys.outputs.storageKeyName
subnetResourceId: spokeNetworks[i].outputs.subnetResourceId
tablesPrivateDnsZoneResourceId: privateDnsZones.outputs.tablePrivateDnsZoneId
tags: tags
userAssignedIdentityResourceId: operationsCustomerManagedKeys.outputs.userAssignedIdentityResourceId
userAssignedIdentityResourceId: customerManagedKeys.outputs.userAssignedIdentityResourceId
}
dependsOn: [
remoteAccess
Expand Down
Loading
Loading