Skip to content

Commit 633672c

Browse files
author
AWS
committed
AWS CloudHSM V2 Update: Added support for hsm type hsm2m.medium. Added supported for creating a cluster in FIPS or NON_FIPS mode.
1 parent 6b270db commit 633672c

File tree

3 files changed

+56
-24
lines changed

3 files changed

+56
-24
lines changed

‎.changes/next-release/feature-AWSCloudHSMV2-062e83f.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"type": "feature",
3+
"category": "AWS CloudHSM V2",
4+
"contributor": "",
5+
"description": "Added support for hsm type hsm2m.medium. Added supported for creating a cluster in FIPS or NON_FIPS mode."
6+
}

‎services/cloudhsmv2/src/main/resources/codegen-resources/endpoint-rule-set.json

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
]
4141
}
4242
],
43-
"type": "tree",
4443
"rules": [
4544
{
4645
"conditions": [
@@ -83,7 +82,8 @@
8382
},
8483
"type": "endpoint"
8584
}
86-
]
85+
],
86+
"type": "tree"
8787
},
8888
{
8989
"conditions": [
@@ -96,7 +96,6 @@
9696
]
9797
}
9898
],
99-
"type": "tree",
10099
"rules": [
101100
{
102101
"conditions": [
@@ -110,7 +109,6 @@
110109
"assign": "PartitionResult"
111110
}
112111
],
113-
"type": "tree",
114112
"rules": [
115113
{
116114
"conditions": [
@@ -133,7 +131,6 @@
133131
]
134132
}
135133
],
136-
"type": "tree",
137134
"rules": [
138135
{
139136
"conditions": [
@@ -168,7 +165,6 @@
168165
]
169166
}
170167
],
171-
"type": "tree",
172168
"rules": [
173169
{
174170
"conditions": [],
@@ -179,14 +175,16 @@
179175
},
180176
"type": "endpoint"
181177
}
182-
]
178+
],
179+
"type": "tree"
183180
},
184181
{
185182
"conditions": [],
186183
"error": "FIPS and DualStack are enabled, but this partition does not support one or both",
187184
"type": "error"
188185
}
189-
]
186+
],
187+
"type": "tree"
190188
},
191189
{
192190
"conditions": [
@@ -200,14 +198,12 @@
200198
]
201199
}
202200
],
203-
"type": "tree",
204201
"rules": [
205202
{
206203
"conditions": [
207204
{
208205
"fn": "booleanEquals",
209206
"argv": [
210-
true,
211207
{
212208
"fn": "getAttr",
213209
"argv": [
@@ -216,11 +212,11 @@
216212
},
217213
"supportsFIPS"
218214
]
219-
}
215+
},
216+
true
220217
]
221218
}
222219
],
223-
"type": "tree",
224220
"rules": [
225221
{
226222
"conditions": [],
@@ -231,14 +227,16 @@
231227
},
232228
"type": "endpoint"
233229
}
234-
]
230+
],
231+
"type": "tree"
235232
},
236233
{
237234
"conditions": [],
238235
"error": "FIPS is enabled but this partition does not support FIPS",
239236
"type": "error"
240237
}
241-
]
238+
],
239+
"type": "tree"
242240
},
243241
{
244242
"conditions": [
@@ -252,7 +250,6 @@
252250
]
253251
}
254252
],
255-
"type": "tree",
256253
"rules": [
257254
{
258255
"conditions": [
@@ -272,7 +269,6 @@
272269
]
273270
}
274271
],
275-
"type": "tree",
276272
"rules": [
277273
{
278274
"conditions": [],
@@ -283,14 +279,16 @@
283279
},
284280
"type": "endpoint"
285281
}
286-
]
282+
],
283+
"type": "tree"
287284
},
288285
{
289286
"conditions": [],
290287
"error": "DualStack is enabled but this partition does not support DualStack",
291288
"type": "error"
292289
}
293-
]
290+
],
291+
"type": "tree"
294292
},
295293
{
296294
"conditions": [
@@ -351,9 +349,11 @@
351349
},
352350
"type": "endpoint"
353351
}
354-
]
352+
],
353+
"type": "tree"
355354
}
356-
]
355+
],
356+
"type": "tree"
357357
},
358358
{
359359
"conditions": [],

‎services/cloudhsmv2/src/main/resources/codegen-resources/service-2.json

Lines changed: 30 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"endpointPrefix":"cloudhsmv2",
66
"jsonVersion":"1.1",
77
"protocol":"json",
8+
"protocols":["json"],
89
"serviceAbbreviation":"CloudHSM V2",
910
"serviceFullName":"AWS CloudHSM V2",
1011
"serviceId":"CloudHSM V2",
@@ -325,6 +326,14 @@
325326
"TagList":{
326327
"shape":"TagList",
327328
"documentation":"<p>The list of tags for the backup.</p>"
329+
},
330+
"HsmType":{
331+
"shape":"HsmType",
332+
"documentation":"<p>The HSM type of the cluster that was backed up.</p>"
333+
},
334+
"Mode":{
335+
"shape":"ClusterMode",
336+
"documentation":"<p>The mode of the cluster that was backed up.</p>"
328337
}
329338
},
330339
"documentation":"<p>Contains information about a backup of an AWS CloudHSM cluster. All backup objects contain the <code>BackupId</code>, <code>BackupState</code>, <code>ClusterId</code>, and <code>CreateTimestamp</code> parameters. Backups that were copied into a destination region additionally contain the <code>CopyTimestamp</code>, <code>SourceBackup</code>, <code>SourceCluster</code>, and <code>SourceRegion</code> parameters. A backup that is pending deletion will include the <code>DeleteTimestamp</code> parameter.</p>"
@@ -382,7 +391,7 @@
382391
"Boolean":{"type":"boolean"},
383392
"Cert":{
384393
"type":"string",
385-
"max":5000,
394+
"max":20000,
386395
"pattern":"[a-zA-Z0-9+-/=\\s]*"
387396
},
388397
"Certificates":{
@@ -522,6 +531,10 @@
522531
"TagList":{
523532
"shape":"TagList",
524533
"documentation":"<p>The list of tags for the cluster.</p>"
534+
},
535+
"Mode":{
536+
"shape":"ClusterMode",
537+
"documentation":"<p>The mode of the cluster.</p>"
525538
}
526539
},
527540
"documentation":"<p>Contains information about an AWS CloudHSM cluster.</p>"
@@ -530,6 +543,13 @@
530543
"type":"string",
531544
"pattern":"cluster-[2-7a-zA-Z]{11,16}"
532545
},
546+
"ClusterMode":{
547+
"type":"string",
548+
"enum":[
549+
"FIPS",
550+
"NON_FIPS"
551+
]
552+
},
533553
"ClusterState":{
534554
"type":"string",
535555
"enum":[
@@ -596,7 +616,7 @@
596616
},
597617
"HsmType":{
598618
"shape":"HsmType",
599-
"documentation":"<p>The type of HSM to use in the cluster. Currently the only allowed value is <code>hsm1.medium</code>.</p>"
619+
"documentation":"<p>The type of HSM to use in the cluster. The allowed values are <code>hsm1.medium</code> and <code>hsm2m.medium</code>.</p>"
600620
},
601621
"SourceBackupId":{
602622
"shape":"BackupId",
@@ -609,6 +629,10 @@
609629
"TagList":{
610630
"shape":"TagList",
611631
"documentation":"<p>Tags to apply to the CloudHSM cluster during creation.</p>"
632+
},
633+
"Mode":{
634+
"shape":"ClusterMode",
635+
"documentation":"<p>The mode to use in the cluster. The allowed values are <code>FIPS</code> and <code>NON_FIPS</code>.</p>"
612636
}
613637
}
614638
},
@@ -826,7 +850,8 @@
826850
"Filters":{
827851
"type":"map",
828852
"key":{"shape":"Field"},
829-
"value":{"shape":"Strings"}
853+
"value":{"shape":"Strings"},
854+
"max":30
830855
},
831856
"Hsm":{
832857
"type":"structure",
@@ -883,7 +908,8 @@
883908
},
884909
"HsmType":{
885910
"type":"string",
886-
"pattern":"(hsm1\\.medium)"
911+
"max":32,
912+
"pattern":"((p|)hsm[0-9][a-z.]*\\.[a-zA-Z]+)"
887913
},
888914
"Hsms":{
889915
"type":"list",

0 commit comments

Comments
 (0)