From 9a15cbf8ae131e773a20c6c75fa016e2b952e3e5 Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Wed, 13 Nov 2024 15:35:56 +0000 Subject: [PATCH 1/4] key vault check fix --- scenarios/covid/data/2-create-akv.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/scenarios/covid/data/2-create-akv.sh b/scenarios/covid/data/2-create-akv.sh index 27e9110..b510d38 100755 --- a/scenarios/covid/data/2-create-akv.sh +++ b/scenarios/covid/data/2-create-akv.sh @@ -8,8 +8,11 @@ if [[ "$AZURE_KEYVAULT_ENDPOINT" == *".vault.azure.net" ]]; then AZURE_AKV_RESOURCE_NAME=`echo $AZURE_KEYVAULT_ENDPOINT | awk '{split($0,a,"."); print a[1]}'` # Check if the Key Vault already exists echo "Checking if Key Vault $KEY_VAULT_NAME exists..." - KEY_VAULT_EXISTS=$(az keyvault list --resource-group $AZURE_RESOURCE_GROUP --query "[?name=='$AZURE_AKV_RESOURCE_NAME'].name" --output tsv) - if [ -z "$KEY_VAULT_EXISTS" ]; then + NAME_AVAILABLE=$(az rest --method post \ + --uri 'https://management.azure.com/subscriptions/a8eb34c2-6598-49ca-8838-8456fb01374d/providers/Microsoft.KeyVault/checkNameAvailability?api-version=2019-09-01' \ + --headers 'Content-Type=application/json' \ + --body '{"name": "depa-training-pavan","type": "Microsoft.KeyVault/vaults"}' | jq -r '.nameAvailable') + if [ "$NAME_AVAILABLE" == true ]; then echo "Key Vault $KEY_VAULT_NAME does not exist. Creating it now..." # Create Azure key vault with RBAC authorization az keyvault create --name $AZURE_AKV_RESOURCE_NAME --resource-group $AZURE_RESOURCE_GROUP --sku "Premium" --enable-rbac-authorization From ada325b71d7d17a0aedb765a45d616ce27fc0f07 Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Wed, 13 Nov 2024 15:40:45 +0000 Subject: [PATCH 2/4] key vault fix --- scenarios/covid/data/2-create-akv.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scenarios/covid/data/2-create-akv.sh b/scenarios/covid/data/2-create-akv.sh index b510d38..ae958bd 100755 --- a/scenarios/covid/data/2-create-akv.sh +++ b/scenarios/covid/data/2-create-akv.sh @@ -9,7 +9,7 @@ if [[ "$AZURE_KEYVAULT_ENDPOINT" == *".vault.azure.net" ]]; then # Check if the Key Vault already exists echo "Checking if Key Vault $KEY_VAULT_NAME exists..." NAME_AVAILABLE=$(az rest --method post \ - --uri 'https://management.azure.com/subscriptions/a8eb34c2-6598-49ca-8838-8456fb01374d/providers/Microsoft.KeyVault/checkNameAvailability?api-version=2019-09-01' \ + --uri 'https://management.azure.com/subscriptions/AZURE_SUBSCRIPTION_ID/providers/Microsoft.KeyVault/checkNameAvailability?api-version=2019-09-01' \ --headers 'Content-Type=application/json' \ --body '{"name": "depa-training-pavan","type": "Microsoft.KeyVault/vaults"}' | jq -r '.nameAvailable') if [ "$NAME_AVAILABLE" == true ]; then From b64865bd7dcc0e3fad708719c962beba086a4d8e Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Wed, 13 Nov 2024 15:41:57 +0000 Subject: [PATCH 3/4] key vault fix --- scenarios/covid/data/2-create-akv.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scenarios/covid/data/2-create-akv.sh b/scenarios/covid/data/2-create-akv.sh index ae958bd..0d38675 100755 --- a/scenarios/covid/data/2-create-akv.sh +++ b/scenarios/covid/data/2-create-akv.sh @@ -9,7 +9,7 @@ if [[ "$AZURE_KEYVAULT_ENDPOINT" == *".vault.azure.net" ]]; then # Check if the Key Vault already exists echo "Checking if Key Vault $KEY_VAULT_NAME exists..." NAME_AVAILABLE=$(az rest --method post \ - --uri 'https://management.azure.com/subscriptions/AZURE_SUBSCRIPTION_ID/providers/Microsoft.KeyVault/checkNameAvailability?api-version=2019-09-01' \ + --uri 'https://management.azure.com/subscriptions/$AZURE_SUBSCRIPTION_ID/providers/Microsoft.KeyVault/checkNameAvailability?api-version=2019-09-01' \ --headers 'Content-Type=application/json' \ --body '{"name": "depa-training-pavan","type": "Microsoft.KeyVault/vaults"}' | jq -r '.nameAvailable') if [ "$NAME_AVAILABLE" == true ]; then From 9f835bc42750652d604a6a3f65a7d6586bffb679 Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Wed, 13 Nov 2024 17:01:46 +0000 Subject: [PATCH 4/4] key vault check fix --- scenarios/covid/data/2-create-akv.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scenarios/covid/data/2-create-akv.sh b/scenarios/covid/data/2-create-akv.sh index 0d38675..07cf2ce 100755 --- a/scenarios/covid/data/2-create-akv.sh +++ b/scenarios/covid/data/2-create-akv.sh @@ -9,9 +9,9 @@ if [[ "$AZURE_KEYVAULT_ENDPOINT" == *".vault.azure.net" ]]; then # Check if the Key Vault already exists echo "Checking if Key Vault $KEY_VAULT_NAME exists..." NAME_AVAILABLE=$(az rest --method post \ - --uri 'https://management.azure.com/subscriptions/$AZURE_SUBSCRIPTION_ID/providers/Microsoft.KeyVault/checkNameAvailability?api-version=2019-09-01' \ - --headers 'Content-Type=application/json' \ - --body '{"name": "depa-training-pavan","type": "Microsoft.KeyVault/vaults"}' | jq -r '.nameAvailable') + --uri "https://management.azure.com/subscriptions/$AZURE_SUBSCRIPTION_ID/providers/Microsoft.KeyVault/checkNameAvailability?api-version=2019-09-01" \ + --headers "Content-Type=application/json" \ + --body "{\"name\": \"$AZURE_AKV_RESOURCE_NAME\", \"type\": \"Microsoft.KeyVault/vaults\"}" | jq -r '.nameAvailable') if [ "$NAME_AVAILABLE" == true ]; then echo "Key Vault $KEY_VAULT_NAME does not exist. Creating it now..." # Create Azure key vault with RBAC authorization