Merge branch 'release-1.12.161'

* release-1.12.161:
  Bumping version to 1.12.161
  Update to latest endpoints
  Update to latest models

.changes/1.12.161.json

@@ -0,0 +1,27 @@
+[
+  {
+    "category": "``ec2``", 
+    "description": "Update ec2 client to latest version", 
+    "type": "api-change"
+  }, 
+  {
+    "category": "``storagegateway``", 
+    "description": "Update storagegateway client to latest version", 
+    "type": "api-change"
+  }, 
+  {
+    "category": "``s3``", 
+    "description": "Update s3 client to latest version", 
+    "type": "api-change"
+  }, 
+  {
+    "category": "``elasticache``", 
+    "description": "Update elasticache client to latest version", 
+    "type": "api-change"
+  }, 
+  {
+    "category": "``iam``", 
+    "description": "Update iam client to latest version", 
+    "type": "api-change"
+  }
+]

CHANGELOG.rst

@@ -2,6 +2,16 @@
 CHANGELOG
 =========
 
+1.12.161
+========
+
+* api-change:``ec2``: Update ec2 client to latest version
+* api-change:``storagegateway``: Update storagegateway client to latest version
+* api-change:``s3``: Update s3 client to latest version
+* api-change:``elasticache``: Update elasticache client to latest version
+* api-change:``iam``: Update iam client to latest version
+
+
 1.12.160
 ========
 

botocore/__init__.py

@@ -16,7 +16,7 @@
 import re
 import logging
 
-__version__ = '1.12.160'
+__version__ = '1.12.161'
 
 
 class NullHandler(logging.Handler):

botocore/data/elasticache/2015-02-02/paginators-1.json

@@ -71,6 +71,18 @@
       "output_token": "Marker",
       "limit_key": "MaxRecords",
       "result_key": "Snapshots"
+    },
+    "DescribeServiceUpdates": {
+      "input_token": "Marker",
+      "limit_key": "MaxRecords",
+      "output_token": "Marker",
+      "result_key": "ServiceUpdates"
+    },
+    "DescribeUpdateActions": {
+      "input_token": "Marker",
+      "limit_key": "MaxRecords",
+      "output_token": "Marker",
+      "result_key": "UpdateActions"
     }
   }
 }

botocore/data/endpoints.json

@@ -442,6 +442,16 @@
           "us-west-2" : { }
         }
       },
+      "backup" : {
+        "endpoints" : {
+          "ap-southeast-2" : { },
+          "eu-central-1" : { },
+          "eu-west-1" : { },
+          "us-east-1" : { },
+          "us-east-2" : { },
+          "us-west-2" : { }
+        }
+      },
       "batch" : {
         "endpoints" : {
           "ap-northeast-1" : { },

botocore/data/iam/2010-05-08/service-2.json

@@ -2794,7 +2794,7 @@
         },
         "AssumeRolePolicyDocument":{
           "shape":"policyDocumentType",
-          "documentation":"<p>The trust relationship policy document that grants an entity permission to assume the role.</p> <p>You must provide policies in JSON format in IAM. However, for AWS CloudFormation templates formatted in YAML, you can provide the policy in JSON or YAML format. AWS CloudFormation always converts a YAML policy to JSON format before submitting it to IAM.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> used to validate this parameter is a string of characters consisting of the following:</p> <ul> <li> <p>Any printable ASCII character ranging from the space character (\\u0020) through the end of the ASCII character range</p> </li> <li> <p>The printable characters in the Basic Latin and Latin-1 Supplement character set (through \\u00FF)</p> </li> <li> <p>The special characters tab (\\u0009), line feed (\\u000A), and carriage return (\\u000D)</p> </li> </ul>"
+          "documentation":"<p>The trust relationship policy document that grants an entity permission to assume the role.</p> <p>in IAM, you must provide a JSON policy that has been converted to a string. However, for AWS CloudFormation templates formatted in YAML, you can provide the policy in JSON or YAML format. AWS CloudFormation always converts a YAML policy to JSON format before submitting it to IAM.</p> <p>The <a href=\"http://wikipedia.org/wiki/regex\">regex pattern</a> used to validate this parameter is a string of characters consisting of the following:</p> <ul> <li> <p>Any printable ASCII character ranging from the space character (\\u0020) through the end of the ASCII character range</p> </li> <li> <p>The printable characters in the Basic Latin and Latin-1 Supplement character set (through \\u00FF)</p> </li> <li> <p>The special characters tab (\\u0009), line feed (\\u000A), and carriage return (\\u000D)</p> </li> </ul> <p> Upon success, the response includes the same trust policy as a URL-encoded JSON string.</p>"
         },
         "Description":{
           "shape":"roleDescriptionType",
@@ -7823,6 +7823,8 @@
     },
     "policyPathType":{
       "type":"string",
+      "max":512,
+      "min":1,
       "pattern":"((/[A-Za-z0-9\\.,\\+@=_-]+)*)/"
     },
     "policyScopeType":{

botocore/data/storagegateway/2013-06-30/service-2.json

@@ -994,6 +994,20 @@
       ],
       "documentation":"<p>Updates a Server Message Block (SMB) file share.</p> <note> <p>To leave a file share field unchanged, set the corresponding input field to null. This operation is only supported for file gateways.</p> </note> <important> <p>File gateways require AWS Security Token Service (AWS STS) to be activated to enable you to create a file share. Make sure that AWS STS is activated in the AWS Region you are creating your file gateway in. If AWS STS is not activated in this AWS Region, activate it. For information about how to activate AWS STS, see <a href=\"https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_enable-regions.html\">Activating and Deactivating AWS STS in an AWS Region</a> in the <i>AWS Identity and Access Management User Guide.</i> </p> <p>File gateways don't support creating hard or symbolic links on a file share.</p> </important>"
     },
+    "UpdateSMBSecurityStrategy":{
+      "name":"UpdateSMBSecurityStrategy",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"UpdateSMBSecurityStrategyInput"},
+      "output":{"shape":"UpdateSMBSecurityStrategyOutput"},
+      "errors":[
+        {"shape":"InvalidGatewayRequestException"},
+        {"shape":"InternalServerError"}
+      ],
+      "documentation":"<p>Updates the SMB security strategy on a file gateway. This action is only supported in file gateways.</p>"
+    },
     "UpdateSnapshotSchedule":{
       "name":"UpdateSnapshotSchedule",
       "http":{
@@ -2233,6 +2247,10 @@
         "Tags":{
           "shape":"Tags",
           "documentation":"<p>A list of up to 50 tags assigned to the gateway, sorted alphabetically by key name. Each tag is a key-value pair. For a gateway with more than 10 tags assigned, you can view all tags using the <code>ListTagsForResource</code> API operation.</p>"
+        },
+        "VPCEndpoint":{
+          "shape":"string",
+          "documentation":"<p>The configuration settings for the virtual private cloud (VPC) endpoint for your gateway. </p>"
         }
       },
       "documentation":"<p>A JSON object containing the following fields:</p>"
@@ -2332,6 +2350,10 @@
         "SMBGuestPasswordSet":{
           "shape":"Boolean",
           "documentation":"<p>This value is true if a password for the guest user “smbguest” is set, and otherwise false.</p>"
+        },
+        "SMBSecurityStrategy":{
+          "shape":"SMBSecurityStrategy",
+          "documentation":"<p>The type of security strategy that was specified for file gateway.</p> <p>ClientSpecified: SMBv1 is enabled, SMB signing is offered but not required, SMB encryption is offered but not required.</p> <p>MandatorySigning: SMBv1 is disabled, SMB signing is required, SMB encryption is offered but not required.</p> <p>MandatoryEncryption: SMBv1 is disabled, SMB signing is offered but not required, SMB encryption is required.</p>"
         }
       }
     },
@@ -3690,6 +3712,14 @@
       "pattern":"^[ -~]+$",
       "sensitive":true
     },
+    "SMBSecurityStrategy":{
+      "type":"string",
+      "enum":[
+        "ClientSpecified",
+        "MandatorySigning",
+        "MandatoryEncryption"
+      ]
+    },
     "ServiceUnavailableError":{
       "type":"structure",
       "members":{
@@ -4381,6 +4411,26 @@
       },
       "documentation":"<p>UpdateSMBFileShareOutput</p>"
     },
+    "UpdateSMBSecurityStrategyInput":{
+      "type":"structure",
+      "required":[
+        "GatewayARN",
+        "SMBSecurityStrategy"
+      ],
+      "members":{
+        "GatewayARN":{"shape":"GatewayARN"},
+        "SMBSecurityStrategy":{
+          "shape":"SMBSecurityStrategy",
+          "documentation":"<p>Specifies the type of security strategy.</p> <p>ClientSpecified: SMBv1 is enabled, SMB signing is offered but not required, SMB encryption is offered but not required.</p> <p>MandatorySigning: SMBv1 is disabled, SMB signing is required, SMB encryption is offered but not required.</p> <p>MandatoryEncryption: SMBv1 is disabled, SMB signing is offered but not required, SMB encryption is required.</p>"
+        }
+      }
+    },
+    "UpdateSMBSecurityStrategyOutput":{
+      "type":"structure",
+      "members":{
+        "GatewayARN":{"shape":"GatewayARN"}
+      }
+    },
     "UpdateSnapshotScheduleInput":{
       "type":"structure",
       "required":[

docs/source/conf.py

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