Merge branch 'release-1.34.136' into develop

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

.changes/1.34.136.json

@@ -0,0 +1,47 @@
+[
+  {
+    "category": "``acm-pca``",
+    "description": "Added CCPC_LEVEL_1_OR_HIGHER KeyStorageSecurityStandard and SM2 KeyAlgorithm and SM3WITHSM2 SigningAlgorithm for China regions.",
+    "type": "api-change"
+  },
+  {
+    "category": "``cloudhsmv2``",
+    "description": "Added 3 new APIs to support backup sharing: GetResourcePolicy, PutResourcePolicy, and DeleteResourcePolicy. Added BackupArn to the output of the DescribeBackups API. Added support for BackupArn in the CreateCluster API.",
+    "type": "api-change"
+  },
+  {
+    "category": "``connect``",
+    "description": "This release supports showing PreferredAgentRouting step via DescribeContact API.",
+    "type": "api-change"
+  },
+  {
+    "category": "``emr``",
+    "description": "This release provides the support for new allocation strategies i.e. CAPACITY_OPTIMIZED_PRIORITIZED for Spot and PRIORITIZED for On-Demand by taking input of priority value for each instance type for instance fleet clusters.",
+    "type": "api-change"
+  },
+  {
+    "category": "``glue``",
+    "description": "Added AttributesToGet parameter to Glue GetDatabases, allowing caller to limit output to include only the database name.",
+    "type": "api-change"
+  },
+  {
+    "category": "``kinesisanalyticsv2``",
+    "description": "Support for Flink 1.19 in Managed Service for Apache Flink",
+    "type": "api-change"
+  },
+  {
+    "category": "``opensearch``",
+    "description": "This release removes support for enabling or disabling Natural Language Query Processing feature for Amazon OpenSearch Service domains.",
+    "type": "api-change"
+  },
+  {
+    "category": "``pi``",
+    "description": "Noting that the filter db.sql.db_id isn't available for RDS for SQL Server DB instances.",
+    "type": "api-change"
+  },
+  {
+    "category": "``workspaces``",
+    "description": "Added support for Red Hat Enterprise Linux 8 on Amazon WorkSpaces Personal.",
+    "type": "api-change"
+  }
+]

CHANGELOG.rst

@@ -2,6 +2,20 @@
 CHANGELOG
 =========
 
+1.34.136
+========
+
+* api-change:``acm-pca``: Added CCPC_LEVEL_1_OR_HIGHER KeyStorageSecurityStandard and SM2 KeyAlgorithm and SM3WITHSM2 SigningAlgorithm for China regions.
+* api-change:``cloudhsmv2``: Added 3 new APIs to support backup sharing: GetResourcePolicy, PutResourcePolicy, and DeleteResourcePolicy. Added BackupArn to the output of the DescribeBackups API. Added support for BackupArn in the CreateCluster API.
+* api-change:``connect``: This release supports showing PreferredAgentRouting step via DescribeContact API.
+* api-change:``emr``: This release provides the support for new allocation strategies i.e. CAPACITY_OPTIMIZED_PRIORITIZED for Spot and PRIORITIZED for On-Demand by taking input of priority value for each instance type for instance fleet clusters.
+* api-change:``glue``: Added AttributesToGet parameter to Glue GetDatabases, allowing caller to limit output to include only the database name.
+* api-change:``kinesisanalyticsv2``: Support for Flink 1.19 in Managed Service for Apache Flink
+* api-change:``opensearch``: This release removes support for enabling or disabling Natural Language Query Processing feature for Amazon OpenSearch Service domains.
+* api-change:``pi``: Noting that the filter db.sql.db_id isn't available for RDS for SQL Server DB instances.
+* api-change:``workspaces``: Added support for Red Hat Enterprise Linux 8 on Amazon WorkSpaces Personal.
+
+
 1.34.135
 ========
 

botocore/__init__.py

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

botocore/data/acm-pca/2017-08-22/service-2.json

@@ -1443,14 +1443,16 @@
         "RSA_2048",
         "RSA_4096",
         "EC_prime256v1",
-        "EC_secp384r1"
+        "EC_secp384r1",
+        "SM2"
       ]
     },
     "KeyStorageSecurityStandard":{
       "type":"string",
       "enum":[
         "FIPS_140_2_LEVEL_2_OR_HIGHER",
-        "FIPS_140_2_LEVEL_3_OR_HIGHER"
+        "FIPS_140_2_LEVEL_3_OR_HIGHER",
+        "CCPC_LEVEL_1_OR_HIGHER"
       ]
     },
     "KeyUsage":{
@@ -1920,7 +1922,8 @@
         "SHA512WITHECDSA",
         "SHA256WITHRSA",
         "SHA384WITHRSA",
-        "SHA512WITHRSA"
+        "SHA512WITHRSA",
+        "SM3WITHSM2"
       ]
     },
     "String":{"type":"string"},

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

@@ -5,12 +5,14 @@
     "endpointPrefix":"elasticmapreduce",
     "jsonVersion":"1.1",
     "protocol":"json",
+    "protocols":["json"],
     "serviceAbbreviation":"Amazon EMR",
     "serviceFullName":"Amazon EMR",
     "serviceId":"EMR",
     "signatureVersion":"v4",
     "targetPrefix":"ElasticMapReduce",
-    "uid":"elasticmapreduce-2009-03-31"
+    "uid":"elasticmapreduce-2009-03-31",
+    "auth":["aws.auth#sigv4"]
   },
   "operations":{
     "AddInstanceFleet":{
@@ -3123,6 +3125,10 @@
         "CustomAmiId":{
           "shape":"XmlStringMaxLen256",
           "documentation":"<p>The custom AMI ID to use for the instance type.</p>"
+        },
+        "Priority":{
+          "shape":"NonNegativeDouble",
+          "documentation":"<p>The priority at which Amazon EMR launches the Amazon EC2 instances with this instance type. Priority starts at 0, which is the highest priority. Amazon EMR considers the highest priority first.</p>"
         }
       },
       "documentation":"<p>An instance type configuration for each instance type in an instance fleet, which determines the Amazon EC2 instances Amazon EMR attempts to provision to fulfill On-Demand and Spot target capacities. When you use an allocation strategy, you can include a maximum of 30 instance type configurations for a fleet. For more information about how to use an allocation strategy, see <a href=\"https://docs.aws.amazon.com/emr/latest/ManagementGuide/emr-instance-fleet.html\">Configure Instance Fleets</a>. Without an allocation strategy, you may specify a maximum of five instance type configurations for a 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.</p> </note>"
@@ -3165,6 +3171,10 @@
         "CustomAmiId":{
           "shape":"XmlStringMaxLen256",
           "documentation":"<p>The custom AMI ID to use for the instance type.</p>"
+        },
+        "Priority":{
+          "shape":"NonNegativeDouble",
+          "documentation":"<p>The priority at which Amazon EMR launches the Amazon EC2 instances with this instance type. Priority starts at 0, which is the highest priority. Amazon EMR considers the highest priority first.</p>"
         }
       },
       "documentation":"<p>The configuration specification for each instance type in an instance 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.</p> </note>"
@@ -4217,15 +4227,18 @@
     },
     "OnDemandProvisioningAllocationStrategy":{
       "type":"string",
-      "enum":["lowest-price"]
+      "enum":[
+        "lowest-price",
+        "prioritized"
+      ]
     },
     "OnDemandProvisioningSpecification":{
       "type":"structure",
       "required":["AllocationStrategy"],
       "members":{
         "AllocationStrategy":{
           "shape":"OnDemandProvisioningAllocationStrategy",
-          "documentation":"<p>Specifies the strategy to use in launching On-Demand instance fleets. Currently, the only option is <code>lowest-price</code> (the default), which launches the lowest price first.</p>"
+          "documentation":"<p>Specifies the strategy to use in launching On-Demand instance fleets. Available options are <code>lowest-price</code> and <code>prioritized</code>. <code>lowest-price</code> specifies to launch the instances with the lowest price first, and <code>prioritized</code> specifies that Amazon EMR should launch the instances with the highest priority first. The default is <code>lowest-price</code>.</p>"
         },
         "CapacityReservationOptions":{
           "shape":"OnDemandCapacityReservationOptions",
@@ -5011,7 +5024,8 @@
         "capacity-optimized",
         "price-capacity-optimized",
         "lowest-price",
-        "diversified"
+        "diversified",
+        "capacity-optimized-prioritized"
       ]
     },
     "SpotProvisioningSpecification":{
@@ -5035,7 +5049,7 @@
         },
         "AllocationStrategy":{
           "shape":"SpotProvisioningAllocationStrategy",
-          "documentation":"<p>Specifies one of the following strategies to launch Spot Instance fleets: <code>price-capacity-optimized</code>, <code>capacity-optimized</code>, <code>lowest-price</code>, or <code>diversified</code>. For more information on the provisioning strategies, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-fleet-allocation-strategy.html\">Allocation strategies for Spot Instances</a> in the <i>Amazon EC2 User Guide for Linux Instances</i>.</p> <note> <p>When you launch a Spot Instance fleet with the old console, it automatically launches with the <code>capacity-optimized</code> strategy. You can't change the allocation strategy from the old console.</p> </note>"
+          "documentation":"<p>Specifies one of the following strategies to launch Spot Instance fleets: <code>capacity-optimized</code>, <code>price-capacity-optimized</code>, <code>lowest-price</code>, or <code>diversified</code>, and <code>capacity-optimized-prioritized</code>. For more information on the provisioning strategies, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-fleet-allocation-strategy.html\">Allocation strategies for Spot Instances</a> in the <i>Amazon EC2 User Guide for Linux Instances</i>.</p> <note> <p>When you launch a Spot Instance fleet with the old console, it automatically launches with the <code>capacity-optimized</code> strategy. You can't change the allocation strategy from the old console.</p> </note>"
         }
       },
       "documentation":"<p>The launch specification for Spot Instances in the instance 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. Spot Instance allocation strategy is available in Amazon EMR releases 5.12.1 and later.</p> </note> <note> <p>Spot Instances with a defined duration (also known as Spot blocks) are no longer available to new customers from July 1, 2021. For customers who have previously used the feature, we will continue to support Spot Instances with a defined duration until December 31, 2022. </p> </note>"

botocore/data/endpoints.json

@@ -21079,6 +21079,14 @@
           "cn-northwest-1" : { }
         }
       },
+      "acm-pca" : {
+        "defaults" : {
+          "protocols" : [ "https" ]
+        },
+        "endpoints" : {
+          "cn-north-1" : { }
+        }
+      },
       "airflow" : {
         "endpoints" : {
           "cn-north-1" : { },

botocore/data/glue/2017-03-31/service-2.json

@@ -9176,6 +9176,14 @@
       },
       "documentation":"<p>The <code>Database</code> object represents a logical grouping of tables that might reside in a Hive metastore or an RDBMS.</p>"
     },
+    "DatabaseAttributes":{
+      "type":"string",
+      "enum":["NAME"]
+    },
+    "DatabaseAttributesList":{
+      "type":"list",
+      "member":{"shape":"DatabaseAttributes"}
+    },
     "DatabaseIdentifier":{
       "type":"structure",
       "members":{
@@ -11848,6 +11856,10 @@
         "ResourceShareType":{
           "shape":"ResourceShareType",
           "documentation":"<p>Allows you to specify that you want to list the databases shared with your account. The allowable values are <code>FEDERATED</code>, <code>FOREIGN</code> or <code>ALL</code>. </p> <ul> <li> <p>If set to <code>FEDERATED</code>, will list the federated databases (referencing an external entity) shared with your account.</p> </li> <li> <p>If set to <code>FOREIGN</code>, will list the databases shared with your account. </p> </li> <li> <p>If set to <code>ALL</code>, will list the databases shared with your account, as well as the databases in yor local account. </p> </li> </ul>"
+        },
+        "AttributesToGet":{
+          "shape":"DatabaseAttributesList",
+          "documentation":"<p>Specifies the database fields returned by the <code>GetDatabases</code> call. This parameter doesn’t accept an empty list. The request must include the <code>NAME</code>.</p>"
         }
       }
     },