Skip to content

Align Microsoft.KeyVault deployment names #724

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

Merged
eriqua merged 2 commits into from
Dec 4, 2021
Merged

Align Microsoft.KeyVault deployment names #724

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
01fac7a
Align kv deployment names
Dec 4, 2021
65fe4d8
Update readme
Dec 4, 2021
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
20 changes: 10 additions & 10 deletions arm/Microsoft.KeyVault/vaults/deploy.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,15 +210,15 @@ resource keyVault_diagnosticSettings 'Microsoft.Insights/diagnosticsettings@2017
}

module keyVault_accessPolicies 'accessPolicies/deploy.bicep' = if (!empty(accessPolicies)) {
name: '${uniqueString(deployment().name, location)}-AccessPolicies'
name: '${uniqueString(deployment().name, location)}-KeyVault-AccessPolicies'
params: {
keyVaultName: keyVault.name
accessPolicies: formattedAccessPolicies
}
}

module keyVault_secrets 'secrets/deploy.bicep' = [for (secret, index) in secrets: {
name: '${uniqueString(deployment().name, location)}-Secret-${index}'
name: '${uniqueString(deployment().name, location)}-KeyVault-Secret-${index}'
params: {
name: secret.name
value: secret.value
Expand All @@ -233,7 +233,7 @@ module keyVault_secrets 'secrets/deploy.bicep' = [for (secret, index) in secrets
}]

module keyVault_keys 'keys/deploy.bicep' = [for (key, index) in keys: {
name: '${uniqueString(deployment().name, location)}-Key-${index}'
name: '${uniqueString(deployment().name, location)}-KeyVault-Key-${index}'
params: {
name: key.name
keyVaultName: keyVault.name
Expand All @@ -250,7 +250,7 @@ module keyVault_keys 'keys/deploy.bicep' = [for (key, index) in keys: {
}]

module keyVault_privateEndpoints '.bicep/nested_privateEndpoint.bicep' = [for (privateEndpoint, index) in privateEndpoints: {
name: '${uniqueString(deployment().name, location)}-PrivateEndpoint-${index}'
name: '${uniqueString(deployment().name, location)}-KeyVault-PrivateEndpoint-${index}'
params: {
privateEndpointResourceId: keyVault.id
privateEndpointVnetLocation: (empty(privateEndpoints) ? 'dummy' : reference(split(privateEndpoint.subnetResourceId, '/subnets/')[0], '2020-06-01', 'Full').location)
Expand All @@ -260,22 +260,22 @@ module keyVault_privateEndpoints '.bicep/nested_privateEndpoint.bicep' = [for (p
}]

module keyVault_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, index) in roleAssignments: {
name: '${deployment().name}-rbac-${index}'
name: '${uniqueString(deployment().name, location)}-KeyVault-Rbac-${index}'
params: {
principalIds: roleAssignment.principalIds
roleDefinitionIdOrName: roleAssignment.roleDefinitionIdOrName
resourceId: keyVault.id
}
}]

@description('The Resource ID of the Key Vault.')
@description('The resource ID of the key vault.')
output keyVaultResourceId string = keyVault.id

@description('The name of the Resource Group the Key Vault was created in.')
@description('The name of the resource group the key vault was created in.')
output keyVaultResourceGroup string = resourceGroup().name

@description('The Name of the Key Vault.')
@description('The name of the key vault.')
output keyVaultName string = keyVault.name

@description('The URL of the Key Vault.')
output keyVaultUrl string = reference(keyVault.id, '2016-10-01').vaultUri
@description('The URL of the key vault.')
output keyVaultUrl string = keyVault.properties.vaultUri
2 changes: 1 addition & 1 deletion arm/Microsoft.KeyVault/vaults/keys/deploy.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ resource key 'Microsoft.KeyVault/vaults/keys@2019-09-01' = {
}

module key_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, index) in roleAssignments: {
name: '${deployment().name}-rbac-${index}'
name: '${deployment().name}-Rbac-${index}'
params: {
principalIds: roleAssignment.principalIds
roleDefinitionIdOrName: roleAssignment.roleDefinitionIdOrName
Expand Down
8 changes: 4 additions & 4 deletions arm/Microsoft.KeyVault/vaults/readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,10 +179,10 @@ To use Private Endpoint the following dependencies must be deployed:

| Output Name | Type | Description |
| :-- | :-- | :-- |
| `keyVaultName` | string | The Name of the Key Vault. |
| `keyVaultResourceGroup` | string | The name of the Resource Group the Key Vault was created in. |
| `keyVaultResourceId` | string | The Resource ID of the Key Vault. |
| `keyVaultUrl` | string | The URL of the Key Vault. |
| `keyVaultName` | string | The name of the key vault. |
| `keyVaultResourceGroup` | string | The name of the resource group the key vault was created in. |
| `keyVaultResourceId` | string | The resource ID of the key vault. |
| `keyVaultUrl` | string | The URL of the key vault. |

## Template references

Expand Down
2 changes: 1 addition & 1 deletion arm/Microsoft.KeyVault/vaults/secrets/deploy.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ resource secret 'Microsoft.KeyVault/vaults/secrets@2019-09-01' = {
}

module secret_rbac '.bicep/nested_rbac.bicep' = [for (roleAssignment, index) in roleAssignments: {
name: '${deployment().name}-rbac-${index}'
name: '${deployment().name}-Rbac-${index}'
params: {
principalIds: roleAssignment.principalIds
roleDefinitionIdOrName: roleAssignment.roleDefinitionIdOrName
Expand Down