Skip to content

Commit c080df9

Browse files
AjitPadhi-MicrosoftAjitPadhi-Microsoft
committed
Consistent Deployment Name Format updated
1 parent 83950cf commit c080df9

File tree

3 files changed

+35
-36
lines changed

3 files changed

+35
-36
lines changed

‎.github/workflows/deploy-KMGeneric.yml‎

Lines changed: 4 additions & 4 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
@@ -103,7 +103,7 @@ jobs:
103103
104104
- name: Determine Tag Name Based on Branch
105105
id: determine_tag
106-
run: echo "tagname=${{ github.ref_name == 'main' && 'latest_migrated' || github.ref_name == 'dev' && 'dev' || github.ref_name == 'demo' && 'demo' || github.ref_name == 'dependabotchanges' && 'dependabotchanges' || github.head_ref || 'default' }}" >> $GITHUB_OUTPUT
106+
run: echo "tagname=${{ github.ref_name == 'main' && 'latest' || github.ref_name == 'dev' && 'dev' || github.ref_name == 'demo' && 'demo' || github.ref_name == 'dependabotchanges' && 'dependabotchanges' || github.head_ref || 'default' }}" >> $GITHUB_OUTPUT
107107

108108
- name: Deploy Bicep Template
109109
id: deploy

‎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: 30 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
"metadata": {
55
"_generator": {
66
"name": "bicep",
7-
"version": "0.34.44.8038",
8-
"templateHash": "10251291785467156580"
7+
"version": "0.33.93.31351",
8+
"templateHash": "4991071636747723425"
99
}
1010
},
1111
"parameters": {
@@ -128,8 +128,8 @@
128128
"metadata": {
129129
"_generator": {
130130
"name": "bicep",
131-
"version": "0.34.44.8038",
132-
"templateHash": "2941318787429287286"
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.34.44.8038",
244-
"templateHash": "5775352776365113688"
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.34.44.8038",
391-
"templateHash": "7008311746261758591"
389+
"version": "0.33.93.31351",
390+
"templateHash": "9550373903228040461"
392391
}
393392
},
394393
"parameters": {
@@ -1082,8 +1081,8 @@
10821081
"metadata": {
10831082
"_generator": {
10841083
"name": "bicep",
1085-
"version": "0.34.44.8038",
1086-
"templateHash": "17679659647877785824"
1084+
"version": "0.33.93.31351",
1085+
"templateHash": "14620142974675285735"
10871086
}
10881087
},
10891088
"parameters": {
@@ -1266,8 +1265,8 @@
12661265
"metadata": {
12671266
"_generator": {
12681267
"name": "bicep",
1269-
"version": "0.34.44.8038",
1270-
"templateHash": "573049773979289587"
1268+
"version": "0.33.93.31351",
1269+
"templateHash": "12347068855899407617"
12711270
}
12721271
},
12731272
"parameters": {
@@ -1478,8 +1477,8 @@
14781477
"metadata": {
14791478
"_generator": {
14801479
"name": "bicep",
1481-
"version": "0.34.44.8038",
1482-
"templateHash": "12523803244328608887"
1480+
"version": "0.33.93.31351",
1481+
"templateHash": "16605082293199555822"
14831482
}
14841483
},
14851484
"parameters": {
@@ -1694,8 +1693,8 @@
16941693
"metadata": {
16951694
"_generator": {
16961695
"name": "bicep",
1697-
"version": "0.34.44.8038",
1698-
"templateHash": "6489935757234589237"
1696+
"version": "0.33.93.31351",
1697+
"templateHash": "16243838204790550721"
16991698
}
17001699
},
17011700
"parameters": {
@@ -1874,8 +1873,8 @@
18741873
"metadata": {
18751874
"_generator": {
18761875
"name": "bicep",
1877-
"version": "0.34.44.8038",
1878-
"templateHash": "5000589525239764864"
1876+
"version": "0.33.93.31351",
1877+
"templateHash": "3990461296238110870"
18791878
},
18801879
"description": "Creates an Azure App Service plan."
18811880
},
@@ -2023,8 +2022,8 @@
20232022
"metadata": {
20242023
"_generator": {
20252024
"name": "bicep",
2026-
"version": "0.34.44.8038",
2027-
"templateHash": "14001159014642291962"
2025+
"version": "0.33.93.31351",
2026+
"templateHash": "3399576512974213659"
20282027
}
20292028
},
20302029
"parameters": {
@@ -2124,8 +2123,8 @@
21242123
"metadata": {
21252124
"_generator": {
21262125
"name": "bicep",
2127-
"version": "0.34.44.8038",
2128-
"templateHash": "356166454386735487"
2126+
"version": "0.33.93.31351",
2127+
"templateHash": "16308543969241672542"
21292128
}
21302129
},
21312130
"parameters": {
@@ -2240,8 +2239,8 @@
22402239
"metadata": {
22412240
"_generator": {
22422241
"name": "bicep",
2243-
"version": "0.34.44.8038",
2244-
"templateHash": "14980344017942960012"
2242+
"version": "0.33.93.31351",
2243+
"templateHash": "5462989833378560251"
22452244
},
22462245
"description": "Updates app settings for an Azure App Service."
22472246
},
@@ -2339,8 +2338,8 @@
23392338
"metadata": {
23402339
"_generator": {
23412340
"name": "bicep",
2342-
"version": "0.34.44.8038",
2343-
"templateHash": "13062487122244574247"
2341+
"version": "0.33.93.31351",
2342+
"templateHash": "10943987651087843369"
23442343
}
23452344
},
23462345
"parameters": {
@@ -2395,8 +2394,8 @@
23952394
"metadata": {
23962395
"_generator": {
23972396
"name": "bicep",
2398-
"version": "0.34.44.8038",
2399-
"templateHash": "356166454386735487"
2397+
"version": "0.33.93.31351",
2398+
"templateHash": "16308543969241672542"
24002399
}
24012400
},
24022401
"parameters": {
@@ -2511,8 +2510,8 @@
25112510
"metadata": {
25122511
"_generator": {
25132512
"name": "bicep",
2514-
"version": "0.34.44.8038",
2515-
"templateHash": "14980344017942960012"
2513+
"version": "0.33.93.31351",
2514+
"templateHash": "5462989833378560251"
25162515
},
25172516
"description": "Updates app settings for an Azure App Service."
25182517
},

0 commit comments

Comments
 (0)