Skip to content

Commit a5cc3a3

Browse files
trivikrtrivikr
committed
fix(clients): populate message field when parsing errors
1 parent e9b66b5 commit a5cc3a3

File tree

322 files changed

+14192
-12260
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

322 files changed

+14192
-12260
lines changed

‎clients/client-accessanalyzer/src/protocols/Aws_restJson1.ts

Lines changed: 34 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -948,7 +948,7 @@ const deserializeAws_restJson1ApplyArchiveRuleCommandError = async (
948948
): Promise<ApplyArchiveRuleCommandOutput> => {
949949
const parsedOutput: any = {
950950
...output,
951-
body: await parseBody(output.body, context),
951+
body: await parseErrorBody(output.body, context),
952952
};
953953
const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
954954
switch (errorCode) {
@@ -998,7 +998,7 @@ const deserializeAws_restJson1CancelPolicyGenerationCommandError = async (
998998
): Promise<CancelPolicyGenerationCommandOutput> => {
999999
const parsedOutput: any = {
10001000
...output,
1001-
body: await parseBody(output.body, context),
1001+
body: await parseErrorBody(output.body, context),
10021002
};
10031003
const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
10041004
switch (errorCode) {
@@ -1048,7 +1048,7 @@ const deserializeAws_restJson1CreateAccessPreviewCommandError = async (
10481048
): Promise<CreateAccessPreviewCommandOutput> => {
10491049
const parsedOutput: any = {
10501050
...output,
1051-
body: await parseBody(output.body, context),
1051+
body: await parseErrorBody(output.body, context),
10521052
};
10531053
const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
10541054
switch (errorCode) {
@@ -1107,7 +1107,7 @@ const deserializeAws_restJson1CreateAnalyzerCommandError = async (
11071107
): Promise<CreateAnalyzerCommandOutput> => {
11081108
const parsedOutput: any = {
11091109
...output,
1110-
body: await parseBody(output.body, context),
1110+
body: await parseErrorBody(output.body, context),
11111111
};
11121112
const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
11131113
switch (errorCode) {
@@ -1160,7 +1160,7 @@ const deserializeAws_restJson1CreateArchiveRuleCommandError = async (
11601160
): Promise<CreateArchiveRuleCommandOutput> => {
11611161
const parsedOutput: any = {
11621162
...output,
1163-
body: await parseBody(output.body, context),
1163+
body: await parseErrorBody(output.body, context),
11641164
};
11651165
const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
11661166
switch (errorCode) {
@@ -1216,7 +1216,7 @@ const deserializeAws_restJson1DeleteAnalyzerCommandError = async (
12161216
): Promise<DeleteAnalyzerCommandOutput> => {
12171217
const parsedOutput: any = {
12181218
...output,
1219-
body: await parseBody(output.body, context),
1219+
body: await parseErrorBody(output.body, context),
12201220
};
12211221
const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
12221222
switch (errorCode) {
@@ -1266,7 +1266,7 @@ const deserializeAws_restJson1DeleteArchiveRuleCommandError = async (
12661266
): Promise<DeleteArchiveRuleCommandOutput> => {
12671267
const parsedOutput: any = {
12681268
...output,
1269-
body: await parseBody(output.body, context),
1269+
body: await parseErrorBody(output.body, context),
12701270
};
12711271
const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
12721272
switch (errorCode) {
@@ -1319,7 +1319,7 @@ const deserializeAws_restJson1GetAccessPreviewCommandError = async (
13191319
): Promise<GetAccessPreviewCommandOutput> => {
13201320
const parsedOutput: any = {
13211321
...output,
1322-
body: await parseBody(output.body, context),
1322+
body: await parseErrorBody(output.body, context),
13231323
};
13241324
const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
13251325
switch (errorCode) {
@@ -1372,7 +1372,7 @@ const deserializeAws_restJson1GetAnalyzedResourceCommandError = async (
13721372
): Promise<GetAnalyzedResourceCommandOutput> => {
13731373
const parsedOutput: any = {
13741374
...output,
1375-
body: await parseBody(output.body, context),
1375+
body: await parseErrorBody(output.body, context),
13761376
};
13771377
const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
13781378
switch (errorCode) {
@@ -1425,7 +1425,7 @@ const deserializeAws_restJson1GetAnalyzerCommandError = async (
14251425
): Promise<GetAnalyzerCommandOutput> => {
14261426
const parsedOutput: any = {
14271427
...output,
1428-
body: await parseBody(output.body, context),
1428+
body: await parseErrorBody(output.body, context),
14291429
};
14301430
const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
14311431
switch (errorCode) {
@@ -1478,7 +1478,7 @@ const deserializeAws_restJson1GetArchiveRuleCommandError = async (
14781478
): Promise<GetArchiveRuleCommandOutput> => {
14791479
const parsedOutput: any = {
14801480
...output,
1481-
body: await parseBody(output.body, context),
1481+
body: await parseErrorBody(output.body, context),
14821482
};
14831483
const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
14841484
switch (errorCode) {
@@ -1531,7 +1531,7 @@ const deserializeAws_restJson1GetFindingCommandError = async (
15311531
): Promise<GetFindingCommandOutput> => {
15321532
const parsedOutput: any = {
15331533
...output,
1534-
body: await parseBody(output.body, context),
1534+
body: await parseErrorBody(output.body, context),
15351535
};
15361536
const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
15371537
switch (errorCode) {
@@ -1587,7 +1587,7 @@ const deserializeAws_restJson1GetGeneratedPolicyCommandError = async (
15871587
): Promise<GetGeneratedPolicyCommandOutput> => {
15881588
const parsedOutput: any = {
15891589
...output,
1590-
body: await parseBody(output.body, context),
1590+
body: await parseErrorBody(output.body, context),
15911591
};
15921592
const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
15931593
switch (errorCode) {
@@ -1640,7 +1640,7 @@ const deserializeAws_restJson1ListAccessPreviewFindingsCommandError = async (
16401640
): Promise<ListAccessPreviewFindingsCommandOutput> => {
16411641
const parsedOutput: any = {
16421642
...output,
1643-
body: await parseBody(output.body, context),
1643+
body: await parseErrorBody(output.body, context),
16441644
};
16451645
const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
16461646
switch (errorCode) {
@@ -1699,7 +1699,7 @@ const deserializeAws_restJson1ListAccessPreviewsCommandError = async (
16991699
): Promise<ListAccessPreviewsCommandOutput> => {
17001700
const parsedOutput: any = {
17011701
...output,
1702-
body: await parseBody(output.body, context),
1702+
body: await parseErrorBody(output.body, context),
17031703
};
17041704
const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
17051705
switch (errorCode) {
@@ -1755,7 +1755,7 @@ const deserializeAws_restJson1ListAnalyzedResourcesCommandError = async (
17551755
): Promise<ListAnalyzedResourcesCommandOutput> => {
17561756
const parsedOutput: any = {
17571757
...output,
1758-
body: await parseBody(output.body, context),
1758+
body: await parseErrorBody(output.body, context),
17591759
};
17601760
const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
17611761
switch (errorCode) {
@@ -1811,7 +1811,7 @@ const deserializeAws_restJson1ListAnalyzersCommandError = async (
18111811
): Promise<ListAnalyzersCommandOutput> => {
18121812
const parsedOutput: any = {
18131813
...output,
1814-
body: await parseBody(output.body, context),
1814+
body: await parseErrorBody(output.body, context),
18151815
};
18161816
const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
18171817
switch (errorCode) {
@@ -1864,7 +1864,7 @@ const deserializeAws_restJson1ListArchiveRulesCommandError = async (
18641864
): Promise<ListArchiveRulesCommandOutput> => {
18651865
const parsedOutput: any = {
18661866
...output,
1867-
body: await parseBody(output.body, context),
1867+
body: await parseErrorBody(output.body, context),
18681868
};
18691869
const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
18701870
switch (errorCode) {
@@ -1917,7 +1917,7 @@ const deserializeAws_restJson1ListFindingsCommandError = async (
19171917
): Promise<ListFindingsCommandOutput> => {
19181918
const parsedOutput: any = {
19191919
...output,
1920-
body: await parseBody(output.body, context),
1920+
body: await parseErrorBody(output.body, context),
19211921
};
19221922
const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
19231923
switch (errorCode) {
@@ -1973,7 +1973,7 @@ const deserializeAws_restJson1ListPolicyGenerationsCommandError = async (
19731973
): Promise<ListPolicyGenerationsCommandOutput> => {
19741974
const parsedOutput: any = {
19751975
...output,
1976-
body: await parseBody(output.body, context),
1976+
body: await parseErrorBody(output.body, context),
19771977
};
19781978
const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
19791979
switch (errorCode) {
@@ -2023,7 +2023,7 @@ const deserializeAws_restJson1ListTagsForResourceCommandError = async (
20232023
): Promise<ListTagsForResourceCommandOutput> => {
20242024
const parsedOutput: any = {
20252025
...output,
2026-
body: await parseBody(output.body, context),
2026+
body: await parseErrorBody(output.body, context),
20272027
};
20282028
const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
20292029
switch (errorCode) {
@@ -2076,7 +2076,7 @@ const deserializeAws_restJson1StartPolicyGenerationCommandError = async (
20762076
): Promise<StartPolicyGenerationCommandOutput> => {
20772077
const parsedOutput: any = {
20782078
...output,
2079-
body: await parseBody(output.body, context),
2079+
body: await parseErrorBody(output.body, context),
20802080
};
20812081
const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
20822082
switch (errorCode) {
@@ -2129,7 +2129,7 @@ const deserializeAws_restJson1StartResourceScanCommandError = async (
21292129
): Promise<StartResourceScanCommandOutput> => {
21302130
const parsedOutput: any = {
21312131
...output,
2132-
body: await parseBody(output.body, context),
2132+
body: await parseErrorBody(output.body, context),
21332133
};
21342134
const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
21352135
switch (errorCode) {
@@ -2179,7 +2179,7 @@ const deserializeAws_restJson1TagResourceCommandError = async (
21792179
): Promise<TagResourceCommandOutput> => {
21802180
const parsedOutput: any = {
21812181
...output,
2182-
body: await parseBody(output.body, context),
2182+
body: await parseErrorBody(output.body, context),
21832183
};
21842184
const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
21852185
switch (errorCode) {
@@ -2229,7 +2229,7 @@ const deserializeAws_restJson1UntagResourceCommandError = async (
22292229
): Promise<UntagResourceCommandOutput> => {
22302230
const parsedOutput: any = {
22312231
...output,
2232-
body: await parseBody(output.body, context),
2232+
body: await parseErrorBody(output.body, context),
22332233
};
22342234
const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
22352235
switch (errorCode) {
@@ -2279,7 +2279,7 @@ const deserializeAws_restJson1UpdateArchiveRuleCommandError = async (
22792279
): Promise<UpdateArchiveRuleCommandOutput> => {
22802280
const parsedOutput: any = {
22812281
...output,
2282-
body: await parseBody(output.body, context),
2282+
body: await parseErrorBody(output.body, context),
22832283
};
22842284
const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
22852285
switch (errorCode) {
@@ -2329,7 +2329,7 @@ const deserializeAws_restJson1UpdateFindingsCommandError = async (
23292329
): Promise<UpdateFindingsCommandOutput> => {
23302330
const parsedOutput: any = {
23312331
...output,
2332-
body: await parseBody(output.body, context),
2332+
body: await parseErrorBody(output.body, context),
23332333
};
23342334
const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
23352335
switch (errorCode) {
@@ -2385,7 +2385,7 @@ const deserializeAws_restJson1ValidatePolicyCommandError = async (
23852385
): Promise<ValidatePolicyCommandOutput> => {
23862386
const parsedOutput: any = {
23872387
...output,
2388-
body: await parseBody(output.body, context),
2388+
body: await parseErrorBody(output.body, context),
23892389
};
23902390
const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
23912391
switch (errorCode) {
@@ -3835,6 +3835,12 @@ const parseBody = (streamBody: any, context: __SerdeContext): any =>
38353835
return {};
38363836
});
38373837

3838+
const parseErrorBody = (errorBody: any, context: __SerdeContext): any => {
3839+
const value = parseBody(errorBody, context);
3840+
value.message = value.message ?? value.Message;
3841+
return value;
3842+
};
3843+
38383844
/**
38393845
* Load an error code for the aws.rest-json-1.1 protocol.
38403846
*/

‎clients/client-account/src/protocols/Aws_restJson1.ts

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ const deserializeAws_restJson1DeleteAlternateContactCommandError = async (
196196
): Promise<DeleteAlternateContactCommandOutput> => {
197197
const parsedOutput: any = {
198198
...output,
199-
body: await parseBody(output.body, context),
199+
body: await parseErrorBody(output.body, context),
200200
};
201201
const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
202202
switch (errorCode) {
@@ -249,7 +249,7 @@ const deserializeAws_restJson1GetAlternateContactCommandError = async (
249249
): Promise<GetAlternateContactCommandOutput> => {
250250
const parsedOutput: any = {
251251
...output,
252-
body: await parseBody(output.body, context),
252+
body: await parseErrorBody(output.body, context),
253253
};
254254
const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
255255
switch (errorCode) {
@@ -302,7 +302,7 @@ const deserializeAws_restJson1GetContactInformationCommandError = async (
302302
): Promise<GetContactInformationCommandOutput> => {
303303
const parsedOutput: any = {
304304
...output,
305-
body: await parseBody(output.body, context),
305+
body: await parseErrorBody(output.body, context),
306306
};
307307
const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
308308
switch (errorCode) {
@@ -352,7 +352,7 @@ const deserializeAws_restJson1PutAlternateContactCommandError = async (
352352
): Promise<PutAlternateContactCommandOutput> => {
353353
const parsedOutput: any = {
354354
...output,
355-
body: await parseBody(output.body, context),
355+
body: await parseErrorBody(output.body, context),
356356
};
357357
const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
358358
switch (errorCode) {
@@ -399,7 +399,7 @@ const deserializeAws_restJson1PutContactInformationCommandError = async (
399399
): Promise<PutContactInformationCommandOutput> => {
400400
const parsedOutput: any = {
401401
...output,
402-
body: await parseBody(output.body, context),
402+
body: await parseErrorBody(output.body, context),
403403
};
404404
const errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
405405
switch (errorCode) {
@@ -585,6 +585,12 @@ const parseBody = (streamBody: any, context: __SerdeContext): any =>
585585
return {};
586586
});
587587

588+
const parseErrorBody = (errorBody: any, context: __SerdeContext): any => {
589+
const value = parseBody(errorBody, context);
590+
value.message = value.message ?? value.Message;
591+
return value;
592+
};
593+
588594
/**
589595
* Load an error code for the aws.rest-json-1.1 protocol.
590596
*/

0 commit comments

Comments
 (0)