Skip to content

Commit 987e464

Browse files
aws-sdk-dotnet-automationaws-sdk-dotnet-automation
committed
Add ConflictException to UpdateEnvironment API
1 parent 8c0ba22 commit 987e464

File tree

9 files changed

+50
-12
lines changed

9 files changed

+50
-12
lines changed

‎generator/ServiceModels/workspaces-thin-client/workspaces-thin-client-2023-08-22.api.json

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626
{"shape":"ServiceQuotaExceededException"},
2727
{"shape":"ValidationException"},
2828
{"shape":"AccessDeniedException"},
29+
{"shape":"ConflictException"},
2930
{"shape":"ResourceNotFoundException"},
3031
{"shape":"ThrottlingException"},
31-
{"shape":"ConflictException"},
3232
{"shape":"InternalServerException"}
3333
],
3434
"endpoint":{"hostPrefix":"api."}
@@ -45,9 +45,9 @@
4545
"errors":[
4646
{"shape":"ValidationException"},
4747
{"shape":"AccessDeniedException"},
48+
{"shape":"ConflictException"},
4849
{"shape":"ResourceNotFoundException"},
4950
{"shape":"ThrottlingException"},
50-
{"shape":"ConflictException"},
5151
{"shape":"InternalServerException"}
5252
],
5353
"endpoint":{"hostPrefix":"api."},
@@ -65,9 +65,9 @@
6565
"errors":[
6666
{"shape":"ValidationException"},
6767
{"shape":"AccessDeniedException"},
68+
{"shape":"ConflictException"},
6869
{"shape":"ResourceNotFoundException"},
6970
{"shape":"ThrottlingException"},
70-
{"shape":"ConflictException"},
7171
{"shape":"InternalServerException"}
7272
],
7373
"endpoint":{"hostPrefix":"api."},
@@ -85,9 +85,9 @@
8585
"errors":[
8686
{"shape":"ValidationException"},
8787
{"shape":"AccessDeniedException"},
88+
{"shape":"ConflictException"},
8889
{"shape":"ResourceNotFoundException"},
8990
{"shape":"ThrottlingException"},
90-
{"shape":"ConflictException"},
9191
{"shape":"InternalServerException"}
9292
],
9393
"endpoint":{"hostPrefix":"api."},
@@ -228,9 +228,9 @@
228228
"errors":[
229229
{"shape":"ValidationException"},
230230
{"shape":"AccessDeniedException"},
231+
{"shape":"ConflictException"},
231232
{"shape":"ResourceNotFoundException"},
232233
{"shape":"ThrottlingException"},
233-
{"shape":"ConflictException"},
234234
{"shape":"InternalServerException"}
235235
],
236236
"endpoint":{"hostPrefix":"api."}
@@ -247,9 +247,9 @@
247247
"errors":[
248248
{"shape":"ValidationException"},
249249
{"shape":"AccessDeniedException"},
250+
{"shape":"ConflictException"},
250251
{"shape":"ResourceNotFoundException"},
251252
{"shape":"ThrottlingException"},
252-
{"shape":"ConflictException"},
253253
{"shape":"InternalServerException"}
254254
],
255255
"endpoint":{"hostPrefix":"api."},
@@ -286,6 +286,7 @@
286286
"errors":[
287287
{"shape":"ValidationException"},
288288
{"shape":"AccessDeniedException"},
289+
{"shape":"ConflictException"},
289290
{"shape":"ResourceNotFoundException"},
290291
{"shape":"ThrottlingException"},
291292
{"shape":"InternalServerException"}

‎generator/ServiceModels/workspaces-thin-client/workspaces-thin-client-2023-08-22.normal.json

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626
{"shape":"ServiceQuotaExceededException"},
2727
{"shape":"ValidationException"},
2828
{"shape":"AccessDeniedException"},
29+
{"shape":"ConflictException"},
2930
{"shape":"ResourceNotFoundException"},
3031
{"shape":"ThrottlingException"},
31-
{"shape":"ConflictException"},
3232
{"shape":"InternalServerException"}
3333
],
3434
"documentation":"<p>Creates an environment for your thin client devices.</p>",
@@ -46,9 +46,9 @@
4646
"errors":[
4747
{"shape":"ValidationException"},
4848
{"shape":"AccessDeniedException"},
49+
{"shape":"ConflictException"},
4950
{"shape":"ResourceNotFoundException"},
5051
{"shape":"ThrottlingException"},
51-
{"shape":"ConflictException"},
5252
{"shape":"InternalServerException"}
5353
],
5454
"documentation":"<p>Deletes a thin client device.</p>",
@@ -67,9 +67,9 @@
6767
"errors":[
6868
{"shape":"ValidationException"},
6969
{"shape":"AccessDeniedException"},
70+
{"shape":"ConflictException"},
7071
{"shape":"ResourceNotFoundException"},
7172
{"shape":"ThrottlingException"},
72-
{"shape":"ConflictException"},
7373
{"shape":"InternalServerException"}
7474
],
7575
"documentation":"<p>Deletes an environment.</p>",
@@ -88,9 +88,9 @@
8888
"errors":[
8989
{"shape":"ValidationException"},
9090
{"shape":"AccessDeniedException"},
91+
{"shape":"ConflictException"},
9192
{"shape":"ResourceNotFoundException"},
9293
{"shape":"ThrottlingException"},
93-
{"shape":"ConflictException"},
9494
{"shape":"InternalServerException"}
9595
],
9696
"documentation":"<p>Deregisters a thin client device.</p>",
@@ -239,9 +239,9 @@
239239
"errors":[
240240
{"shape":"ValidationException"},
241241
{"shape":"AccessDeniedException"},
242+
{"shape":"ConflictException"},
242243
{"shape":"ResourceNotFoundException"},
243244
{"shape":"ThrottlingException"},
244-
{"shape":"ConflictException"},
245245
{"shape":"InternalServerException"}
246246
],
247247
"documentation":"<p>Assigns one or more tags (key-value pairs) to the specified resource.</p>",
@@ -259,9 +259,9 @@
259259
"errors":[
260260
{"shape":"ValidationException"},
261261
{"shape":"AccessDeniedException"},
262+
{"shape":"ConflictException"},
262263
{"shape":"ResourceNotFoundException"},
263264
{"shape":"ThrottlingException"},
264-
{"shape":"ConflictException"},
265265
{"shape":"InternalServerException"}
266266
],
267267
"documentation":"<p>Removes a tag or tags from a resource.</p>",
@@ -300,6 +300,7 @@
300300
"errors":[
301301
{"shape":"ValidationException"},
302302
{"shape":"AccessDeniedException"},
303+
{"shape":"ConflictException"},
303304
{"shape":"ResourceNotFoundException"},
304305
{"shape":"ThrottlingException"},
305306
{"shape":"InternalServerException"}

‎sdk/src/Services/WorkSpacesThinClient/Generated/Model/Internal/MarshallTransformations/UpdateEnvironmentResponseUnmarshaller.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,10 @@ public override AmazonServiceException UnmarshallException(JsonUnmarshallerConte
8585
{
8686
return AccessDeniedExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse);
8787
}
88+
if (errorResponse.Code != null && errorResponse.Code.Equals("ConflictException"))
89+
{
90+
return ConflictExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse);
91+
}
8892
if (errorResponse.Code != null && errorResponse.Code.Equals("InternalServerException"))
8993
{
9094
return InternalServerExceptionUnmarshaller.Instance.Unmarshall(contextCopy, errorResponse);

‎sdk/src/Services/WorkSpacesThinClient/Generated/_bcl35/AmazonWorkSpacesThinClientClient.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1276,6 +1276,10 @@ public virtual UpdateDeviceResponse EndUpdateDevice(IAsyncResult asyncResult)
12761276
/// <exception cref="Amazon.WorkSpacesThinClient.Model.AccessDeniedException">
12771277
/// You do not have sufficient access to perform this action.
12781278
/// </exception>
1279+
/// <exception cref="Amazon.WorkSpacesThinClient.Model.ConflictException">
1280+
/// The requested operation would cause a conflict with the current state of a service
1281+
/// resource associated with the request. Resolve the conflict before retrying this request.
1282+
/// </exception>
12791283
/// <exception cref="Amazon.WorkSpacesThinClient.Model.InternalServerException">
12801284
/// The server encountered an internal error and is unable to complete the request.
12811285
/// </exception>

‎sdk/src/Services/WorkSpacesThinClient/Generated/_bcl35/IAmazonWorkSpacesThinClient.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -862,6 +862,10 @@ public partial interface IAmazonWorkSpacesThinClient : IAmazonService, IDisposab
862862
/// <exception cref="Amazon.WorkSpacesThinClient.Model.AccessDeniedException">
863863
/// You do not have sufficient access to perform this action.
864864
/// </exception>
865+
/// <exception cref="Amazon.WorkSpacesThinClient.Model.ConflictException">
866+
/// The requested operation would cause a conflict with the current state of a service
867+
/// resource associated with the request. Resolve the conflict before retrying this request.
868+
/// </exception>
865869
/// <exception cref="Amazon.WorkSpacesThinClient.Model.InternalServerException">
866870
/// The server encountered an internal error and is unable to complete the request.
867871
/// </exception>

‎sdk/src/Services/WorkSpacesThinClient/Generated/_bcl45/AmazonWorkSpacesThinClientClient.cs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1323,6 +1323,10 @@ public virtual UpdateDeviceResponse UpdateDevice(UpdateDeviceRequest request)
13231323
/// <exception cref="Amazon.WorkSpacesThinClient.Model.AccessDeniedException">
13241324
/// You do not have sufficient access to perform this action.
13251325
/// </exception>
1326+
/// <exception cref="Amazon.WorkSpacesThinClient.Model.ConflictException">
1327+
/// The requested operation would cause a conflict with the current state of a service
1328+
/// resource associated with the request. Resolve the conflict before retrying this request.
1329+
/// </exception>
13261330
/// <exception cref="Amazon.WorkSpacesThinClient.Model.InternalServerException">
13271331
/// The server encountered an internal error and is unable to complete the request.
13281332
/// </exception>
@@ -1358,6 +1362,10 @@ public virtual UpdateEnvironmentResponse UpdateEnvironment(UpdateEnvironmentRequ
13581362
/// <exception cref="Amazon.WorkSpacesThinClient.Model.AccessDeniedException">
13591363
/// You do not have sufficient access to perform this action.
13601364
/// </exception>
1365+
/// <exception cref="Amazon.WorkSpacesThinClient.Model.ConflictException">
1366+
/// The requested operation would cause a conflict with the current state of a service
1367+
/// resource associated with the request. Resolve the conflict before retrying this request.
1368+
/// </exception>
13611369
/// <exception cref="Amazon.WorkSpacesThinClient.Model.InternalServerException">
13621370
/// The server encountered an internal error and is unable to complete the request.
13631371
/// </exception>

‎sdk/src/Services/WorkSpacesThinClient/Generated/_bcl45/IAmazonWorkSpacesThinClient.cs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -920,6 +920,10 @@ public partial interface IAmazonWorkSpacesThinClient : IAmazonService, IDisposab
920920
/// <exception cref="Amazon.WorkSpacesThinClient.Model.AccessDeniedException">
921921
/// You do not have sufficient access to perform this action.
922922
/// </exception>
923+
/// <exception cref="Amazon.WorkSpacesThinClient.Model.ConflictException">
924+
/// The requested operation would cause a conflict with the current state of a service
925+
/// resource associated with the request. Resolve the conflict before retrying this request.
926+
/// </exception>
923927
/// <exception cref="Amazon.WorkSpacesThinClient.Model.InternalServerException">
924928
/// The server encountered an internal error and is unable to complete the request.
925929
/// </exception>
@@ -949,6 +953,10 @@ public partial interface IAmazonWorkSpacesThinClient : IAmazonService, IDisposab
949953
/// <exception cref="Amazon.WorkSpacesThinClient.Model.AccessDeniedException">
950954
/// You do not have sufficient access to perform this action.
951955
/// </exception>
956+
/// <exception cref="Amazon.WorkSpacesThinClient.Model.ConflictException">
957+
/// The requested operation would cause a conflict with the current state of a service
958+
/// resource associated with the request. Resolve the conflict before retrying this request.
959+
/// </exception>
952960
/// <exception cref="Amazon.WorkSpacesThinClient.Model.InternalServerException">
953961
/// The server encountered an internal error and is unable to complete the request.
954962
/// </exception>

‎sdk/src/Services/WorkSpacesThinClient/Generated/_netstandard/AmazonWorkSpacesThinClientClient.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1014,6 +1014,10 @@ internal virtual UpdateEnvironmentResponse UpdateEnvironment(UpdateEnvironmentRe
10141014
/// <exception cref="Amazon.WorkSpacesThinClient.Model.AccessDeniedException">
10151015
/// You do not have sufficient access to perform this action.
10161016
/// </exception>
1017+
/// <exception cref="Amazon.WorkSpacesThinClient.Model.ConflictException">
1018+
/// The requested operation would cause a conflict with the current state of a service
1019+
/// resource associated with the request. Resolve the conflict before retrying this request.
1020+
/// </exception>
10171021
/// <exception cref="Amazon.WorkSpacesThinClient.Model.InternalServerException">
10181022
/// The server encountered an internal error and is unable to complete the request.
10191023
/// </exception>

‎sdk/src/Services/WorkSpacesThinClient/Generated/_netstandard/IAmazonWorkSpacesThinClient.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -556,6 +556,10 @@ public partial interface IAmazonWorkSpacesThinClient : IAmazonService, IDisposab
556556
/// <exception cref="Amazon.WorkSpacesThinClient.Model.AccessDeniedException">
557557
/// You do not have sufficient access to perform this action.
558558
/// </exception>
559+
/// <exception cref="Amazon.WorkSpacesThinClient.Model.ConflictException">
560+
/// The requested operation would cause a conflict with the current state of a service
561+
/// resource associated with the request. Resolve the conflict before retrying this request.
562+
/// </exception>
559563
/// <exception cref="Amazon.WorkSpacesThinClient.Model.InternalServerException">
560564
/// The server encountered an internal error and is unable to complete the request.
561565
/// </exception>

0 commit comments

Comments
 (0)