Merge branch 'release-1.28.3'

* release-1.28.3:
  Bumping version to 1.28.3
  Update to latest endpoints
  Update to latest models
  Support client context params for s3control (#2797)
  Make Baseclient constructor signature backwards compatible with <1.28.0 (#2796)

.changes/1.28.3.json

@@ -0,0 +1,32 @@
+[
+  {
+    "category": "``ec2``",
+    "description": "Feature supports the replacement of instance root volume using an updated AMI without requiring customers to stop their instance.",
+    "type": "api-change"
+  },
+  {
+    "category": "``fms``",
+    "description": "Add support NetworkFirewall Managed Rule Group Override flag in GetViolationDetails API",
+    "type": "api-change"
+  },
+  {
+    "category": "``glue``",
+    "description": "Added support for custom datatypes when using custom csv classifier.",
+    "type": "api-change"
+  },
+  {
+    "category": "``redshift``",
+    "description": "This release clarifies use for the ElasticIp parameter of the CreateCluster and RestoreFromClusterSnapshot APIs.",
+    "type": "api-change"
+  },
+  {
+    "category": "``sagemaker``",
+    "description": "This change allows customers to provide a custom entrypoint script for the docker container to be run while executing training jobs, and provide custom arguments to the entrypoint script.",
+    "type": "api-change"
+  },
+  {
+    "category": "``wafv2``",
+    "description": "This release adds the following: Challenge rule action, to silently verify client browsers; rule group rule action override to any valid rule action, not just Count; token sharing between protected applications for challenge/CAPTCHA token; targeted rules option for Bot Control managed rule group.",
+    "type": "api-change"
+  }
+]

CHANGELOG.rst

@@ -2,6 +2,17 @@
 CHANGELOG
 =========
 
+1.28.3
+======
+
+* api-change:``ec2``: Feature supports the replacement of instance root volume using an updated AMI without requiring customers to stop their instance.
+* api-change:``fms``: Add support NetworkFirewall Managed Rule Group Override flag in GetViolationDetails API
+* api-change:``glue``: Added support for custom datatypes when using custom csv classifier.
+* api-change:``redshift``: This release clarifies use for the ElasticIp parameter of the CreateCluster and RestoreFromClusterSnapshot APIs.
+* api-change:``sagemaker``: This change allows customers to provide a custom entrypoint script for the docker container to be run while executing training jobs, and provide custom arguments to the entrypoint script.
+* api-change:``wafv2``: This release adds the following: Challenge rule action, to silently verify client browsers; rule group rule action override to any valid rule action, not just Count; token sharing between protected applications for challenge/CAPTCHA token; targeted rules option for Bot Control managed rule group.
+
+
 1.28.2
 ======
 

botocore/__init__.py

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

botocore/args.py

@@ -239,7 +239,7 @@ def compute_client_args(
         self._compute_connect_timeout(config_kwargs)
         s3_config = self.compute_s3_config(client_config)
 
-        is_s3_service = service_name in ['s3', 's3-control']
+        is_s3_service = self._is_s3_service(service_name)
 
         if is_s3_service and 'dualstack' in endpoint_variant_tags:
             if s3_config is None:
@@ -278,6 +278,16 @@ def compute_s3_config(self, client_config):
 
         return s3_configuration
 
+    def _is_s3_service(self, service_name):
+        """Whether the service is S3 or S3 Control.
+
+        Note that throughout this class, service_name refers to the endpoint
+        prefix, not the folder name of the service in botocore/data. For
+        S3 Control, the folder name is 's3control' but the endpoint prefix is
+        's3-control'.
+        """
+        return service_name in ['s3', 's3-control']
+
     def _compute_endpoint_config(
         self,
         service_name,
@@ -532,9 +542,11 @@ def _build_endpoint_resolver(
         # botocore does not support client context parameters generically
         # for every service. Instead, the s3 config section entries are
         # available as client context parameters. In the future, endpoint
-        # rulesets of services other than S3 may require client context
-        # parameters.
-        client_context = s3_config_raw if service_name_raw == 's3' else {}
+        # rulesets of services other than s3/s3control may require client
+        # context parameters.
+        client_context = (
+            s3_config_raw if self._is_s3_service(service_name_raw) else {}
+        )
         sig_version = (
             client_config.signature_version
             if client_config is not None

botocore/client.py

@@ -823,7 +823,7 @@ def __init__(
         client_config,
         partition,
         exceptions_factory,
-        endpoint_ruleset_resolver,
+        endpoint_ruleset_resolver=None,
     ):
         self._serializer = serializer
         self._endpoint = endpoint

botocore/data/ec2/2016-11-15/service-2.json

@@ -885,7 +885,7 @@
       },
       "input":{"shape":"CreateReplaceRootVolumeTaskRequest"},
       "output":{"shape":"CreateReplaceRootVolumeTaskResult"},
-      "documentation":"<p>Creates a root volume replacement task for an Amazon EC2 instance. The root volume can either be restored to its initial launch state, or it can be restored using a specific snapshot.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ebs-restoring-volume.html#replace-root\">Replace a root volume</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>.</p>"
+      "documentation":"<p>Replaces the EBS-backed root volume for a <code>running</code> instance with a new volume that is restored to the original root volume's launch state, that is restored to a specific snapshot taken from the original root volume, or that is restored from an AMI that has the same key characteristics as that of the instance.</p> <p>For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ebs-restoring-volume.html#replace-root\">Replace a root volume</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>.</p>"
     },
     "CreateReservedInstancesListing":{
       "name":"CreateReservedInstancesListing",
@@ -12538,7 +12538,7 @@
         },
         "SnapshotId":{
           "shape":"SnapshotId",
-          "documentation":"<p>The ID of the snapshot from which to restore the replacement root volume. If you want to restore the volume to the initial launch state, omit this parameter.</p>"
+          "documentation":"<p>The ID of the snapshot from which to restore the replacement root volume. The specified snapshot must be a snapshot that you previously created from the original root volume.</p> <p>If you want to restore the replacement root volume to the initial launch state, or if you want to restore the replacement root volume from an AMI, omit this parameter.</p>"
         },
         "ClientToken":{
           "shape":"String",
@@ -12553,6 +12553,14 @@
           "shape":"TagSpecificationList",
           "documentation":"<p>The tags to apply to the root volume replacement task.</p>",
           "locationName":"TagSpecification"
+        },
+        "ImageId":{
+          "shape":"ImageId",
+          "documentation":"<p>The ID of the AMI to use to restore the root volume. The specified AMI must have the same product code, billing information, architecture type, and virtualization type as that of the instance.</p> <p>If you want to restore the replacement volume from a specific snapshot, or if you want to restore it to its launch state, omit this parameter.</p>"
+        },
+        "DeleteReplacedRootVolume":{
+          "shape":"Boolean",
+          "documentation":"<p>Indicates whether to automatically delete the original root volume after the root volume replacement task completes. To delete the original root volume, specify <code>true</code>. If you choose to keep the original root volume after the replacement task completes, you must manually delete it when you no longer need it.</p>"
         }
       }
     },
@@ -42262,6 +42270,21 @@
           "shape":"TagList",
           "documentation":"<p>The tags assigned to the task.</p>",
           "locationName":"tagSet"
+        },
+        "ImageId":{
+          "shape":"ImageId",
+          "documentation":"<p>The ID of the AMI used to create the replacement root volume.</p>",
+          "locationName":"imageId"
+        },
+        "SnapshotId":{
+          "shape":"SnapshotId",
+          "documentation":"<p>The ID of the snapshot used to create the replacement root volume.</p>",
+          "locationName":"snapshotId"
+        },
+        "DeleteReplacedRootVolume":{
+          "shape":"Boolean",
+          "documentation":"<p>Indicates whether the original root volume is to be deleted after the root volume replacement task completes.</p>",
+          "locationName":"deleteReplacedRootVolume"
         }
       },
       "documentation":"<p>Information about a root volume replacement task.</p>"

botocore/data/endpoints.json

@@ -2190,6 +2190,7 @@
             "deprecated" : true,
             "hostname" : "cloudcontrolapi-fips.us-west-2.amazonaws.com"
           },
+          "me-central-1" : { },
           "me-south-1" : { },
           "sa-east-1" : { },
           "us-east-1" : {
@@ -20372,7 +20373,8 @@
       },
       "ds" : {
         "endpoints" : {
-          "us-iso-east-1" : { }
+          "us-iso-east-1" : { },
+          "us-iso-west-1" : { }
         }
       },
       "dynamodb" : {

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

@@ -5890,6 +5890,14 @@
         "AllowSingleColumn":{
           "shape":"NullableBoolean",
           "documentation":"<p>Enables the processing of files that contain only one column.</p>"
+        },
+        "CustomDatatypeConfigured":{
+          "shape":"NullableBoolean",
+          "documentation":"<p>Enables the configuration of custom datatypes.</p>"
+        },
+        "CustomDatatypes":{
+          "shape":"CustomDatatypes",
+          "documentation":"<p>Creates a list of supported custom datatypes.</p>"
         }
       },
       "documentation":"<p>Specifies a custom CSV classifier for <code>CreateClassifier</code> to create.</p>"
@@ -6883,6 +6891,14 @@
         "AllowSingleColumn":{
           "shape":"NullableBoolean",
           "documentation":"<p>Enables the processing of files that contain only one column.</p>"
+        },
+        "CustomDatatypeConfigured":{
+          "shape":"NullableBoolean",
+          "documentation":"<p>Enables the custom datatype to be configured.</p>"
+        },
+        "CustomDatatypes":{
+          "shape":"CustomDatatypes",
+          "documentation":"<p>A list of custom datatypes including \"BINARY\", \"BOOLEAN\", \"DATE\", \"DECIMAL\", \"DOUBLE\", \"FLOAT\", \"INT\", \"LONG\", \"SHORT\", \"STRING\", \"TIMESTAMP\".</p>"
         }
       },
       "documentation":"<p>A classifier for custom <code>CSV</code> content.</p>"
@@ -6943,6 +6959,10 @@
       },
       "documentation":"<p>Specifies a transform that uses custom code you provide to perform the data transformation. The output is a collection of DynamicFrames.</p>"
     },
+    "CustomDatatypes":{
+      "type":"list",
+      "member":{"shape":"NameString"}
+    },
     "CustomEntityType":{
       "type":"structure",
       "required":[
@@ -17293,6 +17313,14 @@
         "AllowSingleColumn":{
           "shape":"NullableBoolean",
           "documentation":"<p>Enables the processing of files that contain only one column.</p>"
+        },
+        "CustomDatatypeConfigured":{
+          "shape":"NullableBoolean",
+          "documentation":"<p>Specifies the configuration of custom datatypes.</p>"
+        },
+        "CustomDatatypes":{
+          "shape":"CustomDatatypes",
+          "documentation":"<p>Specifies a list of supported custom datatypes.</p>"
         }
       },
       "documentation":"<p>Specifies a custom CSV classifier to be updated.</p>"

botocore/data/redshift/2012-12-01/service-2.json

@@ -3764,7 +3764,7 @@
         },
         "ElasticIp":{
           "shape":"String",
-          "documentation":"<p>The Elastic IP (EIP) address for the cluster.</p> <p>Constraints: The cluster must be provisioned in EC2-VPC and publicly-accessible through an Internet gateway. For more information about provisioning clusters in EC2-VPC, go to <a href=\"https://docs.aws.amazon.com/redshift/latest/mgmt/working-with-clusters.html#cluster-platforms\">Supported Platforms to Launch Your Cluster</a> in the Amazon Redshift Cluster Management Guide.</p>"
+          "documentation":"<p>The Elastic IP (EIP) address for the cluster.</p> <p>Constraints: The cluster must be provisioned in EC2-VPC and publicly-accessible through an Internet gateway. Don't specify the Elastic IP address for a publicly accessible cluster with availability zone relocation turned on. For more information about provisioning clusters in EC2-VPC, go to <a href=\"https://docs.aws.amazon.com/redshift/latest/mgmt/working-with-clusters.html#cluster-platforms\">Supported Platforms to Launch Your Cluster</a> in the Amazon Redshift Cluster Management Guide.</p>"
         },
         "Tags":{
           "shape":"TagList",
@@ -8611,7 +8611,7 @@
         },
         "ElasticIp":{
           "shape":"String",
-          "documentation":"<p>The elastic IP (EIP) address for the cluster.</p>"
+          "documentation":"<p>The Elastic IP (EIP) address for the cluster. Don't specify the Elastic IP address for a publicly accessible cluster with availability zone relocation turned on.</p>"
         },
         "ClusterParameterGroupName":{
           "shape":"String",