Merge branch 'release-1.35.18' into develop

* release-1.35.18:
  Bumping version to 1.35.18
  Update to latest models
  Merge customizations for Glue

.changes/1.35.18.json

@@ -0,0 +1,42 @@
+[
+  {
+    "category": "``cognito-idp``",
+    "description": "Added email MFA option to user pools with advanced security features.",
+    "type": "api-change"
+  },
+  {
+    "category": "``elbv2``",
+    "description": "Correct incorrectly mapped error in ELBv2 waiters",
+    "type": "api-change"
+  },
+  {
+    "category": "``emr``",
+    "description": "Update APIs to allow modification of ODCR options, allocation strategy, and InstanceTypeConfigs on running InstanceFleet clusters.",
+    "type": "api-change"
+  },
+  {
+    "category": "``glue``",
+    "description": "AWS Glue is introducing two new optimizers for Apache Iceberg tables: snapshot retention and orphan file deletion. Customers can enable these optimizers and customize their configurations to perform daily maintenance tasks on their Iceberg tables based on their specific requirements.",
+    "type": "api-change"
+  },
+  {
+    "category": "``mediaconvert``",
+    "description": "This release includes support for dynamic video overlay workflows, including picture-in-picture and squeezeback",
+    "type": "api-change"
+  },
+  {
+    "category": "``rds``",
+    "description": "This release adds support for the os-upgrade pending maintenance action for Amazon Aurora DB clusters.",
+    "type": "api-change"
+  },
+  {
+    "category": "``storagegateway``",
+    "description": "The S3 File Gateway now supports DSSE-KMS encryption. A new parameter EncryptionType is added to these APIs: CreateSmbFileShare, CreateNfsFileShare, UpdateSmbFileShare, UpdateNfsFileShare, DescribeSmbFileShares, DescribeNfsFileShares. Also, in favor of EncryptionType, KmsEncrypted is deprecated.",
+    "type": "api-change"
+  },
+  {
+    "category": "``synthetics``",
+    "description": "This release introduces two features. The first is tag replication, which allows for the propagation of canary tags onto Synthetics related resources, such as Lambda functions. The second is a limit increase in canary name length, which has now been increased from 21 to 255 characters.",
+    "type": "api-change"
+  }
+]

CHANGELOG.rst

@@ -2,6 +2,19 @@
 CHANGELOG
 =========
 
+1.35.18
+=======
+
+* api-change:``cognito-idp``: Added email MFA option to user pools with advanced security features.
+* api-change:``elbv2``: Correct incorrectly mapped error in ELBv2 waiters
+* api-change:``emr``: Update APIs to allow modification of ODCR options, allocation strategy, and InstanceTypeConfigs on running InstanceFleet clusters.
+* api-change:``glue``: AWS Glue is introducing two new optimizers for Apache Iceberg tables: snapshot retention and orphan file deletion. Customers can enable these optimizers and customize their configurations to perform daily maintenance tasks on their Iceberg tables based on their specific requirements.
+* api-change:``mediaconvert``: This release includes support for dynamic video overlay workflows, including picture-in-picture and squeezeback
+* api-change:``rds``: This release adds support for the os-upgrade pending maintenance action for Amazon Aurora DB clusters.
+* api-change:``storagegateway``: The S3 File Gateway now supports DSSE-KMS encryption. A new parameter EncryptionType is added to these APIs: CreateSmbFileShare, CreateNfsFileShare, UpdateSmbFileShare, UpdateNfsFileShare, DescribeSmbFileShares, DescribeNfsFileShares. Also, in favor of EncryptionType, KmsEncrypted is deprecated.
+* api-change:``synthetics``: This release introduces two features. The first is tag replication, which allows for the propagation of canary tags onto Synthetics related resources, such as Lambda functions. The second is a limit increase in canary name length, which has now been increased from 21 to 255 characters.
+
+
 1.35.17
 =======
 

botocore/__init__.py

@@ -16,7 +16,7 @@
 import os
 import re
 
-__version__ = '1.35.17'
+__version__ = '1.35.18'
 
 
 class NullHandler(logging.Handler):

botocore/data/elbv2/2015-12-01/waiters-2.json

@@ -13,7 +13,7 @@
         },
         {
           "matcher": "error",
-          "expected": "LoadBalancerNotFoundException",
+          "expected": "LoadBalancerNotFound",
           "state": "retry"
         }
       ]
@@ -38,7 +38,7 @@
         {
           "state": "retry",
           "matcher": "error",
-          "expected": "LoadBalancerNotFoundException"
+          "expected": "LoadBalancerNotFound"
         }
       ]
     },
@@ -55,7 +55,7 @@
         },
         {
           "matcher": "error",
-          "expected": "LoadBalancerNotFoundException",
+          "expected": "LoadBalancerNotFound",
           "state": "success"
         }
       ]

botocore/data/emr/2009-03-31/service-2.json

@@ -2529,6 +2529,10 @@
         "ResizeSpecifications":{
           "shape":"InstanceFleetResizingSpecifications",
           "documentation":"<p>The resize specification for the instance fleet.</p>"
+        },
+        "InstanceTypeConfigs":{
+          "shape":"InstanceTypeConfigList",
+          "documentation":"<p>An array of InstanceTypeConfig objects that specify how Amazon EMR provisions Amazon EC2 instances when it fulfills On-Demand and Spot capacities. For more information, see <a href=\"https://docs.aws.amazon.com/emr/latest/APIReference/API_InstanceTypeConfig.html\">InstanceTypeConfig</a>.</p>"
         }
       },
       "documentation":"<p>Configuration parameters for an instance fleet modification request.</p> <note> <p>The instance fleet configuration is available only in Amazon EMR releases 4.8.0 and later, excluding 5.0.x versions.</p> </note>"
@@ -2538,25 +2542,25 @@
       "members":{
         "SpotSpecification":{
           "shape":"SpotProvisioningSpecification",
-          "documentation":"<p>The launch specification for Spot instances in the fleet, which determines the defined duration, provisioning timeout behavior, and allocation strategy.</p>"
+          "documentation":"<p>The launch specification for Spot instances in the fleet, which determines the allocation strategy, defined duration, and provisioning timeout behavior.</p>"
         },
         "OnDemandSpecification":{
           "shape":"OnDemandProvisioningSpecification",
-          "documentation":"<p> The launch specification for On-Demand Instances in the instance fleet, which determines the allocation strategy. </p> <note> <p>The instance fleet configuration is available only in Amazon EMR releases 4.8.0 and later, excluding 5.0.x versions. On-Demand Instances allocation strategy is available in Amazon EMR releases 5.12.1 and later.</p> </note>"
+          "documentation":"<p> The launch specification for On-Demand Instances in the instance fleet, which determines the allocation strategy and capacity reservation options.</p> <note> <p>The instance fleet configuration is available only in Amazon EMR releases 4.8.0 and later, excluding 5.0.x versions. On-Demand Instances allocation strategy is available in Amazon EMR releases 5.12.1 and later.</p> </note>"
         }
       },
-      "documentation":"<p>The launch specification for Spot Instances in the fleet, which determines the defined duration, provisioning timeout behavior, and allocation strategy.</p> <note> <p>The instance fleet configuration is available only in Amazon EMR releases 4.8.0 and later, excluding 5.0.x versions. On-Demand and Spot instance allocation strategies are available in Amazon EMR releases 5.12.1 and later.</p> </note>"
+      "documentation":"<p>The launch specification for On-Demand and Spot Instances in the fleet.</p> <note> <p>The instance fleet configuration is available only in Amazon EMR releases 4.8.0 and later, excluding 5.0.x versions. On-Demand and Spot instance allocation strategies are available in Amazon EMR releases 5.12.1 and later.</p> </note>"
     },
     "InstanceFleetResizingSpecifications":{
       "type":"structure",
       "members":{
         "SpotResizeSpecification":{
           "shape":"SpotResizingSpecification",
-          "documentation":"<p>The resize specification for Spot Instances in the instance fleet, which contains the resize timeout period. </p>"
+          "documentation":"<p>The resize specification for Spot Instances in the instance fleet, which contains the allocation strategy and the resize timeout period. </p>"
         },
         "OnDemandResizeSpecification":{
           "shape":"OnDemandResizingSpecification",
-          "documentation":"<p>The resize specification for On-Demand Instances in the instance fleet, which contains the resize timeout period. </p>"
+          "documentation":"<p>The resize specification for On-Demand Instances in the instance fleet, which contains the allocation strategy, capacity reservation options, and the resize timeout period. </p>"
         }
       },
       "documentation":"<p>The resize specification for On-Demand and Spot Instances in the fleet.</p>"
@@ -4249,12 +4253,16 @@
     },
     "OnDemandResizingSpecification":{
       "type":"structure",
-      "required":["TimeoutDurationMinutes"],
       "members":{
         "TimeoutDurationMinutes":{
           "shape":"WholeNumber",
           "documentation":"<p>On-Demand resize timeout in minutes. If On-Demand Instances are not provisioned within this time, the resize workflow stops. The minimum value is 5 minutes, and the maximum value is 10,080 minutes (7 days). The timeout applies to all resize workflows on the Instance Fleet. The resize could be triggered by Amazon EMR Managed Scaling or by the customer (via Amazon EMR Console, Amazon EMR CLI modify-instance-fleet or Amazon EMR SDK ModifyInstanceFleet API) or by Amazon EMR due to Amazon EC2 Spot Reclamation.</p>"
-        }
+        },
+        "AllocationStrategy":{
+          "shape":"OnDemandProvisioningAllocationStrategy",
+          "documentation":"<p>Specifies the allocation strategy to use to launch On-Demand instances during a resize. The default is <code>lowest-price</code>.</p>"
+        },
+        "CapacityReservationOptions":{"shape":"OnDemandCapacityReservationOptions"}
       },
       "documentation":"<p>The resize specification for On-Demand Instances in the instance fleet, which contains the resize timeout period. </p>"
     },
@@ -5063,11 +5071,14 @@
     },
     "SpotResizingSpecification":{
       "type":"structure",
-      "required":["TimeoutDurationMinutes"],
       "members":{
         "TimeoutDurationMinutes":{
           "shape":"WholeNumber",
           "documentation":"<p>Spot resize timeout in minutes. If Spot Instances are not provisioned within this time, the resize workflow will stop provisioning of Spot instances. Minimum value is 5 minutes and maximum value is 10,080 minutes (7 days). The timeout applies to all resize workflows on the Instance Fleet. The resize could be triggered by Amazon EMR Managed Scaling or by the customer (via Amazon EMR Console, Amazon EMR CLI modify-instance-fleet or Amazon EMR SDK ModifyInstanceFleet API) or by Amazon EMR due to Amazon EC2 Spot Reclamation.</p>"
+        },
+        "AllocationStrategy":{
+          "shape":"SpotProvisioningAllocationStrategy",
+          "documentation":"<p>Specifies the allocation strategy to use to launch Spot instances during a resize. If you run Amazon EMR releases 6.9.0 or higher, the default is <code>price-capacity-optimized</code>. If you run Amazon EMR releases 6.8.0 or lower, the default is <code>capacity-optimized</code>.</p>"
         }
       },
       "documentation":"<p>The resize specification for Spot Instances in the instance fleet, which contains the resize timeout period. </p>"

botocore/data/glue/2017-03-31/paginators-1.json

@@ -148,6 +148,12 @@
       "limit_key": "MaxResults",
       "output_token": "NextToken",
       "result_key": "Workflows"
+    },
+    "ListTableOptimizerRuns": {
+      "input_token": "NextToken",
+      "limit_key": "MaxResults",
+      "output_token": "NextToken",
+      "result_key": "TableOptimizerRuns"
     }
   }
 }

botocore/data/glue/2017-03-31/paginators-1.sdk-extras.json

@@ -0,0 +1,14 @@
+{
+  "version": 1,
+  "merge": {
+    "pagination": {
+      "ListTableOptimizerRuns": {
+        "non_aggregate_keys": [
+          "CatalogId",
+          "DatabaseName",
+          "TableName"
+        ]
+      }
+    }
+  }
+}