@aws-sdk/client-inspector2 3.141.0 → 3.150.0

package/dist-es/protocols/Aws_restJson1.js

@@ -1,6 +1,6 @@
 import { __assign, __awaiter, __generator, __read } from "tslib";
 import { HttpRequest as __HttpRequest } from "@aws-sdk/protocol-http";
-import { decorateServiceException as __decorateServiceException, expectBoolean as __expectBoolean, expectInt32 as __expectInt32, expectLong as __expectLong, expectNonNull as __expectNonNull, expectNumber as __expectNumber, expectObject as __expectObject, expectString as __expectString, expectUnion as __expectUnion, extendedEncodeURIComponent as __extendedEncodeURIComponent, limitedParseDouble as __limitedParseDouble, parseEpochTimestamp as __parseEpochTimestamp, serializeFloat as __serializeFloat, strictParseInt32 as __strictParseInt32, } from "@aws-sdk/smithy-client";
+import { decorateServiceException as __decorateServiceException, expectBoolean as __expectBoolean, expectInt32 as __expectInt32, expectLong as __expectLong, expectNonNull as __expectNonNull, expectNumber as __expectNumber, expectObject as __expectObject, expectString as __expectString, expectUnion as __expectUnion, limitedParseDouble as __limitedParseDouble, map as __map, parseEpochTimestamp as __parseEpochTimestamp, resolvedPath as __resolvedPath, serializeFloat as __serializeFloat, strictParseInt32 as __strictParseInt32, throwDefaultError, } from "@aws-sdk/smithy-client";
 import { v4 as generateIdempotencyToken } from "uuid";
 import { Inspector2ServiceException as __BaseException } from "../models/Inspector2ServiceException";
 import { AccessDeniedException, AggregationRequest, BadRequestException, ConflictException, InternalServerException, ResourceNotFoundException, ServiceQuotaExceededException, ThrottlingException, ValidationException, } from "../models/models_0";
@@ -629,7 +629,7 @@ export var serializeAws_restJson1ListMembersCommand = function (input, context)
     });
 }); };
 export var serializeAws_restJson1ListTagsForResourceCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -637,16 +637,7 @@ export var serializeAws_restJson1ListTagsForResourceCommand = function (input, c
                 _a = _c.sent(), hostname = _a.hostname, _b = _a.protocol, protocol = _b === void 0 ? "https" : _b, port = _a.port, basePath = _a.path;
                 headers = {};
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/tags/{resourceArn}";
-                if (input.resourceArn !== undefined) {
-                    labelValue = input.resourceArn;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: resourceArn.");
-                    }
-                    resolvedPath = resolvedPath.replace("{resourceArn}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: resourceArn.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "resourceArn", function () { return input.resourceArn; }, "{resourceArn}", false);
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -686,7 +677,7 @@ export var serializeAws_restJson1ListUsageTotalsCommand = function (input, conte
     });
 }); };
 export var serializeAws_restJson1TagResourceCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -696,16 +687,7 @@ export var serializeAws_restJson1TagResourceCommand = function (input, context)
                     "content-type": "application/json",
                 };
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/tags/{resourceArn}";
-                if (input.resourceArn !== undefined) {
-                    labelValue = input.resourceArn;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: resourceArn.");
-                    }
-                    resolvedPath = resolvedPath.replace("{resourceArn}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: resourceArn.");
-                }
+                resolvedPath = __resolvedPath(resolvedPath, input, "resourceArn", function () { return input.resourceArn; }, "{resourceArn}", false);
                 body = JSON.stringify(__assign({}, (input.tags != null && { tags: serializeAws_restJson1TagMap(input.tags, context) })));
                 return [2, new __HttpRequest({
                         protocol: protocol,
@@ -720,7 +702,7 @@ export var serializeAws_restJson1TagResourceCommand = function (input, context)
     });
 }); };
 export var serializeAws_restJson1UntagResourceCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, query, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, query, body;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0: return [4, context.endpoint()];
@@ -728,17 +710,10 @@ export var serializeAws_restJson1UntagResourceCommand = function (input, context
                 _a = _c.sent(), hostname = _a.hostname, _b = _a.protocol, protocol = _b === void 0 ? "https" : _b, port = _a.port, basePath = _a.path;
                 headers = {};
                 resolvedPath = "".concat((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/tags/{resourceArn}";
-                if (input.resourceArn !== undefined) {
-                    labelValue = input.resourceArn;
-                    if (labelValue.length <= 0) {
-                        throw new Error("Empty value provided for input HTTP label: resourceArn.");
-                    }
-                    resolvedPath = resolvedPath.replace("{resourceArn}", __extendedEncodeURIComponent(labelValue));
-                }
-                else {
-                    throw new Error("No value provided for input HTTP label: resourceArn.");
-                }
-                query = __assign({}, (input.tagKeys !== undefined && { tagKeys: (input.tagKeys || []).map(function (_entry) { return _entry; }) }));
+                resolvedPath = __resolvedPath(resolvedPath, input, "resourceArn", function () { return input.resourceArn; }, "{resourceArn}", false);
+                query = map({
+                    tagKeys: [function () { return input.tagKeys !== void 0; }, function () { return (input.tagKeys || []).map(function (_entry) { return _entry; }); }],
+                });
                 return [2, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -836,24 +811,23 @@ export var deserializeAws_restJson1AssociateMemberCommand = function (output, co
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1AssociateMemberCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    accountId: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.accountId !== undefined && data.accountId !== null) {
+                if (data.accountId != null) {
                     contents.accountId = __expectString(data.accountId);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1AssociateMemberCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -886,14 +860,14 @@ var deserializeAws_restJson1AssociateMemberCommandError = function (output, cont
             case 9: throw _d.sent();
             case 10:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 11;
+            case 11: return [2];
         }
     });
 }); };
@@ -905,28 +879,26 @@ export var deserializeAws_restJson1BatchGetAccountStatusCommand = function (outp
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1BatchGetAccountStatusCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    accounts: undefined,
-                    failedAccounts: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.accounts !== undefined && data.accounts !== null) {
+                if (data.accounts != null) {
                     contents.accounts = deserializeAws_restJson1AccountStateList(data.accounts, context);
                 }
-                if (data.failedAccounts !== undefined && data.failedAccounts !== null) {
+                if (data.failedAccounts != null) {
                     contents.failedAccounts = deserializeAws_restJson1FailedAccountList(data.failedAccounts, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1BatchGetAccountStatusCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -963,14 +935,14 @@ var deserializeAws_restJson1BatchGetAccountStatusCommandError = function (output
             case 11: throw _d.sent();
             case 12:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 13;
+            case 13: return [2];
         }
     });
 }); };
@@ -982,28 +954,26 @@ export var deserializeAws_restJson1BatchGetFreeTrialInfoCommand = function (outp
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1BatchGetFreeTrialInfoCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    accounts: undefined,
-                    failedAccounts: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.accounts !== undefined && data.accounts !== null) {
+                if (data.accounts != null) {
                     contents.accounts = deserializeAws_restJson1FreeTrialAccountInfoList(data.accounts, context);
                 }
-                if (data.failedAccounts !== undefined && data.failedAccounts !== null) {
+                if (data.failedAccounts != null) {
                     contents.failedAccounts = deserializeAws_restJson1FreeTrialInfoErrorList(data.failedAccounts, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1BatchGetFreeTrialInfoCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -1036,14 +1006,14 @@ var deserializeAws_restJson1BatchGetFreeTrialInfoCommandError = function (output
             case 9: throw _d.sent();
             case 10:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 11;
+            case 11: return [2];
         }
     });
 }); };
@@ -1055,24 +1025,23 @@ export var deserializeAws_restJson1CancelFindingsReportCommand = function (outpu
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1CancelFindingsReportCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    reportId: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.reportId !== undefined && data.reportId !== null) {
+                if (data.reportId != null) {
                     contents.reportId = __expectString(data.reportId);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1CancelFindingsReportCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -1109,14 +1078,14 @@ var deserializeAws_restJson1CancelFindingsReportCommandError = function (output,
             case 11: throw _d.sent();
             case 12:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 13;
+            case 13: return [2];
         }
     });
 }); };
@@ -1128,24 +1097,23 @@ export var deserializeAws_restJson1CreateFilterCommand = function (output, conte
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1CreateFilterCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    arn: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.arn !== undefined && data.arn !== null) {
+                if (data.arn != null) {
                     contents.arn = __expectString(data.arn);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1CreateFilterCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -1186,14 +1154,14 @@ var deserializeAws_restJson1CreateFilterCommandError = function (output, context
             case 13: throw _d.sent();
             case 14:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 15;
+            case 15: return [2];
         }
     });
 }); };
@@ -1205,24 +1173,23 @@ export var deserializeAws_restJson1CreateFindingsReportCommand = function (outpu
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1CreateFindingsReportCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    reportId: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.reportId !== undefined && data.reportId !== null) {
+                if (data.reportId != null) {
                     contents.reportId = __expectString(data.reportId);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1CreateFindingsReportCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -1259,14 +1226,14 @@ var deserializeAws_restJson1CreateFindingsReportCommandError = function (output,
             case 11: throw _d.sent();
             case 12:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 13;
+            case 13: return [2];
         }
     });
 }); };
@@ -1278,24 +1245,23 @@ export var deserializeAws_restJson1DeleteFilterCommand = function (output, conte
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1DeleteFilterCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    arn: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.arn !== undefined && data.arn !== null) {
+                if (data.arn != null) {
                     contents.arn = __expectString(data.arn);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1DeleteFilterCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -1332,14 +1298,14 @@ var deserializeAws_restJson1DeleteFilterCommandError = function (output, context
             case 11: throw _d.sent();
             case 12:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 13;
+            case 13: return [2];
         }
     });
 }); };
@@ -1351,28 +1317,26 @@ export var deserializeAws_restJson1DescribeOrganizationConfigurationCommand = fu
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1DescribeOrganizationConfigurationCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    autoEnable: undefined,
-                    maxAccountLimitReached: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.autoEnable !== undefined && data.autoEnable !== null) {
+                if (data.autoEnable != null) {
                     contents.autoEnable = deserializeAws_restJson1AutoEnable(data.autoEnable, context);
                 }
-                if (data.maxAccountLimitReached !== undefined && data.maxAccountLimitReached !== null) {
+                if (data.maxAccountLimitReached != null) {
                     contents.maxAccountLimitReached = __expectBoolean(data.maxAccountLimitReached);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1DescribeOrganizationConfigurationCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -1405,14 +1369,14 @@ var deserializeAws_restJson1DescribeOrganizationConfigurationCommandError = func
             case 9: throw _d.sent();
             case 10:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 11;
+            case 11: return [2];
         }
     });
 }); };
@@ -1424,28 +1388,26 @@ export var deserializeAws_restJson1DisableCommand = function (output, context) {
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1DisableCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    accounts: undefined,
-                    failedAccounts: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.accounts !== undefined && data.accounts !== null) {
+                if (data.accounts != null) {
                     contents.accounts = deserializeAws_restJson1AccountList(data.accounts, context);
                 }
-                if (data.failedAccounts !== undefined && data.failedAccounts !== null) {
+                if (data.failedAccounts != null) {
                     contents.failedAccounts = deserializeAws_restJson1FailedAccountList(data.failedAccounts, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1DisableCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -1482,14 +1444,14 @@ var deserializeAws_restJson1DisableCommandError = function (output, context) { r
             case 11: throw _d.sent();
             case 12:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 13;
+            case 13: return [2];
         }
     });
 }); };
@@ -1501,24 +1463,23 @@ export var deserializeAws_restJson1DisableDelegatedAdminAccountCommand = functio
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1DisableDelegatedAdminAccountCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    delegatedAdminAccountId: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.delegatedAdminAccountId !== undefined && data.delegatedAdminAccountId !== null) {
+                if (data.delegatedAdminAccountId != null) {
                     contents.delegatedAdminAccountId = __expectString(data.delegatedAdminAccountId);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1DisableDelegatedAdminAccountCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -1559,14 +1520,14 @@ var deserializeAws_restJson1DisableDelegatedAdminAccountCommandError = function
             case 13: throw _d.sent();
             case 14:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 15;
+            case 15: return [2];
         }
     });
 }); };
@@ -1578,24 +1539,23 @@ export var deserializeAws_restJson1DisassociateMemberCommand = function (output,
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1DisassociateMemberCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    accountId: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.accountId !== undefined && data.accountId !== null) {
+                if (data.accountId != null) {
                     contents.accountId = __expectString(data.accountId);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1DisassociateMemberCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -1628,14 +1588,14 @@ var deserializeAws_restJson1DisassociateMemberCommandError = function (output, c
             case 9: throw _d.sent();
             case 10:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 11;
+            case 11: return [2];
         }
     });
 }); };
@@ -1647,28 +1607,26 @@ export var deserializeAws_restJson1EnableCommand = function (output, context) {
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1EnableCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    accounts: undefined,
-                    failedAccounts: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.accounts !== undefined && data.accounts !== null) {
+                if (data.accounts != null) {
                     contents.accounts = deserializeAws_restJson1AccountList(data.accounts, context);
                 }
-                if (data.failedAccounts !== undefined && data.failedAccounts !== null) {
+                if (data.failedAccounts != null) {
                     contents.failedAccounts = deserializeAws_restJson1FailedAccountList(data.failedAccounts, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1EnableCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -1705,14 +1663,14 @@ var deserializeAws_restJson1EnableCommandError = function (output, context) { re
             case 11: throw _d.sent();
             case 12:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 13;
+            case 13: return [2];
         }
     });
 }); };
@@ -1724,24 +1682,23 @@ export var deserializeAws_restJson1EnableDelegatedAdminAccountCommand = function
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1EnableDelegatedAdminAccountCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    delegatedAdminAccountId: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.delegatedAdminAccountId !== undefined && data.delegatedAdminAccountId !== null) {
+                if (data.delegatedAdminAccountId != null) {
                     contents.delegatedAdminAccountId = __expectString(data.delegatedAdminAccountId);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1EnableDelegatedAdminAccountCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -1782,14 +1739,14 @@ var deserializeAws_restJson1EnableDelegatedAdminAccountCommandError = function (
             case 13: throw _d.sent();
             case 14:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 15;
+            case 15: return [2];
         }
     });
 }); };
@@ -1801,24 +1758,23 @@ export var deserializeAws_restJson1GetConfigurationCommand = function (output, c
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1GetConfigurationCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    ecrConfiguration: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.ecrConfiguration !== undefined && data.ecrConfiguration !== null) {
+                if (data.ecrConfiguration != null) {
                     contents.ecrConfiguration = deserializeAws_restJson1EcrConfigurationState(data.ecrConfiguration, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1GetConfigurationCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -1847,14 +1803,14 @@ var deserializeAws_restJson1GetConfigurationCommandError = function (output, con
             case 7: throw _d.sent();
             case 8:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 9;
+            case 9: return [2];
         }
     });
 }); };
@@ -1866,24 +1822,23 @@ export var deserializeAws_restJson1GetDelegatedAdminAccountCommand = function (o
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1GetDelegatedAdminAccountCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    delegatedAdmin: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.delegatedAdmin !== undefined && data.delegatedAdmin !== null) {
+                if (data.delegatedAdmin != null) {
                     contents.delegatedAdmin = deserializeAws_restJson1DelegatedAdmin(data.delegatedAdmin, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1GetDelegatedAdminAccountCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -1920,14 +1875,14 @@ var deserializeAws_restJson1GetDelegatedAdminAccountCommandError = function (out
             case 11: throw _d.sent();
             case 12:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 13;
+            case 13: return [2];
         }
     });
 }); };
@@ -1939,44 +1894,38 @@ export var deserializeAws_restJson1GetFindingsReportStatusCommand = function (ou
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1GetFindingsReportStatusCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    destination: undefined,
-                    errorCode: undefined,
-                    errorMessage: undefined,
-                    filterCriteria: undefined,
-                    reportId: undefined,
-                    status: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.destination !== undefined && data.destination !== null) {
+                if (data.destination != null) {
                     contents.destination = deserializeAws_restJson1Destination(data.destination, context);
                 }
-                if (data.errorCode !== undefined && data.errorCode !== null) {
+                if (data.errorCode != null) {
                     contents.errorCode = __expectString(data.errorCode);
                 }
-                if (data.errorMessage !== undefined && data.errorMessage !== null) {
+                if (data.errorMessage != null) {
                     contents.errorMessage = __expectString(data.errorMessage);
                 }
-                if (data.filterCriteria !== undefined && data.filterCriteria !== null) {
+                if (data.filterCriteria != null) {
                     contents.filterCriteria = deserializeAws_restJson1FilterCriteria(data.filterCriteria, context);
                 }
-                if (data.reportId !== undefined && data.reportId !== null) {
+                if (data.reportId != null) {
                     contents.reportId = __expectString(data.reportId);
                 }
-                if (data.status !== undefined && data.status !== null) {
+                if (data.status != null) {
                     contents.status = __expectString(data.status);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1GetFindingsReportStatusCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -2013,14 +1962,14 @@ var deserializeAws_restJson1GetFindingsReportStatusCommandError = function (outp
             case 11: throw _d.sent();
             case 12:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 13;
+            case 13: return [2];
         }
     });
 }); };
@@ -2032,24 +1981,23 @@ export var deserializeAws_restJson1GetMemberCommand = function (output, context)
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1GetMemberCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    member: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.member !== undefined && data.member !== null) {
+                if (data.member != null) {
                     contents.member = deserializeAws_restJson1Member(data.member, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1GetMemberCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -2086,14 +2034,14 @@ var deserializeAws_restJson1GetMemberCommandError = function (output, context) {
             case 11: throw _d.sent();
             case 12:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 13;
+            case 13: return [2];
         }
     });
 }); };
@@ -2105,28 +2053,26 @@ export var deserializeAws_restJson1ListAccountPermissionsCommand = function (out
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1ListAccountPermissionsCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    nextToken: undefined,
-                    permissions: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.nextToken !== undefined && data.nextToken !== null) {
+                if (data.nextToken != null) {
                     contents.nextToken = __expectString(data.nextToken);
                 }
-                if (data.permissions !== undefined && data.permissions !== null) {
+                if (data.permissions != null) {
                     contents.permissions = deserializeAws_restJson1Permissions(data.permissions, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1ListAccountPermissionsCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -2159,14 +2105,14 @@ var deserializeAws_restJson1ListAccountPermissionsCommandError = function (outpu
             case 9: throw _d.sent();
             case 10:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 11;
+            case 11: return [2];
         }
     });
 }); };
@@ -2178,28 +2124,26 @@ export var deserializeAws_restJson1ListCoverageCommand = function (output, conte
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1ListCoverageCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    coveredResources: undefined,
-                    nextToken: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.coveredResources !== undefined && data.coveredResources !== null) {
+                if (data.coveredResources != null) {
                     contents.coveredResources = deserializeAws_restJson1CoveredResources(data.coveredResources, context);
                 }
-                if (data.nextToken !== undefined && data.nextToken !== null) {
+                if (data.nextToken != null) {
                     contents.nextToken = __expectString(data.nextToken);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1ListCoverageCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -2228,14 +2172,14 @@ var deserializeAws_restJson1ListCoverageCommandError = function (output, context
             case 7: throw _d.sent();
             case 8:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 9;
+            case 9: return [2];
         }
     });
 }); };
@@ -2247,32 +2191,29 @@ export var deserializeAws_restJson1ListCoverageStatisticsCommand = function (out
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1ListCoverageStatisticsCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    countsByGroup: undefined,
-                    nextToken: undefined,
-                    totalCounts: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.countsByGroup !== undefined && data.countsByGroup !== null) {
+                if (data.countsByGroup != null) {
                     contents.countsByGroup = deserializeAws_restJson1CountsList(data.countsByGroup, context);
                 }
-                if (data.nextToken !== undefined && data.nextToken !== null) {
+                if (data.nextToken != null) {
                     contents.nextToken = __expectString(data.nextToken);
                 }
-                if (data.totalCounts !== undefined && data.totalCounts !== null) {
+                if (data.totalCounts != null) {
                     contents.totalCounts = __expectLong(data.totalCounts);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1ListCoverageStatisticsCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -2301,14 +2242,14 @@ var deserializeAws_restJson1ListCoverageStatisticsCommandError = function (outpu
             case 7: throw _d.sent();
             case 8:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 9;
+            case 9: return [2];
         }
     });
 }); };
@@ -2320,28 +2261,26 @@ export var deserializeAws_restJson1ListDelegatedAdminAccountsCommand = function
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1ListDelegatedAdminAccountsCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    delegatedAdminAccounts: undefined,
-                    nextToken: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.delegatedAdminAccounts !== undefined && data.delegatedAdminAccounts !== null) {
+                if (data.delegatedAdminAccounts != null) {
                     contents.delegatedAdminAccounts = deserializeAws_restJson1DelegatedAdminAccountList(data.delegatedAdminAccounts, context);
                 }
-                if (data.nextToken !== undefined && data.nextToken !== null) {
+                if (data.nextToken != null) {
                     contents.nextToken = __expectString(data.nextToken);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1ListDelegatedAdminAccountsCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -2374,14 +2313,14 @@ var deserializeAws_restJson1ListDelegatedAdminAccountsCommandError = function (o
             case 9: throw _d.sent();
             case 10:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 11;
+            case 11: return [2];
         }
     });
 }); };
@@ -2393,28 +2332,26 @@ export var deserializeAws_restJson1ListFiltersCommand = function (output, contex
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1ListFiltersCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    filters: undefined,
-                    nextToken: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.filters !== undefined && data.filters !== null) {
+                if (data.filters != null) {
                     contents.filters = deserializeAws_restJson1FilterList(data.filters, context);
                 }
-                if (data.nextToken !== undefined && data.nextToken !== null) {
+                if (data.nextToken != null) {
                     contents.nextToken = __expectString(data.nextToken);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1ListFiltersCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -2447,14 +2384,14 @@ var deserializeAws_restJson1ListFiltersCommandError = function (output, context)
             case 9: throw _d.sent();
             case 10:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 11;
+            case 11: return [2];
         }
     });
 }); };
@@ -2466,32 +2403,29 @@ export var deserializeAws_restJson1ListFindingAggregationsCommand = function (ou
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1ListFindingAggregationsCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    aggregationType: undefined,
-                    nextToken: undefined,
-                    responses: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.aggregationType !== undefined && data.aggregationType !== null) {
+                if (data.aggregationType != null) {
                     contents.aggregationType = __expectString(data.aggregationType);
                 }
-                if (data.nextToken !== undefined && data.nextToken !== null) {
+                if (data.nextToken != null) {
                     contents.nextToken = __expectString(data.nextToken);
                 }
-                if (data.responses !== undefined && data.responses !== null) {
+                if (data.responses != null) {
                     contents.responses = deserializeAws_restJson1AggregationResponseList(data.responses, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1ListFindingAggregationsCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -2520,14 +2454,14 @@ var deserializeAws_restJson1ListFindingAggregationsCommandError = function (outp
             case 7: throw _d.sent();
             case 8:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 9;
+            case 9: return [2];
         }
     });
 }); };
@@ -2539,28 +2473,26 @@ export var deserializeAws_restJson1ListFindingsCommand = function (output, conte
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1ListFindingsCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    findings: undefined,
-                    nextToken: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.findings !== undefined && data.findings !== null) {
+                if (data.findings != null) {
                     contents.findings = deserializeAws_restJson1FindingList(data.findings, context);
                 }
-                if (data.nextToken !== undefined && data.nextToken !== null) {
+                if (data.nextToken != null) {
                     contents.nextToken = __expectString(data.nextToken);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1ListFindingsCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -2589,14 +2521,14 @@ var deserializeAws_restJson1ListFindingsCommandError = function (output, context
             case 7: throw _d.sent();
             case 8:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 9;
+            case 9: return [2];
         }
     });
 }); };
@@ -2608,28 +2540,26 @@ export var deserializeAws_restJson1ListMembersCommand = function (output, contex
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1ListMembersCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    members: undefined,
-                    nextToken: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.members !== undefined && data.members !== null) {
+                if (data.members != null) {
                     contents.members = deserializeAws_restJson1MemberList(data.members, context);
                 }
-                if (data.nextToken !== undefined && data.nextToken !== null) {
+                if (data.nextToken != null) {
                     contents.nextToken = __expectString(data.nextToken);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1ListMembersCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -2662,14 +2592,14 @@ var deserializeAws_restJson1ListMembersCommandError = function (output, context)
             case 9: throw _d.sent();
             case 10:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 11;
+            case 11: return [2];
         }
     });
 }); };
@@ -2681,24 +2611,23 @@ export var deserializeAws_restJson1ListTagsForResourceCommand = function (output
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1ListTagsForResourceCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    tags: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.tags !== undefined && data.tags !== null) {
+                if (data.tags != null) {
                     contents.tags = deserializeAws_restJson1TagMap(data.tags, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1ListTagsForResourceCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -2731,14 +2660,14 @@ var deserializeAws_restJson1ListTagsForResourceCommandError = function (output,
             case 9: throw _d.sent();
             case 10:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 11;
+            case 11: return [2];
         }
     });
 }); };
@@ -2750,28 +2679,26 @@ export var deserializeAws_restJson1ListUsageTotalsCommand = function (output, co
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1ListUsageTotalsCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    nextToken: undefined,
-                    totals: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.nextToken !== undefined && data.nextToken !== null) {
+                if (data.nextToken != null) {
                     contents.nextToken = __expectString(data.nextToken);
                 }
-                if (data.totals !== undefined && data.totals !== null) {
+                if (data.totals != null) {
                     contents.totals = deserializeAws_restJson1UsageTotalList(data.totals, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1ListUsageTotalsCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -2804,14 +2731,14 @@ var deserializeAws_restJson1ListUsageTotalsCommandError = function (output, cont
             case 9: throw _d.sent();
             case 10:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 11;
+            case 11: return [2];
         }
     });
 }); };
@@ -2823,18 +2750,18 @@ export var deserializeAws_restJson1TagResourceCommand = function (output, contex
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1TagResourceCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                };
+                });
                 return [4, collectBody(output.body, context)];
             case 1:
                 _a.sent();
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1TagResourceCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -2871,14 +2798,14 @@ var deserializeAws_restJson1TagResourceCommandError = function (output, context)
             case 11: throw _d.sent();
             case 12:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 13;
+            case 13: return [2];
         }
     });
 }); };
@@ -2890,18 +2817,18 @@ export var deserializeAws_restJson1UntagResourceCommand = function (output, cont
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1UntagResourceCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                };
+                });
                 return [4, collectBody(output.body, context)];
             case 1:
                 _a.sent();
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1UntagResourceCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -2934,14 +2861,14 @@ var deserializeAws_restJson1UntagResourceCommandError = function (output, contex
             case 9: throw _d.sent();
             case 10:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 11;
+            case 11: return [2];
         }
     });
 }); };
@@ -2953,18 +2880,18 @@ export var deserializeAws_restJson1UpdateConfigurationCommand = function (output
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1UpdateConfigurationCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                };
+                });
                 return [4, collectBody(output.body, context)];
             case 1:
                 _a.sent();
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1UpdateConfigurationCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -2997,14 +2924,14 @@ var deserializeAws_restJson1UpdateConfigurationCommandError = function (output,
             case 9: throw _d.sent();
             case 10:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 11;
+            case 11: return [2];
         }
     });
 }); };
@@ -3016,24 +2943,23 @@ export var deserializeAws_restJson1UpdateFilterCommand = function (output, conte
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1UpdateFilterCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    arn: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.arn !== undefined && data.arn !== null) {
+                if (data.arn != null) {
                     contents.arn = __expectString(data.arn);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1UpdateFilterCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -3070,14 +2996,14 @@ var deserializeAws_restJson1UpdateFilterCommandError = function (output, context
             case 11: throw _d.sent();
             case 12:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 13;
+            case 13: return [2];
         }
     });
 }); };
@@ -3089,24 +3015,23 @@ export var deserializeAws_restJson1UpdateOrganizationConfigurationCommand = func
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2, deserializeAws_restJson1UpdateOrganizationConfigurationCommandError(output, context)];
                 }
-                contents = {
+                contents = map({
                     $metadata: deserializeMetadata(output),
-                    autoEnable: undefined,
-                };
+                });
                 _a = __expectNonNull;
                 _b = __expectObject;
                 return [4, parseBody(output.body, context)];
             case 1:
                 data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
-                if (data.autoEnable !== undefined && data.autoEnable !== null) {
+                if (data.autoEnable != null) {
                     contents.autoEnable = deserializeAws_restJson1AutoEnable(data.autoEnable, context);
                 }
-                return [2, Promise.resolve(contents)];
+                return [2, contents];
         }
     });
 }); };
 var deserializeAws_restJson1UpdateOrganizationConfigurationCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var parsedOutput, _a, response, errorCode, _b, parsedBody, $metadata, statusCode;
+    var parsedOutput, _a, errorCode, _b, parsedBody;
     var _c;
     return __generator(this, function (_d) {
         switch (_d.label) {
@@ -3139,23 +3064,24 @@ var deserializeAws_restJson1UpdateOrganizationConfigurationCommandError = functi
             case 9: throw _d.sent();
             case 10:
                 parsedBody = parsedOutput.body;
-                $metadata = deserializeMetadata(output);
-                statusCode = $metadata.httpStatusCode ? $metadata.httpStatusCode + "" : undefined;
-                response = new __BaseException({
-                    name: parsedBody.code || parsedBody.Code || errorCode || statusCode || "UnknowError",
-                    $fault: "client",
-                    $metadata: $metadata,
+                throwDefaultError({
+                    output: output,
+                    parsedBody: parsedBody,
+                    exceptionCtor: __BaseException,
+                    errorCode: errorCode,
                 });
-                throw __decorateServiceException(response, parsedBody);
+                _d.label = 11;
+            case 11: return [2];
         }
     });
 }); };
+var map = __map;
 var deserializeAws_restJson1AccessDeniedExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
     var contents, data, exception;
     return __generator(this, function (_a) {
-        contents = {};
+        contents = map({});
         data = parsedOutput.body;
-        if (data.message !== undefined && data.message !== null) {
+        if (data.message != null) {
             contents.message = __expectString(data.message);
         }
         exception = new AccessDeniedException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
@@ -3165,9 +3091,9 @@ var deserializeAws_restJson1AccessDeniedExceptionResponse = function (parsedOutp
 var deserializeAws_restJson1BadRequestExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
     var contents, data, exception;
     return __generator(this, function (_a) {
-        contents = {};
+        contents = map({});
         data = parsedOutput.body;
-        if (data.message !== undefined && data.message !== null) {
+        if (data.message != null) {
             contents.message = __expectString(data.message);
         }
         exception = new BadRequestException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
@@ -3177,15 +3103,15 @@ var deserializeAws_restJson1BadRequestExceptionResponse = function (parsedOutput
 var deserializeAws_restJson1ConflictExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
     var contents, data, exception;
     return __generator(this, function (_a) {
-        contents = {};
+        contents = map({});
         data = parsedOutput.body;
-        if (data.message !== undefined && data.message !== null) {
+        if (data.message != null) {
             contents.message = __expectString(data.message);
         }
-        if (data.resourceId !== undefined && data.resourceId !== null) {
+        if (data.resourceId != null) {
             contents.resourceId = __expectString(data.resourceId);
         }
-        if (data.resourceType !== undefined && data.resourceType !== null) {
+        if (data.resourceType != null) {
             contents.resourceType = __expectString(data.resourceType);
         }
         exception = new ConflictException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
@@ -3195,12 +3121,14 @@ var deserializeAws_restJson1ConflictExceptionResponse = function (parsedOutput,
 var deserializeAws_restJson1InternalServerExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
     var contents, data, exception;
     return __generator(this, function (_a) {
-        contents = {};
-        if (parsedOutput.headers["retry-after"] !== undefined) {
-            contents.retryAfterSeconds = __strictParseInt32(parsedOutput.headers["retry-after"]);
-        }
+        contents = map({
+            retryAfterSeconds: [
+                function () { return void 0 !== parsedOutput.headers["retry-after"]; },
+                function () { return __strictParseInt32(parsedOutput.headers["retry-after"]); },
+            ],
+        });
         data = parsedOutput.body;
-        if (data.message !== undefined && data.message !== null) {
+        if (data.message != null) {
             contents.message = __expectString(data.message);
         }
         exception = new InternalServerException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
@@ -3210,9 +3138,9 @@ var deserializeAws_restJson1InternalServerExceptionResponse = function (parsedOu
 var deserializeAws_restJson1ResourceNotFoundExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
     var contents, data, exception;
     return __generator(this, function (_a) {
-        contents = {};
+        contents = map({});
         data = parsedOutput.body;
-        if (data.message !== undefined && data.message !== null) {
+        if (data.message != null) {
             contents.message = __expectString(data.message);
         }
         exception = new ResourceNotFoundException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
@@ -3222,12 +3150,12 @@ var deserializeAws_restJson1ResourceNotFoundExceptionResponse = function (parsed
 var deserializeAws_restJson1ServiceQuotaExceededExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
     var contents, data, exception;
     return __generator(this, function (_a) {
-        contents = {};
+        contents = map({});
         data = parsedOutput.body;
-        if (data.message !== undefined && data.message !== null) {
+        if (data.message != null) {
             contents.message = __expectString(data.message);
         }
-        if (data.resourceId !== undefined && data.resourceId !== null) {
+        if (data.resourceId != null) {
             contents.resourceId = __expectString(data.resourceId);
         }
         exception = new ServiceQuotaExceededException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
@@ -3237,9 +3165,9 @@ var deserializeAws_restJson1ServiceQuotaExceededExceptionResponse = function (pa
 var deserializeAws_restJson1ThrottlingExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
     var contents, data, exception;
     return __generator(this, function (_a) {
-        contents = {};
+        contents = map({});
         data = parsedOutput.body;
-        if (data.message !== undefined && data.message !== null) {
+        if (data.message != null) {
             contents.message = __expectString(data.message);
         }
         exception = new ThrottlingException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
@@ -3249,15 +3177,15 @@ var deserializeAws_restJson1ThrottlingExceptionResponse = function (parsedOutput
 var deserializeAws_restJson1ValidationExceptionResponse = function (parsedOutput, context) { return __awaiter(void 0, void 0, void 0, function () {
     var contents, data, exception;
     return __generator(this, function (_a) {
-        contents = {};
+        contents = map({});
         data = parsedOutput.body;
-        if (data.fields !== undefined && data.fields !== null) {
+        if (data.fields != null) {
             contents.fields = deserializeAws_restJson1ValidationExceptionFields(data.fields, context);
         }
-        if (data.message !== undefined && data.message !== null) {
+        if (data.message != null) {
             contents.message = __expectString(data.message);
         }
-        if (data.reason !== undefined && data.reason !== null) {
+        if (data.reason != null) {
             contents.reason = __expectString(data.reason);
         }
         exception = new ValidationException(__assign({ $metadata: deserializeMetadata(parsedOutput) }, contents));
@@ -3271,9 +3199,6 @@ var serializeAws_restJson1AccountIdSet = function (input, context) {
     return input
         .filter(function (e) { return e != null; })
         .map(function (entry) {
-        if (entry === null) {
-            return null;
-        }
         return entry;
     });
 };
@@ -3344,9 +3269,6 @@ var serializeAws_restJson1CoverageMapFilterList = function (input, context) {
     return input
         .filter(function (e) { return e != null; })
         .map(function (entry) {
-        if (entry === null) {
-            return null;
-        }
         return serializeAws_restJson1CoverageMapFilter(entry, context);
     });
 };
@@ -3357,9 +3279,6 @@ var serializeAws_restJson1CoverageStringFilterList = function (input, context) {
     return input
         .filter(function (e) { return e != null; })
         .map(function (entry) {
-        if (entry === null) {
-            return null;
-        }
         return serializeAws_restJson1CoverageStringFilter(entry, context);
     });
 };
@@ -3370,9 +3289,6 @@ var serializeAws_restJson1DateFilterList = function (input, context) {
     return input
         .filter(function (e) { return e != null; })
         .map(function (entry) {
-        if (entry === null) {
-            return null;
-        }
         return serializeAws_restJson1DateFilter(entry, context);
     });
 };
@@ -3383,9 +3299,6 @@ var serializeAws_restJson1DisableResourceTypeList = function (input, context) {
     return input
         .filter(function (e) { return e != null; })
         .map(function (entry) {
-        if (entry === null) {
-            return null;
-        }
         return entry;
     });
 };
@@ -3405,9 +3318,6 @@ var serializeAws_restJson1EnableResourceTypeList = function (input, context) {
     return input
         .filter(function (e) { return e != null; })
         .map(function (entry) {
-        if (entry === null) {
-            return null;
-        }
         return entry;
     });
 };
@@ -3415,9 +3325,6 @@ var serializeAws_restJson1FilterArnList = function (input, context) {
     return input
         .filter(function (e) { return e != null; })
         .map(function (entry) {
-        if (entry === null) {
-            return null;
-        }
         return entry;
     });
 };
@@ -3493,9 +3400,6 @@ var serializeAws_restJson1MapFilterList = function (input, context) {
     return input
         .filter(function (e) { return e != null; })
         .map(function (entry) {
-        if (entry === null) {
-            return null;
-        }
         return serializeAws_restJson1MapFilter(entry, context);
     });
 };
@@ -3503,9 +3407,6 @@ var serializeAws_restJson1MeteringAccountIdList = function (input, context) {
     return input
         .filter(function (e) { return e != null; })
         .map(function (entry) {
-        if (entry === null) {
-            return null;
-        }
         return entry;
     });
 };
@@ -3516,9 +3417,6 @@ var serializeAws_restJson1NumberFilterList = function (input, context) {
     return input
         .filter(function (e) { return e != null; })
         .map(function (entry) {
-        if (entry === null) {
-            return null;
-        }
         return serializeAws_restJson1NumberFilter(entry, context);
     });
 };
@@ -3538,9 +3436,6 @@ var serializeAws_restJson1PackageFilterList = function (input, context) {
     return input
         .filter(function (e) { return e != null; })
         .map(function (entry) {
-        if (entry === null) {
-            return null;
-        }
         return serializeAws_restJson1PackageFilter(entry, context);
     });
 };
@@ -3551,9 +3446,6 @@ var serializeAws_restJson1PortRangeFilterList = function (input, context) {
     return input
         .filter(function (e) { return e != null; })
         .map(function (entry) {
-        if (entry === null) {
-            return null;
-        }
         return serializeAws_restJson1PortRangeFilter(entry, context);
     });
 };
@@ -3572,9 +3464,6 @@ var serializeAws_restJson1StringFilterList = function (input, context) {
     return input
         .filter(function (e) { return e != null; })
         .map(function (entry) {
-        if (entry === null) {
-            return null;
-        }
         return serializeAws_restJson1StringFilter(entry, context);
     });
 };
@@ -3597,9 +3486,6 @@ var serializeAws_restJson1UsageAccountIdList = function (input, context) {
     return input
         .filter(function (e) { return e != null; })
         .map(function (entry) {
-        if (entry === null) {
-            return null;
-        }
         return entry;
     });
 };
@@ -3650,47 +3536,47 @@ var deserializeAws_restJson1AccountStateList = function (output, context) {
     return retVal;
 };
 var deserializeAws_restJson1AggregationResponse = function (output, context) {
-    if (output.accountAggregation !== undefined && output.accountAggregation !== null) {
+    if (output.accountAggregation != null) {
         return {
             accountAggregation: deserializeAws_restJson1AccountAggregationResponse(output.accountAggregation, context),
         };
     }
-    if (output.amiAggregation !== undefined && output.amiAggregation !== null) {
+    if (output.amiAggregation != null) {
         return {
             amiAggregation: deserializeAws_restJson1AmiAggregationResponse(output.amiAggregation, context),
         };
     }
-    if (output.awsEcrContainerAggregation !== undefined && output.awsEcrContainerAggregation !== null) {
+    if (output.awsEcrContainerAggregation != null) {
         return {
             awsEcrContainerAggregation: deserializeAws_restJson1AwsEcrContainerAggregationResponse(output.awsEcrContainerAggregation, context),
         };
     }
-    if (output.ec2InstanceAggregation !== undefined && output.ec2InstanceAggregation !== null) {
+    if (output.ec2InstanceAggregation != null) {
         return {
             ec2InstanceAggregation: deserializeAws_restJson1Ec2InstanceAggregationResponse(output.ec2InstanceAggregation, context),
         };
     }
-    if (output.findingTypeAggregation !== undefined && output.findingTypeAggregation !== null) {
+    if (output.findingTypeAggregation != null) {
         return {
             findingTypeAggregation: deserializeAws_restJson1FindingTypeAggregationResponse(output.findingTypeAggregation, context),
         };
     }
-    if (output.imageLayerAggregation !== undefined && output.imageLayerAggregation !== null) {
+    if (output.imageLayerAggregation != null) {
         return {
             imageLayerAggregation: deserializeAws_restJson1ImageLayerAggregationResponse(output.imageLayerAggregation, context),
         };
     }
-    if (output.packageAggregation !== undefined && output.packageAggregation !== null) {
+    if (output.packageAggregation != null) {
         return {
             packageAggregation: deserializeAws_restJson1PackageAggregationResponse(output.packageAggregation, context),
         };
     }
-    if (output.repositoryAggregation !== undefined && output.repositoryAggregation !== null) {
+    if (output.repositoryAggregation != null) {
         return {
             repositoryAggregation: deserializeAws_restJson1RepositoryAggregationResponse(output.repositoryAggregation, context),
         };
     }
-    if (output.titleAggregation !== undefined && output.titleAggregation !== null) {
+    if (output.titleAggregation != null) {
         return {
             titleAggregation: deserializeAws_restJson1TitleAggregationResponse(output.titleAggregation, context),
         };