Merge branch 'release-1.40.26' into develop

* release-1.40.26:
  Bumping version to 1.40.26
  Update endpoints model
  Update to latest models

Author: aws-sdk-python-automation

.changes/1.40.26.json

@@ -0,0 +1,17 @@
+[
+  {
+    "category": "``iotsitewise``",
+    "description": "Add ComputationModelVersion support in IoT SiteWise APIs",
+    "type": "api-change"
+  },
+  {
+    "category": "``s3``",
+    "description": "This release includes backward compatibility work on the \"Expires\" parameter.",
+    "type": "api-change"
+  },
+  {
+    "category": "``securityhub``",
+    "description": "This release adds the RESOURCE_NOT_FOUND error code as a possible value in responses to the following operations: BatchGetStandardsControlAssociations, BatchUpdateStandardsControlAssociations, and BatchGetSecurityControls.",
+    "type": "api-change"
+  }
+]

CHANGELOG.rst

@@ -2,6 +2,14 @@
 CHANGELOG
 =========
 
+1.40.26
+=======
+
+* api-change:``iotsitewise``: Add ComputationModelVersion support in IoT SiteWise APIs
+* api-change:``s3``: This release includes backward compatibility work on the "Expires" parameter.
+* api-change:``securityhub``: This release adds the RESOURCE_NOT_FOUND error code as a possible value in responses to the following operations: BatchGetStandardsControlAssociations, BatchUpdateStandardsControlAssociations, and BatchGetSecurityControls.
+
+
 1.40.25
 =======
 

botocore/__init__.py

@@ -17,7 +17,7 @@
 import re
 from logging import NullHandler
 
-__version__ = '1.40.25'
+__version__ = '1.40.26'
 
 
 # Configure default logger to do nothing

botocore/data/endpoints.json

@@ -14050,6 +14050,7 @@
           "ap-south-2" : { },
           "ap-southeast-1" : { },
           "ap-southeast-2" : { },
+          "ap-southeast-5" : { },
           "ca-central-1" : { },
           "eu-central-1" : { },
           "eu-north-1" : { },
@@ -22620,6 +22621,7 @@
           "ap-southeast-3" : { },
           "ap-southeast-4" : { },
           "ap-southeast-5" : { },
+          "ap-southeast-6" : { },
           "ap-southeast-7" : { },
           "ca-central-1" : { },
           "ca-west-1" : { },
@@ -39649,6 +39651,7 @@
       },
       "compute-optimizer" : {
         "endpoints" : {
+          "us-isof-east-1" : { },
           "us-isof-south-1" : {
             "credentialScope" : {
               "region" : "us-isof-south-1"

botocore/data/iotsitewise/2019-12-02/service-2.json

@@ -174,7 +174,7 @@
         {"shape":"ThrottlingException"},
         {"shape":"LimitExceededException"}
       ],
-      "documentation":"<p>Creates an access policy that grants the specified identity (IAM Identity Center user, IAM Identity Center group, or IAM user) access to the specified IoT SiteWise Monitor portal or project resource.</p>",
+      "documentation":"<p>Creates an access policy that grants the specified identity (IAM Identity Center user, IAM Identity Center group, or IAM user) access to the specified IoT SiteWise Monitor portal or project resource.</p> <note> <p>Support for access policies that use an SSO Group as the identity is not supported at this time.</p> </note>",
       "endpoint":{"hostPrefix":"monitor."}
     },
     "CreateAsset":{
@@ -4325,6 +4325,10 @@
       "type":"string",
       "enum":["ANOMALY_DETECTION"]
     },
+    "ComputationModelVersionFilter":{
+      "type":"string",
+      "pattern":"^(LATEST|ACTIVE|[1-9]{1}\\d{0,9})$"
+    },
     "ComputeLocation":{
       "type":"string",
       "enum":[
@@ -6414,6 +6418,12 @@
           "documentation":"<p>The ID of the computation model.</p>",
           "location":"uri",
           "locationName":"computationModelId"
+        },
+        "computationModelVersion":{
+          "shape":"ComputationModelVersionFilter",
+          "documentation":"<p>The version of the computation model.</p>",
+          "location":"querystring",
+          "locationName":"computationModelVersion"
         }
       }
     },
@@ -7317,7 +7327,7 @@
         },
         "maxResults":{
           "shape":"ExecuteQueryMaxResults",
-          "documentation":"<p>The maximum number of results to return at one time.</p> <ul> <li> <p>Minimum is 1</p> </li> <li> <p>Maximum is 20000</p> </li> <li> <p>Default is 250</p> </li> </ul>"
+          "documentation":"<p>The maximum number of results to return at one time.</p> <ul> <li> <p>Minimum is 1</p> </li> <li> <p>Maximum is 20000</p> </li> <li> <p>Default is 20000</p> </li> </ul>"
         },
         "clientToken":{
           "shape":"ClientToken",

botocore/data/s3/2006-03-01/service-2.json

@@ -4309,7 +4309,7 @@
       "type":"boolean",
       "box":true
     },
-    "Expires":{"type":"timestamp"},
+    "Expires":{"type":"string"},
     "ExposeHeader":{"type":"string"},
     "ExposeHeaders":{
       "type":"list",
@@ -10773,7 +10773,7 @@
       "members":{
         "Payload":{
           "shape":"Body",
-          "documentation":"<p>The byte array of partial, one or more result records. S3 Select doesn't guarantee that a record will be self-contained in one record frame. To ensure continuous streaming of data, S3 Select might split the same record across multiple record frames instead of aggregating the results in memory. Some S3 clients (for example, the SDKforJava) handle this behavior by creating a <code>ByteStream</code> out of the response by default. Other clients might not handle this behavior by default. In those cases, you must aggregate the results on the client side and parse the response.</p>",
+          "documentation":"<p>The byte array of partial, one or more result records. S3 Select doesn't guarantee that a record will be self-contained in one record frame. To ensure continuous streaming of data, S3 Select might split the same record across multiple record frames instead of aggregating the results in memory. Some S3 clients (for example, the SDK for Java) handle this behavior by creating a <code>ByteStream</code> out of the response by default. Other clients might not handle this behavior by default. In those cases, you must aggregate the results on the client side and parse the response.</p>",
           "eventpayload":true
         }
       },

botocore/data/securityhub/2018-10-26/service-2.json

@@ -24009,6 +24009,7 @@
         "INVALID_INPUT",
         "ACCESS_DENIED",
         "NOT_FOUND",
+        "RESOURCE_NOT_FOUND",
         "LIMIT_EXCEEDED"
       ]
     },

docs/source/conf.py

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