Release v1.12.40

ysugimoto · Dec 4, 2017 · 107df09 · 107df09
1 parent 8269a72
commit 107df09
Show file tree

Hide file tree

Showing 7 changed files with 114 additions and 65 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,12 @@
+Release v1.12.40 (2017-12-04)
+===
+
+### Service Client Updates
+* `service/budgets`: Updates service API and documentation
+  * Add additional costTypes to support finer control for different charges included in a cost budget.
+* `service/ecs`: Updates service documentation
+  * Documentation updates for ecs
+
 Release v1.12.39 (2017-12-01)
 ===
 

diff --git a/aws/version.go b/aws/version.go
@@ -5,4 +5,4 @@ package aws
 const SDKName = "aws-sdk-go"
 
 // SDKVersion is the version of this SDK
-const SDKVersion = "1.12.39"
+const SDKVersion = "1.12.40"
diff --git a/models/apis/budgets/2016-10-20/api-2.json b/models/apis/budgets/2016-10-20/api-2.json
@@ -219,7 +219,6 @@
       "required":[
         "BudgetName",
         "BudgetLimit",
-        "CostTypes",
         "TimeUnit",
         "TimePeriod",
         "BudgetType"
@@ -275,15 +274,16 @@
     },
     "CostTypes":{
       "type":"structure",
-      "required":[
-        "IncludeTax",
-        "IncludeSubscription",
-        "UseBlended"
-      ],
       "members":{
-        "IncludeTax":{"shape":"GenericBoolean"},
-        "IncludeSubscription":{"shape":"GenericBoolean"},
-        "UseBlended":{"shape":"GenericBoolean"}
+        "IncludeTax":{"shape":"NullableBoolean"},
+        "IncludeSubscription":{"shape":"NullableBoolean"},
+        "UseBlended":{"shape":"NullableBoolean"},
+        "IncludeRefund":{"shape":"NullableBoolean"},
+        "IncludeCredit":{"shape":"NullableBoolean"},
+        "IncludeUpfront":{"shape":"NullableBoolean"},
+        "IncludeRecurring":{"shape":"NullableBoolean"},
+        "IncludeOtherSubscription":{"shape":"NullableBoolean"},
+        "IncludeSupport":{"shape":"NullableBoolean"}
       }
     },
     "CreateBudgetRequest":{
@@ -497,7 +497,6 @@
       },
       "exception":true
     },
-    "GenericBoolean":{"type":"boolean"},
     "GenericString":{"type":"string"},
     "GenericTimestamp":{"type":"timestamp"},
     "InternalErrorException":{
@@ -580,6 +579,10 @@
       "type":"list",
       "member":{"shape":"Notification"}
     },
+    "NullableBoolean":{
+      "type":"boolean",
+      "box":true
+    },
     "NumericValue":{
       "type":"string",
       "pattern":"[0-9]*(\\.)?[0-9]+"
@@ -603,9 +606,13 @@
       ],
       "members":{
         "SubscriptionType":{"shape":"SubscriptionType"},
-        "Address":{"shape":"GenericString"}
+        "Address":{"shape":"SubscriberAddress"}
       }
     },
+    "SubscriberAddress":{
+      "type":"string",
+      "min":1
+    },
     "Subscribers":{
       "type":"list",
       "member":{"shape":"Subscriber"},

diff --git a/models/apis/budgets/2016-10-20/docs-2.json b/models/apis/budgets/2016-10-20/docs-2.json
@@ -217,14 +217,6 @@
       "refs": {
       }
     },
-    "GenericBoolean": {
-      "base": "A generic boolean value.",
-      "refs": {
-        "CostTypes$IncludeTax": null,
-        "CostTypes$IncludeSubscription": null,
-        "CostTypes$UseBlended": null
-      }
-    },
     "GenericString": {
       "base": "A generic String.",
       "refs": {
@@ -235,8 +227,7 @@
         "DescribeNotificationsForBudgetResponse$NextToken": null,
         "DescribeSubscribersForNotificationRequest$NextToken": null,
         "DescribeSubscribersForNotificationResponse$NextToken": null,
-        "DimensionValues$member": null,
-        "Subscriber$Address": null
+        "DimensionValues$member": null
       }
     },
     "GenericTimestamp": {
@@ -319,6 +310,20 @@
         "DescribeNotificationsForBudgetResponse$Notifications": null
       }
     },
+    "NullableBoolean": {
+      "base": null,
+      "refs": {
+        "CostTypes$IncludeTax": "A boolean value whether to include tax in the cost budget.",
+        "CostTypes$IncludeSubscription": "A boolean value whether to include subscriptions in the cost budget.",
+        "CostTypes$UseBlended": "A boolean value whether to use blended costs in the cost budget.",
+        "CostTypes$IncludeRefund": "A boolean value whether to include refunds in the cost budget.",
+        "CostTypes$IncludeCredit": "A boolean value whether to include credits in the cost budget.",
+        "CostTypes$IncludeUpfront": "A boolean value whether to include upfront costs in the cost budget.",
+        "CostTypes$IncludeRecurring": "A boolean value whether to include recurring costs in the cost budget.",
+        "CostTypes$IncludeOtherSubscription": "A boolean value whether to include other subscription costs in the cost budget.",
+        "CostTypes$IncludeSupport": "A boolean value whether to include support costs in the cost budget."
+      }
+    },
     "NumericValue": {
       "base": "A string to represent NumericValue.",
       "refs": {
@@ -343,6 +348,12 @@
         "UpdateSubscriberRequest$NewSubscriber": null
       }
     },
+    "SubscriberAddress": {
+      "base": "String containing email or sns topic for the subscriber address.",
+      "refs": {
+        "Subscriber$Address": null
+      }
+    },
     "Subscribers": {
       "base": "A list of subscribers.",
       "refs": {

diff --git a/models/apis/ecs/2014-11-13/docs-2.json b/models/apis/ecs/2014-11-13/docs-2.json
@@ -772,7 +772,7 @@
       "base": null,
       "refs": {
         "RegisterTaskDefinitionRequest$networkMode": "<p>The Docker networking mode to use for the containers in the task. The valid values are <code>none</code>, <code>bridge</code>, <code>awsvpc</code>, and <code>host</code>. The default Docker network mode is <code>bridge</code>. If using the Fargate launch type, the <code>awsvpc</code> network mode is required. If using the EC2 launch type, any network mode can be used. If the network mode is set to <code>none</code>, you can't specify port mappings in your container definitions, and the task's containers do not have external connectivity. The <code>host</code> and <code>awsvpc</code> network modes offer the highest networking performance for containers because they use the EC2 network stack instead of the virtualized network stack provided by the <code>bridge</code> mode.</p> <p>With the <code>host</code> and <code>awsvpc</code> network modes, exposed container ports are mapped directly to the corresponding host port (for the <code>host</code> network mode) or the attached elastic network interface port (for the <code>awsvpc</code> network mode), so you cannot take advantage of dynamic host port mappings. </p> <p>If the network mode is <code>awsvpc</code>, the task is allocated an Elastic Network Interface, and you must specify a <a>NetworkConfiguration</a> when you create a service or run a task with the task definition. For more information, see <a href=\"http://docs.aws.amazon.com/AmazonECS/latest/developerguide/task-networking.html\">Task Networking</a> in the <i>Amazon Elastic Container Service Developer Guide</i>.</p> <p>If the network mode is <code>host</code>, you can't run multiple instantiations of the same task on a single container instance when port mappings are used.</p> <p>For more information, see <a href=\"https://docs.docker.com/engine/reference/run/#network-settings\">Network settings</a> in the <i>Docker run reference</i>.</p>",
-        "TaskDefinition$networkMode": "<p>The Docker networking mode to use for the containers in the task. The valid values are <code>none</code>, <code>bridge</code>, <code>awsvpc</code>, and <code>host</code>. The default Docker network mode is <code>bridge</code>. If using the Fargate launch type, the <code>awsvpc</code> network mode is required. If using the EC2 launch type, any network mode can be used. If the network mode is set to <code>none</code>, you can't specify port mappings in your container definitions, and the task's containers do not have external connectivity. The <code>host</code> and <code>awsvpc</code> network modes offer the highest networking performance for containers because they use the EC2 network stack instead of the virtualized network stack provided by the <code>bridge</code> mode.</p> <p>With the <code>host</code> and <code>awsvpc</code> network modes, exposed container ports are mapped directly to the corresponding host port (for the <code>host</code> network mode) or the attached elastic network interface port (for the <code>awsvpc</code> network mode), so you cannot take advantage of dynamic host port mappings. </p> <p>If the network mode is <code>awsvpc</code>, the task is allocated an Elastic Network Interface, and you must specify a <a>NetworkConfiguration</a> when you create a service or run a task with the task definition. For more information, see <a href=\"http://docs.aws.amazon.com/AmazonECS/latest/developerguidetask-networking.html\">Task Networking</a> in the <i>Amazon Elastic Container Service Developer Guide</i>.</p> <p>If the network mode is <code>host</code>, you can't run multiple instantiations of the same task on a single container instance when port mappings are used.</p> <p>For more information, see <a href=\"https://docs.docker.com/engine/reference/run/#network-settings\">Network settings</a> in the <i>Docker run reference</i>.</p>"
+        "TaskDefinition$networkMode": "<p>The Docker networking mode to use for the containers in the task. The valid values are <code>none</code>, <code>bridge</code>, <code>awsvpc</code>, and <code>host</code>. The default Docker network mode is <code>bridge</code>. If using the Fargate launch type, the <code>awsvpc</code> network mode is required. If using the EC2 launch type, any network mode can be used. If the network mode is set to <code>none</code>, you can't specify port mappings in your container definitions, and the task's containers do not have external connectivity. The <code>host</code> and <code>awsvpc</code> network modes offer the highest networking performance for containers because they use the EC2 network stack instead of the virtualized network stack provided by the <code>bridge</code> mode.</p> <p>With the <code>host</code> and <code>awsvpc</code> network modes, exposed container ports are mapped directly to the corresponding host port (for the <code>host</code> network mode) or the attached elastic network interface port (for the <code>awsvpc</code> network mode), so you cannot take advantage of dynamic host port mappings. </p> <p>If the network mode is <code>awsvpc</code>, the task is allocated an Elastic Network Interface, and you must specify a <a>NetworkConfiguration</a> when you create a service or run a task with the task definition. For more information, see <a href=\"http://docs.aws.amazon.com/AmazonECS/latest/developerguide/task-networking.html\">Task Networking</a> in the <i>Amazon Elastic Container Service Developer Guide</i>.</p> <p>If the network mode is <code>host</code>, you can't run multiple instantiations of the same task on a single container instance when port mappings are used.</p> <p>For more information, see <a href=\"https://docs.docker.com/engine/reference/run/#network-settings\">Network settings</a> in the <i>Docker run reference</i>.</p>"
       }
     },
     "NoUpdateAvailableException": {

diff --git a/service/budgets/api.go b/service/budgets/api.go
diff --git a/service/ecs/api.go b/service/ecs/api.go