Merge branch 'release-1.21.31'

* release-1.21.31: Bumping version to 1.21.31 Update to latest endpoints Update to latest models
boto · Aug 27, 2021 · 42fcbc8 · 42fcbc8
2 parents 5937ed6 + c442858
commit 42fcbc8
Show file tree

Hide file tree

Showing 8 changed files with 187 additions and 17 deletions.
diff --git a/.changes/1.21.31.json b/.changes/1.21.31.json
@@ -0,0 +1,17 @@
+[
+  {
+    "category": "``s3``",
+    "description": "Documentation updates for Amazon S3.",
+    "type": "api-change"
+  },
+  {
+    "category": "``emr``",
+    "description": "Update emr client to latest version",
+    "type": "api-change"
+  },
+  {
+    "category": "``ec2``",
+    "description": "This release adds the BootMode flag to the ImportImage API and showing the detected BootMode of an ImportImage task.",
+    "type": "api-change"
+  }
+]
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,6 +2,14 @@
 CHANGELOG
 =========
 
+1.21.31
+=======
+
+* api-change:``s3``: Documentation updates for Amazon S3.
+* api-change:``emr``: Update emr client to latest version
+* api-change:``ec2``: This release adds the BootMode flag to the ImportImage API and showing the detected BootMode of an ImportImage task.
+
+
 1.21.30
 =======
 

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

diff --git a/botocore/data/ec2/2016-11-15/service-2.json b/botocore/data/ec2/2016-11-15/service-2.json
@@ -24786,6 +24786,10 @@
         "UsageOperation":{
           "shape":"String",
           "documentation":"<p>The usage operation value. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/billing-info-fields.html\">AMI billing information fields</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>.</p>"
+        },
+        "BootMode":{
+          "shape":"BootModeValues",
+          "documentation":"<p>The boot mode of the virtual machine.</p>"
         }
       }
     },
@@ -24956,6 +24960,11 @@
           "shape":"String",
           "documentation":"<p>The usage operation value.</p>",
           "locationName":"usageOperation"
+        },
+        "BootMode":{
+          "shape":"BootModeValues",
+          "documentation":"<p>The boot mode of the virtual machine.</p>",
+          "locationName":"bootMode"
         }
       },
       "documentation":"<p>Describes an import image task.</p>"

diff --git a/botocore/data/emr/2009-03-31/service-2.json b/botocore/data/emr/2009-03-31/service-2.json
diff --git a/botocore/data/endpoints.json b/botocore/data/endpoints.json
@@ -3796,6 +3796,36 @@
           "eu-west-1" : { },
           "eu-west-2" : { },
           "eu-west-3" : { },
+          "fips-ca-central-1" : {
+            "credentialScope" : {
+              "region" : "ca-central-1"
+            },
+            "hostname" : "api.tunneling.iot-fips.ca-central-1.amazonaws.com"
+          },
+          "fips-us-east-1" : {
+            "credentialScope" : {
+              "region" : "us-east-1"
+            },
+            "hostname" : "api.tunneling.iot-fips.us-east-1.amazonaws.com"
+          },
+          "fips-us-east-2" : {
+            "credentialScope" : {
+              "region" : "us-east-2"
+            },
+            "hostname" : "api.tunneling.iot-fips.us-east-2.amazonaws.com"
+          },
+          "fips-us-west-1" : {
+            "credentialScope" : {
+              "region" : "us-west-1"
+            },
+            "hostname" : "api.tunneling.iot-fips.us-west-1.amazonaws.com"
+          },
+          "fips-us-west-2" : {
+            "credentialScope" : {
+              "region" : "us-west-2"
+            },
+            "hostname" : "api.tunneling.iot-fips.us-west-2.amazonaws.com"
+          },
           "me-south-1" : { },
           "sa-east-1" : { },
           "us-east-1" : { },
@@ -9324,6 +9354,18 @@
       },
       "iotsecuredtunneling" : {
         "endpoints" : {
+          "fips-us-gov-east-1" : {
+            "credentialScope" : {
+              "region" : "us-gov-east-1"
+            },
+            "hostname" : "api.tunneling.iot-fips.us-gov-east-1.amazonaws.com"
+          },
+          "fips-us-gov-west-1" : {
+            "credentialScope" : {
+              "region" : "us-gov-west-1"
+            },
+            "hostname" : "api.tunneling.iot-fips.us-gov-west-1.amazonaws.com"
+          },
           "us-gov-east-1" : { },
           "us-gov-west-1" : { }
         }

diff --git a/botocore/data/s3/2006-03-01/service-2.json b/botocore/data/s3/2006-03-01/service-2.json
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -54,7 +54,7 @@
 # The short X.Y version.
 version = '1.21.'
 # The full version, including alpha/beta/rc tags.
-release = '1.21.30'
+release = '1.21.31'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.