Merge branch 'release-1.31.2'

* release-1.31.2:
  Bumping version to 1.31.2
  Update to latest models
  Fix generate_presigned_url for S3 operations where the modeled request URI contains a query component  (#2971)

.changes/1.31.2.json

@@ -0,0 +1,12 @@
+[
+  {
+    "category": "s3",
+    "description": "Fix s3 presigned URLs for operations with query components (`#2962 <https://github.com/boto/botocore/issues/2962>`__)",
+    "type": "bugfix"
+  },
+  {
+    "category": "``cognito-idp``",
+    "description": "API model updated in Amazon Cognito",
+    "type": "api-change"
+  }
+]

CHANGELOG.rst

@@ -2,6 +2,13 @@
 CHANGELOG
 =========
 
+1.31.2
+======
+
+* bugfix:s3: Fix s3 presigned URLs for operations with query components (`#2962 <https://github.com/boto/botocore/issues/2962>`__)
+* api-change:``cognito-idp``: API model updated in Amazon Cognito
+
+
 1.31.1
 ======
 

botocore/__init__.py

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

botocore/data/cognito-idp/2016-04-18/service-2.json

@@ -3352,7 +3352,8 @@
     "ChallengeResponsesType":{
       "type":"map",
       "key":{"shape":"StringType"},
-      "value":{"shape":"StringType"}
+      "value":{"shape":"StringType"},
+      "sensitive":true
     },
     "ChangePasswordRequest":{
       "type":"structure",
@@ -6664,7 +6665,8 @@
     "SessionType":{
       "type":"string",
       "max":2048,
-      "min":20
+      "min":20,
+      "sensitive":true
     },
     "SetRiskConfigurationRequest":{
       "type":"structure",

botocore/handlers.py

@@ -1049,6 +1049,10 @@ def remove_bucket_from_url_paths_from_model(params, model, context, **kwargs):
     bucket_path = '/{Bucket}'
     if req_uri.startswith(bucket_path):
         model.http['requestUri'] = req_uri[len(bucket_path) :]
+        # Strip query off the requestUri before using as authPath. The
+        # HmacV1Auth signer will append query params to the authPath during
+        # signing.
+        req_uri = req_uri.split('?')[0]
         # If the request URI is ONLY a bucket, the auth_path must be
         # terminated with a '/' character to generate a signature that the
         # server will accept.

docs/source/conf.py

@@ -59,7 +59,7 @@
 # The short X.Y version.
 version = '1.31'
 # The full version, including alpha/beta/rc tags.
-release = '1.31.1'
+release = '1.31.2'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.