Remove some invalid changes
This commit is contained in:
21
infra/core/security/keyvault-access.bicep
Normal file
21
infra/core/security/keyvault-access.bicep
Normal file
@@ -0,0 +1,21 @@
|
||||
param name string = 'add'
|
||||
|
||||
param keyVaultName string = ''
|
||||
param permissions object = { secrets: [ 'get', 'list' ] }
|
||||
param principalId string
|
||||
|
||||
resource keyVaultAccessPolicies 'Microsoft.KeyVault/vaults/accessPolicies@2022-07-01' = {
|
||||
parent: keyVault
|
||||
name: name
|
||||
properties: {
|
||||
accessPolicies: [ {
|
||||
objectId: principalId
|
||||
tenantId: subscription().tenantId
|
||||
permissions: permissions
|
||||
} ]
|
||||
}
|
||||
}
|
||||
|
||||
resource keyVault 'Microsoft.KeyVault/vaults@2022-07-01' existing = {
|
||||
name: keyVaultName
|
||||
}
|
||||
@@ -52,17 +52,27 @@ module web './core/host/appservice.bicep' = {
|
||||
name: !empty(webServiceName) ? webServiceName : '${abbrs.webSitesAppService}web-${resourceToken}'
|
||||
location: location
|
||||
appServicePlanId: appServicePlan.outputs.id
|
||||
keyVaultName: keyVault.outputs.name
|
||||
runtimeName: 'dotnetcore'
|
||||
runtimeVersion: '6.0'
|
||||
tags: union(tags, { 'azd-service-name': 'web' })
|
||||
appSettings: {
|
||||
AZURE_CATALOG_CONNECTION_STRING_KEY: 'AZURE-SQL-CATALOG-CONNECTION-STRING'
|
||||
AZURE_IDENTITY_CONNECTION_STRING_KEY: 'AZURE-SQL-IDENTITY-CONNECTION-STRING'
|
||||
AZURE_SQL_CATALOG_CONNECTION_STRING_KEY: 'AZURE-SQL-CATALOG-CONNECTION-STRING'
|
||||
AZURE_SQL_IDENTITY_CONNECTION_STRING_KEY: 'AZURE-SQL-IDENTITY-CONNECTION-STRING'
|
||||
AZURE_KEY_VAULT_ENDPOINT: keyVault.outputs.endpoint
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
module apiKeyVaultAccess './core/security/keyvault-access.bicep' = {
|
||||
name: 'api-keyvault-access'
|
||||
scope: rg
|
||||
params: {
|
||||
keyVaultName: keyVault.outputs.name
|
||||
principalId: web.outputs.identityPrincipalId
|
||||
}
|
||||
}
|
||||
|
||||
// The application database: Catalog
|
||||
module catalogDb './core/database/sqlserver/sqlserver.bicep' = {
|
||||
name: 'sql-catalog'
|
||||
@@ -122,8 +132,8 @@ module appServicePlan './core/host/appserviceplan.bicep' = {
|
||||
}
|
||||
|
||||
// Data outputs
|
||||
output AZURE_SQL_CATALOG_CONNECTION_STRING string = catalogDb.outputs.connectionStringKey
|
||||
output AZURE_SQL_IDENTITY_CONNECTION_STRING string = identityDb.outputs.connectionStringKey
|
||||
output AZURE_SQL_CATALOG_CONNECTION_STRING_KEY string = catalogDb.outputs.connectionStringKey
|
||||
output AZURE_SQL_IDENTITY_CONNECTION_STRING_KEY string = identityDb.outputs.connectionStringKey
|
||||
output AZURE_SQL_CATALOG_DATABASE_NAME string = catalogDb.outputs.databaseName
|
||||
output AZURE_SQL_IDENTITY_DATABASE_NAME string = identityDb.outputs.databaseName
|
||||
|
||||
|
||||
Reference in New Issue
Block a user