From d36e21dcee21a8381520cd46438cc41cff4a4534 Mon Sep 17 00:00:00 2001 From: jonathan343 Date: Fri, 26 Jan 2024 16:56:17 +0000 Subject: [PATCH 1/2] Update to latest models --- .../next-release/api-change-acmpca-75265.json | 5 +++ .../api-change-lightsail-75457.json | 5 +++ .../2017-08-22/endpoint-rule-set-1.json | 44 +++++++++---------- .../data/acm-pca/2017-08-22/service-2.json | 30 ++++++++++--- .../data/acm-pca/2017-08-22/waiters-2.json | 2 +- .../data/lightsail/2016-11-28/service-2.json | 8 ++++ 6 files changed, 64 insertions(+), 30 deletions(-) create mode 100644 .changes/next-release/api-change-acmpca-75265.json create mode 100644 .changes/next-release/api-change-lightsail-75457.json diff --git a/.changes/next-release/api-change-acmpca-75265.json b/.changes/next-release/api-change-acmpca-75265.json new file mode 100644 index 0000000000..44963bc66a --- /dev/null +++ b/.changes/next-release/api-change-acmpca-75265.json @@ -0,0 +1,5 @@ +{ + "type": "api-change", + "category": "``acm-pca``", + "description": "AWS Private CA now supports an option to omit the CDP extension from issued certificates, when CRL revocation is enabled." +} diff --git a/.changes/next-release/api-change-lightsail-75457.json b/.changes/next-release/api-change-lightsail-75457.json new file mode 100644 index 0000000000..96b25106a7 --- /dev/null +++ b/.changes/next-release/api-change-lightsail-75457.json @@ -0,0 +1,5 @@ +{ + "type": "api-change", + "category": "``lightsail``", + "description": "This release adds support for IPv6-only instance plans." +} diff --git a/botocore/data/acm-pca/2017-08-22/endpoint-rule-set-1.json b/botocore/data/acm-pca/2017-08-22/endpoint-rule-set-1.json index 32fd04c461..94cc1c4810 100644 --- a/botocore/data/acm-pca/2017-08-22/endpoint-rule-set-1.json +++ b/botocore/data/acm-pca/2017-08-22/endpoint-rule-set-1.json @@ -40,7 +40,6 @@ ] } ], - "type": "tree", "rules": [ { "conditions": [ @@ -83,7 +82,8 @@ }, "type": "endpoint" } - ] + ], + "type": "tree" }, { "conditions": [ @@ -96,7 +96,6 @@ ] } ], - "type": "tree", "rules": [ { "conditions": [ @@ -110,7 +109,6 @@ "assign": "PartitionResult" } ], - "type": "tree", "rules": [ { "conditions": [ @@ -133,7 +131,6 @@ ] } ], - "type": "tree", "rules": [ { "conditions": [ @@ -168,7 +165,6 @@ ] } ], - "type": "tree", "rules": [ { "conditions": [], @@ -179,14 +175,16 @@ }, "type": "endpoint" } - ] + ], + "type": "tree" }, { "conditions": [], "error": "FIPS and DualStack are enabled, but this partition does not support one or both", "type": "error" } - ] + ], + "type": "tree" }, { "conditions": [ @@ -200,14 +198,12 @@ ] } ], - "type": "tree", "rules": [ { "conditions": [ { "fn": "booleanEquals", "argv": [ - true, { "fn": "getAttr", "argv": [ @@ -216,18 +212,17 @@ }, "supportsFIPS" ] - } + }, + true ] } ], - "type": "tree", "rules": [ { "conditions": [ { "fn": "stringEquals", "argv": [ - "aws-us-gov", { "fn": "getAttr", "argv": [ @@ -236,7 +231,8 @@ }, "name" ] - } + }, + "aws-us-gov" ] } ], @@ -256,14 +252,16 @@ }, "type": "endpoint" } - ] + ], + "type": "tree" }, { "conditions": [], "error": "FIPS is enabled but this partition does not support FIPS", "type": "error" } - ] + ], + "type": "tree" }, { "conditions": [ @@ -277,7 +275,6 @@ ] } ], - "type": "tree", "rules": [ { "conditions": [ @@ -297,7 +294,6 @@ ] } ], - "type": "tree", "rules": [ { "conditions": [], @@ -308,14 +304,16 @@ }, "type": "endpoint" } - ] + ], + "type": "tree" }, { "conditions": [], "error": "DualStack is enabled but this partition does not support DualStack", "type": "error" } - ] + ], + "type": "tree" }, { "conditions": [], @@ -326,9 +324,11 @@ }, "type": "endpoint" } - ] + ], + "type": "tree" } - ] + ], + "type": "tree" }, { "conditions": [], diff --git a/botocore/data/acm-pca/2017-08-22/service-2.json b/botocore/data/acm-pca/2017-08-22/service-2.json index 62fbca99db..8a7365ac14 100644 --- a/botocore/data/acm-pca/2017-08-22/service-2.json +++ b/botocore/data/acm-pca/2017-08-22/service-2.json @@ -551,7 +551,7 @@ "type":"string", "max":200, "min":5, - "pattern":"arn:[\\w+=/,.@-]+:[\\w+=/,.@-]+:[\\w+=/,.@-]*:[0-9]*:[\\w+=,.@-]+(/[\\w+=,.@-]+)*" + "pattern":"arn:[\\w+=/,.@-]+:acm-pca:[\\w+=/,.@-]*:[0-9]*:[\\w+=,.@-]+(/[\\w+=,.@-]+)*" }, "AuditReportId":{ "type":"string", @@ -882,9 +882,25 @@ "S3ObjectAcl":{ "shape":"S3ObjectAcl", "documentation":"

Determines whether the CRL will be publicly readable or privately held in the CRL Amazon S3 bucket. If you choose PUBLIC_READ, the CRL will be accessible over the public internet. If you choose BUCKET_OWNER_FULL_CONTROL, only the owner of the CRL S3 bucket can access the CRL, and your PKI clients may need an alternative method of access.

If no value is specified, the default is PUBLIC_READ.

Note: This default can cause CA creation to fail in some circumstances. If you have have enabled the Block Public Access (BPA) feature in your S3 account, then you must specify the value of this parameter as BUCKET_OWNER_FULL_CONTROL, and not doing so results in an error. If you have disabled BPA in S3, then you can specify either BUCKET_OWNER_FULL_CONTROL or PUBLIC_READ as the value.

For more information, see Blocking public access to the S3 bucket.

" + }, + "CrlDistributionPointExtensionConfiguration":{ + "shape":"CrlDistributionPointExtensionConfiguration", + "documentation":"

Configures the behavior of the CRL Distribution Point extension for certificates issued by your certificate authority. If this field is not provided, then the CRl Distribution Point Extension will be present and contain the default CRL URL.

" } }, - "documentation":"

Contains configuration information for a certificate revocation list (CRL). Your private certificate authority (CA) creates base CRLs. Delta CRLs are not supported. You can enable CRLs for your new or an existing private CA by setting the Enabled parameter to true. Your private CA writes CRLs to an S3 bucket that you specify in the S3BucketName parameter. You can hide the name of your bucket by specifying a value for the CustomCname parameter. Your private CA copies the CNAME or the S3 bucket name to the CRL Distribution Points extension of each certificate it issues. Your S3 bucket policy must give write permission to Amazon Web Services Private CA.

Amazon Web Services Private CA assets that are stored in Amazon S3 can be protected with encryption. For more information, see Encrypting Your CRLs.

Your private CA uses the value in the ExpirationInDays parameter to calculate the nextUpdate field in the CRL. The CRL is refreshed prior to a certificate's expiration date or when a certificate is revoked. When a certificate is revoked, it appears in the CRL until the certificate expires, and then in one additional CRL after expiration, and it always appears in the audit report.

A CRL is typically updated approximately 30 minutes after a certificate is revoked. If for any reason a CRL update fails, Amazon Web Services Private CA makes further attempts every 15 minutes.

CRLs contain the following fields:

Certificate revocation lists created by Amazon Web Services Private CA are DER-encoded. You can use the following OpenSSL command to list a CRL.

openssl crl -inform DER -text -in crl_path -noout

For more information, see Planning a certificate revocation list (CRL) in the Amazon Web Services Private Certificate Authority User Guide

" + "documentation":"

Contains configuration information for a certificate revocation list (CRL). Your private certificate authority (CA) creates base CRLs. Delta CRLs are not supported. You can enable CRLs for your new or an existing private CA by setting the Enabled parameter to true. Your private CA writes CRLs to an S3 bucket that you specify in the S3BucketName parameter. You can hide the name of your bucket by specifying a value for the CustomCname parameter. Your private CA by default copies the CNAME or the S3 bucket name to the CRL Distribution Points extension of each certificate it issues. If you want to configure this default behavior to be something different, you can set the CrlDistributionPointExtensionConfiguration parameter. Your S3 bucket policy must give write permission to Amazon Web Services Private CA.

Amazon Web Services Private CA assets that are stored in Amazon S3 can be protected with encryption. For more information, see Encrypting Your CRLs.

Your private CA uses the value in the ExpirationInDays parameter to calculate the nextUpdate field in the CRL. The CRL is refreshed prior to a certificate's expiration date or when a certificate is revoked. When a certificate is revoked, it appears in the CRL until the certificate expires, and then in one additional CRL after expiration, and it always appears in the audit report.

A CRL is typically updated approximately 30 minutes after a certificate is revoked. If for any reason a CRL update fails, Amazon Web Services Private CA makes further attempts every 15 minutes.

CRLs contain the following fields:

Certificate revocation lists created by Amazon Web Services Private CA are DER-encoded. You can use the following OpenSSL command to list a CRL.

openssl crl -inform DER -text -in crl_path -noout

For more information, see Planning a certificate revocation list (CRL) in the Amazon Web Services Private Certificate Authority User Guide

" + }, + "CrlDistributionPointExtensionConfiguration":{ + "type":"structure", + "required":["OmitExtension"], + "members":{ + "OmitExtension":{ + "shape":"Boolean", + "documentation":"

Configures whether the CRL Distribution Point extension should be populated with the default URL to the CRL. If set to true, then the CDP extension will not be present in any certificates issued by that CA unless otherwise specified through CSR or API passthrough.

Only set this if you have another way to distribute the CRL Distribution Points ffor certificates issued by your CA, such as the Matter Distributed Compliance Ledger

This configuration cannot be enabled with a custom CNAME set.

", + "box":true + } + }, + "documentation":"

Contains configuration information for the default behavior of the CRL Distribution Point (CDP) extension in certificates issued by your CA. This extension contains a link to download the CRL, so you can check whether a certificate has been revoked. To choose whether you want this extension omitted or not in certificates issued by your CA, you can set the OmitExtension parameter.

" }, "CsrBlob":{ "type":"blob", @@ -927,7 +943,7 @@ "CustomAttributeList":{ "type":"list", "member":{"shape":"CustomAttribute"}, - "max":30, + "max":150, "min":1 }, "CustomExtension":{ @@ -956,7 +972,7 @@ "CustomExtensionList":{ "type":"list", "member":{"shape":"CustomExtension"}, - "max":20, + "max":150, "min":1 }, "CustomObjectIdentifier":{ @@ -1185,7 +1201,7 @@ "GeneralNameList":{ "type":"list", "member":{"shape":"GeneralName"}, - "max":20, + "max":150, "min":1 }, "GetCertificateAuthorityCertificateRequest":{ @@ -1494,7 +1510,7 @@ }, "MaxResults":{ "shape":"MaxResults", - "documentation":"

Use this parameter when paginating results to specify the maximum number of items to return in the response on each page. If additional items exist beyond the number you specify, the NextToken element is sent in the response. Use this NextToken value in a subsequent request to retrieve additional items.

" + "documentation":"

Use this parameter when paginating results to specify the maximum number of items to return in the response on each page. If additional items exist beyond the number you specify, the NextToken element is sent in the response. Use this NextToken value in a subsequent request to retrieve additional items.

Although the maximum value is 1000, the action only returns a maximum of 100 items.

" }, "ResourceOwner":{ "shape":"ResourceOwner", @@ -1608,7 +1624,7 @@ }, "NextToken":{ "type":"string", - "max":500, + "max":43739, "min":1 }, "OcspConfiguration":{ diff --git a/botocore/data/acm-pca/2017-08-22/waiters-2.json b/botocore/data/acm-pca/2017-08-22/waiters-2.json index 79bf399b99..245186cadf 100644 --- a/botocore/data/acm-pca/2017-08-22/waiters-2.json +++ b/botocore/data/acm-pca/2017-08-22/waiters-2.json @@ -22,7 +22,7 @@ "CertificateIssued": { "description": "Wait until a certificate is issued", "operation": "GetCertificate", - "delay": 3, + "delay": 1, "maxAttempts": 60, "acceptors": [ { diff --git a/botocore/data/lightsail/2016-11-28/service-2.json b/botocore/data/lightsail/2016-11-28/service-2.json index e3a459b53d..ea9d9a766f 100644 --- a/botocore/data/lightsail/2016-11-28/service-2.json +++ b/botocore/data/lightsail/2016-11-28/service-2.json @@ -3832,6 +3832,10 @@ "supportedAppCategories":{ "shape":"AppCategoryList", "documentation":"

Virtual computer blueprints that are supported by a Lightsail for Research bundle.

This parameter only applies to Lightsail for Research resources.

" + }, + "publicIpv4AddressCount":{ + "shape":"integer", + "documentation":"

An integer that indicates the public ipv4 address count included in the bundle, the value is either 0 or 1.

" } }, "documentation":"

Describes a bundle, which is a set of specs describing your virtual private server (or instance).

" @@ -8849,6 +8853,10 @@ "shape":"IpAddress", "documentation":"

The public IP address of the Amazon Lightsail instance.

" }, + "ipv6Addresses":{ + "shape":"Ipv6AddressList", + "documentation":"

The IPv6 address of the Amazon Lightsail instance.

" + }, "password":{ "shape":"string", "documentation":"

For RDP access, the password for your Amazon Lightsail instance. Password will be an empty string if the password for your new instance is not ready yet. When you create an instance, it can take up to 15 minutes for the instance to be ready.

If you create an instance using any key pair other than the default (LightsailDefaultKeyPair), password will always be an empty string.

If you change the Administrator password on the instance, Lightsail will continue to return the original password value. When accessing the instance using RDP, you need to manually enter the Administrator password after changing it from the default.

" From 210791f265b4af1c7b673cfc71b22d4a8370f774 Mon Sep 17 00:00:00 2001 From: jonathan343 Date: Fri, 26 Jan 2024 16:57:16 +0000 Subject: [PATCH 2/2] Bumping version to 1.34.27 --- .changes/1.34.27.json | 12 ++++++++++++ .changes/next-release/api-change-acmpca-75265.json | 5 ----- .../next-release/api-change-lightsail-75457.json | 5 ----- CHANGELOG.rst | 7 +++++++ botocore/__init__.py | 2 +- docs/source/conf.py | 2 +- 6 files changed, 21 insertions(+), 12 deletions(-) create mode 100644 .changes/1.34.27.json delete mode 100644 .changes/next-release/api-change-acmpca-75265.json delete mode 100644 .changes/next-release/api-change-lightsail-75457.json diff --git a/.changes/1.34.27.json b/.changes/1.34.27.json new file mode 100644 index 0000000000..714df0b502 --- /dev/null +++ b/.changes/1.34.27.json @@ -0,0 +1,12 @@ +[ + { + "category": "``acm-pca``", + "description": "AWS Private CA now supports an option to omit the CDP extension from issued certificates, when CRL revocation is enabled.", + "type": "api-change" + }, + { + "category": "``lightsail``", + "description": "This release adds support for IPv6-only instance plans.", + "type": "api-change" + } +] \ No newline at end of file diff --git a/.changes/next-release/api-change-acmpca-75265.json b/.changes/next-release/api-change-acmpca-75265.json deleted file mode 100644 index 44963bc66a..0000000000 --- a/.changes/next-release/api-change-acmpca-75265.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "type": "api-change", - "category": "``acm-pca``", - "description": "AWS Private CA now supports an option to omit the CDP extension from issued certificates, when CRL revocation is enabled." -} diff --git a/.changes/next-release/api-change-lightsail-75457.json b/.changes/next-release/api-change-lightsail-75457.json deleted file mode 100644 index 96b25106a7..0000000000 --- a/.changes/next-release/api-change-lightsail-75457.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "type": "api-change", - "category": "``lightsail``", - "description": "This release adds support for IPv6-only instance plans." -} diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 76c72edc57..53f07fc547 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -2,6 +2,13 @@ CHANGELOG ========= +1.34.27 +======= + +* api-change:``acm-pca``: AWS Private CA now supports an option to omit the CDP extension from issued certificates, when CRL revocation is enabled. +* api-change:``lightsail``: This release adds support for IPv6-only instance plans. + + 1.34.26 ======= diff --git a/botocore/__init__.py b/botocore/__init__.py index 28cad4e0e2..1bfd09b3ec 100644 --- a/botocore/__init__.py +++ b/botocore/__init__.py @@ -16,7 +16,7 @@ import os import re -__version__ = '1.34.26' +__version__ = '1.34.27' class NullHandler(logging.Handler): diff --git a/docs/source/conf.py b/docs/source/conf.py index 95d4374c8b..cb84826a5a 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -59,7 +59,7 @@ # The short X.Y version. version = '1.34.' # The full version, including alpha/beta/rc tags. -release = '1.34.26' +release = '1.34.27' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages.