Skip to content

Commit ed3a913

Browse files
Update API model
1 parent 96c3516 commit ed3a913

8 files changed

+759
-608
lines changed

tools/code-generation/smithy/api-descriptions/connect-contact-lens.json

+1-3
Original file line numberDiff line numberDiff line change
@@ -1389,9 +1389,7 @@
13891389
"Sentiment": {
13901390
"target": "com.amazonaws.connectcontactlens#SentimentValue",
13911391
"traits": {
1392-
"smithy.api#clientOptional": {},
1393-
"smithy.api#documentation": "<p>The sentiment detected for this piece of transcript.</p>",
1394-
"smithy.api#required": {}
1392+
"smithy.api#documentation": "<p>The sentiment detected for this piece of transcript.</p>"
13951393
}
13961394
},
13971395
"IssuesDetected": {

tools/code-generation/smithy/api-descriptions/datazone.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1830,7 +1830,7 @@
18301830
"traits": {
18311831
"smithy.api#length": {
18321832
"min": 1,
1833-
"max": 10
1833+
"max": 20
18341834
}
18351835
}
18361836
},

tools/code-generation/smithy/api-descriptions/detective.json

+471-503
Large diffs are not rendered by default.

tools/code-generation/smithy/api-descriptions/dynamodb.json

+95-95
Large diffs are not rendered by default.

tools/code-generation/smithy/api-descriptions/marketplace-entitlement-service.json

+44-1
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,49 @@
259259
},
260260
"type": "endpoint"
261261
},
262+
{
263+
"conditions": [
264+
{
265+
"fn": "stringEquals",
266+
"argv": [
267+
{
268+
"fn": "getAttr",
269+
"argv": [
270+
{
271+
"ref": "PartitionResult"
272+
},
273+
"name"
274+
]
275+
},
276+
"aws-cn"
277+
]
278+
},
279+
{
280+
"fn": "booleanEquals",
281+
"argv": [
282+
{
283+
"ref": "UseFIPS"
284+
},
285+
false
286+
]
287+
},
288+
{
289+
"fn": "booleanEquals",
290+
"argv": [
291+
{
292+
"ref": "UseDualStack"
293+
},
294+
true
295+
]
296+
}
297+
],
298+
"endpoint": {
299+
"url": "https://entitlement-marketplace.{Region}.{PartitionResult#dualStackDnsSuffix}",
300+
"properties": {},
301+
"headers": {}
302+
},
303+
"type": "endpoint"
304+
},
262305
{
263306
"conditions": [
264307
{
@@ -599,7 +642,7 @@
599642
"documentation": "For region cn-northwest-1 with FIPS disabled and DualStack enabled",
600643
"expect": {
601644
"endpoint": {
602-
"url": "https://entitlement.marketplace.cn-northwest-1.api.amazonwebservices.com.cn"
645+
"url": "https://entitlement-marketplace.cn-northwest-1.api.amazonwebservices.com.cn"
603646
}
604647
},
605648
"params": {

tools/code-generation/smithy/api-descriptions/marketplace-metering.json

+88-2
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,92 @@
225225
},
226226
"type": "endpoint"
227227
},
228+
{
229+
"conditions": [
230+
{
231+
"fn": "stringEquals",
232+
"argv": [
233+
{
234+
"fn": "getAttr",
235+
"argv": [
236+
{
237+
"ref": "PartitionResult"
238+
},
239+
"name"
240+
]
241+
},
242+
"aws-cn"
243+
]
244+
},
245+
{
246+
"fn": "booleanEquals",
247+
"argv": [
248+
{
249+
"ref": "UseFIPS"
250+
},
251+
false
252+
]
253+
},
254+
{
255+
"fn": "booleanEquals",
256+
"argv": [
257+
{
258+
"ref": "UseDualStack"
259+
},
260+
true
261+
]
262+
}
263+
],
264+
"endpoint": {
265+
"url": "https://metering-marketplace.{Region}.{PartitionResult#dualStackDnsSuffix}",
266+
"properties": {},
267+
"headers": {}
268+
},
269+
"type": "endpoint"
270+
},
271+
{
272+
"conditions": [
273+
{
274+
"fn": "stringEquals",
275+
"argv": [
276+
{
277+
"fn": "getAttr",
278+
"argv": [
279+
{
280+
"ref": "PartitionResult"
281+
},
282+
"name"
283+
]
284+
},
285+
"aws-us-gov"
286+
]
287+
},
288+
{
289+
"fn": "booleanEquals",
290+
"argv": [
291+
{
292+
"ref": "UseFIPS"
293+
},
294+
false
295+
]
296+
},
297+
{
298+
"fn": "booleanEquals",
299+
"argv": [
300+
{
301+
"ref": "UseDualStack"
302+
},
303+
true
304+
]
305+
}
306+
],
307+
"endpoint": {
308+
"url": "https://metering-marketplace.{Region}.{PartitionResult#dualStackDnsSuffix}",
309+
"properties": {},
310+
"headers": {}
311+
},
312+
"type": "endpoint"
313+
},
228314
{
229315
"conditions": [
230316
{
@@ -565,7 +651,7 @@
565651
"documentation": "For region cn-northwest-1 with FIPS disabled and DualStack enabled",
566652
"expect": {
567653
"endpoint": {
568-
"url": "https://metering.marketplace.cn-northwest-1.api.amazonwebservices.com.cn"
654+
"url": "https://metering-marketplace.cn-northwest-1.api.amazonwebservices.com.cn"
569655
}
570656
},
571657
"params": {
@@ -617,7 +703,7 @@
617703
"documentation": "For region us-gov-west-1 with FIPS disabled and DualStack enabled",
618704
"expect": {
619705
"endpoint": {
620-
"url": "https://metering.marketplace.us-gov-west-1.api.aws"
706+
"url": "https://metering-marketplace.us-gov-west-1.api.aws"
621707
}
622708
},
623709
"params": {

tools/code-generation/smithy/api-descriptions/pcs.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -858,7 +858,7 @@
858858
"com.amazonaws.pcs#ClusterIdentifier": {
859859
"type": "string",
860860
"traits": {
861-
"smithy.api#pattern": "^(pcs_[a-zA-Z0-9]+|[A-Za-z][A-Za-z0-9-]{3,40})$"
861+
"smithy.api#pattern": "^(pcs_[a-zA-Z0-9]+|[A-Za-z][A-Za-z0-9-]{2,40})$"
862862
}
863863
},
864864
"com.amazonaws.pcs#ClusterList": {
@@ -1213,7 +1213,7 @@
12131213
"com.amazonaws.pcs#ComputeNodeGroupIdentifier": {
12141214
"type": "string",
12151215
"traits": {
1216-
"smithy.api#pattern": "^(pcs_[a-zA-Z0-9]+|[A-Za-z][A-Za-z0-9-]{3,25})$"
1216+
"smithy.api#pattern": "^(pcs_[a-zA-Z0-9]+|[A-Za-z][A-Za-z0-9-]{2,25})$"
12171217
}
12181218
},
12191219
"com.amazonaws.pcs#ComputeNodeGroupList": {
@@ -2937,7 +2937,7 @@
29372937
"com.amazonaws.pcs#QueueIdentifier": {
29382938
"type": "string",
29392939
"traits": {
2940-
"smithy.api#pattern": "^(pcs_[a-zA-Z0-9]+|[A-Za-z][A-Za-z0-9-]{3,25})$"
2940+
"smithy.api#pattern": "^(pcs_[a-zA-Z0-9]+|[A-Za-z][A-Za-z0-9-]{2,25})$"
29412941
}
29422942
},
29432943
"com.amazonaws.pcs#QueueList": {

tools/code-generation/smithy/api-descriptions/verifiedpermissions.json

+56
Original file line numberDiff line numberDiff line change
@@ -1722,6 +1722,12 @@
17221722
"traits": {
17231723
"smithy.api#documentation": "<p>Descriptive text that you can provide to help with identification \n of the current policy store.</p>"
17241724
}
1725+
},
1726+
"deletionProtection": {
1727+
"target": "com.amazonaws.verifiedpermissions#DeletionProtection",
1728+
"traits": {
1729+
"smithy.api#documentation": "<p>Specifies whether the policy store can be deleted. If enabled, the policy store can't be deleted.</p>\n <p>The default state is <code>DISABLED</code>.</p>"
1730+
}
17251731
}
17261732
},
17271733
"traits": {
@@ -2044,6 +2050,11 @@
20442050
"output": {
20452051
"target": "com.amazonaws.verifiedpermissions#DeletePolicyStoreOutput"
20462052
},
2053+
"errors": [
2054+
{
2055+
"target": "com.amazonaws.verifiedpermissions#InvalidStateException"
2056+
}
2057+
],
20472058
"traits": {
20482059
"aws.iam#iamAction": {
20492060
"documentation": "Grants permission to delete the specified policy store"
@@ -2148,6 +2159,23 @@
21482159
"smithy.api#output": {}
21492160
}
21502161
},
2162+
"com.amazonaws.verifiedpermissions#DeletionProtection": {
2163+
"type": "enum",
2164+
"members": {
2165+
"ENABLED": {
2166+
"target": "smithy.api#Unit",
2167+
"traits": {
2168+
"smithy.api#enumValue": "ENABLED"
2169+
}
2170+
},
2171+
"DISABLED": {
2172+
"target": "smithy.api#Unit",
2173+
"traits": {
2174+
"smithy.api#enumValue": "DISABLED"
2175+
}
2176+
}
2177+
}
2178+
},
21512179
"com.amazonaws.verifiedpermissions#DeterminingPolicyItem": {
21522180
"type": "structure",
21532181
"members": {
@@ -2722,6 +2750,12 @@
27222750
"traits": {
27232751
"smithy.api#documentation": "<p>Descriptive text that you can provide to help with identification \n of the current policy store.</p>"
27242752
}
2753+
},
2754+
"deletionProtection": {
2755+
"target": "com.amazonaws.verifiedpermissions#DeletionProtection",
2756+
"traits": {
2757+
"smithy.api#documentation": "<p>Specifies whether the policy store can be deleted. If enabled, the policy store can't be deleted.</p>\n <p>The default state is <code>DISABLED</code>.</p>"
2758+
}
27252759
}
27262760
},
27272761
"traits": {
@@ -3196,6 +3230,22 @@
31963230
"smithy.api#retryable": {}
31973231
}
31983232
},
3233+
"com.amazonaws.verifiedpermissions#InvalidStateException": {
3234+
"type": "structure",
3235+
"members": {
3236+
"message": {
3237+
"target": "smithy.api#String",
3238+
"traits": {
3239+
"smithy.api#required": {}
3240+
}
3241+
}
3242+
},
3243+
"traits": {
3244+
"smithy.api#documentation": "<p>The policy store can't be deleted because deletion protection is enabled. To delete this policy store, disable deletion protection.</p>",
3245+
"smithy.api#error": "client",
3246+
"smithy.api#httpError": 406
3247+
}
3248+
},
31993249
"com.amazonaws.verifiedpermissions#IpAddr": {
32003250
"type": "string",
32013251
"traits": {
@@ -5959,6 +6009,12 @@
59596009
"smithy.api#required": {}
59606010
}
59616011
},
6012+
"deletionProtection": {
6013+
"target": "com.amazonaws.verifiedpermissions#DeletionProtection",
6014+
"traits": {
6015+
"smithy.api#documentation": "<p>Specifies whether the policy store can be deleted. If enabled, the policy store can't be deleted.</p>\n <p>When you call <code>UpdatePolicyStore</code>, this parameter is unchanged unless explicitly included in the call.</p>"
6016+
}
6017+
},
59626018
"description": {
59636019
"target": "com.amazonaws.verifiedpermissions#PolicyStoreDescription",
59646020
"traits": {

0 commit comments

Comments
 (0)