From 8a8b36b0d2a50204175e522b480efb924816dea4 Mon Sep 17 00:00:00 2001
From: Jon Gallant <2163001+jongio@users.noreply.github.com>
Date: Wed, 31 May 2023 18:17:03 +0000
Subject: [PATCH] Fix bicep

---
 infra/main.bicep           | 5 +++--
 infra/main.parameters.json | 2 +-
 infra/resources.bicep      | 9 ++++++---
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/infra/main.bicep b/infra/main.bicep
index ae8c28b..9687df3 100644
--- a/infra/main.bicep
+++ b/infra/main.bicep
@@ -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')
@@ -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
diff --git a/infra/main.parameters.json b/infra/main.parameters.json
index 9c0507a..16a7f77 100644
--- a/infra/main.parameters.json
+++ b/infra/main.parameters.json
@@ -12,7 +12,7 @@
       "value": "${AZURE_PRINCIPAL_ID}"
     },
     "vaultName": {
-      "value": "${AZURE_KEYVAULT_URL}"
+      "value": "${AZURE_KEYVAULT_NAME}"
     },
     "sku": {
       "value": "${AZURE_KEYVAULT_SKU=standard}"
diff --git a/infra/resources.bicep b/infra/resources.bicep
index c5e9650..31ea7c8 100644
--- a/infra/resources.bicep
+++ b/infra/resources.bicep
@@ -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')
@@ -29,7 +30,7 @@ var ecKeys = [
 ]
 
 resource vault 'Microsoft.KeyVault/vaults@2023-02-01' = {
-  name: vaultName
+  name: actualVaultName
   location: location
   properties: {
     tenantId: tenantId
@@ -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
+