Merge branch 'release-1.23.39'

* release-1.23.39: Bumping version to 1.23.39 Update to latest models Skip serializing empty lists in headers
boto · Jan 19, 2022 · 78f608c · 78f608c
2 parents a7913ec + 63896f9
commit 78f608c
Show file tree

Hide file tree

Showing 9 changed files with 90 additions and 8 deletions.
diff --git a/.changes/1.23.39.json b/.changes/1.23.39.json
@@ -0,0 +1,12 @@
+[
+  {
+    "category": "``macie2``",
+    "description": "This release of the Amazon Macie API introduces stricter validation of requests to create custom data identifiers.",
+    "type": "api-change"
+  },
+  {
+    "category": "``ec2-instance-connect``",
+    "description": "Adds support for ED25519 keys. PushSSHPublicKey Availability Zone parameter is now optional. Adds EC2InstanceStateInvalidException for instances that are not running. This was previously a service exception, so this may require updating your code to handle this new exception.",
+    "type": "api-change"
+  }
+]
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,6 +2,13 @@
 CHANGELOG
 =========
 
+1.23.39
+=======
+
+* api-change:``macie2``: This release of the Amazon Macie API introduces stricter validation of requests to create custom data identifiers.
+* api-change:``ec2-instance-connect``: Adds support for ED25519 keys. PushSSHPublicKey Availability Zone parameter is now optional. Adds EC2InstanceStateInvalidException for instances that are not running. This was previously a service exception, so this may require updating your code to handle this new exception.
+
+
 1.23.38
 =======
 

diff --git a/botocore/__init__.py b/botocore/__init__.py
@@ -16,7 +16,7 @@
 import re
 import logging
 
-__version__ = '1.23.38'
+__version__ = '1.23.39'
 
 
 class NullHandler(logging.Handler):

diff --git a/botocore/data/ec2-instance-connect/2018-04-02/service-2.json b/botocore/data/ec2-instance-connect/2018-04-02/service-2.json
@@ -26,7 +26,8 @@
         {"shape":"InvalidArgsException"},
         {"shape":"ServiceException"},
         {"shape":"ThrottlingException"},
-        {"shape":"EC2InstanceNotFoundException"}
+        {"shape":"EC2InstanceNotFoundException"},
+        {"shape":"EC2InstanceStateInvalidException"}
       ],
       "documentation":"<p>Pushes an SSH public key to the specified EC2 instance for use by the specified user. The key remains for 60 seconds. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Connect-using-EC2-Instance-Connect.html\">Connect to your Linux instance using EC2 Instance Connect</a> in the <i>Amazon EC2 User Guide</i>.</p>"
     },
@@ -47,7 +48,8 @@
         {"shape":"EC2InstanceNotFoundException"},
         {"shape":"EC2InstanceTypeInvalidException"},
         {"shape":"SerialConsoleSessionLimitExceededException"},
-        {"shape":"SerialConsoleSessionUnavailableException"}
+        {"shape":"SerialConsoleSessionUnavailableException"},
+        {"shape":"EC2InstanceStateInvalidException"}
       ],
       "documentation":"<p>Pushes an SSH public key to the specified EC2 instance. The key remains for 60 seconds, which gives you 60 seconds to establish a serial console connection to the instance using SSH. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-serial-console.html\">EC2 Serial Console</a> in the <i>Amazon EC2 User Guide</i>.</p>"
     }
@@ -75,6 +77,14 @@
       "documentation":"<p>The specified instance was not found.</p>",
       "exception":true
     },
+    "EC2InstanceStateInvalidException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"String"}
+      },
+      "documentation":"<p>Unable to connect because the instance is not in a valid state. Connecting to a stopped or terminated instance is not supported. If the instance is stopped, start your instance, and try to connect again.</p>",
+      "exception":true
+    },
     "EC2InstanceTypeInvalidException":{
       "type":"structure",
       "members":{
@@ -107,15 +117,14 @@
     "SSHPublicKey":{
       "type":"string",
       "max":4096,
-      "min":256
+      "min":80
     },
     "SendSSHPublicKeyRequest":{
       "type":"structure",
       "required":[
         "InstanceId",
         "InstanceOSUser",
-        "SSHPublicKey",
-        "AvailabilityZone"
+        "SSHPublicKey"
       ],
       "members":{
         "InstanceId":{

diff --git a/botocore/data/macie2/2020-01-01/service-2.json b/botocore/data/macie2/2020-01-01/service-2.json
@@ -3465,7 +3465,11 @@
           "locationName": "tags",
           "documentation": "<p>A map of key-value pairs that specifies the tags to associate with the custom data identifier.</p> <p>A custom data identifier can have a maximum of 50 tags. Each tag consists of a tag key and an associated tag value. The maximum length of a tag key is 128 characters. The maximum length of a tag value is 256 characters.</p>"
         }
-      }
+      },
+      "required": [
+        "name",
+        "regex"
+      ]
     },
     "CreateCustomDataIdentifierResponse": {
       "type": "structure",

diff --git a/botocore/serialize.py b/botocore/serialize.py
@@ -588,6 +588,9 @@ def _partition_parameters(self, partitioned, param_name,
                 partitioned['query_string_kwargs'][key_name] = param_value
         elif location == 'header':
             shape = shape_members[param_name]
+            if not param_value and shape.type_name == 'list':
+                # Empty lists should not be set on the headers
+                return
             value = self._convert_header_value(shape, param_value)
             partitioned['headers'][key_name] = str(value)
         elif location == 'headers':

diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -54,7 +54,7 @@
 # The short X.Y version.
 version = '1.23.'
 # The full version, including alpha/beta/rc tags.
-release = '1.23.38'
+release = '1.23.39'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/tests/unit/protocols/input/rest-json.json b/tests/unit/protocols/input/rest-json.json
@@ -2165,6 +2165,29 @@
             "x-amz-list-param": "one,two,three"
           }
         }
+      },
+      {
+        "given": {
+          "http": {
+            "method": "POST",
+            "requestUri": "/2014-01-01/example"
+          },
+          "input": {
+            "shape": "InputShape",
+            "locationName": "OperationRequest"
+          },
+          "name": "OperationName"
+        },
+        "params": {
+          "ListParam": []
+        },
+        "serialized": {
+          "method": "POST",
+          "body": "",
+          "uri": "/2014-01-01/example",
+          "headers": {},
+          "forbidHeaders": ["x-amz-list-param"]
+        }
       }
     ]
   }

diff --git a/tests/unit/protocols/input/rest-xml.json b/tests/unit/protocols/input/rest-xml.json
@@ -1946,6 +1946,30 @@
             "x-amz-list-param": "one,two,three"
           }
         }
+      },
+      {
+        "given": {
+          "http": {
+            "method": "POST",
+            "requestUri": "/2014-01-01/example"
+          },
+          "input": {
+            "shape": "InputShape",
+            "locationName": "OperationRequest",
+            "xmlNamespace": {"uri": "https://foo/"}
+          },
+          "name": "OperationName"
+        },
+        "params": {
+          "ListParam": []
+        },
+        "serialized": {
+          "method": "POST",
+          "body": "",
+          "uri": "/2014-01-01/example",
+          "headers": {},
+          "forbidHeaders": ["x-amz-list-param"]
+        }
       }
     ]
   }