Skip to content

Commit 3a1529e

Browse files
Update API model
1 parent 7d45bbb commit 3a1529e

File tree

5 files changed

+3618
-311
lines changed

5 files changed

+3618
-311
lines changed

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

+84-36
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,5 @@
11
{
22
"smithy": "2.0",
3-
"metadata": {
4-
"suppressions": [
5-
{
6-
"id": "HttpMethodSemantics",
7-
"namespace": "*"
8-
},
9-
{
10-
"id": "HttpResponseCodeSemantics",
11-
"namespace": "*"
12-
},
13-
{
14-
"id": "PaginatedTrait",
15-
"namespace": "*"
16-
},
17-
{
18-
"id": "HttpHeaderTrait",
19-
"namespace": "*"
20-
},
21-
{
22-
"id": "HttpUriConflict",
23-
"namespace": "*"
24-
},
25-
{
26-
"id": "Service",
27-
"namespace": "*"
28-
}
29-
]
30-
},
313
"shapes": {
324
"com.amazonaws.acm#AccessDeniedException": {
335
"type": "structure",
@@ -175,6 +147,12 @@
175147
"smithy.api#documentation": "<p>One or more domain names (subject alternative names) \n included in the certificate. This\n list contains the domain names that are bound to the public key that is contained in the\n certificate. The subject alternative names include the canonical domain name (CN) of the\n certificate and additional domain names that can be used to connect to the website. </p>"
176148
}
177149
},
150+
"ManagedBy": {
151+
"target": "com.amazonaws.acm#CertificateManagedBy",
152+
"traits": {
153+
"smithy.api#documentation": "<p>Identifies the Amazon Web Services service that manages the certificate issued by ACM.</p>"
154+
}
155+
},
178156
"DomainValidationOptions": {
179157
"target": "com.amazonaws.acm#DomainValidationList",
180158
"traits": {
@@ -318,6 +296,17 @@
318296
"smithy.api#documentation": "<p>Contains metadata about an ACM certificate. This structure is returned in the response\n to a <a>DescribeCertificate</a> request. </p>"
319297
}
320298
},
299+
"com.amazonaws.acm#CertificateManagedBy": {
300+
"type": "enum",
301+
"members": {
302+
"CLOUDFRONT": {
303+
"target": "smithy.api#Unit",
304+
"traits": {
305+
"smithy.api#enumValue": "CLOUDFRONT"
306+
}
307+
}
308+
}
309+
},
321310
"com.amazonaws.acm#CertificateManager": {
322311
"type": "service",
323312
"version": "2015-12-08",
@@ -371,10 +360,10 @@
371360
"traits": {
372361
"aws.api#service": {
373362
"sdkId": "ACM",
363+
"endpointPrefix": "acm",
374364
"arnNamespace": "acm",
375-
"cloudFormationName": "CertificateManager",
376365
"cloudTrailEventSource": "acm.amazonaws.com",
377-
"endpointPrefix": "acm"
366+
"cloudFormationName": "CertificateManager"
378367
},
379368
"aws.auth#sigv4": {
380369
"name": "acm"
@@ -1473,13 +1462,13 @@
14731462
"SubjectAlternativeNameSummaries": {
14741463
"target": "com.amazonaws.acm#DomainList",
14751464
"traits": {
1476-
"smithy.api#documentation": "<p>One or more domain names (subject alternative names) \n included in the certificate. This\n list contains the domain names that are bound to the public key that is contained in the\n certificate. The subject alternative names include the canonical domain name (CN) of the\n certificate and additional domain names that can be used to connect to the website. </p>\n <p>When called by <a>ListCertificates</a>, this parameter will only return the first 100 subject alternative\n names included in the certificate. To display the full list of subject alternative names, use\n <a>DescribeCertificate</a>.</p>"
1465+
"smithy.api#documentation": "<p>One or more domain names (subject alternative names) \n included in the certificate. This\n list contains the domain names that are bound to the public key that is contained in the\n certificate. The subject alternative names include the canonical domain name (CN) of the\n certificate and additional domain names that can be used to connect to the website. </p>\n <p>When called by <a href=\"https://docs.aws.amazon.com/acm/latestAPIReference/API_ListCertificates.html\">ListCertificates</a>, this parameter will only return the first 100 subject alternative\n names included in the certificate. To display the full list of subject alternative names, use\n <a href=\"https://docs.aws.amazon.com/acm/latestAPIReference/API_DescribeCertificate.html\">DescribeCertificate</a>.</p>"
14771466
}
14781467
},
14791468
"HasAdditionalSubjectAlternativeNames": {
14801469
"target": "com.amazonaws.acm#NullableBoolean",
14811470
"traits": {
1482-
"smithy.api#documentation": "<p>When called by <a>ListCertificates</a>, indicates whether the full list of subject alternative names has\n been included in the response. If false, the response includes all of the subject alternative\n names included in the certificate. If true, the response only includes the first 100 subject\n alternative names included in the certificate. To display the full list of subject alternative\n names, use <a>DescribeCertificate</a>.</p>"
1471+
"smithy.api#documentation": "<p>When called by <a href=\"https://docs.aws.amazon.com/acm/latestAPIReference/API_ListCertificates.html\">ListCertificates</a>, indicates whether the full list of subject alternative names has\n been included in the response. If false, the response includes all of the subject alternative\n names included in the certificate. If true, the response only includes the first 100 subject\n alternative names included in the certificate. To display the full list of subject alternative\n names, use <a href=\"https://docs.aws.amazon.com/acm/latestAPIReference/API_DescribeCertificate.html\">DescribeCertificate</a>.</p>"
14831472
}
14841473
},
14851474
"Status": {
@@ -1565,6 +1554,12 @@
15651554
"traits": {
15661555
"smithy.api#documentation": "<p>The time at which the certificate was revoked. This value exists only when the certificate\n status is <code>REVOKED</code>. </p>"
15671556
}
1557+
},
1558+
"ManagedBy": {
1559+
"target": "com.amazonaws.acm#CertificateManagedBy",
1560+
"traits": {
1561+
"smithy.api#documentation": "<p>Identifies the Amazon Web Services service that manages the certificate issued by ACM.</p>"
1562+
}
15681563
}
15691564
},
15701565
"traits": {
@@ -1838,13 +1833,19 @@
18381833
"ValidationStatus": {
18391834
"target": "com.amazonaws.acm#DomainStatus",
18401835
"traits": {
1841-
"smithy.api#documentation": "<p>The validation status of the domain name. This can be one of the following values:</p>\n <ul>\n <li>\n <p>\n <code>PENDING_VALIDATION</code>\n </p>\n </li>\n <li>\n <p>\n <code>SUCCESS</code>\n </p>\n </li>\n <li>\n <p>\n <code>FAILED</code>\n </p>\n </li>\n </ul>"
1836+
"smithy.api#documentation": "<p>The validation status of the domain name. This can be one of the following values:</p>\n <ul>\n <li>\n <p>\n <code>PENDING_VALIDATION</code>\n </p>\n </li>\n <li>\n <p>\n <code/>SUCCESS</p>\n </li>\n <li>\n <p>\n <code/>FAILED</p>\n </li>\n </ul>"
18421837
}
18431838
},
18441839
"ResourceRecord": {
18451840
"target": "com.amazonaws.acm#ResourceRecord",
18461841
"traits": {
1847-
"smithy.api#documentation": "<p>Contains the CNAME record that you add to your DNS database for domain validation. For\n more information, see <a href=\"https://docs.aws.amazon.com/acm/latest/userguide/gs-acm-validate-dns.html\">Use DNS to Validate Domain Ownership</a>.</p>\n <p>Note: The CNAME information that you need does not include the name of your domain. If you\n include\u2028 your domain name in the DNS database CNAME record, validation fails.\u2028 For example, if\n the name is \"_a79865eb4cd1a6ab990a45779b4e0b96.yourdomain.com\", only\n \"_a79865eb4cd1a6ab990a45779b4e0b96\" must be used.</p>"
1842+
"smithy.api#documentation": "<p>Contains the CNAME record that you add to your DNS database for domain validation. For\n more information, see <a href=\"https://docs.aws.amazon.com/acm/latest/userguide/gs-acm-validate-dns.html\">Use DNS to Validate Domain Ownership</a>.</p>\n <p>Note: The CNAME information that you need does not include the name of your domain. If you\n include your domain name in the DNS database CNAME record, validation fails. For example, if\n the name is \"_a79865eb4cd1a6ab990a45779b4e0b96.yourdomain.com\", only\n \"_a79865eb4cd1a6ab990a45779b4e0b96\" must be used.</p>"
1843+
}
1844+
},
1845+
"HttpRedirect": {
1846+
"target": "com.amazonaws.acm#HttpRedirect",
1847+
"traits": {
1848+
"smithy.api#documentation": "<p>Contains information for HTTP-based domain validation of certificates requested through CloudFront and issued by ACM.\n This field exists only when the certificate type is <code>AMAZON_ISSUED</code> and the validation method is <code>HTTP</code>.</p>"
18481849
}
18491850
},
18501851
"ValidationMethod": {
@@ -2231,6 +2232,12 @@
22312232
"traits": {
22322233
"smithy.api#documentation": "<p>Specify one or more algorithms that can be used to generate key pairs.</p>\n <p>Default filtering returns only <code>RSA_1024</code> and <code>RSA_2048</code>\n certificates that have at least one domain. To return other certificate types, provide the\n desired type signatures in a comma-separated list. For example, <code>\"keyTypes\":\n [\"RSA_2048\",\"RSA_4096\"]</code> returns both <code>RSA_2048</code> and <code>RSA_4096</code>\n certificates.</p>"
22332234
}
2235+
},
2236+
"managedBy": {
2237+
"target": "com.amazonaws.acm#CertificateManagedBy",
2238+
"traits": {
2239+
"smithy.api#documentation": "<p>Identifies the Amazon Web Services service that manages the certificate issued by ACM.</p>"
2240+
}
22342241
}
22352242
},
22362243
"traits": {
@@ -2344,6 +2351,26 @@
23442351
"smithy.api#output": {}
23452352
}
23462353
},
2354+
"com.amazonaws.acm#HttpRedirect": {
2355+
"type": "structure",
2356+
"members": {
2357+
"RedirectFrom": {
2358+
"target": "com.amazonaws.acm#String",
2359+
"traits": {
2360+
"smithy.api#documentation": "<p>The URL including the domain to be validated. The certificate authority sends <code>GET</code> requests here during validation.</p>"
2361+
}
2362+
},
2363+
"RedirectTo": {
2364+
"target": "com.amazonaws.acm#String",
2365+
"traits": {
2366+
"smithy.api#documentation": "<p>The URL hosting the validation token. <code>RedirectFrom</code> must return this content or redirect here.</p>"
2367+
}
2368+
}
2369+
},
2370+
"traits": {
2371+
"smithy.api#documentation": "<p>Contains information for HTTP-based domain validation of certificates requested through CloudFront and issued by ACM.\n This field exists only when the certificate type is <code>AMAZON_ISSUED</code> and the validation method is <code>HTTP</code>.</p>"
2372+
}
2373+
},
23472374
"com.amazonaws.acm#IdempotencyToken": {
23482375
"type": "string",
23492376
"traits": {
@@ -2706,7 +2733,7 @@
27062733
}
27072734
],
27082735
"traits": {
2709-
"smithy.api#documentation": "<p>Retrieves a list of certificate ARNs and domain names. By default, the API returns RSA_2048 certificates. To return all certificates in the account, include the <code>keyType</code> filter with the values <code>[RSA_1024, RSA_2048, RSA_3072, RSA_4096, EC_prime256v1, EC_secp384r1, EC_secp521r1]</code>.</p>\n <p>In addition to <code>keyType</code>, you can also filter by the <code>CertificateStatuses</code>, <code>keyUsage</code>, and <code>extendedKeyUsage</code> attributes on the certificate. For more information, see <a>Filters</a>.</p>",
2736+
"smithy.api#documentation": "<p>Retrieves a list of certificate ARNs and domain names. You can request that only\n certificates that match a specific status be listed. You can also filter by specific\n attributes of the certificate. Default filtering returns only <code>RSA_2048</code>\n certificates. For more information, see <a>Filters</a>.</p>",
27102737
"smithy.api#paginated": {
27112738
"inputToken": "NextToken",
27122739
"outputToken": "NextToken",
@@ -3036,6 +3063,9 @@
30363063
{
30373064
"target": "com.amazonaws.acm#InvalidArnException"
30383065
},
3066+
{
3067+
"target": "com.amazonaws.acm#RequestInProgressException"
3068+
},
30393069
{
30403070
"target": "com.amazonaws.acm#ResourceNotFoundException"
30413071
}
@@ -3232,6 +3262,12 @@
32323262
"traits": {
32333263
"smithy.api#documentation": "<p>Specifies the algorithm of the public and private key pair that your certificate uses to\n encrypt data. RSA is the default key algorithm for ACM certificates. Elliptic Curve Digital\n Signature Algorithm (ECDSA) keys are smaller, offering security comparable to RSA keys but\n with greater computing efficiency. However, ECDSA is not supported by all network clients.\n Some Amazon Web Services services may require RSA keys, or only support ECDSA keys of a particular size,\n while others allow the use of either RSA and ECDSA keys to ensure that compatibility is not\n broken. Check the requirements for the Amazon Web Services service where you plan to deploy your\n certificate. For more information about selecting an algorithm, see <a href=\"https://docs.aws.amazon.com/acm/latest/userguide/acm-certificate.html#algorithms\">Key\n algorithms</a>.</p>\n <note>\n <p>Algorithms supported for an ACM certificate request include: </p>\n <ul>\n <li>\n <p>\n <code>RSA_2048</code>\n </p>\n </li>\n <li>\n <p>\n <code>EC_prime256v1</code>\n </p>\n </li>\n <li>\n <p>\n <code>EC_secp384r1</code>\n </p>\n </li>\n </ul>\n <p>Other listed algorithms are for imported certificates only. </p>\n </note>\n <note>\n <p>When you request a private PKI certificate signed by a CA from Amazon Web Services Private CA, the\n specified signing algorithm family (RSA or ECDSA) must match the algorithm family of\n the CA's secret key.</p>\n </note>\n <p>Default: RSA_2048</p>"
32343264
}
3265+
},
3266+
"ManagedBy": {
3267+
"target": "com.amazonaws.acm#CertificateManagedBy",
3268+
"traits": {
3269+
"smithy.api#documentation": "<p>Identifies the Amazon Web Services service that manages the certificate issued by ACM.</p>"
3270+
}
32353271
}
32363272
},
32373273
"traits": {
@@ -3405,6 +3441,12 @@
34053441
"smithy.api#enumValue": "SUPERCEDED"
34063442
}
34073443
},
3444+
"SUPERSEDED": {
3445+
"target": "smithy.api#Unit",
3446+
"traits": {
3447+
"smithy.api#enumValue": "SUPERSEDED"
3448+
}
3449+
},
34083450
"CESSATION_OF_OPERATION": {
34093451
"target": "smithy.api#Unit",
34103452
"traits": {
@@ -3656,8 +3698,14 @@
36563698
"traits": {
36573699
"smithy.api#enumValue": "DNS"
36583700
}
3701+
},
3702+
"HTTP": {
3703+
"target": "smithy.api#Unit",
3704+
"traits": {
3705+
"smithy.api#enumValue": "HTTP"
3706+
}
36593707
}
36603708
}
36613709
}
36623710
}
3663-
}
3711+
}

tools/code-generation/smithy/api-descriptions/bedrock-runtime.json

+10-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,16 @@
6060
"aws.auth#sigv4": {
6161
"name": "bedrock"
6262
},
63-
"aws.protocols#restJson1": {},
63+
"aws.protocols#restJson1": {
64+
"http": [
65+
"h2",
66+
"http/1.1"
67+
],
68+
"eventStreamHttp": [
69+
"h2",
70+
"http/1.1"
71+
]
72+
},
6473
"smithy.api#documentation": "<p>Describes the API operations for running inference using Amazon Bedrock models.</p>",
6574
"smithy.api#title": "Amazon Bedrock Runtime",
6675
"smithy.rules#endpointRuleSet": {

0 commit comments

Comments
 (0)