Skip to content

Fix bicep #27

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
heaths merged 1 commit into from
May 31, 2023
Merged

Fix bicep #27

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
5 changes: 3 additions & 2 deletions infra/main.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ param location string
param principalId string

@description('The vault name; default is a unique string based on the resource group ID')
param vaultName string = 't${uniqueString(environmentName, 'vault')}'
param vaultName string = ''

@allowed([ 'standard', 'premium' ])
@description('SKU name; default is standard')
Expand Down Expand Up @@ -43,5 +43,6 @@ module resources 'resources.bicep' = {
}
}

output AZURE_KEYVAULT_URL string = resources.outputs.AZURE_KEYVAULT_URL
output AZURE_KEYVAULT_NAME string = resources.outputs.AZURE_KEYVAULT_NAME
output AZURE_KEYVAULT_SKU string = resources.outputs.AZURE_KEYVAULT_SKU
output AZURE_KEYVAULT_URL string = resources.outputs.AZURE_KEYVAULT_URL
2 changes: 1 addition & 1 deletion infra/main.parameters.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"value": "${AZURE_PRINCIPAL_ID}"
},
"vaultName": {
"value": "${AZURE_KEYVAULT_URL}"
"value": "${AZURE_KEYVAULT_NAME}"
},
"sku": {
"value": "${AZURE_KEYVAULT_SKU=standard}"
Expand Down
9 changes: 6 additions & 3 deletions infra/resources.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ param location string = resourceGroup().location
param principalId string

@description('The vault name; default is a unique string based on the resource group ID')
param vaultName string = 't${uniqueString(resourceGroup().id, 'vault')}'
param vaultName string = ''
var actualVaultName = !empty(vaultName) ? vaultName : 't${uniqueString(resourceGroup().id, 'vault')}'

@allowed([ 'standard', 'premium' ])
@description('SKU name; default is standard')
Expand All @@ -29,7 +30,7 @@ var ecKeys = [
]

resource vault 'Microsoft.KeyVault/vaults@2023-02-01' = {
name: vaultName
name: actualVaultName
location: location
properties: {
tenantId: tenantId
Expand Down Expand Up @@ -93,5 +94,7 @@ resource vault 'Microsoft.KeyVault/vaults@2023-02-01' = {
}
}

output AZURE_KEYVAULT_URL string = vault.properties.vaultUri
output AZURE_KEYVAULT_NAME string = vault.name
output AZURE_KEYVAULT_SKU string = vault.properties.sku.name
output AZURE_KEYVAULT_URL string = vault.properties.vaultUri