update bicep for keyvault

Author: Dongbumlee

infra/main.bicep

@@ -123,9 +123,8 @@ module bicepOwnerRoleAssignment 'modules/role_assignment.bicep' = {
 module avmKeyVault './modules/key-vault.bicep' = {
   name: format(deployment_param.resource_name_format_string, abbrs.security.keyVault)
   params: {
-    name: format(deployment_param.resource_name_format_string, abbrs.security.keyVault)
     keyVaultParams: {
-      name: '${abbrs.security.keyVault}${deployment_param.solution_prefix}'
+      keyvaultName: '${abbrs.security.keyVault}${deployment_param.solution_prefix}'
       location: deployment_param.resource_group_location
       tags: {
         app: deployment_param.solution_prefix

infra/modules/key-vault.bicep

@@ -17,15 +17,15 @@ metadata name = 'Key Vault Module'
 
 import {
   key_vault_param_type
+  default_deployment_param_type
 } from './types.bicep'
 
 param keyVaultParams key_vault_param_type
-param name string
-
+param deployment_param default_deployment_param_type
 module avmKeyVault 'br/public:avm/res/key-vault/vault:0.12.1' = {
-  name: name
+  name: 'deploy_keyvault'
   params: {
-    name: keyVaultParams.name
+    name: keyVaultParams.keyvaultName
     location: keyVaultParams.location
     tags: keyVaultParams.tags
     roleAssignments: keyVaultParams.roleAssignments
@@ -42,5 +42,7 @@ module avmKeyVault 'br/public:avm/res/key-vault/vault:0.12.1' = {
   }
 }
 
+// Adding additional resource deployment for WAF enabled
+
 output resourceId string = avmKeyVault.outputs.resourceId
 output vaultUri string = avmKeyVault.outputs.uri

infra/modules/types.bicep

@@ -65,14 +65,14 @@ type container_app_deployment_info_type = {
 @export()
 func make_solution_prefix(unique_id string) string => 'cps-${padLeft(take(unique_id, 12), 12, '0')}'
 
-type keyvault_sku_type = 'standard' | 'premium' 
+type keyvault_sku_type = 'standard' | 'premium'
 
-type keyvault_public_network_access_type = 'Disabled' | 'Enabled' 
+type keyvault_public_network_access_type = 'Disabled' | 'Enabled'
 
-@export() 
+@export()
 type key_vault_param_type = {
   @description('Name of the Key Vault')
-  name: string
+  keyvaultName: string
   @description('Location of the Key Vault')
   location: string
   @description('Tags for the Key Vault')