Merge branch 'release-1.29.136' into develop

* release-1.29.136:
  Bumping version to 1.29.136
  Update to latest partitions and endpoints
  Update to latest models

.changes/1.29.136.json

@@ -0,0 +1,52 @@
+[
+  {
+    "category": "``athena``",
+    "description": "Removing SparkProperties from EngineConfiguration object for StartSession API call",
+    "type": "api-change"
+  },
+  {
+    "category": "``cloudtrail``",
+    "description": "Add ConflictException to PutEventSelectors, add (Channel/EDS)ARNInvalidException to Tag APIs. These exceptions provide customers with more specific error messages instead of internal errors.",
+    "type": "api-change"
+  },
+  {
+    "category": "``compute-optimizer``",
+    "description": "In this launch, we add support for showing integration status with external metric providers such as Instana, Datadog ...etc in GetEC2InstanceRecommendations and ExportEC2InstanceRecommendations apis",
+    "type": "api-change"
+  },
+  {
+    "category": "``connect``",
+    "description": "You can programmatically create and manage prompts using APIs, for example, to extract prompts stored within Amazon Connect and add them to your Amazon S3 bucket. AWS CloudTrail, AWS CloudFormation and tagging are supported.",
+    "type": "api-change"
+  },
+  {
+    "category": "``ec2``",
+    "description": "Add support for i4g.large, i4g.xlarge, i4g.2xlarge, i4g.4xlarge, i4g.8xlarge and i4g.16xlarge instances powered by AWS Graviton2 processors that deliver up to 15% better compute performance than our other storage-optimized instances.",
+    "type": "api-change"
+  },
+  {
+    "category": "``ecs``",
+    "description": "Documentation only release to address various tickets.",
+    "type": "api-change"
+  },
+  {
+    "category": "``mediaconvert``",
+    "description": "This release introduces a new MXF Profile for XDCAM which is strictly compliant with the SMPTE RDD 9 standard and improved handling of output name modifiers.",
+    "type": "api-change"
+  },
+  {
+    "category": "``rds``",
+    "description": "RDS documentation update for the EngineVersion parameter of ModifyDBSnapshot",
+    "type": "api-change"
+  },
+  {
+    "category": "``sagemaker-geospatial``",
+    "description": "This release makes ExecutionRoleArn a required field in the StartEarthObservationJob API.",
+    "type": "api-change"
+  },
+  {
+    "category": "``sts``",
+    "description": "API updates for the AWS Security Token Service",
+    "type": "api-change"
+  }
+]

CHANGELOG.rst

@@ -2,6 +2,21 @@
 CHANGELOG
 =========
 
+1.29.136
+========
+
+* api-change:``athena``: Removing SparkProperties from EngineConfiguration object for StartSession API call
+* api-change:``cloudtrail``: Add ConflictException to PutEventSelectors, add (Channel/EDS)ARNInvalidException to Tag APIs. These exceptions provide customers with more specific error messages instead of internal errors.
+* api-change:``compute-optimizer``: In this launch, we add support for showing integration status with external metric providers such as Instana, Datadog ...etc in GetEC2InstanceRecommendations and ExportEC2InstanceRecommendations apis
+* api-change:``connect``: You can programmatically create and manage prompts using APIs, for example, to extract prompts stored within Amazon Connect and add them to your Amazon S3 bucket. AWS CloudTrail, AWS CloudFormation and tagging are supported.
+* api-change:``ec2``: Add support for i4g.large, i4g.xlarge, i4g.2xlarge, i4g.4xlarge, i4g.8xlarge and i4g.16xlarge instances powered by AWS Graviton2 processors that deliver up to 15% better compute performance than our other storage-optimized instances.
+* api-change:``ecs``: Documentation only release to address various tickets.
+* api-change:``mediaconvert``: This release introduces a new MXF Profile for XDCAM which is strictly compliant with the SMPTE RDD 9 standard and improved handling of output name modifiers.
+* api-change:``rds``: RDS documentation update for the EngineVersion parameter of ModifyDBSnapshot
+* api-change:``sagemaker-geospatial``: This release makes ExecutionRoleArn a required field in the StartEarthObservationJob API.
+* api-change:``sts``: API updates for the AWS Security Token Service
+
+
 1.29.135
 ========
 

botocore/__init__.py

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

botocore/data/athena/2017-05-18/service-2.json

@@ -1989,10 +1989,6 @@
         "AdditionalConfigs":{
           "shape":"ParametersMap",
           "documentation":"<p>Contains additional notebook engine <code>MAP&lt;string, string&gt;</code> parameter mappings in the form of key-value pairs. To specify an Athena notebook that the Jupyter server will download and serve, specify a value for the <a>StartSessionRequest$NotebookVersion</a> field, and then add a key named <code>NotebookId</code> to <code>AdditionalConfigs</code> that has the value of the Athena notebook ID.</p>"
-        },
-        "SparkProperties":{
-          "shape":"ParametersMap",
-          "documentation":"<p>Specifies custom jar files and Spark properties for use cases like cluster encryption, table formats, and general Spark tuning.</p>"
         }
       },
       "documentation":"<p>Contains data processing unit (DPU) configuration settings and parameter mappings for a notebook engine.</p>"

botocore/data/compute-optimizer/2019-11-01/service-2.json

@@ -1499,7 +1499,9 @@
         "RecommendationOptionsMigrationEffort",
         "EffectiveRecommendationPreferencesExternalMetricsSource",
         "InstanceState",
-        "Tags"
+        "Tags",
+        "ExternalMetricStatusCode",
+        "ExternalMetricStatusReason"
       ]
     },
     "ExportableInstanceFields":{
@@ -1581,6 +1583,36 @@
       "type":"list",
       "member":{"shape":"ExportableVolumeField"}
     },
+    "ExternalMetricStatus":{
+      "type":"structure",
+      "members":{
+        "statusCode":{
+          "shape":"ExternalMetricStatusCode",
+          "documentation":"<p> The status code for Compute Optimizer's integration with an external metrics provider. </p>"
+        },
+        "statusReason":{
+          "shape":"ExternalMetricStatusReason",
+          "documentation":"<p> The reason for Compute Optimizer's integration status with your external metric provider. </p>"
+        }
+      },
+      "documentation":"<p> Describes Compute Optimizer's integration status with your chosen external metric provider. For example, Datadog. </p>"
+    },
+    "ExternalMetricStatusCode":{
+      "type":"string",
+      "enum":[
+        "NO_EXTERNAL_METRIC_SET",
+        "INTEGRATION_SUCCESS",
+        "DATADOG_INTEGRATION_ERROR",
+        "DYNATRACE_INTEGRATION_ERROR",
+        "NEWRELIC_INTEGRATION_ERROR",
+        "INSTANA_INTEGRATION_ERROR",
+        "INSUFFICIENT_DATADOG_METRICS",
+        "INSUFFICIENT_DYNATRACE_METRICS",
+        "INSUFFICIENT_NEWRELIC_METRICS",
+        "INSUFFICIENT_INSTANA_METRICS"
+      ]
+    },
+    "ExternalMetricStatusReason":{"type":"string"},
     "ExternalMetricsPreference":{
       "type":"structure",
       "members":{
@@ -2247,6 +2279,10 @@
         "tags":{
           "shape":"Tags",
           "documentation":"<p> A list of tags assigned to your Amazon EC2 instance recommendations. </p>"
+        },
+        "externalMetricStatus":{
+          "shape":"ExternalMetricStatus",
+          "documentation":"<p> An object that describes Compute Optimizer's integration status with your external metrics provider. </p>"
         }
       },
       "documentation":"<p>Describes an Amazon EC2 instance recommendation.</p>"