Merge branch 'release-1.12.5'

* release-1.12.5:
  Bumping version to 1.12.5
  Update to latest models

.changes/1.12.5.json

@@ -0,0 +1,37 @@
+[
+  {
+    "category": "``codebuild``", 
+    "description": "Update codebuild client to latest version", 
+    "type": "api-change"
+  }, 
+  {
+    "category": "``elastictranscoder``", 
+    "description": "Update elastictranscoder client to latest version", 
+    "type": "api-change"
+  }, 
+  {
+    "category": "``ecs``", 
+    "description": "Update ecs client to latest version", 
+    "type": "api-change"
+  }, 
+  {
+    "category": "``ec2``", 
+    "description": "Update ec2 client to latest version", 
+    "type": "api-change"
+  }, 
+  {
+    "category": "``cloudwatch``", 
+    "description": "Update cloudwatch client to latest version", 
+    "type": "api-change"
+  }, 
+  {
+    "category": "``secretsmanager``", 
+    "description": "Update secretsmanager client to latest version", 
+    "type": "api-change"
+  }, 
+  {
+    "category": "``elasticache``", 
+    "description": "Update elasticache client to latest version", 
+    "type": "api-change"
+  }
+]

CHANGELOG.rst

@@ -2,6 +2,18 @@
 CHANGELOG
 =========
 
+1.12.5
+======
+
+* api-change:``codebuild``: Update codebuild client to latest version
+* api-change:``elastictranscoder``: Update elastictranscoder client to latest version
+* api-change:``ecs``: Update ecs client to latest version
+* api-change:``ec2``: Update ec2 client to latest version
+* api-change:``cloudwatch``: Update cloudwatch client to latest version
+* api-change:``secretsmanager``: Update secretsmanager client to latest version
+* api-change:``elasticache``: Update elasticache client to latest version
+
+
 1.12.4
 ======
 

botocore/__init__.py

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

botocore/data/codebuild/2016-10-06/service-2.json

@@ -555,6 +555,25 @@
         "S3"
       ]
     },
+    "CloudWatchLogsConfig":{
+      "type":"structure",
+      "required":["status"],
+      "members":{
+        "status":{
+          "shape":"LogsConfigStatusType",
+          "documentation":"<p>The current status of the Amazon CloudWatch Logs for a build project. Valid values are:</p> <ul> <li> <p> <code>ENABLED</code>: Amazon CloudWatch Logs are enabled for this build project.</p> </li> <li> <p> <code>DISABLED</code>: Amazon CloudWatch Logs are not enabled for this build project.</p> </li> </ul>"
+        },
+        "groupName":{
+          "shape":"String",
+          "documentation":"<p> The group name of the Amazon CloudWatch Logs. For more information, see <a href=\"http://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/Working-with-log-groups-and-streams.html\">Working with Log Groups and Log Streams</a> </p>"
+        },
+        "streamName":{
+          "shape":"String",
+          "documentation":"<p> The prefix of the stream name of the Amazon CloudWatch Logs. For more information, see <a href=\"http://docs.aws.amazon.com/AmazonCloudWatch/latest/logs/Working-with-log-groups-and-streams.html\">Working with Log Groups and Log Streams</a> </p>"
+        }
+      },
+      "documentation":"<p> Information about Amazon CloudWatch Logs for a build project. </p>"
+    },
     "ComputeType":{
       "type":"string",
       "enum":[
@@ -628,6 +647,10 @@
         "badgeEnabled":{
           "shape":"WrapperBoolean",
           "documentation":"<p>Set this to true to generate a publicly-accessible URL for your project's build badge.</p>"
+        },
+        "logsConfig":{
+          "shape":"LogsConfig",
+          "documentation":"<p> Information about logs for the build project. Logs can be Amazon CloudWatch Logs, uploaded to a specified S3 bucket, or both. </p>"
         }
       }
     },
@@ -942,6 +965,27 @@
         }
       }
     },
+    "LogsConfig":{
+      "type":"structure",
+      "members":{
+        "cloudWatchLogs":{
+          "shape":"CloudWatchLogsConfig",
+          "documentation":"<p> Information about Amazon CloudWatch Logs for a build project. Amazon CloudWatch Logs are enabled by default. </p>"
+        },
+        "s3Logs":{
+          "shape":"S3LogsConfig",
+          "documentation":"<p> Information about logs built to an S3 bucket for a build project. S3 logs are not enabled by default. </p>"
+        }
+      },
+      "documentation":"<p> Information about logs for a build project. Logs can be Amazon CloudWatch Logs, built in a specified S3 bucket, or both. </p>"
+    },
+    "LogsConfigStatusType":{
+      "type":"string",
+      "enum":[
+        "ENABLED",
+        "DISABLED"
+      ]
+    },
     "LogsLocation":{
       "type":"structure",
       "members":{
@@ -956,6 +1000,18 @@
         "deepLink":{
           "shape":"String",
           "documentation":"<p>The URL to an individual build log in Amazon CloudWatch Logs.</p>"
+        },
+        "s3DeepLink":{
+          "shape":"String",
+          "documentation":"<p> The URL to an individual build log in an S3 bucket. </p>"
+        },
+        "cloudWatchLogs":{
+          "shape":"CloudWatchLogsConfig",
+          "documentation":"<p> Information about Amazon CloudWatch Logs for a build project. </p>"
+        },
+        "s3Logs":{
+          "shape":"S3LogsConfig",
+          "documentation":"<p> Information about S3 logs for a build project. </p>"
         }
       },
       "documentation":"<p>Information about build logs in Amazon CloudWatch Logs.</p>"
@@ -1086,6 +1142,10 @@
         "badge":{
           "shape":"ProjectBadge",
           "documentation":"<p>Information about the build badge for the build project.</p>"
+        },
+        "logsConfig":{
+          "shape":"LogsConfig",
+          "documentation":"<p> Information about logs for the build project. A project can create Amazon CloudWatch Logs, logs in an S3 bucket, or both. </p>"
         }
       },
       "documentation":"<p>Information about a build project.</p>"
@@ -1240,7 +1300,7 @@
       "members":{
         "type":{
           "shape":"SourceType",
-          "documentation":"<p>The type of repository that contains the source code to be built. Valid values include:</p> <ul> <li> <p> <code>BITBUCKET</code>: The source code is in a Bitbucket repository.</p> </li> <li> <p> <code>CODECOMMIT</code>: The source code is in an AWS CodeCommit repository.</p> </li> <li> <p> <code>CODEPIPELINE</code>: The source code settings are specified in the source action of a pipeline in AWS CodePipeline.</p> </li> <li> <p> <code>GITHUB</code>: The source code is in a GitHub repository.</p> </li> <li> <p> <code>S3</code>: The source code is in an Amazon Simple Storage Service (Amazon S3) input bucket.</p> </li> </ul>"
+          "documentation":"<p>The type of repository that contains the source code to be built. Valid values include:</p> <ul> <li> <p> <code>BITBUCKET</code>: The source code is in a Bitbucket repository.</p> </li> <li> <p> <code>CODECOMMIT</code>: The source code is in an AWS CodeCommit repository.</p> </li> <li> <p> <code>CODEPIPELINE</code>: The source code settings are specified in the source action of a pipeline in AWS CodePipeline.</p> </li> <li> <p> <code>GITHUB</code>: The source code is in a GitHub repository.</p> </li> <li> <p> <code>NO_SOURCE</code>: The project does not have input source code.</p> </li> <li> <p> <code>S3</code>: The source code is in an Amazon Simple Storage Service (Amazon S3) input bucket.</p> </li> </ul>"
         },
         "location":{
           "shape":"String",
@@ -1315,6 +1375,21 @@
       "documentation":"<p>The specified AWS resource cannot be found.</p>",
       "exception":true
     },
+    "S3LogsConfig":{
+      "type":"structure",
+      "required":["status"],
+      "members":{
+        "status":{
+          "shape":"LogsConfigStatusType",
+          "documentation":"<p>The current status of the S3 build logs. Valid values are:</p> <ul> <li> <p> <code>ENABLED</code>: S3 build logs are enabled for this build project.</p> </li> <li> <p> <code>DISABLED</code>: S3 build logs are not enabled for this build project.</p> </li> </ul>"
+        },
+        "location":{
+          "shape":"String",
+          "documentation":"<p> The ARN of an S3 bucket and the path prefix for S3 logs. If your Amazon S3 bucket name is <code>my-bucket</code>, and your path prefix is <code>build-log</code>, then acceptable formats are <code>my-bucket/build-log</code> or <code>aws:s3:::my-bucket/build-log</code>. </p>"
+        }
+      },
+      "documentation":"<p> Information about S3 logs for a build project. </p>"
+    },
     "SecurityGroupIds":{
       "type":"list",
       "member":{"shape":"NonEmptyString"},
@@ -1392,7 +1467,7 @@
         },
         "sourceTypeOverride":{
           "shape":"SourceType",
-          "documentation":"<p>A source input type for this build that overrides the source input defined in the build project</p>"
+          "documentation":"<p>A source input type for this build that overrides the source input defined in the build project.</p>"
         },
         "sourceLocationOverride":{
           "shape":"String",
@@ -1453,6 +1528,10 @@
         "idempotencyToken":{
           "shape":"String",
           "documentation":"<p>A unique, case sensitive identifier you provide to ensure the idempotency of the StartBuild request. The token is included in the StartBuild request and is valid for 12 hours. If you repeat the StartBuild request with the same token, but change a parameter, AWS CodeBuild returns a parameter mismatch error. </p>"
+        },
+        "logsConfigOverride":{
+          "shape":"LogsConfig",
+          "documentation":"<p> Log settings for this build that override the log settings defined in the build project. </p>"
         }
       }
     },
@@ -1586,6 +1665,10 @@
         "badgeEnabled":{
           "shape":"WrapperBoolean",
           "documentation":"<p>Set this to true to generate a publicly-accessible URL for your project's build badge.</p>"
+        },
+        "logsConfig":{
+          "shape":"LogsConfig",
+          "documentation":"<p> Information about logs for the build project. A project can create Amazon CloudWatch Logs, logs in an S3 bucket, or both. </p>"
         }
       }
     },

botocore/data/ec2/2016-11-15/service-2.json

@@ -3016,6 +3016,11 @@
           "shape":"Integer",
           "documentation":"<p>The number of Dedicated Hosts to allocate to your account with these parameters.</p>",
           "locationName":"quantity"
+        },
+        "TagSpecifications":{
+          "shape":"TagSpecificationList",
+          "documentation":"<p>The tags to apply to the Dedicated Host during creation.</p>",
+          "locationName":"TagSpecification"
         }
       }
     },
@@ -3027,7 +3032,8 @@
           "documentation":"<p>The ID of the allocated Dedicated Host. This is used to launch an instance onto a specific host.</p>",
           "locationName":"hostIdSet"
         }
-      }
+      },
+      "documentation":"<p>Contains the output of AllocateHosts.</p>"
     },
     "AllocationIdList":{
       "type":"list",
@@ -9763,7 +9769,7 @@
         },
         "Filters":{
           "shape":"FilterList",
-          "documentation":"<p>One or more filters.</p> <ul> <li> <p> <code>key</code> - The tag key.</p> </li> <li> <p> <code>resource-id</code> - The ID of the resource.</p> </li> <li> <p> <code>resource-type</code> - The resource type (<code>customer-gateway</code> | <code>dhcp-options</code> | <code>elastic-ip</code> | <code>fleet</code> | <code>fpga-image</code> | <code>image</code> | <code>instance</code> | <code>internet-gateway</code> | <code>launch-template</code> | <code>natgateway</code> | <code>network-acl</code> | <code>network-interface</code> | <code>reserved-instances</code> | <code>route-table</code> | <code>security-group</code> | <code>snapshot</code> | <code>spot-instances-request</code> | <code>subnet</code> | <code>volume</code> | <code>vpc</code> | <code>vpc-peering-connection</code> | <code>vpn-connection</code> | <code>vpn-gateway</code>).</p> </li> <li> <p> <code>tag</code>:&lt;key&gt; - The key/value combination of the tag. For example, specify \"tag:Owner\" for the filter name and \"TeamA\" for the filter value to find resources with the tag \"Owner=TeamA\".</p> </li> <li> <p> <code>value</code> - The tag value.</p> </li> </ul>",
+          "documentation":"<p>One or more filters.</p> <ul> <li> <p> <code>key</code> - The tag key.</p> </li> <li> <p> <code>resource-id</code> - The ID of the resource.</p> </li> <li> <p> <code>resource-type</code> - The resource type (<code>customer-gateway</code> | <code>dedicated-host</code> | <code>dhcp-options</code> | <code>elastic-ip</code> | <code>fleet</code> | <code>fpga-image</code> | <code>image</code> | <code>instance</code> | <code>internet-gateway</code> | <code>launch-template</code> | <code>natgateway</code> | <code>network-acl</code> | <code>network-interface</code> | <code>reserved-instances</code> | <code>route-table</code> | <code>security-group</code> | <code>snapshot</code> | <code>spot-instances-request</code> | <code>subnet</code> | <code>volume</code> | <code>vpc</code> | <code>vpc-peering-connection</code> | <code>vpn-connection</code> | <code>vpn-gateway</code>).</p> </li> <li> <p> <code>tag</code>:&lt;key&gt; - The key/value combination of the tag. For example, specify \"tag:Owner\" for the filter name and \"TeamA\" for the filter value to find resources with the tag \"Owner=TeamA\".</p> </li> <li> <p> <code>value</code> - The tag value.</p> </li> </ul>",
           "locationName":"Filter"
         },
         "MaxResults":{
@@ -19953,6 +19959,7 @@
       "type":"string",
       "enum":[
         "customer-gateway",
+        "dedicated-host",
         "dhcp-options",
         "image",
         "instance",
@@ -22763,7 +22770,7 @@
       "members":{
         "ResourceType":{
           "shape":"ResourceType",
-          "documentation":"<p>The type of resource to tag. Currently, the resource types that support tagging on creation are <code>fleet</code>, <code>instance</code>, <code>snapshot</code>, and <code>volume</code>. To tag a resource after it has been created, see <a>CreateTags</a>.</p>",
+          "documentation":"<p>The type of resource to tag. Currently, the resource types that support tagging on creation are <code>fleet</code>, <code>dedicated-host</code>, <code>instance</code>, <code>snapshot</code>, and <code>volume</code>. To tag a resource after it has been created, see <a>CreateTags</a>.</p>",
           "locationName":"resourceType"
         },
         "Tags":{