Skip to content

Commit a364ce3

Browse files
shawntmeyershawntmeyer
authored
removed Key expiration (#748)
1 parent ccb94c9 commit a364ce3

File tree

5 files changed

+53
-91
lines changed

5 files changed

+53
-91
lines changed

‎workload/arm/deploy-baseline.json

+3-25
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"_generator": {
66
"name": "bicep",
77
"version": "0.33.93.31351",
8-
"templateHash": "3282208684113992366"
8+
"templateHash": "4958873004827480878"
99
},
1010
"name": "AVD Accelerator - Baseline Deployment",
1111
"description": "AVD Accelerator - Deployment Baseline",
@@ -1435,7 +1435,6 @@
14351435
"varBaseScriptUri": "https://raw.githubusercontent.com/Azure/avdaccelerator/main/workload/",
14361436
"varSessionHostConfigurationScriptUri": "[format('{0}scripts/Set-SessionHostConfiguration.ps1', variables('varBaseScriptUri'))]",
14371437
"varSessionHostConfigurationScript": "./Set-SessionHostConfiguration.ps1",
1438-
"varDiskEncryptionKeyExpirationInEpoch": "[dateTimeToEpoch(dateTimeAdd(parameters('time'), format('P{0}D', string(parameters('diskEncryptionKeyExpirationInDays')))))]",
14391438
"varCreateStorageDeployment": "[if(or(parameters('createAvdFslogixDeployment'), equals(variables('varCreateAppAttachDeployment'), true())), true(), false())]",
14401439
"varFslogixStorageSku": "[if(parameters('zoneRedundantStorage'), format('{0}_ZRS', parameters('fslogixStoragePerformance')), format('{0}_LRS', parameters('fslogixStoragePerformance')))]",
14411440
"varAppAttachStorageSku": "[if(parameters('zoneRedundantStorage'), format('{0}_ZRS', parameters('appAttachStoragePerformance')), format('{0}_LRS', parameters('appAttachStoragePerformance')))]",
@@ -14230,9 +14229,6 @@
1423014229
"diskEncryptionKeyExpirationInDays": {
1423114230
"value": "[parameters('diskEncryptionKeyExpirationInDays')]"
1423214231
},
14233-
"diskEncryptionKeyExpirationInEpoch": {
14234-
"value": "[variables('varDiskEncryptionKeyExpirationInEpoch')]"
14235-
},
1423614232
"diskEncryptionSetName": {
1423714233
"value": "[variables('varDiskEncryptionSetName')]"
1423814234
},
@@ -14262,7 +14258,7 @@
1426214258
"_generator": {
1426314259
"name": "bicep",
1426414260
"version": "0.33.93.31351",
14265-
"templateHash": "10703368545591314389"
14261+
"templateHash": "8370040284189693367"
1426614262
}
1426714263
},
1426814264
"parameters": {
@@ -14302,12 +14298,6 @@
1430214298
"description": "This value is used to set the expiration date on the disk encryption key."
1430314299
}
1430414300
},
14305-
"diskEncryptionKeyExpirationInEpoch": {
14306-
"type": "int",
14307-
"metadata": {
14308-
"description": "This value is used to set the expiration date on the disk encryption key."
14309-
}
14310-
},
1431114301
"deployPrivateEndpointKeyvaultStorage": {
1431214302
"type": "bool",
1431314303
"metadata": {
@@ -15980,9 +15970,6 @@
1598015970
"diskEncryptionKeyExpirationInDays": {
1598115971
"value": "[parameters('diskEncryptionKeyExpirationInDays')]"
1598215972
},
15983-
"diskEncryptionKeyExpirationInEpoch": {
15984-
"value": "[parameters('diskEncryptionKeyExpirationInEpoch')]"
15985-
},
1598615973
"diskEncryptionSetName": {
1598715974
"value": "[parameters('diskEncryptionSetName')]"
1598815975
},
@@ -16000,7 +15987,7 @@
1600015987
"_generator": {
1600115988
"name": "bicep",
1600215989
"version": "0.33.93.31351",
16003-
"templateHash": "9820967518177630734"
15990+
"templateHash": "14616528108278942259"
1600415991
}
1600515992
},
1600615993
"parameters": {
@@ -16058,12 +16045,6 @@
1605816045
"description": "This value is used to set the expiration date on the disk encryption key."
1605916046
}
1606016047
},
16061-
"diskEncryptionKeyExpirationInEpoch": {
16062-
"type": "int",
16063-
"metadata": {
16064-
"description": "This value is used to set the expiration date on the disk encryption key."
16065-
}
16066-
},
1606716048
"diskEncryptionSetName": {
1606816049
"type": "string",
1606916050
"metadata": {
@@ -18879,9 +18860,6 @@
1887918860
"attributesEnabled": {
1888018861
"value": true
1888118862
},
18882-
"attributesExp": {
18883-
"value": "[parameters('diskEncryptionKeyExpirationInEpoch')]"
18884-
},
1888518863
"keySize": {
1888618864
"value": 4096
1888718865
},

‎workload/arm/deploy-custom-image.json

+50-50
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
"metadata": {
55
"_generator": {
66
"name": "bicep",
7-
"version": "0.32.4.45862",
8-
"templateHash": "8280825469777706940"
7+
"version": "0.33.93.31351",
8+
"templateHash": "12991191461115376458"
99
},
1010
"name": "AVD Accelerator - Baseline Custom Image Deployment",
1111
"description": "AVD Accelerator - Custom Image Baseline"
@@ -894,8 +894,8 @@
894894
"metadata": {
895895
"_generator": {
896896
"name": "bicep",
897-
"version": "0.32.4.45862",
898-
"templateHash": "2997718652572802150"
897+
"version": "0.33.93.31351",
898+
"templateHash": "17832108042529526083"
899899
},
900900
"name": "Resource Groups",
901901
"description": "This module deploys a Resource Group.",
@@ -1027,8 +1027,8 @@
10271027
"metadata": {
10281028
"_generator": {
10291029
"name": "bicep",
1030-
"version": "0.32.4.45862",
1031-
"templateHash": "18377214292539099814"
1030+
"version": "0.33.93.31351",
1031+
"templateHash": "13361380975228545358"
10321032
}
10331033
},
10341034
"parameters": {
@@ -1162,8 +1162,8 @@
11621162
"metadata": {
11631163
"_generator": {
11641164
"name": "bicep",
1165-
"version": "0.32.4.45862",
1166-
"templateHash": "9800876540676001554"
1165+
"version": "0.33.93.31351",
1166+
"templateHash": "4949725037835210878"
11671167
},
11681168
"name": "User Assigned Identities",
11691169
"description": "This module deploys a User Assigned Identity.",
@@ -1416,8 +1416,8 @@
14161416
"metadata": {
14171417
"_generator": {
14181418
"name": "bicep",
1419-
"version": "0.32.4.45862",
1420-
"templateHash": "6548182237058026465"
1419+
"version": "0.33.93.31351",
1420+
"templateHash": "2452193429452217414"
14211421
},
14221422
"name": "Role Assignments (Resource Group scope)",
14231423
"description": "This module deploys a Role Assignment at a Resource Group scope.",
@@ -1588,8 +1588,8 @@
15881588
"metadata": {
15891589
"_generator": {
15901590
"name": "bicep",
1591-
"version": "0.32.4.45862",
1592-
"templateHash": "6548182237058026465"
1591+
"version": "0.33.93.31351",
1592+
"templateHash": "2452193429452217414"
15931593
},
15941594
"name": "Role Assignments (Resource Group scope)",
15951595
"description": "This module deploys a Role Assignment at a Resource Group scope.",
@@ -1760,8 +1760,8 @@
17601760
"metadata": {
17611761
"_generator": {
17621762
"name": "bicep",
1763-
"version": "0.32.4.45862",
1764-
"templateHash": "767607799676016995"
1763+
"version": "0.33.93.31351",
1764+
"templateHash": "14126579568998252740"
17651765
},
17661766
"name": "Azure Compute Galleries",
17671767
"description": "This module deploys an Azure Compute Gallery (formerly known as Shared Image Gallery).",
@@ -2074,8 +2074,8 @@
20742074
"metadata": {
20752075
"_generator": {
20762076
"name": "bicep",
2077-
"version": "0.32.4.45862",
2078-
"templateHash": "10144839515674727775"
2077+
"version": "0.33.93.31351",
2078+
"templateHash": "10810652457093201326"
20792079
},
20802080
"name": "Compute Galleries Applications",
20812081
"description": "This module deploys an Azure Compute Gallery Application.",
@@ -2428,8 +2428,8 @@
24282428
"metadata": {
24292429
"_generator": {
24302430
"name": "bicep",
2431-
"version": "0.32.4.45862",
2432-
"templateHash": "11413741938827176545"
2431+
"version": "0.33.93.31351",
2432+
"templateHash": "4110134105629269996"
24332433
},
24342434
"name": "Compute Galleries Image Definitions",
24352435
"description": "This module deploys an Azure Compute Gallery Image Definition.",
@@ -2935,8 +2935,8 @@
29352935
"metadata": {
29362936
"_generator": {
29372937
"name": "bicep",
2938-
"version": "0.32.4.45862",
2939-
"templateHash": "11413741938827176545"
2938+
"version": "0.33.93.31351",
2939+
"templateHash": "4110134105629269996"
29402940
},
29412941
"name": "Compute Galleries Image Definitions",
29422942
"description": "This module deploys an Azure Compute Gallery Image Definition.",
@@ -3399,8 +3399,8 @@
33993399
"metadata": {
34003400
"_generator": {
34013401
"name": "bicep",
3402-
"version": "0.32.4.45862",
3403-
"templateHash": "2647588914323323261"
3402+
"version": "0.33.93.31351",
3403+
"templateHash": "2672506188372779155"
34043404
},
34053405
"name": "Virtual Machine Image Templates",
34063406
"description": "This module deploys a Virtual Machine Image Template that can be consumed by Azure Image Builder (AIB).",
@@ -4117,8 +4117,8 @@
41174117
"metadata": {
41184118
"_generator": {
41194119
"name": "bicep",
4120-
"version": "0.32.4.45862",
4121-
"templateHash": "3083170160174738636"
4120+
"version": "0.33.93.31351",
4121+
"templateHash": "4856541365330529232"
41224122
},
41234123
"name": "Log Analytics Workspaces",
41244124
"description": "This module deploys a Log Analytics Workspace.",
@@ -4350,8 +4350,8 @@
43504350
"metadata": {
43514351
"_generator": {
43524352
"name": "bicep",
4353-
"version": "0.32.4.45862",
4354-
"templateHash": "12329258505555524534"
4353+
"version": "0.33.93.31351",
4354+
"templateHash": "17358515953093451973"
43554355
},
43564356
"name": "Log Analytics Workspace Storage Insight Configs",
43574357
"description": "This module deploys a Log Analytics Workspace Storage Insight Config.",
@@ -4595,8 +4595,8 @@
45954595
"metadata": {
45964596
"_generator": {
45974597
"name": "bicep",
4598-
"version": "0.32.4.45862",
4599-
"templateHash": "15856342842826356274"
4598+
"version": "0.33.93.31351",
4599+
"templateHash": "994675065106978625"
46004600
},
46014601
"name": "Automation Accounts",
46024602
"description": "This module deploys an Azure Automation Account.",
@@ -5447,8 +5447,8 @@
54475447
"metadata": {
54485448
"_generator": {
54495449
"name": "bicep",
5450-
"version": "0.32.4.45862",
5451-
"templateHash": "7887936383291613293"
5450+
"version": "0.33.93.31351",
5451+
"templateHash": "15637148690708434772"
54525452
},
54535453
"name": "Automation Account Credential",
54545454
"description": "This module deploys Azure Automation Account Credential.",
@@ -5603,8 +5603,8 @@
56035603
"metadata": {
56045604
"_generator": {
56055605
"name": "bicep",
5606-
"version": "0.32.4.45862",
5607-
"templateHash": "11043846710506937492"
5606+
"version": "0.33.93.31351",
5607+
"templateHash": "15192444331380437877"
56085608
},
56095609
"name": "Automation Account Modules",
56105610
"description": "This module deploys an Azure Automation Account Module.",
@@ -5742,8 +5742,8 @@
57425742
"metadata": {
57435743
"_generator": {
57445744
"name": "bicep",
5745-
"version": "0.32.4.45862",
5746-
"templateHash": "2769963466163535886"
5745+
"version": "0.33.93.31351",
5746+
"templateHash": "12347404838819859886"
57475747
},
57485748
"name": "Automation Account Schedules",
57495749
"description": "This module deploys an Azure Automation Account Schedule.",
@@ -5921,8 +5921,8 @@
59215921
"metadata": {
59225922
"_generator": {
59235923
"name": "bicep",
5924-
"version": "0.32.4.45862",
5925-
"templateHash": "10628373878524632674"
5924+
"version": "0.33.93.31351",
5925+
"templateHash": "13684684173486774594"
59265926
},
59275927
"name": "Automation Account Runbooks",
59285928
"description": "This module deploys an Azure Automation Account Runbook.",
@@ -6121,8 +6121,8 @@
61216121
"metadata": {
61226122
"_generator": {
61236123
"name": "bicep",
6124-
"version": "0.32.4.45862",
6125-
"templateHash": "17724956402217558185"
6124+
"version": "0.33.93.31351",
6125+
"templateHash": "13410368199864240864"
61266126
},
61276127
"name": "Automation Account Job Schedules",
61286128
"description": "This module deploys an Azure Automation Account Job Schedule.",
@@ -6249,8 +6249,8 @@
62496249
"metadata": {
62506250
"_generator": {
62516251
"name": "bicep",
6252-
"version": "0.32.4.45862",
6253-
"templateHash": "995071399213667449"
6252+
"version": "0.33.93.31351",
6253+
"templateHash": "2873995502006074287"
62546254
},
62556255
"name": "Automation Account Variables",
62566256
"description": "This module deploys an Azure Automation Account Variable.",
@@ -6364,8 +6364,8 @@
63646364
"metadata": {
63656365
"_generator": {
63666366
"name": "bicep",
6367-
"version": "0.32.4.45862",
6368-
"templateHash": "17097798234862446049"
6367+
"version": "0.33.93.31351",
6368+
"templateHash": "13052313367230626139"
63696369
},
63706370
"name": "Log Analytics Workspace Linked Services",
63716371
"description": "This module deploys a Log Analytics Workspace Linked Service.",
@@ -6680,8 +6680,8 @@
66806680
"metadata": {
66816681
"_generator": {
66826682
"name": "bicep",
6683-
"version": "0.32.4.45862",
6684-
"templateHash": "13977107975362188587"
6683+
"version": "0.33.93.31351",
6684+
"templateHash": "9209894420478503247"
66856685
},
66866686
"name": "Automation Account Software Update Configurations",
66876687
"description": "This module deploys an Azure Automation Account Software Update Configuration.",
@@ -7834,8 +7834,8 @@
78347834
"metadata": {
78357835
"_generator": {
78367836
"name": "bicep",
7837-
"version": "0.32.4.45862",
7838-
"templateHash": "11043846710506937492"
7837+
"version": "0.33.93.31351",
7838+
"templateHash": "15192444331380437877"
78397839
},
78407840
"name": "Automation Account Modules",
78417841
"description": "This module deploys an Azure Automation Account Module.",
@@ -7982,8 +7982,8 @@
79827982
"metadata": {
79837983
"_generator": {
79847984
"name": "bicep",
7985-
"version": "0.32.4.45862",
7986-
"templateHash": "585773104499839924"
7985+
"version": "0.33.93.31351",
7986+
"templateHash": "6539982218709542037"
79877987
},
79887988
"name": "Action Groups",
79897989
"description": "This module deploys an Action Group.",
@@ -8352,8 +8352,8 @@
83528352
"metadata": {
83538353
"_generator": {
83548354
"name": "bicep",
8355-
"version": "0.32.4.45862",
8356-
"templateHash": "16700458498164414655"
8355+
"version": "0.33.93.31351",
8356+
"templateHash": "5681214311989020148"
83578357
},
83588358
"name": "Scheduled Query Rules",
83598359
"description": "This module deploys a Scheduled Query Rule.",

‎workload/bicep/deploy-baseline.bicep

-5
Original file line numberDiff line numberDiff line change
@@ -606,10 +606,6 @@ var varFslogixSharePath = createAvdFslogixDeployment ? '\\\\${varFslogixStorageN
606606
var varBaseScriptUri = 'https://raw.githubusercontent.com/Azure/avdaccelerator/main/workload/'
607607
var varSessionHostConfigurationScriptUri = '${varBaseScriptUri}scripts/Set-SessionHostConfiguration.ps1'
608608
var varSessionHostConfigurationScript = './Set-SessionHostConfiguration.ps1'
609-
var varDiskEncryptionKeyExpirationInEpoch = dateTimeToEpoch(dateTimeAdd(
610-
time,
611-
'P${string(diskEncryptionKeyExpirationInDays)}D'
612-
))
613609
var varCreateStorageDeployment = (createAvdFslogixDeployment || varCreateAppAttachDeployment == true) ? true : false
614610
var varFslogixStorageSku = zoneRedundantStorage ? '${fslogixStoragePerformance}_ZRS' : '${fslogixStoragePerformance}_LRS'
615611
var varAppAttachStorageSku = zoneRedundantStorage ? '${appAttachStoragePerformance}_ZRS' : '${appAttachStoragePerformance}_LRS'
@@ -1183,7 +1179,6 @@ module zeroTrust './modules/zeroTrust/deploy.bicep' = if (diskZeroTrust && avdDe
11831179
computeObjectsRgName: varComputeObjectsRgName
11841180
vaultSku: varWrklKeyVaultSku
11851181
diskEncryptionKeyExpirationInDays: diskEncryptionKeyExpirationInDays
1186-
diskEncryptionKeyExpirationInEpoch: varDiskEncryptionKeyExpirationInEpoch
11871182
diskEncryptionSetName: varDiskEncryptionSetName
11881183
ztKvName: varZtKvName
11891184
ztKvPrivateEndpointName: varZtKvPrivateEndpointName

0 commit comments

Comments
 (0)