Merge branch 'release-1.21.54'

* release-1.21.54:
  Bumping version to 1.21.54
  Update to latest models
  add outpost presigned_url test (#2513)

.changes/1.21.54.json

@@ -0,0 +1,17 @@
+[
+  {
+    "category": "``codebuild``",
+    "description": "CodeBuild now allows you to select how batch build statuses are sent to the source provider for a project.",
+    "type": "api-change"
+  },
+  {
+    "category": "``efs``",
+    "description": "Update efs client to latest version",
+    "type": "api-change"
+  },
+  {
+    "category": "``kms``",
+    "description": "Added SDK examples for ConnectCustomKeyStore, CreateCustomKeyStore, CreateKey, DeleteCustomKeyStore, DescribeCustomKeyStores, DisconnectCustomKeyStore, GenerateDataKeyPair, GenerateDataKeyPairWithoutPlaintext, GetPublicKey, ReplicateKey, Sign, UpdateCustomKeyStore and Verify APIs",
+    "type": "api-change"
+  }
+]

CHANGELOG.rst

@@ -2,6 +2,14 @@
 CHANGELOG
 =========
 
+1.21.54
+=======
+
+* api-change:``codebuild``: CodeBuild now allows you to select how batch build statuses are sent to the source provider for a project.
+* api-change:``efs``: Update efs client to latest version
+* api-change:``kms``: Added SDK examples for ConnectCustomKeyStore, CreateCustomKeyStore, CreateKey, DeleteCustomKeyStore, DescribeCustomKeyStores, DisconnectCustomKeyStore, GenerateDataKeyPair, GenerateDataKeyPairWithoutPlaintext, GetPublicKey, ReplicateKey, Sign, UpdateCustomKeyStore and Verify APIs
+
+
 1.21.53
 =======
 

botocore/__init__.py

@@ -16,7 +16,7 @@
 import re
 import logging
 
-__version__ = '1.21.53'
+__version__ = '1.21.54'
 
 
 class NullHandler(logging.Handler):

botocore/data/codebuild/2016-10-06/service-2.json

@@ -804,6 +804,13 @@
         }
       }
     },
+    "BatchReportModeType":{
+      "type":"string",
+      "enum":[
+        "REPORT_INDIVIDUAL_BUILDS",
+        "REPORT_AGGREGATED_BATCH"
+      ]
+    },
     "BatchRestrictions":{
       "type":"structure",
       "members":{
@@ -2234,7 +2241,7 @@
         },
         "sortOrder":{
           "shape":"SortOrderType",
-          "documentation":"<p>The order to list results in. The results are sorted by build number, not the build identifier.</p> <p>Valid values include:</p> <ul> <li> <p> <code>ASCENDING</code>: List the build IDs in ascending order by build ID.</p> </li> <li> <p> <code>DESCENDING</code>: List the build IDs in descending order by build ID.</p> </li> </ul> <p>If the project has more than 100 builds, setting the sort order will result in an error. </p>"
+          "documentation":"<p>The order to sort the results in. The results are sorted by build number, not the build identifier. If this is not specified, the results are sorted in descending order.</p> <p>Valid values include:</p> <ul> <li> <p> <code>ASCENDING</code>: List the build identifiers in ascending order, by build number.</p> </li> <li> <p> <code>DESCENDING</code>: List the build identifiers in descending order, by build number.</p> </li> </ul> <p>If the project has more than 100 builds, setting the sort order will result in an error. </p>"
         },
         "nextToken":{
           "shape":"String",
@@ -2247,7 +2254,7 @@
       "members":{
         "ids":{
           "shape":"BuildIds",
-          "documentation":"<p>A list of build IDs for the specified build project, with each build ID representing a single build.</p>"
+          "documentation":"<p>A list of build identifiers for the specified build project, with each build ID representing a single build.</p>"
         },
         "nextToken":{
           "shape":"String",
@@ -2842,6 +2849,10 @@
         "timeoutInMins":{
           "shape":"WrapperInt",
           "documentation":"<p>Specifies the maximum amount of time, in minutes, that the batch build must be completed in.</p>"
+        },
+        "batchReportMode":{
+          "shape":"BatchReportModeType",
+          "documentation":"<p>Specifies how build status reports are sent to the source provider for the batch build. This property is only used when the source provider for your project is Bitbucket, GitHub, or GitHub Enterprise, and your project is configured to report build statuses to the source provider.</p> <dl> <dt>REPORT_AGGREGATED_BATCH</dt> <dd> <p>(Default) Aggregate all of the build statuses into a single status report.</p> </dd> <dt>REPORT_INDIVIDUAL_BUILDS</dt> <dd> <p>Send a separate status report for each individual build.</p> </dd> </dl>"
         }
       },
       "documentation":"<p>Contains configuration information about a batch build project.</p>"
@@ -4042,7 +4053,7 @@
         },
         "secondaryArtifacts":{
           "shape":"ProjectArtifactsList",
-          "documentation":"<p> An array of <code>ProjectSource</code> objects. </p>"
+          "documentation":"<p> An array of <code>ProjectArtifact</code> objects. </p>"
         },
         "cache":{
           "shape":"ProjectCache",

botocore/data/efs/2015-02-01/service-2.json

@@ -367,6 +367,7 @@
       "input":{"shape":"PutAccountPreferencesRequest"},
       "output":{"shape":"PutAccountPreferencesResponse"},
       "errors":[
+        {"shape":"BadRequest"},
         {"shape":"InternalServerError"}
       ],
       "documentation":"<p>Use this operation to set the account preference in the current Amazon Web Services Region to use either long 17 character (63 bit) or short 8 character (32 bit) IDs for new EFS file systems and mount targets created. All existing resource IDs are not affected by any changes you make. You can set the ID preference during the opt-in period as EFS transitions to long resource IDs. For more information, see <a href=\"efs/latest/ug/manage-efs-resource-ids.html\">Managing Amazon EFS resource IDs</a>.</p>"

botocore/data/kms/2014-11-01/service-2.json

@@ -829,7 +829,7 @@
         {"shape":"CloudHsmClusterNotActiveException"},
         {"shape":"CloudHsmClusterInvalidConfigurationException"}
       ],
-      "documentation":"<p>Changes the properties of a custom key store. Use the <code>CustomKeyStoreId</code> parameter to identify the custom key store you want to edit. Use the remaining parameters to change the properties of the custom key store.</p> <p>You can only update a custom key store that is disconnected. To disconnect the custom key store, use <a>DisconnectCustomKeyStore</a>. To reconnect the custom key store after the update completes, use <a>ConnectCustomKeyStore</a>. To find the connection state of a custom key store, use the <a>DescribeCustomKeyStores</a> operation.</p> <p>Use the parameters of <code>UpdateCustomKeyStore</code> to edit your keystore settings.</p> <ul> <li> <p>Use the <b>NewCustomKeyStoreName</b> parameter to change the friendly name of the custom key store to the value that you specify.</p> <p> </p> </li> <li> <p>Use the <b>KeyStorePassword</b> parameter tell KMS the current password of the <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/key-store-concepts.html#concept-kmsuser\"> <code>kmsuser</code> crypto user (CU)</a> in the associated CloudHSM cluster. You can use this parameter to <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/fix-keystore.html#fix-keystore-password\">fix connection failures</a> that occur when KMS cannot log into the associated cluster because the <code>kmsuser</code> password has changed. This value does not change the password in the CloudHSM cluster.</p> <p> </p> </li> <li> <p>Use the <b>CloudHsmClusterId</b> parameter to associate the custom key store with a different, but related, CloudHSM cluster. You can use this parameter to repair a custom key store if its CloudHSM cluster becomes corrupted or is deleted, or when you need to create or restore a cluster from a backup. </p> </li> </ul> <p>If the operation succeeds, it returns a JSON object with no properties.</p> <p>This operation is part of the <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/custom-key-store-overview.html\">Custom Key Store feature</a> feature in KMS, which combines the convenience and extensive integration of KMS with the isolation and control of a single-tenant key store.</p> <p> <b>Cross-account use</b>: No. You cannot perform this operation on a custom key store in a different Amazon Web Services account. </p> <p> <b>Required permissions</b>: <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/kms-api-permissions-reference.html\">kms:UpdateCustomKeyStore</a> (IAM policy)</p> <p> <b>Related operations:</b> </p> <ul> <li> <p> <a>ConnectCustomKeyStore</a> </p> </li> <li> <p> <a>CreateCustomKeyStore</a> </p> </li> <li> <p> <a>DeleteCustomKeyStore</a> </p> </li> <li> <p> <a>DescribeCustomKeyStores</a> </p> </li> <li> <p> <a>DisconnectCustomKeyStore</a> </p> </li> </ul>"
+      "documentation":"<p>Changes the properties of a custom key store. Use the <code>CustomKeyStoreId</code> parameter to identify the custom key store you want to edit. Use the remaining parameters to change the properties of the custom key store.</p> <p>You can only update a custom key store that is disconnected. To disconnect the custom key store, use <a>DisconnectCustomKeyStore</a>. To reconnect the custom key store after the update completes, use <a>ConnectCustomKeyStore</a>. To find the connection state of a custom key store, use the <a>DescribeCustomKeyStores</a> operation.</p> <p>The <code>CustomKeyStoreId</code> parameter is required in all commands. Use the other parameters of <code>UpdateCustomKeyStore</code> to edit your key store settings.</p> <ul> <li> <p>Use the <code>NewCustomKeyStoreName</code> parameter to change the friendly name of the custom key store to the value that you specify.</p> <p> </p> </li> <li> <p>Use the <code>KeyStorePassword</code> parameter tell KMS the current password of the <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/key-store-concepts.html#concept-kmsuser\"> <code>kmsuser</code> crypto user (CU)</a> in the associated CloudHSM cluster. You can use this parameter to <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/fix-keystore.html#fix-keystore-password\">fix connection failures</a> that occur when KMS cannot log into the associated cluster because the <code>kmsuser</code> password has changed. This value does not change the password in the CloudHSM cluster.</p> <p> </p> </li> <li> <p>Use the <code>CloudHsmClusterId</code> parameter to associate the custom key store with a different, but related, CloudHSM cluster. You can use this parameter to repair a custom key store if its CloudHSM cluster becomes corrupted or is deleted, or when you need to create or restore a cluster from a backup. </p> </li> </ul> <p>If the operation succeeds, it returns a JSON object with no properties.</p> <p>This operation is part of the <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/custom-key-store-overview.html\">Custom Key Store feature</a> feature in KMS, which combines the convenience and extensive integration of KMS with the isolation and control of a single-tenant key store.</p> <p> <b>Cross-account use</b>: No. You cannot perform this operation on a custom key store in a different Amazon Web Services account. </p> <p> <b>Required permissions</b>: <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/kms-api-permissions-reference.html\">kms:UpdateCustomKeyStore</a> (IAM policy)</p> <p> <b>Related operations:</b> </p> <ul> <li> <p> <a>ConnectCustomKeyStore</a> </p> </li> <li> <p> <a>CreateCustomKeyStore</a> </p> </li> <li> <p> <a>DeleteCustomKeyStore</a> </p> </li> <li> <p> <a>DescribeCustomKeyStores</a> </p> </li> <li> <p> <a>DisconnectCustomKeyStore</a> </p> </li> </ul>"
     },
     "UpdateKeyDescription":{
       "name":"UpdateKeyDescription",

docs/source/conf.py

@@ -54,7 +54,7 @@
 # The short X.Y version.
 version = '1.21.'
 # The full version, including alpha/beta/rc tags.
-release = '1.21.53'
+release = '1.21.54'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

tests/functional/test_s3.py

@@ -778,6 +778,17 @@ def test_basic_outpost_arn(self):
         )
         self.assert_endpoint(request, expected_endpoint)
 
+    def test_outpost_arn_presigned_url(self):
+        outpost_arn = (
+            'arn:aws:s3-outposts:us-west-2:123456789012:outpost/'
+            'op-01234567890123456/accesspoint/myaccesspoint'
+        )
+        expected_url = (
+            'myaccesspoint-123456789012.op-01234567890123456.'
+            's3-outposts.us-west-2.amazonaws.com'
+        )
+        self._assert_presigned_url(outpost_arn, 'us-west-2', expected_url)
+
     def test_outpost_arn_with_s3_accelerate(self):
         outpost_arn = (
             'arn:aws:s3-outposts:us-west-2:123456789012:outpost:'
@@ -1118,7 +1129,7 @@ def _assert_mrap_config_failure(self, arn, region, config):
                 UnsupportedS3AccesspointConfigurationError):
             self.client.list_objects(Bucket=arn)
 
-    def _assert_mrap_presigned_url(
+    def _assert_presigned_url(
         self, arn, region, expected, endpoint_url=None, config=None
     ):
         self.client, self.http_stubber = self.create_stubbed_s3_client(
@@ -1129,6 +1140,17 @@ def _assert_mrap_presigned_url(
         )
         url_parts = urlsplit(presigned_url)
         self.assertEqual(url_parts.netloc, expected)
+
+    def _assert_mrap_presigned_url(
+        self, arn, region, expected, endpoint_url=None, config=None
+    ):
+        self.client, self.http_stubber = self.create_stubbed_s3_client(
+            region_name=region, endpoint_url=endpoint_url, config=config)
+        presigned_url = self.client.generate_presigned_url(
+            'get_object',
+            Params={'Bucket': arn, 'Key': 'test_object'}
+        )
+        url_parts = urlsplit(presigned_url)
         # X-Amz-Region-Set header MUST be * (percent-encoded as %2A) for MRAPs
         self.assertIn('X-Amz-Region-Set=%2A', url_parts.query)