Skip to content

Commit 0e9f9b8

Browse files
author
AWS
committed
Amazon Recycle Bin Update: Added resource identifier in the output and updated error handling.
1 parent 6b65ab4 commit 0e9f9b8

File tree

3 files changed

+53
-22
lines changed

3 files changed

+53
-22
lines changed

‎.changes/next-release/feature-AmazonRecycleBin-dabf772.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": "Amazon Recycle Bin",
4+
"contributor": "",
5+
"description": "Added resource identifier in the output and updated error handling."
6+
}

‎services/rbin/src/main/resources/codegen-resources/endpoint-rule-set.json

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
]
4141
}
4242
],
43-
"type": "tree",
4443
"rules": [
4544
{
4645
"conditions": [
@@ -83,7 +82,8 @@
8382
},
8483
"type": "endpoint"
8584
}
86-
]
85+
],
86+
"type": "tree"
8787
},
8888
{
8989
"conditions": [
@@ -96,7 +96,6 @@
9696
]
9797
}
9898
],
99-
"type": "tree",
10099
"rules": [
101100
{
102101
"conditions": [
@@ -110,7 +109,6 @@
110109
"assign": "PartitionResult"
111110
}
112111
],
113-
"type": "tree",
114112
"rules": [
115113
{
116114
"conditions": [
@@ -133,7 +131,6 @@
133131
]
134132
}
135133
],
136-
"type": "tree",
137134
"rules": [
138135
{
139136
"conditions": [
@@ -168,7 +165,6 @@
168165
]
169166
}
170167
],
171-
"type": "tree",
172168
"rules": [
173169
{
174170
"conditions": [],
@@ -179,14 +175,16 @@
179175
},
180176
"type": "endpoint"
181177
}
182-
]
178+
],
179+
"type": "tree"
183180
},
184181
{
185182
"conditions": [],
186183
"error": "FIPS and DualStack are enabled, but this partition does not support one or both",
187184
"type": "error"
188185
}
189-
]
186+
],
187+
"type": "tree"
190188
},
191189
{
192190
"conditions": [
@@ -200,14 +198,12 @@
200198
]
201199
}
202200
],
203-
"type": "tree",
204201
"rules": [
205202
{
206203
"conditions": [
207204
{
208205
"fn": "booleanEquals",
209206
"argv": [
210-
true,
211207
{
212208
"fn": "getAttr",
213209
"argv": [
@@ -216,11 +212,11 @@
216212
},
217213
"supportsFIPS"
218214
]
219-
}
215+
},
216+
true
220217
]
221218
}
222219
],
223-
"type": "tree",
224220
"rules": [
225221
{
226222
"conditions": [],
@@ -231,14 +227,16 @@
231227
},
232228
"type": "endpoint"
233229
}
234-
]
230+
],
231+
"type": "tree"
235232
},
236233
{
237234
"conditions": [],
238235
"error": "FIPS is enabled but this partition does not support FIPS",
239236
"type": "error"
240237
}
241-
]
238+
],
239+
"type": "tree"
242240
},
243241
{
244242
"conditions": [
@@ -252,7 +250,6 @@
252250
]
253251
}
254252
],
255-
"type": "tree",
256253
"rules": [
257254
{
258255
"conditions": [
@@ -272,7 +269,6 @@
272269
]
273270
}
274271
],
275-
"type": "tree",
276272
"rules": [
277273
{
278274
"conditions": [],
@@ -283,14 +279,16 @@
283279
},
284280
"type": "endpoint"
285281
}
286-
]
282+
],
283+
"type": "tree"
287284
},
288285
{
289286
"conditions": [],
290287
"error": "DualStack is enabled but this partition does not support DualStack",
291288
"type": "error"
292289
}
293-
]
290+
],
291+
"type": "tree"
294292
},
295293
{
296294
"conditions": [],
@@ -301,9 +299,11 @@
301299
},
302300
"type": "endpoint"
303301
}
304-
]
302+
],
303+
"type": "tree"
305304
}
306-
]
305+
],
306+
"type": "tree"
307307
},
308308
{
309309
"conditions": [],

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

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,8 @@
172172
{"shape":"ValidationException"},
173173
{"shape":"InternalServerException"},
174174
{"shape":"ResourceNotFoundException"},
175-
{"shape":"ConflictException"}
175+
{"shape":"ConflictException"},
176+
{"shape":"ServiceQuotaExceededException"}
176177
],
177178
"documentation":"<p>Updates an existing Recycle Bin retention rule. You can update a retention rule's description, resource tags, and retention period at any time after creation. You can't update a retention rule's resource type after creation. For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/recycle-bin-working-with-rules.html#recycle-bin-update-rule\"> Update Recycle Bin retention rules</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>.</p>"
178179
}
@@ -263,6 +264,10 @@
263264
"LockState":{
264265
"shape":"LockState",
265266
"documentation":"<p>The lock state for the retention rule.</p> <ul> <li> <p> <code>locked</code> - The retention rule is locked and can't be modified or deleted.</p> </li> <li> <p> <code>pending_unlock</code> - The retention rule has been unlocked but it is still within the unlock delay period. The retention rule can be modified or deleted only after the unlock delay period has expired.</p> </li> <li> <p> <code>unlocked</code> - The retention rule is unlocked and it can be modified or deleted by any user with the required permissions.</p> </li> <li> <p> <code>null</code> - The retention rule has never been locked. Once a retention rule has been locked, it can transition between the <code>locked</code> and <code>unlocked</code> states only; it can never transition back to <code>null</code>.</p> </li> </ul>"
267+
},
268+
"RuleArn":{
269+
"shape":"RuleArn",
270+
"documentation":"<p>The Amazon Resource Name (ARN) of the retention rule.</p>"
266271
}
267272
}
268273
},
@@ -338,6 +343,10 @@
338343
"LockEndTime":{
339344
"shape":"TimeStamp",
340345
"documentation":"<p>The date and time at which the unlock delay is set to expire. Only returned for retention rules that have been unlocked and that are still within the unlock delay period.</p>"
346+
},
347+
"RuleArn":{
348+
"shape":"RuleArn",
349+
"documentation":"<p>The Amazon Resource Name (ARN) of the retention rule.</p>"
341350
}
342351
}
343352
},
@@ -472,6 +481,10 @@
472481
"LockState":{
473482
"shape":"LockState",
474483
"documentation":"<p>The lock state for the retention rule.</p> <ul> <li> <p> <code>locked</code> - The retention rule is locked and can't be modified or deleted.</p> </li> <li> <p> <code>pending_unlock</code> - The retention rule has been unlocked but it is still within the unlock delay period. The retention rule can be modified or deleted only after the unlock delay period has expired.</p> </li> <li> <p> <code>unlocked</code> - The retention rule is unlocked and it can be modified or deleted by any user with the required permissions.</p> </li> <li> <p> <code>null</code> - The retention rule has never been locked. Once a retention rule has been locked, it can transition between the <code>locked</code> and <code>unlocked</code> states only; it can never transition back to <code>null</code>.</p> </li> </ul>"
484+
},
485+
"RuleArn":{
486+
"shape":"RuleArn",
487+
"documentation":"<p>The Amazon Resource Name (ARN) of the retention rule.</p>"
475488
}
476489
}
477490
},
@@ -607,6 +620,10 @@
607620
"LockState":{
608621
"shape":"LockState",
609622
"documentation":"<p>The lock state for the retention rule.</p> <ul> <li> <p> <code>locked</code> - The retention rule is locked and can't be modified or deleted.</p> </li> <li> <p> <code>pending_unlock</code> - The retention rule has been unlocked but it is still within the unlock delay period. The retention rule can be modified or deleted only after the unlock delay period has expired.</p> </li> <li> <p> <code>unlocked</code> - The retention rule is unlocked and it can be modified or deleted by any user with the required permissions.</p> </li> <li> <p> <code>null</code> - The retention rule has never been locked. Once a retention rule has been locked, it can transition between the <code>locked</code> and <code>unlocked</code> states only; it can never transition back to <code>null</code>.</p> </li> </ul>"
623+
},
624+
"RuleArn":{
625+
"shape":"RuleArn",
626+
"documentation":"<p>The Amazon Resource Name (ARN) of the retention rule.</p>"
610627
}
611628
},
612629
"documentation":"<p>Information about a Recycle Bin retention rule.</p>"
@@ -773,6 +790,10 @@
773790
"LockEndTime":{
774791
"shape":"TimeStamp",
775792
"documentation":"<p>The date and time at which the unlock delay is set to expire. Only returned for retention rules that have been unlocked and that are still within the unlock delay period.</p>"
793+
},
794+
"RuleArn":{
795+
"shape":"RuleArn",
796+
"documentation":"<p>The Amazon Resource Name (ARN) of the retention rule.</p>"
776797
}
777798
}
778799
},
@@ -861,6 +882,10 @@
861882
"LockEndTime":{
862883
"shape":"TimeStamp",
863884
"documentation":"<p>The date and time at which the unlock delay is set to expire. Only returned for retention rules that have been unlocked and that are still within the unlock delay period.</p>"
885+
},
886+
"RuleArn":{
887+
"shape":"RuleArn",
888+
"documentation":"<p>The Amazon Resource Name (ARN) of the retention rule.</p>"
864889
}
865890
}
866891
},
@@ -885,5 +910,5 @@
885910
]
886911
}
887912
},
888-
"documentation":"<p>This is the <i>Recycle Bin API Reference</i>. This documentation provides descriptions and syntax for each of the actions and data types in Recycle Bin.</p> <p>Recycle Bin is a resource recovery feature that enables you to restore accidentally deleted snapshots and EBS-backed AMIs. When using Recycle Bin, if your resources are deleted, they are retained in the Recycle Bin for a time period that you specify.</p> <p>You can restore a resource from the Recycle Bin at any time before its retention period expires. After you restore a resource from the Recycle Bin, the resource is removed from the Recycle Bin, and you can then use it in the same way you use any other resource of that type in your account. If the retention period expires and the resource is not restored, the resource is permanently deleted from the Recycle Bin and is no longer available for recovery. For more information about Recycle Bin, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/snapshot-recycle-bin.html\"> Recycle Bin</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>.</p>"
913+
"documentation":"<p>This is the <i>Recycle Bin API Reference</i>. This documentation provides descriptions and syntax for each of the actions and data types in Recycle Bin.</p> <p>Recycle Bin is a resource recovery feature that enables you to restore accidentally deleted snapshots and EBS-backed AMIs. When using Recycle Bin, if your resources are deleted, they are retained in the Recycle Bin for a time period that you specify.</p> <p>You can restore a resource from the Recycle Bin at any time before its retention period expires. After you restore a resource from the Recycle Bin, the resource is removed from the Recycle Bin, and you can then use it in the same way you use any other resource of that type in your account. If the retention period expires and the resource is not restored, the resource is permanently deleted from the Recycle Bin and is no longer available for recovery. For more information about Recycle Bin, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/recycle-bin.html\"> Recycle Bin</a> in the <i>Amazon Elastic Compute Cloud User Guide</i>.</p>"
889914
}

0 commit comments

Comments
 (0)