Merge branch 'release-1.16.17' into develop

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

.changes/1.16.17.json

@@ -0,0 +1,32 @@
+[
+  {
+    "category": "``elasticache``", 
+    "description": "Update elasticache client to latest version", 
+    "type": "api-change"
+  }, 
+  {
+    "category": "``dlm``", 
+    "description": "Update dlm client to latest version", 
+    "type": "api-change"
+  }, 
+  {
+    "category": "``quicksight``", 
+    "description": "Update quicksight client to latest version", 
+    "type": "api-change"
+  }, 
+  {
+    "category": "``ssm``", 
+    "description": "Update ssm client to latest version", 
+    "type": "api-change"
+  }, 
+  {
+    "category": "``ec2``", 
+    "description": "Update ec2 client to latest version", 
+    "type": "api-change"
+  }, 
+  {
+    "category": "``macie``", 
+    "description": "Update macie client to latest version", 
+    "type": "api-change"
+  }
+]

CHANGELOG.rst

@@ -2,6 +2,17 @@
 CHANGELOG
 =========
 
+1.16.17
+=======
+
+* api-change:``elasticache``: Update elasticache client to latest version
+* api-change:``dlm``: Update dlm client to latest version
+* api-change:``quicksight``: Update quicksight client to latest version
+* api-change:``ssm``: Update ssm client to latest version
+* api-change:``ec2``: Update ec2 client to latest version
+* api-change:``macie``: Update macie client to latest version
+
+
 1.16.16
 =======
 

botocore/__init__.py

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

botocore/data/dlm/2018-01-12/service-2.json

@@ -204,10 +204,6 @@
     },
     "CreateRule":{
       "type":"structure",
-      "required":[
-        "Interval",
-        "IntervalUnit"
-      ],
       "members":{
         "Interval":{
           "shape":"Interval",
@@ -219,10 +215,20 @@
         },
         "Times":{
           "shape":"TimesList",
-          "documentation":"<p>The time, in UTC, to start the operation. The supported format is hh:mm.</p> <p>The operation occurs within a one-hour window following the specified time.</p>"
+          "documentation":"<p>The time, in UTC, to start the operation. The supported format is hh:mm.</p> <p>The operation occurs within a one-hour window following the specified time. If you do not specify a time, Amazon DLM selects a time within the next 24 hours.</p>"
+        },
+        "CronExpression":{
+          "shape":"CronExpression",
+          "documentation":"<p>The schedule, as a Cron expression. The schedule interval must be between 1 hour and 1 year. For more information, see <a href=\"https://docs.aws.amazon.com/AmazonCloudWatch/latest/events/ScheduledEvents.html#CronExpressions\">Cron expressions</a> in the <i>Amazon CloudWatch User Guide</i>.</p>"
         }
       },
-      "documentation":"<p>Specifies when to create snapshots of EBS volumes.</p>"
+      "documentation":"<p>Specifies when to create snapshots of EBS volumes.</p> <p>You must specify either a Cron expression or an interval, interval unit, and start time. You cannot specify both.</p>"
+    },
+    "CronExpression":{
+      "type":"string",
+      "max":106,
+      "min":17,
+      "pattern":"cron\\([^\\n]{11,100}\\)"
     },
     "CrossRegionCopyRetainRule":{
       "type":"structure",
@@ -576,7 +582,7 @@
         },
         "ResourceTypes":{
           "shape":"ResourceTypeValuesList",
-          "documentation":"<p>The resource type.</p>"
+          "documentation":"<p>The resource type. Use VOLUME to create snapshots of individual volumes or use INSTANCE to create multi-volume snapshots from the volumes for an instance.</p>"
         },
         "TargetTags":{
           "shape":"TargetTagList",

botocore/data/elasticache/2015-02-02/service-2.json

@@ -1426,6 +1426,10 @@
         "AtRestEncryptionEnabled":{
           "shape":"BooleanOptional",
           "documentation":"<p>A flag that enables encryption at-rest when set to <code>true</code>.</p> <p>You cannot modify the value of <code>AtRestEncryptionEnabled</code> after the cluster is created. To enable at-rest encryption on a cluster you must set <code>AtRestEncryptionEnabled</code> to <code>true</code> when you create a cluster.</p> <p> <b>Required:</b> Only available when creating a replication group in an Amazon VPC using redis version <code>3.2.6</code>, <code>4.x</code> or later.</p> <p>Default: <code>false</code> </p>"
+        },
+        "ARN":{
+          "shape":"String",
+          "documentation":"<p>The ARN (Amazon Resource Name) of the cache cluster.</p>"
         }
       },
       "documentation":"<p>Contains all of the attributes of a specific cluster.</p>",
@@ -1709,6 +1713,10 @@
         "IsGlobal":{
           "shape":"Boolean",
           "documentation":"<p>Indicates whether the parameter group is associated with a Global Datastore</p>"
+        },
+        "ARN":{
+          "shape":"String",
+          "documentation":"<p>The ARN (Amazon Resource Name) of the cache parameter group.</p>"
         }
       },
       "documentation":"<p>Represents the output of a <code>CreateCacheParameterGroup</code> operation.</p>",
@@ -1835,6 +1843,10 @@
         "EC2SecurityGroups":{
           "shape":"EC2SecurityGroupList",
           "documentation":"<p>A list of Amazon EC2 security groups that are associated with this cache security group.</p>"
+        },
+        "ARN":{
+          "shape":"String",
+          "documentation":"<p>The ARN (Amazon Resource Name) of the cache security group.</p>"
         }
       },
       "documentation":"<p>Represents the output of one of the following operations:</p> <ul> <li> <p> <code>AuthorizeCacheSecurityGroupIngress</code> </p> </li> <li> <p> <code>CreateCacheSecurityGroup</code> </p> </li> <li> <p> <code>RevokeCacheSecurityGroupIngress</code> </p> </li> </ul>",
@@ -1943,6 +1955,10 @@
         "Subnets":{
           "shape":"SubnetList",
           "documentation":"<p>A list of subnets associated with the cache subnet group.</p>"
+        },
+        "ARN":{
+          "shape":"String",
+          "documentation":"<p>The ARN (Amazon Resource Name) of the cache subnet group.</p>"
         }
       },
       "documentation":"<p>Represents the output of one of the following operations:</p> <ul> <li> <p> <code>CreateCacheSubnetGroup</code> </p> </li> <li> <p> <code>ModifyCacheSubnetGroup</code> </p> </li> </ul>",
@@ -2372,7 +2388,7 @@
         },
         "NumCacheClusters":{
           "shape":"IntegerOptional",
-          "documentation":"<p>The number of clusters this replication group initially has.</p> <p>This parameter is not used if there is more than one node group (shard). You should use <code>ReplicasPerNodeGroup</code> instead.</p> <p>If <code>AutomaticFailoverEnabled</code> is <code>true</code>, the value of this parameter must be at least 2. If <code>AutomaticFailoverEnabled</code> is <code>false</code> you can omit this parameter (it will default to 1), or you can explicitly set it to a value between 2 and 6.</p> <p>The maximum permitted value for <code>NumCacheClusters</code> is 6 (1 primary plus 5 replicas).</p>"
+          "documentation":"<p>The number of nodes in the cluster.</p> <p>This parameter is not used if there is more than one node group (shard). You should use <code>ReplicasPerNodeGroup</code> instead.</p> <p>If <code>AutomaticFailoverEnabled</code> is <code>true</code>, the value of this parameter must be at least 2. If <code>AutomaticFailoverEnabled</code> is <code>false</code> you can omit this parameter (it will default to 1), or you can explicitly set it to a value between 2 and 6.</p> <p>The maximum permitted value for <code>NumCacheClusters</code> is 6 (1 primary plus 5 replicas).</p>"
         },
         "PreferredCacheClusterAZs":{
           "shape":"AvailabilityZonesList",
@@ -3386,6 +3402,10 @@
         "AtRestEncryptionEnabled":{
           "shape":"BooleanOptional",
           "documentation":"<p>A flag that enables encryption at rest when set to <code>true</code>.</p> <p>You cannot modify the value of <code>AtRestEncryptionEnabled</code> after the replication group is created. To enable encryption at rest on a replication group you must set <code>AtRestEncryptionEnabled</code> to <code>true</code> when you create the replication group. </p> <p> <b>Required:</b> Only available when creating a replication group in an Amazon VPC using redis version <code>3.2.6</code>, <code>4.x</code> or later.</p>"
+        },
+        "ARN":{
+          "shape":"String",
+          "documentation":"<p>The ARN (Amazon Resource Name) of the global replication group.</p>"
         }
       },
       "documentation":"<p>Consists of a primary cluster that accepts writes and an associated secondary cluster that resides in a different AWS region. The secondary cluster accepts only reads. The primary cluster automatically replicates updates to the secondary cluster.</p> <ul> <li> <p>The <b>GlobalReplicationGroupIdSuffix</b> represents the name of the Global Datastore, which is what you use to associate a secondary cluster.</p> </li> </ul>",
@@ -4731,6 +4751,10 @@
         "KmsKeyId":{
           "shape":"String",
           "documentation":"<p>The ID of the KMS key used to encrypt the disk in the cluster.</p>"
+        },
+        "ARN":{
+          "shape":"String",
+          "documentation":"<p>The ARN (Amazon Resource Name) of the replication group.</p>"
         }
       },
       "documentation":"<p>Contains all of the attributes of a specific Redis replication group.</p>",
@@ -5368,6 +5392,10 @@
         "KmsKeyId":{
           "shape":"String",
           "documentation":"<p>The ID of the KMS key used to encrypt the snapshot.</p>"
+        },
+        "ARN":{
+          "shape":"String",
+          "documentation":"<p>The ARN (Amazon Resource Name) of the snapshot.</p>"
         }
       },
       "documentation":"<p>Represents a copy of an entire Redis cluster as of the time when the snapshot was taken.</p>",

botocore/data/endpoints.json

@@ -7704,7 +7704,19 @@
       "sts" : {
         "endpoints" : {
           "us-gov-east-1" : { },
-          "us-gov-west-1" : { }
+          "us-gov-east-1-fips" : {
+            "credentialScope" : {
+              "region" : "us-gov-east-1"
+            },
+            "hostname" : "sts.us-gov-east-1.amazonaws.com"
+          },
+          "us-gov-west-1" : { },
+          "us-gov-west-1-fips" : {
+            "credentialScope" : {
+              "region" : "us-gov-west-1"
+            },
+            "hostname" : "sts.us-gov-west-1.amazonaws.com"
+          }
         }
       },
       "support" : {
@@ -7714,6 +7726,12 @@
               "region" : "us-gov-west-1"
             },
             "hostname" : "support.us-gov-west-1.amazonaws.com"
+          },
+          "fips-us-gov-west-1" : {
+            "credentialScope" : {
+              "region" : "us-gov-west-1"
+            },
+            "hostname" : "support.us-gov-west-1.amazonaws.com"
           }
         },
         "partitionEndpoint" : "aws-us-gov-global"