Release v1.25.32 (2019-11-11) (#2940)

Release v1.25.32 (2019-11-11) === ### Service Client Updates * `service/ce`: Updates service API and documentation * `service/cloudformation`: Updates service API, documentation, and waiters * The Resource Import feature enables customers to import existing AWS resources into new or existing CloudFormation Stacks.
aws · Nov 11, 2019 · 1337b9a · 1337b9a
1 parent b8ebb17
commit 1337b9a
Show file tree

Hide file tree

Showing 14 changed files with 967 additions and 72 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,11 @@
+Release v1.25.32 (2019-11-11)
+===
+
+### Service Client Updates
+* `service/ce`: Updates service API and documentation
+* `service/cloudformation`: Updates service API, documentation, and waiters
+  * The Resource Import feature enables customers to import existing AWS resources into new or existing CloudFormation Stacks.
+
 Release v1.25.31 (2019-11-08)
 ===
 

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.25.31"
+const SDKVersion = "1.25.32"
diff --git a/models/apis/ce/2017-10-25/api-2.json b/models/apis/ce/2017-10-25/api-2.json
@@ -30,6 +30,22 @@
         {"shape":"RequestChangedException"}
       ]
     },
+    "GetCostAndUsageWithResources":{
+      "name":"GetCostAndUsageWithResources",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"GetCostAndUsageWithResourcesRequest"},
+      "output":{"shape":"GetCostAndUsageWithResourcesResponse"},
+      "errors":[
+        {"shape":"DataUnavailableException"},
+        {"shape":"LimitExceededException"},
+        {"shape":"BillExpirationException"},
+        {"shape":"InvalidNextTokenException"},
+        {"shape":"RequestChangedException"}
+      ]
+    },
     "GetCostForecast":{
       "name":"GetCostForecast",
       "http":{
@@ -335,6 +351,7 @@
         "INSTANCE_TYPE_FAMILY",
         "BILLING_ENTITY",
         "RESERVATION_ID",
+        "RESOURCE_ID",
         "RIGHTSIZING_TYPE",
         "SAVINGS_PLANS_TYPE",
         "SAVINGS_PLAN_ARN",
@@ -473,6 +490,26 @@
         "ResultsByTime":{"shape":"ResultsByTime"}
       }
     },
+    "GetCostAndUsageWithResourcesRequest":{
+      "type":"structure",
+      "required":["TimePeriod"],
+      "members":{
+        "TimePeriod":{"shape":"DateInterval"},
+        "Granularity":{"shape":"Granularity"},
+        "Filter":{"shape":"Expression"},
+        "Metrics":{"shape":"MetricNames"},
+        "GroupBy":{"shape":"GroupDefinitions"},
+        "NextPageToken":{"shape":"NextPageToken"}
+      }
+    },
+    "GetCostAndUsageWithResourcesResponse":{
+      "type":"structure",
+      "members":{
+        "NextPageToken":{"shape":"NextPageToken"},
+        "GroupDefinitions":{"shape":"GroupDefinitions"},
+        "ResultsByTime":{"shape":"ResultsByTime"}
+      }
+    },
     "GetCostForecastRequest":{
       "type":"structure",
       "required":[

diff --git a/models/apis/ce/2017-10-25/docs-2.json b/models/apis/ce/2017-10-25/docs-2.json
diff --git a/models/apis/cloudformation/2010-05-15/api-2.json b/models/apis/cloudformation/2010-05-15/api-2.json
@@ -741,7 +741,8 @@
       "enum":[
         "Add",
         "Modify",
-        "Remove"
+        "Remove",
+        "Import"
       ]
     },
     "ChangeSetId":{
@@ -805,7 +806,8 @@
       "type":"string",
       "enum":[
         "CREATE",
-        "UPDATE"
+        "UPDATE",
+        "IMPORT"
       ]
     },
     "ChangeSource":{
@@ -873,7 +875,8 @@
         "ChangeSetName":{"shape":"ChangeSetName"},
         "ClientToken":{"shape":"ClientToken"},
         "Description":{"shape":"Description"},
-        "ChangeSetType":{"shape":"ChangeSetType"}
+        "ChangeSetType":{"shape":"ChangeSetType"},
+        "ResourcesToImport":{"shape":"ResourcesToImport"}
       }
     },
     "CreateChangeSetOutput":{
@@ -1401,7 +1404,8 @@
         "ResourceTypes":{"shape":"ResourceTypes"},
         "Version":{"shape":"Version"},
         "Metadata":{"shape":"Metadata"},
-        "DeclaredTransforms":{"shape":"TransformsList"}
+        "DeclaredTransforms":{"shape":"TransformsList"},
+        "ResourceIdentifierSummaries":{"shape":"ResourceIdentifierSummaries"}
       }
     },
     "Imports":{
@@ -1838,6 +1842,39 @@
       "type":"list",
       "member":{"shape":"ResourceChangeDetail"}
     },
+    "ResourceIdentifierProperties":{
+      "type":"map",
+      "key":{"shape":"ResourceIdentifierPropertyKey"},
+      "value":{"shape":"ResourceIdentifierPropertyValue"},
+      "max":256,
+      "min":1
+    },
+    "ResourceIdentifierPropertyKey":{
+      "type":"string",
+      "max":2048,
+      "min":1
+    },
+    "ResourceIdentifierPropertyValue":{
+      "type":"string",
+      "max":2048,
+      "min":1
+    },
+    "ResourceIdentifierSummaries":{
+      "type":"list",
+      "member":{"shape":"ResourceIdentifierSummary"}
+    },
+    "ResourceIdentifierSummary":{
+      "type":"structure",
+      "members":{
+        "ResourceType":{"shape":"ResourceType"},
+        "LogicalResourceIds":{"shape":"LogicalResourceIds"},
+        "ResourceIdentifiers":{"shape":"ResourceIdentifiers"}
+      }
+    },
+    "ResourceIdentifiers":{
+      "type":"list",
+      "member":{"shape":"ResourceIdentifierPropertyKey"}
+    },
     "ResourceProperties":{"type":"string"},
     "ResourceSignalStatus":{
       "type":"string",
@@ -1863,7 +1900,13 @@
         "DELETE_SKIPPED",
         "UPDATE_IN_PROGRESS",
         "UPDATE_FAILED",
-        "UPDATE_COMPLETE"
+        "UPDATE_COMPLETE",
+        "IMPORT_FAILED",
+        "IMPORT_COMPLETE",
+        "IMPORT_IN_PROGRESS",
+        "IMPORT_ROLLBACK_IN_PROGRESS",
+        "IMPORT_ROLLBACK_FAILED",
+        "IMPORT_ROLLBACK_COMPLETE"
       ]
     },
     "ResourceStatusReason":{"type":"string"},
@@ -1875,6 +1918,19 @@
         "RequiresRecreation":{"shape":"RequiresRecreation"}
       }
     },
+    "ResourceToImport":{
+      "type":"structure",
+      "required":[
+        "ResourceType",
+        "LogicalResourceId",
+        "ResourceIdentifier"
+      ],
+      "members":{
+        "ResourceType":{"shape":"ResourceType"},
+        "LogicalResourceId":{"shape":"LogicalResourceId"},
+        "ResourceIdentifier":{"shape":"ResourceIdentifierProperties"}
+      }
+    },
     "ResourceToSkip":{
       "type":"string",
       "pattern":"[a-zA-Z0-9]+|[a-zA-Z][-a-zA-Z0-9]*\\.[a-zA-Z0-9]+"
@@ -1888,6 +1944,11 @@
       "type":"list",
       "member":{"shape":"ResourceType"}
     },
+    "ResourcesToImport":{
+      "type":"list",
+      "member":{"shape":"ResourceToImport"},
+      "max":200
+    },
     "ResourcesToSkip":{
       "type":"list",
       "member":{"shape":"ResourceToSkip"}
@@ -2415,7 +2476,12 @@
         "UPDATE_ROLLBACK_FAILED",
         "UPDATE_ROLLBACK_COMPLETE_CLEANUP_IN_PROGRESS",
         "UPDATE_ROLLBACK_COMPLETE",
-        "REVIEW_IN_PROGRESS"
+        "REVIEW_IN_PROGRESS",
+        "IMPORT_IN_PROGRESS",
+        "IMPORT_COMPLETE",
+        "IMPORT_ROLLBACK_IN_PROGRESS",
+        "IMPORT_ROLLBACK_FAILED",
+        "IMPORT_ROLLBACK_COMPLETE"
       ]
     },
     "StackStatusFilter":{