Skip to content

Commit 340b623

Browse files
author
AWS
committed
AWS Cloud Control API Update: SDK release for Cloud Control API to include paginators for Python SDK.
1 parent e5938db commit 340b623

File tree

4 files changed

+111
-96
lines changed

4 files changed

+111
-96
lines changed

‎.changes/next-release/feature-AWSCloudControlAPI-fc252b9.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"type": "feature",
3+
"category": "AWS Cloud Control API",
4+
"contributor": "",
5+
"description": "SDK release for Cloud Control API to include paginators for Python SDK."
6+
}

‎services/cloudcontrol/src/main/resources/codegen-resources/paginators-1.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,14 @@
33
"ListResourceRequests": {
44
"input_token": "NextToken",
55
"output_token": "NextToken",
6-
"limit_key": "MaxResults"
6+
"limit_key": "MaxResults",
7+
"result_key": "ResourceRequestStatusSummaries"
78
},
89
"ListResources": {
910
"input_token": "NextToken",
1011
"output_token": "NextToken",
11-
"limit_key": "MaxResults"
12+
"limit_key": "MaxResults",
13+
"result_key": "ResourceDescriptions"
1214
}
1315
}
1416
}

‎services/cloudcontrol/src/main/resources/codegen-resources/service-2.json

Lines changed: 78 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
"input":{"shape":"CancelResourceRequestInput"},
2424
"output":{"shape":"CancelResourceRequestOutput"},
2525
"errors":[
26-
{"shape":"RequestTokenNotFoundException"},
27-
{"shape":"ConcurrentModificationException"}
26+
{"shape":"ConcurrentModificationException"},
27+
{"shape":"RequestTokenNotFoundException"}
2828
],
2929
"documentation":"<p>Cancels the specified resource operation request. For more information, see <a href=\"https://docs.aws.amazon.com/cloudcontrolapi/latest/userguide/resource-operations-manage-requests.html#resource-operations-manage-requests-cancel\">Canceling resource operation requests</a> in the <i>Amazon Web Services Cloud Control API User Guide</i>.</p> <p>Only resource operations requests with a status of <code>PENDING</code> or <code>IN_PROGRESS</code> can be canceled.</p>",
3030
"idempotent":true
@@ -38,25 +38,25 @@
3838
"input":{"shape":"CreateResourceInput"},
3939
"output":{"shape":"CreateResourceOutput"},
4040
"errors":[
41-
{"shape":"ConcurrentOperationException"},
42-
{"shape":"ClientTokenConflictException"},
43-
{"shape":"UnsupportedActionException"},
44-
{"shape":"TypeNotFoundException"},
4541
{"shape":"AlreadyExistsException"},
46-
{"shape":"GeneralServiceException"},
4742
{"shape":"HandlerInternalFailureException"},
48-
{"shape":"InvalidCredentialsException"},
43+
{"shape":"GeneralServiceException"},
44+
{"shape":"NotUpdatableException"},
45+
{"shape":"TypeNotFoundException"},
46+
{"shape":"ConcurrentOperationException"},
4947
{"shape":"InvalidRequestException"},
50-
{"shape":"NetworkFailureException"},
48+
{"shape":"PrivateTypeException"},
5149
{"shape":"ResourceNotFoundException"},
50+
{"shape":"NetworkFailureException"},
51+
{"shape":"UnsupportedActionException"},
5252
{"shape":"NotStabilizedException"},
53-
{"shape":"NotUpdatableException"},
54-
{"shape":"ResourceConflictException"},
5553
{"shape":"ServiceInternalErrorException"},
54+
{"shape":"HandlerFailureException"},
5655
{"shape":"ServiceLimitExceededException"},
57-
{"shape":"ThrottlingException"},
58-
{"shape":"PrivateTypeException"},
59-
{"shape":"HandlerFailureException"}
56+
{"shape":"InvalidCredentialsException"},
57+
{"shape":"ResourceConflictException"},
58+
{"shape":"ClientTokenConflictException"},
59+
{"shape":"ThrottlingException"}
6060
],
6161
"documentation":"<p>Creates the specified resource. For more information, see <a href=\"https://docs.aws.amazon.com/cloudcontrolapi/latest/userguide/resource-operations-create.html\">Creating a resource</a> in the <i>Amazon Web Services Cloud Control API User Guide</i>.</p> <p>After you have initiated a resource creation request, you can monitor the progress of your request by calling <a href=\"https://docs.aws.amazon.com/cloudcontrolapi/latest/APIReference/API_GetResourceRequestStatus.html\">GetResourceRequestStatus</a> using the <code>RequestToken</code> of the <code>ProgressEvent</code> type returned by <code>CreateResource</code>.</p>"
6262
},
@@ -69,25 +69,25 @@
6969
"input":{"shape":"DeleteResourceInput"},
7070
"output":{"shape":"DeleteResourceOutput"},
7171
"errors":[
72-
{"shape":"ConcurrentOperationException"},
73-
{"shape":"ClientTokenConflictException"},
74-
{"shape":"UnsupportedActionException"},
75-
{"shape":"TypeNotFoundException"},
7672
{"shape":"AlreadyExistsException"},
77-
{"shape":"GeneralServiceException"},
7873
{"shape":"HandlerInternalFailureException"},
79-
{"shape":"InvalidCredentialsException"},
74+
{"shape":"GeneralServiceException"},
75+
{"shape":"NotUpdatableException"},
76+
{"shape":"TypeNotFoundException"},
77+
{"shape":"ConcurrentOperationException"},
8078
{"shape":"InvalidRequestException"},
81-
{"shape":"NetworkFailureException"},
79+
{"shape":"PrivateTypeException"},
8280
{"shape":"ResourceNotFoundException"},
81+
{"shape":"NetworkFailureException"},
82+
{"shape":"UnsupportedActionException"},
8383
{"shape":"NotStabilizedException"},
84-
{"shape":"NotUpdatableException"},
85-
{"shape":"ResourceConflictException"},
8684
{"shape":"ServiceInternalErrorException"},
85+
{"shape":"HandlerFailureException"},
8786
{"shape":"ServiceLimitExceededException"},
88-
{"shape":"ThrottlingException"},
89-
{"shape":"PrivateTypeException"},
90-
{"shape":"HandlerFailureException"}
87+
{"shape":"InvalidCredentialsException"},
88+
{"shape":"ResourceConflictException"},
89+
{"shape":"ClientTokenConflictException"},
90+
{"shape":"ThrottlingException"}
9191
],
9292
"documentation":"<p>Deletes the specified resource. For details, see <a href=\"https://docs.aws.amazon.com/cloudcontrolapi/latest/userguide/resource-operations-delete.html\">Deleting a resource</a> in the <i>Amazon Web Services Cloud Control API User Guide</i>.</p> <p>After you have initiated a resource deletion request, you can monitor the progress of your request by calling <a href=\"https://docs.aws.amazon.com/cloudcontrolapi/latest/APIReference/API_GetResourceRequestStatus.html\">GetResourceRequestStatus</a> using the <code>RequestToken</code> of the <code>ProgressEvent</code> returned by <code>DeleteResource</code>.</p>"
9393
},
@@ -100,23 +100,23 @@
100100
"input":{"shape":"GetResourceInput"},
101101
"output":{"shape":"GetResourceOutput"},
102102
"errors":[
103-
{"shape":"UnsupportedActionException"},
104-
{"shape":"TypeNotFoundException"},
105103
{"shape":"AlreadyExistsException"},
106-
{"shape":"GeneralServiceException"},
107104
{"shape":"HandlerInternalFailureException"},
108-
{"shape":"InvalidCredentialsException"},
105+
{"shape":"GeneralServiceException"},
106+
{"shape":"NotUpdatableException"},
107+
{"shape":"TypeNotFoundException"},
109108
{"shape":"InvalidRequestException"},
110-
{"shape":"NetworkFailureException"},
109+
{"shape":"PrivateTypeException"},
111110
{"shape":"ResourceNotFoundException"},
111+
{"shape":"NetworkFailureException"},
112+
{"shape":"UnsupportedActionException"},
112113
{"shape":"NotStabilizedException"},
113-
{"shape":"NotUpdatableException"},
114-
{"shape":"ResourceConflictException"},
115114
{"shape":"ServiceInternalErrorException"},
115+
{"shape":"HandlerFailureException"},
116116
{"shape":"ServiceLimitExceededException"},
117-
{"shape":"ThrottlingException"},
118-
{"shape":"PrivateTypeException"},
119-
{"shape":"HandlerFailureException"}
117+
{"shape":"InvalidCredentialsException"},
118+
{"shape":"ResourceConflictException"},
119+
{"shape":"ThrottlingException"}
120120
],
121121
"documentation":"<p>Returns information about the current state of the specified resource. For details, see <a href=\"https://docs.aws.amazon.com/cloudcontrolapi/latest/userguide/resource-operations-read.html\">Reading a resource's current state</a>.</p> <p>You can use this action to return information about an existing resource in your account and Amazon Web Services Region, whether those resources were provisioned using Cloud Control API.</p>"
122122
},
@@ -152,23 +152,23 @@
152152
"input":{"shape":"ListResourcesInput"},
153153
"output":{"shape":"ListResourcesOutput"},
154154
"errors":[
155-
{"shape":"UnsupportedActionException"},
156-
{"shape":"TypeNotFoundException"},
157155
{"shape":"AlreadyExistsException"},
158-
{"shape":"GeneralServiceException"},
159156
{"shape":"HandlerInternalFailureException"},
160-
{"shape":"InvalidCredentialsException"},
157+
{"shape":"GeneralServiceException"},
158+
{"shape":"NotUpdatableException"},
159+
{"shape":"TypeNotFoundException"},
161160
{"shape":"InvalidRequestException"},
162-
{"shape":"NetworkFailureException"},
161+
{"shape":"PrivateTypeException"},
163162
{"shape":"ResourceNotFoundException"},
163+
{"shape":"NetworkFailureException"},
164+
{"shape":"UnsupportedActionException"},
164165
{"shape":"NotStabilizedException"},
165-
{"shape":"NotUpdatableException"},
166-
{"shape":"ResourceConflictException"},
167166
{"shape":"ServiceInternalErrorException"},
167+
{"shape":"HandlerFailureException"},
168168
{"shape":"ServiceLimitExceededException"},
169-
{"shape":"ThrottlingException"},
170-
{"shape":"PrivateTypeException"},
171-
{"shape":"HandlerFailureException"}
169+
{"shape":"InvalidCredentialsException"},
170+
{"shape":"ResourceConflictException"},
171+
{"shape":"ThrottlingException"}
172172
],
173173
"documentation":"<p>Returns information about the specified resources. For more information, see <a href=\"https://docs.aws.amazon.com/cloudcontrolapi/latest/userguide/resource-operations-list.html\">Discovering resources</a> in the <i>Amazon Web Services Cloud Control API User Guide</i>.</p> <p>You can use this action to return information about existing resources in your account and Amazon Web Services Region, whether those resources were provisioned using Cloud Control API.</p>"
174174
},
@@ -181,25 +181,25 @@
181181
"input":{"shape":"UpdateResourceInput"},
182182
"output":{"shape":"UpdateResourceOutput"},
183183
"errors":[
184-
{"shape":"ConcurrentOperationException"},
185-
{"shape":"ClientTokenConflictException"},
186-
{"shape":"UnsupportedActionException"},
187-
{"shape":"TypeNotFoundException"},
188184
{"shape":"AlreadyExistsException"},
189-
{"shape":"GeneralServiceException"},
190185
{"shape":"HandlerInternalFailureException"},
191-
{"shape":"InvalidCredentialsException"},
186+
{"shape":"GeneralServiceException"},
187+
{"shape":"NotUpdatableException"},
188+
{"shape":"TypeNotFoundException"},
189+
{"shape":"ConcurrentOperationException"},
192190
{"shape":"InvalidRequestException"},
193-
{"shape":"NetworkFailureException"},
191+
{"shape":"PrivateTypeException"},
194192
{"shape":"ResourceNotFoundException"},
193+
{"shape":"NetworkFailureException"},
194+
{"shape":"UnsupportedActionException"},
195195
{"shape":"NotStabilizedException"},
196-
{"shape":"NotUpdatableException"},
197-
{"shape":"ResourceConflictException"},
198196
{"shape":"ServiceInternalErrorException"},
197+
{"shape":"HandlerFailureException"},
199198
{"shape":"ServiceLimitExceededException"},
200-
{"shape":"ThrottlingException"},
201-
{"shape":"PrivateTypeException"},
202-
{"shape":"HandlerFailureException"}
199+
{"shape":"InvalidCredentialsException"},
200+
{"shape":"ResourceConflictException"},
201+
{"shape":"ClientTokenConflictException"},
202+
{"shape":"ThrottlingException"}
203203
],
204204
"documentation":"<p>Updates the specified property values in the resource.</p> <p>You specify your resource property updates as a list of patch operations contained in a JSON patch document that adheres to the <a href=\"https://datatracker.ietf.org/doc/html/rfc6902\"> <i>RFC 6902 - JavaScript Object Notation (JSON) Patch</i> </a> standard.</p> <p>For details on how Cloud Control API performs resource update operations, see <a href=\"https://docs.aws.amazon.com/cloudcontrolapi/latest/userguide/resource-operations-update.html\">Updating a resource</a> in the <i>Amazon Web Services Cloud Control API User Guide</i>.</p> <p>After you have initiated a resource update request, you can monitor the progress of your request by calling <a href=\"https://docs.aws.amazon.com/cloudcontrolapi/latest/APIReference/API_GetResourceRequestStatus.html\">GetResourceRequestStatus</a> using the <code>RequestToken</code> of the <code>ProgressEvent</code> returned by <code>UpdateResource</code>.</p> <p>For more information about the properties of a specific resource, refer to the related topic for the resource in the <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-template-resource-type-ref.html\">Resource and property types reference</a> in the <i>CloudFormation Users Guide</i>.</p>"
205205
}
@@ -249,7 +249,8 @@
249249
"Message":{"shape":"ErrorMessage"}
250250
},
251251
"documentation":"<p>The resource is currently being modified by another operation.</p>",
252-
"exception":true
252+
"exception":true,
253+
"fault":true
253254
},
254255
"ConcurrentOperationException":{
255256
"type":"structure",
@@ -285,7 +286,7 @@
285286
},
286287
"DesiredState":{
287288
"shape":"Properties",
288-
"documentation":"<p>Structured data format representing the desired state of the resource, consisting of that resource's properties and their desired values.</p> <note> <p>Cloud Control API currently supports JSON as a structured data format.</p> </note> <p>Specify the desired state as one of the following:</p> <ul> <li> <p>A JSON blob</p> </li> <li> <p>A local path containing the desired state in JSON data format</p> </li> </ul> <p>For more information, see <a href=\"https://docs.aws.amazon.com/cloudcontrolapi/latest/userguide/resource-operations-create.html#resource-operations-create-desiredstate\">Composing the desired state of the resource</a> in the <i>Amazon Web Services Cloud Control API User Guide</i>.</p> <p>For more information about the properties of a specific resource, refer to the related topic for the resource in the <a href=\"https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-template-resource-type-ref.html\">Resource and property types reference</a> in the <i>CloudFormation Users Guide</i>.</p>"
289+
"documentation":"<p>Structured data format representing the desired state of the resource, consisting of that resource's properties and their desired values.</p> <note> <p>Cloud Control API currently supports JSON as a structured data format.</p> </note> <pre><code> &lt;p&gt;Specify the desired state as one of the following:&lt;/p&gt; &lt;ul&gt; &lt;li&gt; &lt;p&gt;A JSON blob&lt;/p&gt; &lt;/li&gt; &lt;li&gt; &lt;p&gt;A local path containing the desired state in JSON data format&lt;/p&gt; &lt;/li&gt; &lt;/ul&gt; &lt;p&gt;For more information, see &lt;a href=&quot;https://docs.aws.amazon.com/cloudcontrolapi/latest/userguide/resource-operations-create.html#resource-operations-create-desiredstate&quot;&gt;Composing the desired state of the resource&lt;/a&gt; in the &lt;i&gt;Amazon Web Services Cloud Control API User Guide&lt;/i&gt;.&lt;/p&gt; &lt;p&gt;For more information about the properties of a specific resource, refer to the related topic for the resource in the &lt;a href=&quot;https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-template-resource-type-ref.html&quot;&gt;Resource and property types reference&lt;/a&gt; in the &lt;i&gt;CloudFormation Users Guide&lt;/i&gt;.&lt;/p&gt; </code></pre>"
289290
}
290291
}
291292
},
@@ -340,7 +341,8 @@
340341
"ErrorMessage":{
341342
"type":"string",
342343
"max":1024,
343-
"min":1
344+
"min":1,
345+
"pattern":".+"
344346
},
345347
"GeneralServiceException":{
346348
"type":"structure",
@@ -430,15 +432,17 @@
430432
"Message":{"shape":"ErrorMessage"}
431433
},
432434
"documentation":"<p>The resource handler has failed without a returning a more specific error code. This can include timeouts.</p>",
433-
"exception":true
435+
"exception":true,
436+
"fault":true
434437
},
435438
"HandlerInternalFailureException":{
436439
"type":"structure",
437440
"members":{
438441
"Message":{"shape":"ErrorMessage"}
439442
},
440443
"documentation":"<p>The resource handler has returned that an unexpected error occurred within the resource handler.</p>",
441-
"exception":true
444+
"exception":true,
445+
"fault":true
442446
},
443447
"HandlerNextToken":{
444448
"type":"string",
@@ -547,6 +551,7 @@
547551
},
548552
"MaxResults":{
549553
"type":"integer",
554+
"box":true,
550555
"max":100,
551556
"min":1
552557
},
@@ -556,7 +561,8 @@
556561
"Message":{"shape":"ErrorMessage"}
557562
},
558563
"documentation":"<p>The resource handler has returned that the request couldn't be completed due to networking issues, such as a failure to receive a response from the server.</p>",
559-
"exception":true
564+
"exception":true,
565+
"fault":true
560566
},
561567
"NextToken":{
562568
"type":"string",
@@ -611,6 +617,7 @@
611617
"type":"string",
612618
"max":65536,
613619
"min":1,
620+
"pattern":"[\\s\\S]*",
614621
"sensitive":true
615622
},
616623
"PrivateTypeException":{
@@ -669,8 +676,9 @@
669676
},
670677
"Properties":{
671678
"type":"string",
672-
"max":16384,
679+
"max":65536,
673680
"min":1,
681+
"pattern":"[\\s\\S]*",
674682
"sensitive":true
675683
},
676684
"RequestToken":{
@@ -751,7 +759,8 @@
751759
"Message":{"shape":"ErrorMessage"}
752760
},
753761
"documentation":"<p>The resource handler has returned that the downstream service returned an internal error, typically with a <code>5XX HTTP</code> status code.</p>",
754-
"exception":true
762+
"exception":true,
763+
"fault":true
755764
},
756765
"ServiceLimitExceededException":{
757766
"type":"structure",
@@ -763,7 +772,9 @@
763772
},
764773
"StatusMessage":{
765774
"type":"string",
766-
"max":1024
775+
"max":1024,
776+
"min":0,
777+
"pattern":"[\\s\\S]*"
767778
},
768779
"ThrottlingException":{
769780
"type":"structure",

‎services/cloudcontrol/src/main/resources/codegen-resources/waiters-2.json

Lines changed: 23 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,27 @@
11
{
2-
"version": 2,
3-
"waiters": {
4-
"ResourceRequestSuccess": {
5-
"description": "Wait until resource operation request is successful",
6-
"operation": "GetResourceRequestStatus",
7-
"delay": 5,
8-
"maxAttempts": 720,
9-
"acceptors": [
10-
{
11-
"state": "success",
12-
"matcher": "path",
13-
"argument": "ProgressEvent.OperationStatus",
14-
"expected": "SUCCESS"
15-
},
16-
{
17-
"state": "failure",
18-
"matcher": "path",
19-
"argument": "ProgressEvent.OperationStatus",
20-
"expected": "FAILED"
21-
},
22-
{
23-
"state": "failure",
24-
"matcher": "path",
25-
"argument": "ProgressEvent.OperationStatus",
26-
"expected": "CANCEL_COMPLETE"
27-
}
28-
]
2+
"version" : 2,
3+
"waiters" : {
4+
"ResourceRequestSuccess" : {
5+
"description" : "Wait until resource operation request is successful",
6+
"delay" : 5,
7+
"maxAttempts" : 24,
8+
"operation" : "GetResourceRequestStatus",
9+
"acceptors" : [ {
10+
"matcher" : "path",
11+
"argument" : "ProgressEvent.OperationStatus",
12+
"state" : "success",
13+
"expected" : "SUCCESS"
14+
}, {
15+
"matcher" : "path",
16+
"argument" : "ProgressEvent.OperationStatus",
17+
"state" : "failure",
18+
"expected" : "FAILED"
19+
}, {
20+
"matcher" : "path",
21+
"argument" : "ProgressEvent.OperationStatus",
22+
"state" : "failure",
23+
"expected" : "CANCEL_COMPLETE"
24+
} ]
2925
}
3026
}
3127
}

0 commit comments

Comments
 (0)