Skip to content

Commit 9c66b45

Browse files
Avijit-MicrosoftAvijit-Microsoft
authored
fix: Consistent Deployment Name Format updated and keyvault purging disabled
fix: Consistent Deployment Name Format updated
2 parents 5fdd3e4 + 92aa184 commit 9c66b45

File tree

3 files changed

+39
-40
lines changed

3 files changed

+39
-40
lines changed

‎.github/workflows/deploy-KMGeneric.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,9 @@ jobs:
7979
id: generate_rg_name
8080
run: |
8181
echo "Generating a unique resource group name..."
82-
TIMESTAMP=$(date +%Y%m%d%H%M%S)
83-
COMMON_PART="ci-KMGeneric"
84-
UNIQUE_RG_NAME="${COMMON_PART}${TIMESTAMP}"
82+
ACCL_NAME="ci-KMGeneric" # Account name as specified
83+
SHORT_UUID=$(uuidgen | cut -d'-' -f1)
84+
UNIQUE_RG_NAME="arg-${ACCL_NAME}-${SHORT_UUID}"
8585
echo "RESOURCE_GROUP_NAME=${UNIQUE_RG_NAME}" >> $GITHUB_ENV
8686
echo "Generated Resource_GROUP_PREFIX: ${UNIQUE_RG_NAME}"
8787
@@ -120,10 +120,10 @@ jobs:
120120
run: |
121121
echo "Fetching AI Services and Key Vault names before deletion..."
122122
123-
# # Get Key Vault name
124-
# KEYVAULT_NAME=$(az resource list --resource-group ${{ env.RESOURCE_GROUP_NAME }} --resource-type "Microsoft.KeyVault/vaults" --query "[].name" -o tsv)
125-
# echo "Detected Key Vault: $KEYVAULT_NAME"
126-
# echo "KEYVAULT_NAME=$KEYVAULT_NAME" >> $GITHUB_ENV
123+
# Get Key Vault name
124+
KEYVAULT_NAME=$(az resource list --resource-group ${{ env.RESOURCE_GROUP_NAME }} --resource-type "Microsoft.KeyVault/vaults" --query "[].name" -o tsv)
125+
echo "Detected Key Vault: $KEYVAULT_NAME"
126+
echo "KEYVAULT_NAME=$KEYVAULT_NAME" >> $GITHUB_ENV
127127
128128
# Get AI Services names and convert them into a space-separated string
129129
AI_SERVICES=$(az resource list --resource-group ${{ env.RESOURCE_GROUP_NAME }} --resource-type "Microsoft.CognitiveServices/accounts" --query "[].name" -o tsv | tr '\n' ' ')

‎infra/deploy_keyvault.bicep

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ resource keyVault 'Microsoft.KeyVault/vaults@2022-07-01' = {
3636
enabledForDiskEncryption: true
3737
enabledForTemplateDeployment: true
3838
enableRbacAuthorization: true
39-
enablePurgeProtection: true
39+
// enablePurgeProtection: true
4040
publicNetworkAccess: 'enabled'
4141
// networkAcls: {
4242
// bypass: 'AzureServices'

‎infra/main.json

Lines changed: 31 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
"metadata": {
55
"_generator": {
66
"name": "bicep",
7-
"version": "0.35.1.17967",
8-
"templateHash": "4422559797427921508"
7+
"version": "0.33.93.31351",
8+
"templateHash": "17488426294766268611"
99
}
1010
},
1111
"parameters": {
@@ -128,8 +128,8 @@
128128
"metadata": {
129129
"_generator": {
130130
"name": "bicep",
131-
"version": "0.35.1.17967",
132-
"templateHash": "3577716481523254546"
131+
"version": "0.33.93.31351",
132+
"templateHash": "11920656242524003012"
133133
}
134134
},
135135
"parameters": {
@@ -240,8 +240,8 @@
240240
"metadata": {
241241
"_generator": {
242242
"name": "bicep",
243-
"version": "0.35.1.17967",
244-
"templateHash": "4322902206161965243"
243+
"version": "0.33.93.31351",
244+
"templateHash": "8736572098206132937"
245245
}
246246
},
247247
"parameters": {
@@ -295,7 +295,6 @@
295295
"enabledForDiskEncryption": true,
296296
"enabledForTemplateDeployment": true,
297297
"enableRbacAuthorization": true,
298-
"enablePurgeProtection": true,
299298
"publicNetworkAccess": "enabled",
300299
"sku": {
301300
"family": "A",
@@ -387,8 +386,8 @@
387386
"metadata": {
388387
"_generator": {
389388
"name": "bicep",
390-
"version": "0.35.1.17967",
391-
"templateHash": "8627123677898681051"
389+
"version": "0.33.93.31351",
390+
"templateHash": "10839472820726017192"
392391
}
393392
},
394393
"parameters": {
@@ -1084,8 +1083,8 @@
10841083
"metadata": {
10851084
"_generator": {
10861085
"name": "bicep",
1087-
"version": "0.35.1.17967",
1088-
"templateHash": "15989391424807539709"
1086+
"version": "0.33.93.31351",
1087+
"templateHash": "14620142974675285735"
10891088
}
10901089
},
10911090
"parameters": {
@@ -1268,8 +1267,8 @@
12681267
"metadata": {
12691268
"_generator": {
12701269
"name": "bicep",
1271-
"version": "0.35.1.17967",
1272-
"templateHash": "13542293930946641523"
1270+
"version": "0.33.93.31351",
1271+
"templateHash": "12347068855899407617"
12731272
}
12741273
},
12751274
"parameters": {
@@ -1480,8 +1479,8 @@
14801479
"metadata": {
14811480
"_generator": {
14821481
"name": "bicep",
1483-
"version": "0.35.1.17967",
1484-
"templateHash": "1810228841691441178"
1482+
"version": "0.33.93.31351",
1483+
"templateHash": "10845724333769330719"
14851484
}
14861485
},
14871486
"parameters": {
@@ -1697,8 +1696,8 @@
16971696
"metadata": {
16981697
"_generator": {
16991698
"name": "bicep",
1700-
"version": "0.35.1.17967",
1701-
"templateHash": "5501823863095481452"
1699+
"version": "0.33.93.31351",
1700+
"templateHash": "16243838204790550721"
17021701
}
17031702
},
17041703
"parameters": {
@@ -1877,8 +1876,8 @@
18771876
"metadata": {
18781877
"_generator": {
18791878
"name": "bicep",
1880-
"version": "0.35.1.17967",
1881-
"templateHash": "3388883066287739760"
1879+
"version": "0.33.93.31351",
1880+
"templateHash": "3990461296238110870"
18821881
},
18831882
"description": "Creates an Azure App Service plan."
18841883
},
@@ -2026,8 +2025,8 @@
20262025
"metadata": {
20272026
"_generator": {
20282027
"name": "bicep",
2029-
"version": "0.35.1.17967",
2030-
"templateHash": "3979043666234492120"
2028+
"version": "0.33.93.31351",
2029+
"templateHash": "1048230098337804947"
20312030
}
20322031
},
20332032
"parameters": {
@@ -2066,7 +2065,7 @@
20662065
"variables": {
20672066
"imageName": "[format('DOCKER|kmcontainerreg.azurecr.io/km-api:{0}', parameters('imageTag'))]",
20682067
"name": "[format('{0}-api', parameters('solutionName'))]",
2069-
"reactAppLayoutConfig": "{\n \"appConfig\": {\n \"THREE_COLUMN\": {\n \"DASHBOARD\": 50,\n \"CHAT\": 33,\n \"CHATHISTORY\": 17\n },\n \"TWO_COLUMN\": {\n \"DASHBOARD_CHAT\": {\n \"DASHBOARD\": 65,\n \"CHAT\": 35\n },\n \"CHAT_CHATHISTORY\": {\n \"CHAT\": 80,\n \"CHATHISTORY\": 20\n }\n }\n },\n \"charts\": [\n {\n \"id\": \"SATISFIED\",\n \"name\": \"Satisfied\",\n \"type\": \"card\",\n \"layout\": { \"row\": 1, \"column\": 1, \"height\": 11 }\n },\n {\n \"id\": \"TOTAL_CALLS\",\n \"name\": \"Total Calls\",\n \"type\": \"card\",\n \"layout\": { \"row\": 1, \"column\": 2, \"span\": 1 }\n },\n {\n \"id\": \"AVG_HANDLING_TIME\",\n \"name\": \"Average Handling Time\",\n \"type\": \"card\",\n \"layout\": { \"row\": 1, \"column\": 3, \"span\": 1 }\n },\n {\n \"id\": \"SENTIMENT\",\n \"name\": \"Topics Overview\",\n \"type\": \"donutchart\",\n \"layout\": { \"row\": 2, \"column\": 1, \"width\": 40, \"height\": 44.5 }\n },\n {\n \"id\": \"AVG_HANDLING_TIME_BY_TOPIC\",\n \"name\": \"Average Handling Time By Topic\",\n \"type\": \"bar\",\n \"layout\": { \"row\": 2, \"column\": 2, \"row-span\": 2, \"width\": 60 }\n },\n {\n \"id\": \"TOPICS\",\n \"name\": \"Trending Topics\",\n \"type\": \"table\",\n \"layout\": { \"row\": 3, \"column\": 1, \"span\": 2 }\n },\n {\n \"id\": \"KEY_PHRASES\",\n \"name\": \"Key Phrases\",\n \"type\": \"wordcloud\",\n \"layout\": { \"row\": 3, \"column\": 2, \"height\": 44.5 }\n }\n ]\n}"
2068+
"reactAppLayoutConfig": "{\r\n \"appConfig\": {\r\n \"THREE_COLUMN\": {\r\n \"DASHBOARD\": 50,\r\n \"CHAT\": 33,\r\n \"CHATHISTORY\": 17\r\n },\r\n \"TWO_COLUMN\": {\r\n \"DASHBOARD_CHAT\": {\r\n \"DASHBOARD\": 65,\r\n \"CHAT\": 35\r\n },\r\n \"CHAT_CHATHISTORY\": {\r\n \"CHAT\": 80,\r\n \"CHATHISTORY\": 20\r\n }\r\n }\r\n },\r\n \"charts\": [\r\n {\r\n \"id\": \"SATISFIED\",\r\n \"name\": \"Satisfied\",\r\n \"type\": \"card\",\r\n \"layout\": { \"row\": 1, \"column\": 1, \"height\": 11 }\r\n },\r\n {\r\n \"id\": \"TOTAL_CALLS\",\r\n \"name\": \"Total Calls\",\r\n \"type\": \"card\",\r\n \"layout\": { \"row\": 1, \"column\": 2, \"span\": 1 }\r\n },\r\n {\r\n \"id\": \"AVG_HANDLING_TIME\",\r\n \"name\": \"Average Handling Time\",\r\n \"type\": \"card\",\r\n \"layout\": { \"row\": 1, \"column\": 3, \"span\": 1 }\r\n },\r\n {\r\n \"id\": \"SENTIMENT\",\r\n \"name\": \"Topics Overview\",\r\n \"type\": \"donutchart\",\r\n \"layout\": { \"row\": 2, \"column\": 1, \"width\": 40, \"height\": 44.5 }\r\n },\r\n {\r\n \"id\": \"AVG_HANDLING_TIME_BY_TOPIC\",\r\n \"name\": \"Average Handling Time By Topic\",\r\n \"type\": \"bar\",\r\n \"layout\": { \"row\": 2, \"column\": 2, \"row-span\": 2, \"width\": 60 }\r\n },\r\n {\r\n \"id\": \"TOPICS\",\r\n \"name\": \"Trending Topics\",\r\n \"type\": \"table\",\r\n \"layout\": { \"row\": 3, \"column\": 1, \"span\": 2 }\r\n },\r\n {\r\n \"id\": \"KEY_PHRASES\",\r\n \"name\": \"Key Phrases\",\r\n \"type\": \"wordcloud\",\r\n \"layout\": { \"row\": 3, \"column\": 2, \"height\": 44.5 }\r\n }\r\n ]\r\n}"
20702069
},
20712070
"resources": [
20722071
{
@@ -2127,8 +2126,8 @@
21272126
"metadata": {
21282127
"_generator": {
21292128
"name": "bicep",
2130-
"version": "0.35.1.17967",
2131-
"templateHash": "5594723048561919975"
2129+
"version": "0.33.93.31351",
2130+
"templateHash": "16308543969241672542"
21322131
}
21332132
},
21342133
"parameters": {
@@ -2243,8 +2242,8 @@
22432242
"metadata": {
22442243
"_generator": {
22452244
"name": "bicep",
2246-
"version": "0.35.1.17967",
2247-
"templateHash": "12543749504493145946"
2245+
"version": "0.33.93.31351",
2246+
"templateHash": "5462989833378560251"
22482247
},
22492248
"description": "Updates app settings for an Azure App Service."
22502249
},
@@ -2350,8 +2349,8 @@
23502349
"metadata": {
23512350
"_generator": {
23522351
"name": "bicep",
2353-
"version": "0.35.1.17967",
2354-
"templateHash": "14942529326450944423"
2352+
"version": "0.33.93.31351",
2353+
"templateHash": "10943987651087843369"
23552354
}
23562355
},
23572356
"parameters": {
@@ -2406,8 +2405,8 @@
24062405
"metadata": {
24072406
"_generator": {
24082407
"name": "bicep",
2409-
"version": "0.35.1.17967",
2410-
"templateHash": "5594723048561919975"
2408+
"version": "0.33.93.31351",
2409+
"templateHash": "16308543969241672542"
24112410
}
24122411
},
24132412
"parameters": {
@@ -2522,8 +2521,8 @@
25222521
"metadata": {
25232522
"_generator": {
25242523
"name": "bicep",
2525-
"version": "0.35.1.17967",
2526-
"templateHash": "12543749504493145946"
2524+
"version": "0.33.93.31351",
2525+
"templateHash": "5462989833378560251"
25272526
},
25282527
"description": "Updates app settings for an Azure App Service."
25292528
},

0 commit comments

Comments
 (0)