Skip to content

Commit 8aa8177

Browse files
AWS SDK for RubyNobody
AWS SDK for Ruby
authored and
Nobody
committed
Updated service API models for release.
1 parent 003c948 commit 8aa8177

File tree

7 files changed

+290
-36
lines changed

7 files changed

+290
-36
lines changed

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
Unreleased Changes
22
------------------
33

4+
* Feature - Aws::CostExplorer - Updated the API, and documentation for AWS Cost Explorer Service.
5+
6+
* Feature - Aws::CloudFormation - Updated the API, documentation, waiters, and integration test for AWS CloudFormation.
7+
48
2.11.394 (2019-11-08)
59
------------------
610

‎aws-sdk-core/apis/ce/2017-10-25/api-2.json‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,22 @@
3030
{"shape":"RequestChangedException"}
3131
]
3232
},
33+
"GetCostAndUsageWithResources":{
34+
"name":"GetCostAndUsageWithResources",
35+
"http":{
36+
"method":"POST",
37+
"requestUri":"/"
38+
},
39+
"input":{"shape":"GetCostAndUsageWithResourcesRequest"},
40+
"output":{"shape":"GetCostAndUsageWithResourcesResponse"},
41+
"errors":[
42+
{"shape":"DataUnavailableException"},
43+
{"shape":"LimitExceededException"},
44+
{"shape":"BillExpirationException"},
45+
{"shape":"InvalidNextTokenException"},
46+
{"shape":"RequestChangedException"}
47+
]
48+
},
3349
"GetCostForecast":{
3450
"name":"GetCostForecast",
3551
"http":{
@@ -335,6 +351,7 @@
335351
"INSTANCE_TYPE_FAMILY",
336352
"BILLING_ENTITY",
337353
"RESERVATION_ID",
354+
"RESOURCE_ID",
338355
"RIGHTSIZING_TYPE",
339356
"SAVINGS_PLANS_TYPE",
340357
"SAVINGS_PLAN_ARN",
@@ -473,6 +490,26 @@
473490
"ResultsByTime":{"shape":"ResultsByTime"}
474491
}
475492
},
493+
"GetCostAndUsageWithResourcesRequest":{
494+
"type":"structure",
495+
"required":["TimePeriod"],
496+
"members":{
497+
"TimePeriod":{"shape":"DateInterval"},
498+
"Granularity":{"shape":"Granularity"},
499+
"Filter":{"shape":"Expression"},
500+
"Metrics":{"shape":"MetricNames"},
501+
"GroupBy":{"shape":"GroupDefinitions"},
502+
"NextPageToken":{"shape":"NextPageToken"}
503+
}
504+
},
505+
"GetCostAndUsageWithResourcesResponse":{
506+
"type":"structure",
507+
"members":{
508+
"NextPageToken":{"shape":"NextPageToken"},
509+
"GroupDefinitions":{"shape":"GroupDefinitions"},
510+
"ResultsByTime":{"shape":"ResultsByTime"}
511+
}
512+
},
476513
"GetCostForecastRequest":{
477514
"type":"structure",
478515
"required":[

‎aws-sdk-core/apis/ce/2017-10-25/docs-2.json‎

Lines changed: 36 additions & 16 deletions
Large diffs are not rendered by default.

‎aws-sdk-core/apis/cloudformation/2010-05-15/api-2.json‎

Lines changed: 72 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -741,7 +741,8 @@
741741
"enum":[
742742
"Add",
743743
"Modify",
744-
"Remove"
744+
"Remove",
745+
"Import"
745746
]
746747
},
747748
"ChangeSetId":{
@@ -805,7 +806,8 @@
805806
"type":"string",
806807
"enum":[
807808
"CREATE",
808-
"UPDATE"
809+
"UPDATE",
810+
"IMPORT"
809811
]
810812
},
811813
"ChangeSource":{
@@ -873,7 +875,8 @@
873875
"ChangeSetName":{"shape":"ChangeSetName"},
874876
"ClientToken":{"shape":"ClientToken"},
875877
"Description":{"shape":"Description"},
876-
"ChangeSetType":{"shape":"ChangeSetType"}
878+
"ChangeSetType":{"shape":"ChangeSetType"},
879+
"ResourcesToImport":{"shape":"ResourcesToImport"}
877880
}
878881
},
879882
"CreateChangeSetOutput":{
@@ -1401,7 +1404,8 @@
14011404
"ResourceTypes":{"shape":"ResourceTypes"},
14021405
"Version":{"shape":"Version"},
14031406
"Metadata":{"shape":"Metadata"},
1404-
"DeclaredTransforms":{"shape":"TransformsList"}
1407+
"DeclaredTransforms":{"shape":"TransformsList"},
1408+
"ResourceIdentifierSummaries":{"shape":"ResourceIdentifierSummaries"}
14051409
}
14061410
},
14071411
"Imports":{
@@ -1838,6 +1842,39 @@
18381842
"type":"list",
18391843
"member":{"shape":"ResourceChangeDetail"}
18401844
},
1845+
"ResourceIdentifierProperties":{
1846+
"type":"map",
1847+
"key":{"shape":"ResourceIdentifierPropertyKey"},
1848+
"value":{"shape":"ResourceIdentifierPropertyValue"},
1849+
"max":256,
1850+
"min":1
1851+
},
1852+
"ResourceIdentifierPropertyKey":{
1853+
"type":"string",
1854+
"max":2048,
1855+
"min":1
1856+
},
1857+
"ResourceIdentifierPropertyValue":{
1858+
"type":"string",
1859+
"max":2048,
1860+
"min":1
1861+
},
1862+
"ResourceIdentifierSummaries":{
1863+
"type":"list",
1864+
"member":{"shape":"ResourceIdentifierSummary"}
1865+
},
1866+
"ResourceIdentifierSummary":{
1867+
"type":"structure",
1868+
"members":{
1869+
"ResourceType":{"shape":"ResourceType"},
1870+
"LogicalResourceIds":{"shape":"LogicalResourceIds"},
1871+
"ResourceIdentifiers":{"shape":"ResourceIdentifiers"}
1872+
}
1873+
},
1874+
"ResourceIdentifiers":{
1875+
"type":"list",
1876+
"member":{"shape":"ResourceIdentifierPropertyKey"}
1877+
},
18411878
"ResourceProperties":{"type":"string"},
18421879
"ResourceSignalStatus":{
18431880
"type":"string",
@@ -1863,7 +1900,13 @@
18631900
"DELETE_SKIPPED",
18641901
"UPDATE_IN_PROGRESS",
18651902
"UPDATE_FAILED",
1866-
"UPDATE_COMPLETE"
1903+
"UPDATE_COMPLETE",
1904+
"IMPORT_FAILED",
1905+
"IMPORT_COMPLETE",
1906+
"IMPORT_IN_PROGRESS",
1907+
"IMPORT_ROLLBACK_IN_PROGRESS",
1908+
"IMPORT_ROLLBACK_FAILED",
1909+
"IMPORT_ROLLBACK_COMPLETE"
18671910
]
18681911
},
18691912
"ResourceStatusReason":{"type":"string"},
@@ -1875,6 +1918,19 @@
18751918
"RequiresRecreation":{"shape":"RequiresRecreation"}
18761919
}
18771920
},
1921+
"ResourceToImport":{
1922+
"type":"structure",
1923+
"required":[
1924+
"ResourceType",
1925+
"LogicalResourceId",
1926+
"ResourceIdentifier"
1927+
],
1928+
"members":{
1929+
"ResourceType":{"shape":"ResourceType"},
1930+
"LogicalResourceId":{"shape":"LogicalResourceId"},
1931+
"ResourceIdentifier":{"shape":"ResourceIdentifierProperties"}
1932+
}
1933+
},
18781934
"ResourceToSkip":{
18791935
"type":"string",
18801936
"pattern":"[a-zA-Z0-9]+|[a-zA-Z][-a-zA-Z0-9]*\\.[a-zA-Z0-9]+"
@@ -1888,6 +1944,11 @@
18881944
"type":"list",
18891945
"member":{"shape":"ResourceType"}
18901946
},
1947+
"ResourcesToImport":{
1948+
"type":"list",
1949+
"member":{"shape":"ResourceToImport"},
1950+
"max":200
1951+
},
18911952
"ResourcesToSkip":{
18921953
"type":"list",
18931954
"member":{"shape":"ResourceToSkip"}
@@ -2415,7 +2476,12 @@
24152476
"UPDATE_ROLLBACK_FAILED",
24162477
"UPDATE_ROLLBACK_COMPLETE_CLEANUP_IN_PROGRESS",
24172478
"UPDATE_ROLLBACK_COMPLETE",
2418-
"REVIEW_IN_PROGRESS"
2479+
"REVIEW_IN_PROGRESS",
2480+
"IMPORT_IN_PROGRESS",
2481+
"IMPORT_COMPLETE",
2482+
"IMPORT_ROLLBACK_IN_PROGRESS",
2483+
"IMPORT_ROLLBACK_FAILED",
2484+
"IMPORT_ROLLBACK_COMPLETE"
24192485
]
24202486
},
24212487
"StackStatusFilter":{

‎aws-sdk-core/apis/cloudformation/2010-05-15/docs-2.json‎

Lines changed: 66 additions & 13 deletions
Large diffs are not rendered by default.

‎aws-sdk-core/apis/cloudformation/2010-05-15/smoke.json‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{
2+
"version": 1,
3+
"defaultRegion": "us-west-2",
4+
"testCases": [
5+
{
6+
"operationName": "ListStacks",
7+
"input": {},
8+
"errorExpectedFromService": false
9+
},
10+
{
11+
"operationName": "CreateStack",
12+
"input": {
13+
"StackName": "fakestack",
14+
"TemplateURL": "http:\/\/s3.amazonaws.com\/foo\/bar"
15+
},
16+
"errorExpectedFromService": true
17+
}
18+
]
19+
}

‎aws-sdk-core/apis/cloudformation/2010-05-15/waiters-2.json‎

Lines changed: 56 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,12 @@
102102
"matcher": "pathAny",
103103
"state": "failure"
104104
},
105+
{
106+
"argument": "Stacks[].StackStatus",
107+
"expected": "UPDATE_ROLLBACK_IN_PROGRESS",
108+
"matcher": "pathAny",
109+
"state": "failure"
110+
},
105111
{
106112
"argument": "Stacks[].StackStatus",
107113
"expected": "UPDATE_ROLLBACK_FAILED",
@@ -110,7 +116,7 @@
110116
},
111117
{
112118
"argument": "Stacks[].StackStatus",
113-
"expected": "UPDATE_ROLLBACK_IN_PROGRESS",
119+
"expected": "UPDATE_ROLLBACK_COMPLETE",
114120
"matcher": "pathAny",
115121
"state": "failure"
116122
}
@@ -153,6 +159,55 @@
153159
}
154160
]
155161
},
162+
"StackImportComplete": {
163+
"delay": 30,
164+
"maxAttempts": 120,
165+
"operation": "DescribeStacks",
166+
"description": "Wait until stack status is IMPORT_COMPLETE.",
167+
"acceptors": [
168+
{
169+
"argument": "Stacks[].StackStatus",
170+
"expected": "IMPORT_COMPLETE",
171+
"matcher": "pathAll",
172+
"state": "success"
173+
},
174+
{
175+
"expected": "ROLLBACK_COMPLETE",
176+
"matcher": "pathAny",
177+
"state": "failure",
178+
"argument": "Stacks[].StackStatus"
179+
},
180+
{
181+
"expected": "ROLLBACK_FAILED",
182+
"matcher": "pathAny",
183+
"state": "failure",
184+
"argument": "Stacks[].StackStatus"
185+
},
186+
{
187+
"argument": "Stacks[].StackStatus",
188+
"expected": "IMPORT_ROLLBACK_IN_PROGRESS",
189+
"matcher": "pathAny",
190+
"state": "failure"
191+
},
192+
{
193+
"argument": "Stacks[].StackStatus",
194+
"expected": "IMPORT_ROLLBACK_FAILED",
195+
"matcher": "pathAny",
196+
"state": "failure"
197+
},
198+
{
199+
"expected": "IMPORT_ROLLBACK_COMPLETE",
200+
"matcher": "pathAny",
201+
"state": "failure",
202+
"argument": "Stacks[].StackStatus"
203+
},
204+
{
205+
"expected": "ValidationError",
206+
"matcher": "error",
207+
"state": "failure"
208+
}
209+
]
210+
},
156211
"ChangeSetCreateComplete": {
157212
"delay": 30,
158213
"operation": "DescribeChangeSet",

0 commit comments

Comments
 (0)