@aws-sdk/client-securityhub 3.28.0 → 3.32.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 { expectBoolean as __expectBoolean, expectInt as __expectInt, expectString as __expectString, extendedEncodeURIComponent as __extendedEncodeURIComponent, limitedParseFloat as __limitedParseFloat, serializeFloat as __serializeFloat, } from "@aws-sdk/smithy-client";
+import { expectBoolean as __expectBoolean, expectInt32 as __expectInt32, expectLong as __expectLong, expectNonNull as __expectNonNull, expectObject as __expectObject, expectString as __expectString, extendedEncodeURIComponent as __extendedEncodeURIComponent, limitedParseDouble as __limitedParseDouble, parseRfc3339DateTime as __parseRfc3339DateTime, serializeFloat as __serializeFloat, } from "@aws-sdk/smithy-client";
 export var serializeAws_restJson1AcceptAdministratorInvitationCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
     var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, body;
     return __generator(this, function (_c) {
@@ -1567,9 +1567,9 @@ var deserializeAws_restJson1AcceptInvitationCommandError = function (output, con
     });
 }); };
 export var deserializeAws_restJson1BatchDisableStandardsCommand = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var contents, data;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
+    var contents, data, _a, _b;
+    return __generator(this, function (_c) {
+        switch (_c.label) {
             case 0:
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2 /*return*/, deserializeAws_restJson1BatchDisableStandardsCommandError(output, context)];
@@ -1578,9 +1578,11 @@ export var deserializeAws_restJson1BatchDisableStandardsCommand = function (outp
                     $metadata: deserializeMetadata(output),
                     StandardsSubscriptions: undefined,
                 };
+                _a = __expectNonNull;
+                _b = __expectObject;
                 return [4 /*yield*/, parseBody(output.body, context)];
             case 1:
-                data = _a.sent();
+                data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
                 if (data.StandardsSubscriptions !== undefined && data.StandardsSubscriptions !== null) {
                     contents.StandardsSubscriptions = deserializeAws_restJson1StandardsSubscriptions(data.StandardsSubscriptions, context);
                 }
@@ -1651,9 +1653,9 @@ var deserializeAws_restJson1BatchDisableStandardsCommandError = function (output
     });
 }); };
 export var deserializeAws_restJson1BatchEnableStandardsCommand = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var contents, data;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
+    var contents, data, _a, _b;
+    return __generator(this, function (_c) {
+        switch (_c.label) {
             case 0:
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2 /*return*/, deserializeAws_restJson1BatchEnableStandardsCommandError(output, context)];
@@ -1662,9 +1664,11 @@ export var deserializeAws_restJson1BatchEnableStandardsCommand = function (outpu
                     $metadata: deserializeMetadata(output),
                     StandardsSubscriptions: undefined,
                 };
+                _a = __expectNonNull;
+                _b = __expectObject;
                 return [4 /*yield*/, parseBody(output.body, context)];
             case 1:
-                data = _a.sent();
+                data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
                 if (data.StandardsSubscriptions !== undefined && data.StandardsSubscriptions !== null) {
                     contents.StandardsSubscriptions = deserializeAws_restJson1StandardsSubscriptions(data.StandardsSubscriptions, context);
                 }
@@ -1735,9 +1739,9 @@ var deserializeAws_restJson1BatchEnableStandardsCommandError = function (output,
     });
 }); };
 export var deserializeAws_restJson1BatchImportFindingsCommand = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var contents, data;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
+    var contents, data, _a, _b;
+    return __generator(this, function (_c) {
+        switch (_c.label) {
             case 0:
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2 /*return*/, deserializeAws_restJson1BatchImportFindingsCommandError(output, context)];
@@ -1748,17 +1752,19 @@ export var deserializeAws_restJson1BatchImportFindingsCommand = function (output
                     FailedFindings: undefined,
                     SuccessCount: undefined,
                 };
+                _a = __expectNonNull;
+                _b = __expectObject;
                 return [4 /*yield*/, parseBody(output.body, context)];
             case 1:
-                data = _a.sent();
+                data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
                 if (data.FailedCount !== undefined && data.FailedCount !== null) {
-                    contents.FailedCount = __expectInt(data.FailedCount);
+                    contents.FailedCount = __expectInt32(data.FailedCount);
                 }
                 if (data.FailedFindings !== undefined && data.FailedFindings !== null) {
                     contents.FailedFindings = deserializeAws_restJson1ImportFindingsErrorList(data.FailedFindings, context);
                 }
                 if (data.SuccessCount !== undefined && data.SuccessCount !== null) {
-                    contents.SuccessCount = __expectInt(data.SuccessCount);
+                    contents.SuccessCount = __expectInt32(data.SuccessCount);
                 }
                 return [2 /*return*/, Promise.resolve(contents)];
         }
@@ -1827,9 +1833,9 @@ var deserializeAws_restJson1BatchImportFindingsCommandError = function (output,
     });
 }); };
 export var deserializeAws_restJson1BatchUpdateFindingsCommand = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var contents, data;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
+    var contents, data, _a, _b;
+    return __generator(this, function (_c) {
+        switch (_c.label) {
             case 0:
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2 /*return*/, deserializeAws_restJson1BatchUpdateFindingsCommandError(output, context)];
@@ -1839,9 +1845,11 @@ export var deserializeAws_restJson1BatchUpdateFindingsCommand = function (output
                     ProcessedFindings: undefined,
                     UnprocessedFindings: undefined,
                 };
+                _a = __expectNonNull;
+                _b = __expectObject;
                 return [4 /*yield*/, parseBody(output.body, context)];
             case 1:
-                data = _a.sent();
+                data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
                 if (data.ProcessedFindings !== undefined && data.ProcessedFindings !== null) {
                     contents.ProcessedFindings = deserializeAws_restJson1AwsSecurityFindingIdentifierList(data.ProcessedFindings, context);
                 }
@@ -1915,9 +1923,9 @@ var deserializeAws_restJson1BatchUpdateFindingsCommandError = function (output,
     });
 }); };
 export var deserializeAws_restJson1CreateActionTargetCommand = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var contents, data;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
+    var contents, data, _a, _b;
+    return __generator(this, function (_c) {
+        switch (_c.label) {
             case 0:
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2 /*return*/, deserializeAws_restJson1CreateActionTargetCommandError(output, context)];
@@ -1926,9 +1934,11 @@ export var deserializeAws_restJson1CreateActionTargetCommand = function (output,
                     $metadata: deserializeMetadata(output),
                     ActionTargetArn: undefined,
                 };
+                _a = __expectNonNull;
+                _b = __expectObject;
                 return [4 /*yield*/, parseBody(output.body, context)];
             case 1:
-                data = _a.sent();
+                data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
                 if (data.ActionTargetArn !== undefined && data.ActionTargetArn !== null) {
                     contents.ActionTargetArn = __expectString(data.ActionTargetArn);
                 }
@@ -2007,9 +2017,9 @@ var deserializeAws_restJson1CreateActionTargetCommandError = function (output, c
     });
 }); };
 export var deserializeAws_restJson1CreateInsightCommand = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var contents, data;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
+    var contents, data, _a, _b;
+    return __generator(this, function (_c) {
+        switch (_c.label) {
             case 0:
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2 /*return*/, deserializeAws_restJson1CreateInsightCommandError(output, context)];
@@ -2018,9 +2028,11 @@ export var deserializeAws_restJson1CreateInsightCommand = function (output, cont
                     $metadata: deserializeMetadata(output),
                     InsightArn: undefined,
                 };
+                _a = __expectNonNull;
+                _b = __expectObject;
                 return [4 /*yield*/, parseBody(output.body, context)];
             case 1:
-                data = _a.sent();
+                data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
                 if (data.InsightArn !== undefined && data.InsightArn !== null) {
                     contents.InsightArn = __expectString(data.InsightArn);
                 }
@@ -2099,9 +2111,9 @@ var deserializeAws_restJson1CreateInsightCommandError = function (output, contex
     });
 }); };
 export var deserializeAws_restJson1CreateMembersCommand = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var contents, data;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
+    var contents, data, _a, _b;
+    return __generator(this, function (_c) {
+        switch (_c.label) {
             case 0:
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2 /*return*/, deserializeAws_restJson1CreateMembersCommandError(output, context)];
@@ -2110,9 +2122,11 @@ export var deserializeAws_restJson1CreateMembersCommand = function (output, cont
                     $metadata: deserializeMetadata(output),
                     UnprocessedAccounts: undefined,
                 };
+                _a = __expectNonNull;
+                _b = __expectObject;
                 return [4 /*yield*/, parseBody(output.body, context)];
             case 1:
-                data = _a.sent();
+                data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
                 if (data.UnprocessedAccounts !== undefined && data.UnprocessedAccounts !== null) {
                     contents.UnprocessedAccounts = deserializeAws_restJson1ResultList(data.UnprocessedAccounts, context);
                 }
@@ -2191,9 +2205,9 @@ var deserializeAws_restJson1CreateMembersCommandError = function (output, contex
     });
 }); };
 export var deserializeAws_restJson1DeclineInvitationsCommand = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var contents, data;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
+    var contents, data, _a, _b;
+    return __generator(this, function (_c) {
+        switch (_c.label) {
             case 0:
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2 /*return*/, deserializeAws_restJson1DeclineInvitationsCommandError(output, context)];
@@ -2202,9 +2216,11 @@ export var deserializeAws_restJson1DeclineInvitationsCommand = function (output,
                     $metadata: deserializeMetadata(output),
                     UnprocessedAccounts: undefined,
                 };
+                _a = __expectNonNull;
+                _b = __expectObject;
                 return [4 /*yield*/, parseBody(output.body, context)];
             case 1:
-                data = _a.sent();
+                data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
                 if (data.UnprocessedAccounts !== undefined && data.UnprocessedAccounts !== null) {
                     contents.UnprocessedAccounts = deserializeAws_restJson1ResultList(data.UnprocessedAccounts, context);
                 }
@@ -2275,9 +2291,9 @@ var deserializeAws_restJson1DeclineInvitationsCommandError = function (output, c
     });
 }); };
 export var deserializeAws_restJson1DeleteActionTargetCommand = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var contents, data;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
+    var contents, data, _a, _b;
+    return __generator(this, function (_c) {
+        switch (_c.label) {
             case 0:
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2 /*return*/, deserializeAws_restJson1DeleteActionTargetCommandError(output, context)];
@@ -2286,9 +2302,11 @@ export var deserializeAws_restJson1DeleteActionTargetCommand = function (output,
                     $metadata: deserializeMetadata(output),
                     ActionTargetArn: undefined,
                 };
+                _a = __expectNonNull;
+                _b = __expectObject;
                 return [4 /*yield*/, parseBody(output.body, context)];
             case 1:
-                data = _a.sent();
+                data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
                 if (data.ActionTargetArn !== undefined && data.ActionTargetArn !== null) {
                     contents.ActionTargetArn = __expectString(data.ActionTargetArn);
                 }
@@ -2359,9 +2377,9 @@ var deserializeAws_restJson1DeleteActionTargetCommandError = function (output, c
     });
 }); };
 export var deserializeAws_restJson1DeleteInsightCommand = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var contents, data;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
+    var contents, data, _a, _b;
+    return __generator(this, function (_c) {
+        switch (_c.label) {
             case 0:
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2 /*return*/, deserializeAws_restJson1DeleteInsightCommandError(output, context)];
@@ -2370,9 +2388,11 @@ export var deserializeAws_restJson1DeleteInsightCommand = function (output, cont
                     $metadata: deserializeMetadata(output),
                     InsightArn: undefined,
                 };
+                _a = __expectNonNull;
+                _b = __expectObject;
                 return [4 /*yield*/, parseBody(output.body, context)];
             case 1:
-                data = _a.sent();
+                data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
                 if (data.InsightArn !== undefined && data.InsightArn !== null) {
                     contents.InsightArn = __expectString(data.InsightArn);
                 }
@@ -2451,9 +2471,9 @@ var deserializeAws_restJson1DeleteInsightCommandError = function (output, contex
     });
 }); };
 export var deserializeAws_restJson1DeleteInvitationsCommand = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var contents, data;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
+    var contents, data, _a, _b;
+    return __generator(this, function (_c) {
+        switch (_c.label) {
             case 0:
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2 /*return*/, deserializeAws_restJson1DeleteInvitationsCommandError(output, context)];
@@ -2462,9 +2482,11 @@ export var deserializeAws_restJson1DeleteInvitationsCommand = function (output,
                     $metadata: deserializeMetadata(output),
                     UnprocessedAccounts: undefined,
                 };
+                _a = __expectNonNull;
+                _b = __expectObject;
                 return [4 /*yield*/, parseBody(output.body, context)];
             case 1:
-                data = _a.sent();
+                data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
                 if (data.UnprocessedAccounts !== undefined && data.UnprocessedAccounts !== null) {
                     contents.UnprocessedAccounts = deserializeAws_restJson1ResultList(data.UnprocessedAccounts, context);
                 }
@@ -2543,9 +2565,9 @@ var deserializeAws_restJson1DeleteInvitationsCommandError = function (output, co
     });
 }); };
 export var deserializeAws_restJson1DeleteMembersCommand = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var contents, data;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
+    var contents, data, _a, _b;
+    return __generator(this, function (_c) {
+        switch (_c.label) {
             case 0:
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2 /*return*/, deserializeAws_restJson1DeleteMembersCommandError(output, context)];
@@ -2554,9 +2576,11 @@ export var deserializeAws_restJson1DeleteMembersCommand = function (output, cont
                     $metadata: deserializeMetadata(output),
                     UnprocessedAccounts: undefined,
                 };
+                _a = __expectNonNull;
+                _b = __expectObject;
                 return [4 /*yield*/, parseBody(output.body, context)];
             case 1:
-                data = _a.sent();
+                data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
                 if (data.UnprocessedAccounts !== undefined && data.UnprocessedAccounts !== null) {
                     contents.UnprocessedAccounts = deserializeAws_restJson1ResultList(data.UnprocessedAccounts, context);
                 }
@@ -2635,9 +2659,9 @@ var deserializeAws_restJson1DeleteMembersCommandError = function (output, contex
     });
 }); };
 export var deserializeAws_restJson1DescribeActionTargetsCommand = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var contents, data;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
+    var contents, data, _a, _b;
+    return __generator(this, function (_c) {
+        switch (_c.label) {
             case 0:
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2 /*return*/, deserializeAws_restJson1DescribeActionTargetsCommandError(output, context)];
@@ -2647,9 +2671,11 @@ export var deserializeAws_restJson1DescribeActionTargetsCommand = function (outp
                     ActionTargets: undefined,
                     NextToken: undefined,
                 };
+                _a = __expectNonNull;
+                _b = __expectObject;
                 return [4 /*yield*/, parseBody(output.body, context)];
             case 1:
-                data = _a.sent();
+                data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
                 if (data.ActionTargets !== undefined && data.ActionTargets !== null) {
                     contents.ActionTargets = deserializeAws_restJson1ActionTargetList(data.ActionTargets, context);
                 }
@@ -2723,9 +2749,9 @@ var deserializeAws_restJson1DescribeActionTargetsCommandError = function (output
     });
 }); };
 export var deserializeAws_restJson1DescribeHubCommand = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var contents, data;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
+    var contents, data, _a, _b;
+    return __generator(this, function (_c) {
+        switch (_c.label) {
             case 0:
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2 /*return*/, deserializeAws_restJson1DescribeHubCommandError(output, context)];
@@ -2736,9 +2762,11 @@ export var deserializeAws_restJson1DescribeHubCommand = function (output, contex
                     HubArn: undefined,
                     SubscribedAt: undefined,
                 };
+                _a = __expectNonNull;
+                _b = __expectObject;
                 return [4 /*yield*/, parseBody(output.body, context)];
             case 1:
-                data = _a.sent();
+                data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
                 if (data.AutoEnableControls !== undefined && data.AutoEnableControls !== null) {
                     contents.AutoEnableControls = __expectBoolean(data.AutoEnableControls);
                 }
@@ -2823,9 +2851,9 @@ var deserializeAws_restJson1DescribeHubCommandError = function (output, context)
     });
 }); };
 export var deserializeAws_restJson1DescribeOrganizationConfigurationCommand = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var contents, data;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
+    var contents, data, _a, _b;
+    return __generator(this, function (_c) {
+        switch (_c.label) {
             case 0:
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2 /*return*/, deserializeAws_restJson1DescribeOrganizationConfigurationCommandError(output, context)];
@@ -2835,9 +2863,11 @@ export var deserializeAws_restJson1DescribeOrganizationConfigurationCommand = fu
                     AutoEnable: undefined,
                     MemberAccountLimitReached: undefined,
                 };
+                _a = __expectNonNull;
+                _b = __expectObject;
                 return [4 /*yield*/, parseBody(output.body, context)];
             case 1:
-                data = _a.sent();
+                data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
                 if (data.AutoEnable !== undefined && data.AutoEnable !== null) {
                     contents.AutoEnable = __expectBoolean(data.AutoEnable);
                 }
@@ -2911,9 +2941,9 @@ var deserializeAws_restJson1DescribeOrganizationConfigurationCommandError = func
     });
 }); };
 export var deserializeAws_restJson1DescribeProductsCommand = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var contents, data;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
+    var contents, data, _a, _b;
+    return __generator(this, function (_c) {
+        switch (_c.label) {
             case 0:
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2 /*return*/, deserializeAws_restJson1DescribeProductsCommandError(output, context)];
@@ -2923,9 +2953,11 @@ export var deserializeAws_restJson1DescribeProductsCommand = function (output, c
                     NextToken: undefined,
                     Products: undefined,
                 };
+                _a = __expectNonNull;
+                _b = __expectObject;
                 return [4 /*yield*/, parseBody(output.body, context)];
             case 1:
-                data = _a.sent();
+                data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
                 if (data.NextToken !== undefined && data.NextToken !== null) {
                     contents.NextToken = __expectString(data.NextToken);
                 }
@@ -2999,9 +3031,9 @@ var deserializeAws_restJson1DescribeProductsCommandError = function (output, con
     });
 }); };
 export var deserializeAws_restJson1DescribeStandardsCommand = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var contents, data;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
+    var contents, data, _a, _b;
+    return __generator(this, function (_c) {
+        switch (_c.label) {
             case 0:
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2 /*return*/, deserializeAws_restJson1DescribeStandardsCommandError(output, context)];
@@ -3011,9 +3043,11 @@ export var deserializeAws_restJson1DescribeStandardsCommand = function (output,
                     NextToken: undefined,
                     Standards: undefined,
                 };
+                _a = __expectNonNull;
+                _b = __expectObject;
                 return [4 /*yield*/, parseBody(output.body, context)];
             case 1:
-                data = _a.sent();
+                data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
                 if (data.NextToken !== undefined && data.NextToken !== null) {
                     contents.NextToken = __expectString(data.NextToken);
                 }
@@ -3079,9 +3113,9 @@ var deserializeAws_restJson1DescribeStandardsCommandError = function (output, co
     });
 }); };
 export var deserializeAws_restJson1DescribeStandardsControlsCommand = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var contents, data;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
+    var contents, data, _a, _b;
+    return __generator(this, function (_c) {
+        switch (_c.label) {
             case 0:
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2 /*return*/, deserializeAws_restJson1DescribeStandardsControlsCommandError(output, context)];
@@ -3091,9 +3125,11 @@ export var deserializeAws_restJson1DescribeStandardsControlsCommand = function (
                     Controls: undefined,
                     NextToken: undefined,
                 };
+                _a = __expectNonNull;
+                _b = __expectObject;
                 return [4 /*yield*/, parseBody(output.body, context)];
             case 1:
-                data = _a.sent();
+                data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
                 if (data.Controls !== undefined && data.Controls !== null) {
                     contents.Controls = deserializeAws_restJson1StandardsControls(data.Controls, context);
                 }
@@ -3679,9 +3715,9 @@ var deserializeAws_restJson1DisassociateMembersCommandError = function (output,
     });
 }); };
 export var deserializeAws_restJson1EnableImportFindingsForProductCommand = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var contents, data;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
+    var contents, data, _a, _b;
+    return __generator(this, function (_c) {
+        switch (_c.label) {
             case 0:
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2 /*return*/, deserializeAws_restJson1EnableImportFindingsForProductCommandError(output, context)];
@@ -3690,9 +3726,11 @@ export var deserializeAws_restJson1EnableImportFindingsForProductCommand = funct
                     $metadata: deserializeMetadata(output),
                     ProductSubscriptionArn: undefined,
                 };
+                _a = __expectNonNull;
+                _b = __expectObject;
                 return [4 /*yield*/, parseBody(output.body, context)];
             case 1:
-                data = _a.sent();
+                data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
                 if (data.ProductSubscriptionArn !== undefined && data.ProductSubscriptionArn !== null) {
                     contents.ProductSubscriptionArn = __expectString(data.ProductSubscriptionArn);
                 }
@@ -3939,9 +3977,9 @@ var deserializeAws_restJson1EnableSecurityHubCommandError = function (output, co
     });
 }); };
 export var deserializeAws_restJson1GetAdministratorAccountCommand = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var contents, data;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
+    var contents, data, _a, _b;
+    return __generator(this, function (_c) {
+        switch (_c.label) {
             case 0:
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2 /*return*/, deserializeAws_restJson1GetAdministratorAccountCommandError(output, context)];
@@ -3950,9 +3988,11 @@ export var deserializeAws_restJson1GetAdministratorAccountCommand = function (ou
                     $metadata: deserializeMetadata(output),
                     Administrator: undefined,
                 };
+                _a = __expectNonNull;
+                _b = __expectObject;
                 return [4 /*yield*/, parseBody(output.body, context)];
             case 1:
-                data = _a.sent();
+                data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
                 if (data.Administrator !== undefined && data.Administrator !== null) {
                     contents.Administrator = deserializeAws_restJson1Invitation(data.Administrator, context);
                 }
@@ -4031,9 +4071,9 @@ var deserializeAws_restJson1GetAdministratorAccountCommandError = function (outp
     });
 }); };
 export var deserializeAws_restJson1GetEnabledStandardsCommand = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var contents, data;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
+    var contents, data, _a, _b;
+    return __generator(this, function (_c) {
+        switch (_c.label) {
             case 0:
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2 /*return*/, deserializeAws_restJson1GetEnabledStandardsCommandError(output, context)];
@@ -4043,9 +4083,11 @@ export var deserializeAws_restJson1GetEnabledStandardsCommand = function (output
                     NextToken: undefined,
                     StandardsSubscriptions: undefined,
                 };
+                _a = __expectNonNull;
+                _b = __expectObject;
                 return [4 /*yield*/, parseBody(output.body, context)];
             case 1:
-                data = _a.sent();
+                data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
                 if (data.NextToken !== undefined && data.NextToken !== null) {
                     contents.NextToken = __expectString(data.NextToken);
                 }
@@ -4119,9 +4161,9 @@ var deserializeAws_restJson1GetEnabledStandardsCommandError = function (output,
     });
 }); };
 export var deserializeAws_restJson1GetFindingsCommand = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var contents, data;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
+    var contents, data, _a, _b;
+    return __generator(this, function (_c) {
+        switch (_c.label) {
             case 0:
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2 /*return*/, deserializeAws_restJson1GetFindingsCommandError(output, context)];
@@ -4131,9 +4173,11 @@ export var deserializeAws_restJson1GetFindingsCommand = function (output, contex
                     Findings: undefined,
                     NextToken: undefined,
                 };
+                _a = __expectNonNull;
+                _b = __expectObject;
                 return [4 /*yield*/, parseBody(output.body, context)];
             case 1:
-                data = _a.sent();
+                data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
                 if (data.Findings !== undefined && data.Findings !== null) {
                     contents.Findings = deserializeAws_restJson1AwsSecurityFindingList(data.Findings, context);
                 }
@@ -4207,9 +4251,9 @@ var deserializeAws_restJson1GetFindingsCommandError = function (output, context)
     });
 }); };
 export var deserializeAws_restJson1GetInsightResultsCommand = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var contents, data;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
+    var contents, data, _a, _b;
+    return __generator(this, function (_c) {
+        switch (_c.label) {
             case 0:
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2 /*return*/, deserializeAws_restJson1GetInsightResultsCommandError(output, context)];
@@ -4218,9 +4262,11 @@ export var deserializeAws_restJson1GetInsightResultsCommand = function (output,
                     $metadata: deserializeMetadata(output),
                     InsightResults: undefined,
                 };
+                _a = __expectNonNull;
+                _b = __expectObject;
                 return [4 /*yield*/, parseBody(output.body, context)];
             case 1:
-                data = _a.sent();
+                data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
                 if (data.InsightResults !== undefined && data.InsightResults !== null) {
                     contents.InsightResults = deserializeAws_restJson1InsightResults(data.InsightResults, context);
                 }
@@ -4299,9 +4345,9 @@ var deserializeAws_restJson1GetInsightResultsCommandError = function (output, co
     });
 }); };
 export var deserializeAws_restJson1GetInsightsCommand = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var contents, data;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
+    var contents, data, _a, _b;
+    return __generator(this, function (_c) {
+        switch (_c.label) {
             case 0:
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2 /*return*/, deserializeAws_restJson1GetInsightsCommandError(output, context)];
@@ -4311,9 +4357,11 @@ export var deserializeAws_restJson1GetInsightsCommand = function (output, contex
                     Insights: undefined,
                     NextToken: undefined,
                 };
+                _a = __expectNonNull;
+                _b = __expectObject;
                 return [4 /*yield*/, parseBody(output.body, context)];
             case 1:
-                data = _a.sent();
+                data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
                 if (data.Insights !== undefined && data.Insights !== null) {
                     contents.Insights = deserializeAws_restJson1InsightList(data.Insights, context);
                 }
@@ -4395,9 +4443,9 @@ var deserializeAws_restJson1GetInsightsCommandError = function (output, context)
     });
 }); };
 export var deserializeAws_restJson1GetInvitationsCountCommand = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var contents, data;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
+    var contents, data, _a, _b;
+    return __generator(this, function (_c) {
+        switch (_c.label) {
             case 0:
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2 /*return*/, deserializeAws_restJson1GetInvitationsCountCommandError(output, context)];
@@ -4406,11 +4454,13 @@ export var deserializeAws_restJson1GetInvitationsCountCommand = function (output
                     $metadata: deserializeMetadata(output),
                     InvitationsCount: undefined,
                 };
+                _a = __expectNonNull;
+                _b = __expectObject;
                 return [4 /*yield*/, parseBody(output.body, context)];
             case 1:
-                data = _a.sent();
+                data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
                 if (data.InvitationsCount !== undefined && data.InvitationsCount !== null) {
-                    contents.InvitationsCount = __expectInt(data.InvitationsCount);
+                    contents.InvitationsCount = __expectInt32(data.InvitationsCount);
                 }
                 return [2 /*return*/, Promise.resolve(contents)];
         }
@@ -4479,9 +4529,9 @@ var deserializeAws_restJson1GetInvitationsCountCommandError = function (output,
     });
 }); };
 export var deserializeAws_restJson1GetMasterAccountCommand = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var contents, data;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
+    var contents, data, _a, _b;
+    return __generator(this, function (_c) {
+        switch (_c.label) {
             case 0:
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2 /*return*/, deserializeAws_restJson1GetMasterAccountCommandError(output, context)];
@@ -4490,9 +4540,11 @@ export var deserializeAws_restJson1GetMasterAccountCommand = function (output, c
                     $metadata: deserializeMetadata(output),
                     Master: undefined,
                 };
+                _a = __expectNonNull;
+                _b = __expectObject;
                 return [4 /*yield*/, parseBody(output.body, context)];
             case 1:
-                data = _a.sent();
+                data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
                 if (data.Master !== undefined && data.Master !== null) {
                     contents.Master = deserializeAws_restJson1Invitation(data.Master, context);
                 }
@@ -4571,9 +4623,9 @@ var deserializeAws_restJson1GetMasterAccountCommandError = function (output, con
     });
 }); };
 export var deserializeAws_restJson1GetMembersCommand = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var contents, data;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
+    var contents, data, _a, _b;
+    return __generator(this, function (_c) {
+        switch (_c.label) {
             case 0:
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2 /*return*/, deserializeAws_restJson1GetMembersCommandError(output, context)];
@@ -4583,9 +4635,11 @@ export var deserializeAws_restJson1GetMembersCommand = function (output, context
                     Members: undefined,
                     UnprocessedAccounts: undefined,
                 };
+                _a = __expectNonNull;
+                _b = __expectObject;
                 return [4 /*yield*/, parseBody(output.body, context)];
             case 1:
-                data = _a.sent();
+                data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
                 if (data.Members !== undefined && data.Members !== null) {
                     contents.Members = deserializeAws_restJson1MemberList(data.Members, context);
                 }
@@ -4667,9 +4721,9 @@ var deserializeAws_restJson1GetMembersCommandError = function (output, context)
     });
 }); };
 export var deserializeAws_restJson1InviteMembersCommand = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var contents, data;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
+    var contents, data, _a, _b;
+    return __generator(this, function (_c) {
+        switch (_c.label) {
             case 0:
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2 /*return*/, deserializeAws_restJson1InviteMembersCommandError(output, context)];
@@ -4678,9 +4732,11 @@ export var deserializeAws_restJson1InviteMembersCommand = function (output, cont
                     $metadata: deserializeMetadata(output),
                     UnprocessedAccounts: undefined,
                 };
+                _a = __expectNonNull;
+                _b = __expectObject;
                 return [4 /*yield*/, parseBody(output.body, context)];
             case 1:
-                data = _a.sent();
+                data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
                 if (data.UnprocessedAccounts !== undefined && data.UnprocessedAccounts !== null) {
                     contents.UnprocessedAccounts = deserializeAws_restJson1ResultList(data.UnprocessedAccounts, context);
                 }
@@ -4759,9 +4815,9 @@ var deserializeAws_restJson1InviteMembersCommandError = function (output, contex
     });
 }); };
 export var deserializeAws_restJson1ListEnabledProductsForImportCommand = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var contents, data;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
+    var contents, data, _a, _b;
+    return __generator(this, function (_c) {
+        switch (_c.label) {
             case 0:
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2 /*return*/, deserializeAws_restJson1ListEnabledProductsForImportCommandError(output, context)];
@@ -4771,9 +4827,11 @@ export var deserializeAws_restJson1ListEnabledProductsForImportCommand = functio
                     NextToken: undefined,
                     ProductSubscriptions: undefined,
                 };
+                _a = __expectNonNull;
+                _b = __expectObject;
                 return [4 /*yield*/, parseBody(output.body, context)];
             case 1:
-                data = _a.sent();
+                data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
                 if (data.NextToken !== undefined && data.NextToken !== null) {
                     contents.NextToken = __expectString(data.NextToken);
                 }
@@ -4839,9 +4897,9 @@ var deserializeAws_restJson1ListEnabledProductsForImportCommandError = function
     });
 }); };
 export var deserializeAws_restJson1ListInvitationsCommand = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var contents, data;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
+    var contents, data, _a, _b;
+    return __generator(this, function (_c) {
+        switch (_c.label) {
             case 0:
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2 /*return*/, deserializeAws_restJson1ListInvitationsCommandError(output, context)];
@@ -4851,9 +4909,11 @@ export var deserializeAws_restJson1ListInvitationsCommand = function (output, co
                     Invitations: undefined,
                     NextToken: undefined,
                 };
+                _a = __expectNonNull;
+                _b = __expectObject;
                 return [4 /*yield*/, parseBody(output.body, context)];
             case 1:
-                data = _a.sent();
+                data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
                 if (data.Invitations !== undefined && data.Invitations !== null) {
                     contents.Invitations = deserializeAws_restJson1InvitationList(data.Invitations, context);
                 }
@@ -4927,9 +4987,9 @@ var deserializeAws_restJson1ListInvitationsCommandError = function (output, cont
     });
 }); };
 export var deserializeAws_restJson1ListMembersCommand = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var contents, data;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
+    var contents, data, _a, _b;
+    return __generator(this, function (_c) {
+        switch (_c.label) {
             case 0:
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2 /*return*/, deserializeAws_restJson1ListMembersCommandError(output, context)];
@@ -4939,9 +4999,11 @@ export var deserializeAws_restJson1ListMembersCommand = function (output, contex
                     Members: undefined,
                     NextToken: undefined,
                 };
+                _a = __expectNonNull;
+                _b = __expectObject;
                 return [4 /*yield*/, parseBody(output.body, context)];
             case 1:
-                data = _a.sent();
+                data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
                 if (data.Members !== undefined && data.Members !== null) {
                     contents.Members = deserializeAws_restJson1MemberList(data.Members, context);
                 }
@@ -5015,9 +5077,9 @@ var deserializeAws_restJson1ListMembersCommandError = function (output, context)
     });
 }); };
 export var deserializeAws_restJson1ListOrganizationAdminAccountsCommand = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var contents, data;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
+    var contents, data, _a, _b;
+    return __generator(this, function (_c) {
+        switch (_c.label) {
             case 0:
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2 /*return*/, deserializeAws_restJson1ListOrganizationAdminAccountsCommandError(output, context)];
@@ -5027,9 +5089,11 @@ export var deserializeAws_restJson1ListOrganizationAdminAccountsCommand = functi
                     AdminAccounts: undefined,
                     NextToken: undefined,
                 };
+                _a = __expectNonNull;
+                _b = __expectObject;
                 return [4 /*yield*/, parseBody(output.body, context)];
             case 1:
-                data = _a.sent();
+                data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
                 if (data.AdminAccounts !== undefined && data.AdminAccounts !== null) {
                     contents.AdminAccounts = deserializeAws_restJson1AdminAccounts(data.AdminAccounts, context);
                 }
@@ -5103,9 +5167,9 @@ var deserializeAws_restJson1ListOrganizationAdminAccountsCommandError = function
     });
 }); };
 export var deserializeAws_restJson1ListTagsForResourceCommand = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var contents, data;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
+    var contents, data, _a, _b;
+    return __generator(this, function (_c) {
+        switch (_c.label) {
             case 0:
                 if (output.statusCode !== 200 && output.statusCode >= 300) {
                     return [2 /*return*/, deserializeAws_restJson1ListTagsForResourceCommandError(output, context)];
@@ -5114,9 +5178,11 @@ export var deserializeAws_restJson1ListTagsForResourceCommand = function (output
                     $metadata: deserializeMetadata(output),
                     Tags: undefined,
                 };
+                _a = __expectNonNull;
+                _b = __expectObject;
                 return [4 /*yield*/, parseBody(output.body, context)];
             case 1:
-                data = _a.sent();
+                data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
                 if (data.Tags !== undefined && data.Tags !== null) {
                     contents.Tags = deserializeAws_restJson1TagMap(data.Tags, context);
                 }
@@ -6021,6 +6087,19 @@ var serializeAws_restJson1ActionRemoteIpDetails = function (input, context) {
 var serializeAws_restJson1ActionRemotePortDetails = function (input, context) {
     return __assign(__assign({}, (input.Port !== undefined && input.Port !== null && { Port: input.Port })), (input.PortName !== undefined && input.PortName !== null && { PortName: input.PortName }));
 };
+var serializeAws_restJson1Adjustment = function (input, context) {
+    return __assign(__assign({}, (input.Metric !== undefined && input.Metric !== null && { Metric: input.Metric })), (input.Reason !== undefined && input.Reason !== null && { Reason: input.Reason }));
+};
+var serializeAws_restJson1AdjustmentList = function (input, context) {
+    return input
+        .filter(function (e) { return e != null; })
+        .map(function (entry) {
+        if (entry === null) {
+            return null;
+        }
+        return serializeAws_restJson1Adjustment(entry, context);
+    });
+};
 var serializeAws_restJson1ArnList = function (input, context) {
     return input
         .filter(function (e) { return e != null; })
@@ -6173,6 +6252,49 @@ var serializeAws_restJson1AwsAutoScalingAutoScalingGroupDetails = function (inpu
         LoadBalancerNames: serializeAws_restJson1StringList(input.LoadBalancerNames, context),
     }));
 };
+var serializeAws_restJson1AwsAutoScalingLaunchConfigurationBlockDeviceMappingsDetails = function (input, context) {
+    return __assign(__assign(__assign(__assign({}, (input.DeviceName !== undefined && input.DeviceName !== null && { DeviceName: input.DeviceName })), (input.Ebs !== undefined &&
+        input.Ebs !== null && {
+        Ebs: serializeAws_restJson1AwsAutoScalingLaunchConfigurationBlockDeviceMappingsEbsDetails(input.Ebs, context),
+    })), (input.NoDevice !== undefined && input.NoDevice !== null && { NoDevice: input.NoDevice })), (input.VirtualName !== undefined && input.VirtualName !== null && { VirtualName: input.VirtualName }));
+};
+var serializeAws_restJson1AwsAutoScalingLaunchConfigurationBlockDeviceMappingsEbsDetails = function (input, context) {
+    return __assign(__assign(__assign(__assign(__assign(__assign({}, (input.DeleteOnTermination !== undefined &&
+        input.DeleteOnTermination !== null && { DeleteOnTermination: input.DeleteOnTermination })), (input.Encrypted !== undefined && input.Encrypted !== null && { Encrypted: input.Encrypted })), (input.Iops !== undefined && input.Iops !== null && { Iops: input.Iops })), (input.SnapshotId !== undefined && input.SnapshotId !== null && { SnapshotId: input.SnapshotId })), (input.VolumeSize !== undefined && input.VolumeSize !== null && { VolumeSize: input.VolumeSize })), (input.VolumeType !== undefined && input.VolumeType !== null && { VolumeType: input.VolumeType }));
+};
+var serializeAws_restJson1AwsAutoScalingLaunchConfigurationBlockDeviceMappingsList = function (input, context) {
+    return input
+        .filter(function (e) { return e != null; })
+        .map(function (entry) {
+        if (entry === null) {
+            return null;
+        }
+        return serializeAws_restJson1AwsAutoScalingLaunchConfigurationBlockDeviceMappingsDetails(entry, context);
+    });
+};
+var serializeAws_restJson1AwsAutoScalingLaunchConfigurationDetails = function (input, context) {
+    return __assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign({}, (input.AssociatePublicIpAddress !== undefined &&
+        input.AssociatePublicIpAddress !== null && { AssociatePublicIpAddress: input.AssociatePublicIpAddress })), (input.BlockDeviceMappings !== undefined &&
+        input.BlockDeviceMappings !== null && {
+        BlockDeviceMappings: serializeAws_restJson1AwsAutoScalingLaunchConfigurationBlockDeviceMappingsList(input.BlockDeviceMappings, context),
+    })), (input.ClassicLinkVpcId !== undefined &&
+        input.ClassicLinkVpcId !== null && { ClassicLinkVpcId: input.ClassicLinkVpcId })), (input.ClassicLinkVpcSecurityGroups !== undefined &&
+        input.ClassicLinkVpcSecurityGroups !== null && {
+        ClassicLinkVpcSecurityGroups: serializeAws_restJson1NonEmptyStringList(input.ClassicLinkVpcSecurityGroups, context),
+    })), (input.CreatedTime !== undefined && input.CreatedTime !== null && { CreatedTime: input.CreatedTime })), (input.EbsOptimized !== undefined && input.EbsOptimized !== null && { EbsOptimized: input.EbsOptimized })), (input.IamInstanceProfile !== undefined &&
+        input.IamInstanceProfile !== null && { IamInstanceProfile: input.IamInstanceProfile })), (input.ImageId !== undefined && input.ImageId !== null && { ImageId: input.ImageId })), (input.InstanceMonitoring !== undefined &&
+        input.InstanceMonitoring !== null && {
+        InstanceMonitoring: serializeAws_restJson1AwsAutoScalingLaunchConfigurationInstanceMonitoringDetails(input.InstanceMonitoring, context),
+    })), (input.InstanceType !== undefined && input.InstanceType !== null && { InstanceType: input.InstanceType })), (input.KernelId !== undefined && input.KernelId !== null && { KernelId: input.KernelId })), (input.KeyName !== undefined && input.KeyName !== null && { KeyName: input.KeyName })), (input.LaunchConfigurationName !== undefined &&
+        input.LaunchConfigurationName !== null && { LaunchConfigurationName: input.LaunchConfigurationName })), (input.PlacementTenancy !== undefined &&
+        input.PlacementTenancy !== null && { PlacementTenancy: input.PlacementTenancy })), (input.RamdiskId !== undefined && input.RamdiskId !== null && { RamdiskId: input.RamdiskId })), (input.SecurityGroups !== undefined &&
+        input.SecurityGroups !== null && {
+        SecurityGroups: serializeAws_restJson1NonEmptyStringList(input.SecurityGroups, context),
+    })), (input.SpotPrice !== undefined && input.SpotPrice !== null && { SpotPrice: input.SpotPrice })), (input.UserData !== undefined && input.UserData !== null && { UserData: input.UserData }));
+};
+var serializeAws_restJson1AwsAutoScalingLaunchConfigurationInstanceMonitoringDetails = function (input, context) {
+    return __assign({}, (input.Enabled !== undefined && input.Enabled !== null && { Enabled: input.Enabled }));
+};
 var serializeAws_restJson1AwsCertificateManagerCertificateDetails = function (input, context) {
     return __assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign({}, (input.CertificateAuthorityArn !== undefined &&
         input.CertificateAuthorityArn !== null && { CertificateAuthorityArn: input.CertificateAuthorityArn })), (input.CreatedAt !== undefined && input.CreatedAt !== null && { CreatedAt: input.CreatedAt })), (input.DomainName !== undefined && input.DomainName !== null && { DomainName: input.DomainName })), (input.DomainValidationOptions !== undefined &&
@@ -6884,6 +7006,108 @@ var serializeAws_restJson1AwsEc2VpcDetails = function (input, context) {
         Ipv6CidrBlockAssociationSet: serializeAws_restJson1Ipv6CidrBlockAssociationList(input.Ipv6CidrBlockAssociationSet, context),
     })), (input.State !== undefined && input.State !== null && { State: input.State }));
 };
+var serializeAws_restJson1AwsEc2VpnConnectionDetails = function (input, context) {
+    return __assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign({}, (input.Category !== undefined && input.Category !== null && { Category: input.Category })), (input.CustomerGatewayConfiguration !== undefined &&
+        input.CustomerGatewayConfiguration !== null && {
+        CustomerGatewayConfiguration: input.CustomerGatewayConfiguration,
+    })), (input.CustomerGatewayId !== undefined &&
+        input.CustomerGatewayId !== null && { CustomerGatewayId: input.CustomerGatewayId })), (input.Options !== undefined &&
+        input.Options !== null && {
+        Options: serializeAws_restJson1AwsEc2VpnConnectionOptionsDetails(input.Options, context),
+    })), (input.Routes !== undefined &&
+        input.Routes !== null && { Routes: serializeAws_restJson1AwsEc2VpnConnectionRoutesList(input.Routes, context) })), (input.State !== undefined && input.State !== null && { State: input.State })), (input.TransitGatewayId !== undefined &&
+        input.TransitGatewayId !== null && { TransitGatewayId: input.TransitGatewayId })), (input.Type !== undefined && input.Type !== null && { Type: input.Type })), (input.VgwTelemetry !== undefined &&
+        input.VgwTelemetry !== null && {
+        VgwTelemetry: serializeAws_restJson1AwsEc2VpnConnectionVgwTelemetryList(input.VgwTelemetry, context),
+    })), (input.VpnConnectionId !== undefined &&
+        input.VpnConnectionId !== null && { VpnConnectionId: input.VpnConnectionId })), (input.VpnGatewayId !== undefined && input.VpnGatewayId !== null && { VpnGatewayId: input.VpnGatewayId }));
+};
+var serializeAws_restJson1AwsEc2VpnConnectionOptionsDetails = function (input, context) {
+    return __assign(__assign({}, (input.StaticRoutesOnly !== undefined &&
+        input.StaticRoutesOnly !== null && { StaticRoutesOnly: input.StaticRoutesOnly })), (input.TunnelOptions !== undefined &&
+        input.TunnelOptions !== null && {
+        TunnelOptions: serializeAws_restJson1AwsEc2VpnConnectionOptionsTunnelOptionsList(input.TunnelOptions, context),
+    }));
+};
+var serializeAws_restJson1AwsEc2VpnConnectionOptionsTunnelOptionsDetails = function (input, context) {
+    return __assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign({}, (input.DpdTimeoutSeconds !== undefined &&
+        input.DpdTimeoutSeconds !== null && { DpdTimeoutSeconds: input.DpdTimeoutSeconds })), (input.IkeVersions !== undefined &&
+        input.IkeVersions !== null && {
+        IkeVersions: serializeAws_restJson1NonEmptyStringList(input.IkeVersions, context),
+    })), (input.OutsideIpAddress !== undefined &&
+        input.OutsideIpAddress !== null && { OutsideIpAddress: input.OutsideIpAddress })), (input.Phase1DhGroupNumbers !== undefined &&
+        input.Phase1DhGroupNumbers !== null && {
+        Phase1DhGroupNumbers: serializeAws_restJson1IntegerList(input.Phase1DhGroupNumbers, context),
+    })), (input.Phase1EncryptionAlgorithms !== undefined &&
+        input.Phase1EncryptionAlgorithms !== null && {
+        Phase1EncryptionAlgorithms: serializeAws_restJson1NonEmptyStringList(input.Phase1EncryptionAlgorithms, context),
+    })), (input.Phase1IntegrityAlgorithms !== undefined &&
+        input.Phase1IntegrityAlgorithms !== null && {
+        Phase1IntegrityAlgorithms: serializeAws_restJson1NonEmptyStringList(input.Phase1IntegrityAlgorithms, context),
+    })), (input.Phase1LifetimeSeconds !== undefined &&
+        input.Phase1LifetimeSeconds !== null && { Phase1LifetimeSeconds: input.Phase1LifetimeSeconds })), (input.Phase2DhGroupNumbers !== undefined &&
+        input.Phase2DhGroupNumbers !== null && {
+        Phase2DhGroupNumbers: serializeAws_restJson1IntegerList(input.Phase2DhGroupNumbers, context),
+    })), (input.Phase2EncryptionAlgorithms !== undefined &&
+        input.Phase2EncryptionAlgorithms !== null && {
+        Phase2EncryptionAlgorithms: serializeAws_restJson1NonEmptyStringList(input.Phase2EncryptionAlgorithms, context),
+    })), (input.Phase2IntegrityAlgorithms !== undefined &&
+        input.Phase2IntegrityAlgorithms !== null && {
+        Phase2IntegrityAlgorithms: serializeAws_restJson1NonEmptyStringList(input.Phase2IntegrityAlgorithms, context),
+    })), (input.Phase2LifetimeSeconds !== undefined &&
+        input.Phase2LifetimeSeconds !== null && { Phase2LifetimeSeconds: input.Phase2LifetimeSeconds })), (input.PreSharedKey !== undefined && input.PreSharedKey !== null && { PreSharedKey: input.PreSharedKey })), (input.RekeyFuzzPercentage !== undefined &&
+        input.RekeyFuzzPercentage !== null && { RekeyFuzzPercentage: input.RekeyFuzzPercentage })), (input.RekeyMarginTimeSeconds !== undefined &&
+        input.RekeyMarginTimeSeconds !== null && { RekeyMarginTimeSeconds: input.RekeyMarginTimeSeconds })), (input.ReplayWindowSize !== undefined &&
+        input.ReplayWindowSize !== null && { ReplayWindowSize: input.ReplayWindowSize })), (input.TunnelInsideCidr !== undefined &&
+        input.TunnelInsideCidr !== null && { TunnelInsideCidr: input.TunnelInsideCidr }));
+};
+var serializeAws_restJson1AwsEc2VpnConnectionOptionsTunnelOptionsList = function (input, context) {
+    return input
+        .filter(function (e) { return e != null; })
+        .map(function (entry) {
+        if (entry === null) {
+            return null;
+        }
+        return serializeAws_restJson1AwsEc2VpnConnectionOptionsTunnelOptionsDetails(entry, context);
+    });
+};
+var serializeAws_restJson1AwsEc2VpnConnectionRoutesDetails = function (input, context) {
+    return __assign(__assign({}, (input.DestinationCidrBlock !== undefined &&
+        input.DestinationCidrBlock !== null && { DestinationCidrBlock: input.DestinationCidrBlock })), (input.State !== undefined && input.State !== null && { State: input.State }));
+};
+var serializeAws_restJson1AwsEc2VpnConnectionRoutesList = function (input, context) {
+    return input
+        .filter(function (e) { return e != null; })
+        .map(function (entry) {
+        if (entry === null) {
+            return null;
+        }
+        return serializeAws_restJson1AwsEc2VpnConnectionRoutesDetails(entry, context);
+    });
+};
+var serializeAws_restJson1AwsEc2VpnConnectionVgwTelemetryDetails = function (input, context) {
+    return __assign(__assign(__assign(__assign(__assign(__assign({}, (input.AcceptedRouteCount !== undefined &&
+        input.AcceptedRouteCount !== null && { AcceptedRouteCount: input.AcceptedRouteCount })), (input.CertificateArn !== undefined &&
+        input.CertificateArn !== null && { CertificateArn: input.CertificateArn })), (input.LastStatusChange !== undefined &&
+        input.LastStatusChange !== null && { LastStatusChange: input.LastStatusChange })), (input.OutsideIpAddress !== undefined &&
+        input.OutsideIpAddress !== null && { OutsideIpAddress: input.OutsideIpAddress })), (input.Status !== undefined && input.Status !== null && { Status: input.Status })), (input.StatusMessage !== undefined && input.StatusMessage !== null && { StatusMessage: input.StatusMessage }));
+};
+var serializeAws_restJson1AwsEc2VpnConnectionVgwTelemetryList = function (input, context) {
+    return input
+        .filter(function (e) { return e != null; })
+        .map(function (entry) {
+        if (entry === null) {
+            return null;
+        }
+        return serializeAws_restJson1AwsEc2VpnConnectionVgwTelemetryDetails(entry, context);
+    });
+};
+var serializeAws_restJson1AwsEcrContainerImageDetails = function (input, context) {
+    return __assign(__assign(__assign(__assign(__assign(__assign({}, (input.Architecture !== undefined && input.Architecture !== null && { Architecture: input.Architecture })), (input.ImageDigest !== undefined && input.ImageDigest !== null && { ImageDigest: input.ImageDigest })), (input.ImagePublishedAt !== undefined &&
+        input.ImagePublishedAt !== null && { ImagePublishedAt: input.ImagePublishedAt })), (input.ImageTags !== undefined &&
+        input.ImageTags !== null && { ImageTags: serializeAws_restJson1NonEmptyStringList(input.ImageTags, context) })), (input.RegistryId !== undefined && input.RegistryId !== null && { RegistryId: input.RegistryId })), (input.RepositoryName !== undefined &&
+        input.RepositoryName !== null && { RepositoryName: input.RepositoryName }));
+};
 var serializeAws_restJson1AwsEcsClusterClusterSettingsDetails = function (input, context) {
     return __assign(__assign({}, (input.Name !== undefined && input.Name !== null && { Name: input.Name })), (input.Value !== undefined && input.Value !== null && { Value: input.Value }));
 };
@@ -7958,8 +8182,9 @@ var serializeAws_restJson1AwsIamUserPolicyList = function (input, context) {
     });
 };
 var serializeAws_restJson1AwsKmsKeyDetails = function (input, context) {
-    return __assign(__assign(__assign(__assign(__assign(__assign(__assign({}, (input.AWSAccountId !== undefined && input.AWSAccountId !== null && { AWSAccountId: input.AWSAccountId })), (input.CreationDate !== undefined &&
-        input.CreationDate !== null && { CreationDate: __serializeFloat(input.CreationDate) })), (input.Description !== undefined && input.Description !== null && { Description: input.Description })), (input.KeyId !== undefined && input.KeyId !== null && { KeyId: input.KeyId })), (input.KeyManager !== undefined && input.KeyManager !== null && { KeyManager: input.KeyManager })), (input.KeyState !== undefined && input.KeyState !== null && { KeyState: input.KeyState })), (input.Origin !== undefined && input.Origin !== null && { Origin: input.Origin }));
+    return __assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign({}, (input.AWSAccountId !== undefined && input.AWSAccountId !== null && { AWSAccountId: input.AWSAccountId })), (input.CreationDate !== undefined &&
+        input.CreationDate !== null && { CreationDate: __serializeFloat(input.CreationDate) })), (input.Description !== undefined && input.Description !== null && { Description: input.Description })), (input.KeyId !== undefined && input.KeyId !== null && { KeyId: input.KeyId })), (input.KeyManager !== undefined && input.KeyManager !== null && { KeyManager: input.KeyManager })), (input.KeyRotationStatus !== undefined &&
+        input.KeyRotationStatus !== null && { KeyRotationStatus: input.KeyRotationStatus })), (input.KeyState !== undefined && input.KeyState !== null && { KeyState: input.KeyState })), (input.Origin !== undefined && input.Origin !== null && { Origin: input.Origin }));
 };
 var serializeAws_restJson1AwsLambdaFunctionCode = function (input, context) {
     return __assign(__assign(__assign(__assign({}, (input.S3Bucket !== undefined && input.S3Bucket !== null && { S3Bucket: input.S3Bucket })), (input.S3Key !== undefined && input.S3Key !== null && { S3Key: input.S3Key })), (input.S3ObjectVersion !== undefined &&
@@ -8750,9 +8975,19 @@ var serializeAws_restJson1AwsS3BucketBucketLifecycleConfigurationRulesTransition
     });
 };
 var serializeAws_restJson1AwsS3BucketDetails = function (input, context) {
-    return __assign(__assign(__assign(__assign(__assign(__assign({}, (input.BucketLifecycleConfiguration !== undefined &&
+    return __assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign({}, (input.AccessControlList !== undefined &&
+        input.AccessControlList !== null && { AccessControlList: input.AccessControlList })), (input.BucketLifecycleConfiguration !== undefined &&
         input.BucketLifecycleConfiguration !== null && {
         BucketLifecycleConfiguration: serializeAws_restJson1AwsS3BucketBucketLifecycleConfigurationDetails(input.BucketLifecycleConfiguration, context),
+    })), (input.BucketLoggingConfiguration !== undefined &&
+        input.BucketLoggingConfiguration !== null && {
+        BucketLoggingConfiguration: serializeAws_restJson1AwsS3BucketLoggingConfiguration(input.BucketLoggingConfiguration, context),
+    })), (input.BucketNotificationConfiguration !== undefined &&
+        input.BucketNotificationConfiguration !== null && {
+        BucketNotificationConfiguration: serializeAws_restJson1AwsS3BucketNotificationConfiguration(input.BucketNotificationConfiguration, context),
+    })), (input.BucketWebsiteConfiguration !== undefined &&
+        input.BucketWebsiteConfiguration !== null && {
+        BucketWebsiteConfiguration: serializeAws_restJson1AwsS3BucketWebsiteConfiguration(input.BucketWebsiteConfiguration, context),
     })), (input.CreatedAt !== undefined && input.CreatedAt !== null && { CreatedAt: input.CreatedAt })), (input.OwnerId !== undefined && input.OwnerId !== null && { OwnerId: input.OwnerId })), (input.OwnerName !== undefined && input.OwnerName !== null && { OwnerName: input.OwnerName })), (input.PublicAccessBlockConfiguration !== undefined &&
         input.PublicAccessBlockConfiguration !== null && {
         PublicAccessBlockConfiguration: serializeAws_restJson1AwsS3AccountPublicAccessBlockDetails(input.PublicAccessBlockConfiguration, context),
@@ -8761,6 +8996,70 @@ var serializeAws_restJson1AwsS3BucketDetails = function (input, context) {
         ServerSideEncryptionConfiguration: serializeAws_restJson1AwsS3BucketServerSideEncryptionConfiguration(input.ServerSideEncryptionConfiguration, context),
     }));
 };
+var serializeAws_restJson1AwsS3BucketLoggingConfiguration = function (input, context) {
+    return __assign(__assign({}, (input.DestinationBucketName !== undefined &&
+        input.DestinationBucketName !== null && { DestinationBucketName: input.DestinationBucketName })), (input.LogFilePrefix !== undefined && input.LogFilePrefix !== null && { LogFilePrefix: input.LogFilePrefix }));
+};
+var serializeAws_restJson1AwsS3BucketNotificationConfiguration = function (input, context) {
+    return __assign({}, (input.Configurations !== undefined &&
+        input.Configurations !== null && {
+        Configurations: serializeAws_restJson1AwsS3BucketNotificationConfigurationDetails(input.Configurations, context),
+    }));
+};
+var serializeAws_restJson1AwsS3BucketNotificationConfigurationDetail = function (input, context) {
+    return __assign(__assign(__assign(__assign({}, (input.Destination !== undefined && input.Destination !== null && { Destination: input.Destination })), (input.Events !== undefined &&
+        input.Events !== null && {
+        Events: serializeAws_restJson1AwsS3BucketNotificationConfigurationEvents(input.Events, context),
+    })), (input.Filter !== undefined &&
+        input.Filter !== null && {
+        Filter: serializeAws_restJson1AwsS3BucketNotificationConfigurationFilter(input.Filter, context),
+    })), (input.Type !== undefined && input.Type !== null && { Type: input.Type }));
+};
+var serializeAws_restJson1AwsS3BucketNotificationConfigurationDetails = function (input, context) {
+    return input
+        .filter(function (e) { return e != null; })
+        .map(function (entry) {
+        if (entry === null) {
+            return null;
+        }
+        return serializeAws_restJson1AwsS3BucketNotificationConfigurationDetail(entry, context);
+    });
+};
+var serializeAws_restJson1AwsS3BucketNotificationConfigurationEvents = function (input, context) {
+    return input
+        .filter(function (e) { return e != null; })
+        .map(function (entry) {
+        if (entry === null) {
+            return null;
+        }
+        return entry;
+    });
+};
+var serializeAws_restJson1AwsS3BucketNotificationConfigurationFilter = function (input, context) {
+    return __assign({}, (input.S3KeyFilter !== undefined &&
+        input.S3KeyFilter !== null && {
+        S3KeyFilter: serializeAws_restJson1AwsS3BucketNotificationConfigurationS3KeyFilter(input.S3KeyFilter, context),
+    }));
+};
+var serializeAws_restJson1AwsS3BucketNotificationConfigurationS3KeyFilter = function (input, context) {
+    return __assign({}, (input.FilterRules !== undefined &&
+        input.FilterRules !== null && {
+        FilterRules: serializeAws_restJson1AwsS3BucketNotificationConfigurationS3KeyFilterRules(input.FilterRules, context),
+    }));
+};
+var serializeAws_restJson1AwsS3BucketNotificationConfigurationS3KeyFilterRule = function (input, context) {
+    return __assign(__assign({}, (input.Name !== undefined && input.Name !== null && { Name: input.Name })), (input.Value !== undefined && input.Value !== null && { Value: input.Value }));
+};
+var serializeAws_restJson1AwsS3BucketNotificationConfigurationS3KeyFilterRules = function (input, context) {
+    return input
+        .filter(function (e) { return e != null; })
+        .map(function (entry) {
+        if (entry === null) {
+            return null;
+        }
+        return serializeAws_restJson1AwsS3BucketNotificationConfigurationS3KeyFilterRule(entry, context);
+    });
+};
 var serializeAws_restJson1AwsS3BucketServerSideEncryptionByDefault = function (input, context) {
     return __assign(__assign({}, (input.KMSMasterKeyID !== undefined &&
         input.KMSMasterKeyID !== null && { KMSMasterKeyID: input.KMSMasterKeyID })), (input.SSEAlgorithm !== undefined && input.SSEAlgorithm !== null && { SSEAlgorithm: input.SSEAlgorithm }));
@@ -8787,6 +9086,49 @@ var serializeAws_restJson1AwsS3BucketServerSideEncryptionRules = function (input
         return serializeAws_restJson1AwsS3BucketServerSideEncryptionRule(entry, context);
     });
 };
+var serializeAws_restJson1AwsS3BucketWebsiteConfiguration = function (input, context) {
+    return __assign(__assign(__assign(__assign({}, (input.ErrorDocument !== undefined && input.ErrorDocument !== null && { ErrorDocument: input.ErrorDocument })), (input.IndexDocumentSuffix !== undefined &&
+        input.IndexDocumentSuffix !== null && { IndexDocumentSuffix: input.IndexDocumentSuffix })), (input.RedirectAllRequestsTo !== undefined &&
+        input.RedirectAllRequestsTo !== null && {
+        RedirectAllRequestsTo: serializeAws_restJson1AwsS3BucketWebsiteConfigurationRedirectTo(input.RedirectAllRequestsTo, context),
+    })), (input.RoutingRules !== undefined &&
+        input.RoutingRules !== null && {
+        RoutingRules: serializeAws_restJson1AwsS3BucketWebsiteConfigurationRoutingRules(input.RoutingRules, context),
+    }));
+};
+var serializeAws_restJson1AwsS3BucketWebsiteConfigurationRedirectTo = function (input, context) {
+    return __assign(__assign({}, (input.Hostname !== undefined && input.Hostname !== null && { Hostname: input.Hostname })), (input.Protocol !== undefined && input.Protocol !== null && { Protocol: input.Protocol }));
+};
+var serializeAws_restJson1AwsS3BucketWebsiteConfigurationRoutingRule = function (input, context) {
+    return __assign(__assign({}, (input.Condition !== undefined &&
+        input.Condition !== null && {
+        Condition: serializeAws_restJson1AwsS3BucketWebsiteConfigurationRoutingRuleCondition(input.Condition, context),
+    })), (input.Redirect !== undefined &&
+        input.Redirect !== null && {
+        Redirect: serializeAws_restJson1AwsS3BucketWebsiteConfigurationRoutingRuleRedirect(input.Redirect, context),
+    }));
+};
+var serializeAws_restJson1AwsS3BucketWebsiteConfigurationRoutingRuleCondition = function (input, context) {
+    return __assign(__assign({}, (input.HttpErrorCodeReturnedEquals !== undefined &&
+        input.HttpErrorCodeReturnedEquals !== null && { HttpErrorCodeReturnedEquals: input.HttpErrorCodeReturnedEquals })), (input.KeyPrefixEquals !== undefined &&
+        input.KeyPrefixEquals !== null && { KeyPrefixEquals: input.KeyPrefixEquals }));
+};
+var serializeAws_restJson1AwsS3BucketWebsiteConfigurationRoutingRuleRedirect = function (input, context) {
+    return __assign(__assign(__assign(__assign(__assign({}, (input.Hostname !== undefined && input.Hostname !== null && { Hostname: input.Hostname })), (input.HttpRedirectCode !== undefined &&
+        input.HttpRedirectCode !== null && { HttpRedirectCode: input.HttpRedirectCode })), (input.Protocol !== undefined && input.Protocol !== null && { Protocol: input.Protocol })), (input.ReplaceKeyPrefixWith !== undefined &&
+        input.ReplaceKeyPrefixWith !== null && { ReplaceKeyPrefixWith: input.ReplaceKeyPrefixWith })), (input.ReplaceKeyWith !== undefined &&
+        input.ReplaceKeyWith !== null && { ReplaceKeyWith: input.ReplaceKeyWith }));
+};
+var serializeAws_restJson1AwsS3BucketWebsiteConfigurationRoutingRules = function (input, context) {
+    return input
+        .filter(function (e) { return e != null; })
+        .map(function (entry) {
+        if (entry === null) {
+            return null;
+        }
+        return serializeAws_restJson1AwsS3BucketWebsiteConfigurationRoutingRule(entry, context);
+    });
+};
 var serializeAws_restJson1AwsS3ObjectDetails = function (input, context) {
     return __assign(__assign(__assign(__assign(__assign(__assign({}, (input.ContentType !== undefined && input.ContentType !== null && { ContentType: input.ContentType })), (input.ETag !== undefined && input.ETag !== null && { ETag: input.ETag })), (input.LastModified !== undefined && input.LastModified !== null && { LastModified: input.LastModified })), (input.SSEKMSKeyId !== undefined && input.SSEKMSKeyId !== null && { SSEKMSKeyId: input.SSEKMSKeyId })), (input.ServerSideEncryption !== undefined &&
         input.ServerSideEncryption !== null && { ServerSideEncryption: input.ServerSideEncryption })), (input.VersionId !== undefined && input.VersionId !== null && { VersionId: input.VersionId }));
@@ -9287,7 +9629,8 @@ var serializeAws_restJson1CustomDataIdentifiersResult = function (input, context
     })), (input.TotalCount !== undefined && input.TotalCount !== null && { TotalCount: input.TotalCount }));
 };
 var serializeAws_restJson1Cvss = function (input, context) {
-    return __assign(__assign(__assign({}, (input.BaseScore !== undefined && input.BaseScore !== null && { BaseScore: __serializeFloat(input.BaseScore) })), (input.BaseVector !== undefined && input.BaseVector !== null && { BaseVector: input.BaseVector })), (input.Version !== undefined && input.Version !== null && { Version: input.Version }));
+    return __assign(__assign(__assign(__assign(__assign({}, (input.Adjustments !== undefined &&
+        input.Adjustments !== null && { Adjustments: serializeAws_restJson1AdjustmentList(input.Adjustments, context) })), (input.BaseScore !== undefined && input.BaseScore !== null && { BaseScore: __serializeFloat(input.BaseScore) })), (input.BaseVector !== undefined && input.BaseVector !== null && { BaseVector: input.BaseVector })), (input.Source !== undefined && input.Source !== null && { Source: input.Source })), (input.Version !== undefined && input.Version !== null && { Version: input.Version }));
 };
 var serializeAws_restJson1CvssList = function (input, context) {
     return input
@@ -9351,6 +9694,16 @@ var serializeAws_restJson1GeoLocation = function (input, context) {
 var serializeAws_restJson1IcmpTypeCode = function (input, context) {
     return __assign(__assign({}, (input.Code !== undefined && input.Code !== null && { Code: input.Code })), (input.Type !== undefined && input.Type !== null && { Type: input.Type }));
 };
+var serializeAws_restJson1IntegerList = function (input, context) {
+    return input
+        .filter(function (e) { return e != null; })
+        .map(function (entry) {
+        if (entry === null) {
+            return null;
+        }
+        return entry;
+    });
+};
 var serializeAws_restJson1IpFilter = function (input, context) {
     return __assign({}, (input.Cidr !== undefined && input.Cidr !== null && { Cidr: input.Cidr }));
 };
@@ -9646,7 +9999,7 @@ var serializeAws_restJson1Resource = function (input, context) {
         input.Tags !== null && { Tags: serializeAws_restJson1FieldMap(input.Tags, context) })), (input.Type !== undefined && input.Type !== null && { Type: input.Type }));
 };
 var serializeAws_restJson1ResourceDetails = function (input, context) {
-    return __assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign({}, (input.AwsApiGatewayRestApi !== undefined &&
+    return __assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign({}, (input.AwsApiGatewayRestApi !== undefined &&
         input.AwsApiGatewayRestApi !== null && {
         AwsApiGatewayRestApi: serializeAws_restJson1AwsApiGatewayRestApiDetails(input.AwsApiGatewayRestApi, context),
     })), (input.AwsApiGatewayStage !== undefined &&
@@ -9661,6 +10014,9 @@ var serializeAws_restJson1ResourceDetails = function (input, context) {
     })), (input.AwsAutoScalingAutoScalingGroup !== undefined &&
         input.AwsAutoScalingAutoScalingGroup !== null && {
         AwsAutoScalingAutoScalingGroup: serializeAws_restJson1AwsAutoScalingAutoScalingGroupDetails(input.AwsAutoScalingAutoScalingGroup, context),
+    })), (input.AwsAutoScalingLaunchConfiguration !== undefined &&
+        input.AwsAutoScalingLaunchConfiguration !== null && {
+        AwsAutoScalingLaunchConfiguration: serializeAws_restJson1AwsAutoScalingLaunchConfigurationDetails(input.AwsAutoScalingLaunchConfiguration, context),
     })), (input.AwsCertificateManagerCertificate !== undefined &&
         input.AwsCertificateManagerCertificate !== null && {
         AwsCertificateManagerCertificate: serializeAws_restJson1AwsCertificateManagerCertificateDetails(input.AwsCertificateManagerCertificate, context),
@@ -9696,7 +10052,13 @@ var serializeAws_restJson1ResourceDetails = function (input, context) {
         input.AwsEc2Volume !== null && {
         AwsEc2Volume: serializeAws_restJson1AwsEc2VolumeDetails(input.AwsEc2Volume, context),
     })), (input.AwsEc2Vpc !== undefined &&
-        input.AwsEc2Vpc !== null && { AwsEc2Vpc: serializeAws_restJson1AwsEc2VpcDetails(input.AwsEc2Vpc, context) })), (input.AwsEcsCluster !== undefined &&
+        input.AwsEc2Vpc !== null && { AwsEc2Vpc: serializeAws_restJson1AwsEc2VpcDetails(input.AwsEc2Vpc, context) })), (input.AwsEc2VpnConnection !== undefined &&
+        input.AwsEc2VpnConnection !== null && {
+        AwsEc2VpnConnection: serializeAws_restJson1AwsEc2VpnConnectionDetails(input.AwsEc2VpnConnection, context),
+    })), (input.AwsEcrContainerImage !== undefined &&
+        input.AwsEcrContainerImage !== null && {
+        AwsEcrContainerImage: serializeAws_restJson1AwsEcrContainerImageDetails(input.AwsEcrContainerImage, context),
+    })), (input.AwsEcsCluster !== undefined &&
         input.AwsEcsCluster !== null && {
         AwsEcsCluster: serializeAws_restJson1AwsEcsClusterDetails(input.AwsEcsCluster, context),
     })), (input.AwsEcsService !== undefined &&
@@ -9838,7 +10200,8 @@ var serializeAws_restJson1SeverityUpdate = function (input, context) {
     return __assign(__assign(__assign({}, (input.Label !== undefined && input.Label !== null && { Label: input.Label })), (input.Normalized !== undefined && input.Normalized !== null && { Normalized: input.Normalized })), (input.Product !== undefined && input.Product !== null && { Product: __serializeFloat(input.Product) }));
 };
 var serializeAws_restJson1SoftwarePackage = function (input, context) {
-    return __assign(__assign(__assign(__assign(__assign({}, (input.Architecture !== undefined && input.Architecture !== null && { Architecture: input.Architecture })), (input.Epoch !== undefined && input.Epoch !== null && { Epoch: input.Epoch })), (input.Name !== undefined && input.Name !== null && { Name: input.Name })), (input.Release !== undefined && input.Release !== null && { Release: input.Release })), (input.Version !== undefined && input.Version !== null && { Version: input.Version }));
+    return __assign(__assign(__assign(__assign(__assign(__assign(__assign({}, (input.Architecture !== undefined && input.Architecture !== null && { Architecture: input.Architecture })), (input.Epoch !== undefined && input.Epoch !== null && { Epoch: input.Epoch })), (input.FilePath !== undefined && input.FilePath !== null && { FilePath: input.FilePath })), (input.Name !== undefined && input.Name !== null && { Name: input.Name })), (input.PackageManager !== undefined &&
+        input.PackageManager !== null && { PackageManager: input.PackageManager })), (input.Release !== undefined && input.Release !== null && { Release: input.Release })), (input.Version !== undefined && input.Version !== null && { Version: input.Version }));
 };
 var serializeAws_restJson1SoftwarePackageList = function (input, context) {
     return input
@@ -10048,7 +10411,7 @@ var deserializeAws_restJson1ActionLocalIpDetails = function (output, context) {
 };
 var deserializeAws_restJson1ActionLocalPortDetails = function (output, context) {
     return {
-        Port: __expectInt(output.Port),
+        Port: __expectInt32(output.Port),
         PortName: __expectString(output.PortName),
     };
 };
@@ -10071,7 +10434,7 @@ var deserializeAws_restJson1ActionRemoteIpDetails = function (output, context) {
 };
 var deserializeAws_restJson1ActionRemotePortDetails = function (output, context) {
     return {
-        Port: __expectInt(output.Port),
+        Port: __expectInt32(output.Port),
         PortName: __expectString(output.PortName),
     };
 };
@@ -10092,6 +10455,22 @@ var deserializeAws_restJson1ActionTargetList = function (output, context) {
         return deserializeAws_restJson1ActionTarget(entry, context);
     });
 };
+var deserializeAws_restJson1Adjustment = function (output, context) {
+    return {
+        Metric: __expectString(output.Metric),
+        Reason: __expectString(output.Reason),
+    };
+};
+var deserializeAws_restJson1AdjustmentList = function (output, context) {
+    return (output || [])
+        .filter(function (e) { return e != null; })
+        .map(function (entry) {
+        if (entry === null) {
+            return null;
+        }
+        return deserializeAws_restJson1Adjustment(entry, context);
+    });
+};
 var deserializeAws_restJson1AdminAccount = function (output, context) {
     return {
         AccountId: __expectString(output.AccountId),
@@ -10156,7 +10535,7 @@ var deserializeAws_restJson1AwsApiGatewayAccessLogSettings = function (output, c
 var deserializeAws_restJson1AwsApiGatewayCanarySettings = function (output, context) {
     return {
         DeploymentId: __expectString(output.DeploymentId),
-        PercentTraffic: __limitedParseFloat(output.PercentTraffic),
+        PercentTraffic: __limitedParseDouble(output.PercentTraffic),
         StageVariableOverrides: output.StageVariableOverrides !== undefined && output.StageVariableOverrides !== null
             ? deserializeAws_restJson1FieldMap(output.StageVariableOverrides, context)
             : undefined,
@@ -10173,7 +10552,7 @@ var deserializeAws_restJson1AwsApiGatewayEndpointConfiguration = function (outpu
 var deserializeAws_restJson1AwsApiGatewayMethodSettings = function (output, context) {
     return {
         CacheDataEncrypted: __expectBoolean(output.CacheDataEncrypted),
-        CacheTtlInSeconds: __expectInt(output.CacheTtlInSeconds),
+        CacheTtlInSeconds: __expectInt32(output.CacheTtlInSeconds),
         CachingEnabled: __expectBoolean(output.CachingEnabled),
         DataTraceEnabled: __expectBoolean(output.DataTraceEnabled),
         HttpMethod: __expectString(output.HttpMethod),
@@ -10181,8 +10560,8 @@ var deserializeAws_restJson1AwsApiGatewayMethodSettings = function (output, cont
         MetricsEnabled: __expectBoolean(output.MetricsEnabled),
         RequireAuthorizationForCacheControl: __expectBoolean(output.RequireAuthorizationForCacheControl),
         ResourcePath: __expectString(output.ResourcePath),
-        ThrottlingBurstLimit: __expectInt(output.ThrottlingBurstLimit),
-        ThrottlingRateLimit: __limitedParseFloat(output.ThrottlingRateLimit),
+        ThrottlingBurstLimit: __expectInt32(output.ThrottlingBurstLimit),
+        ThrottlingRateLimit: __limitedParseDouble(output.ThrottlingRateLimit),
         UnauthorizedCacheControlHeaderStrategy: __expectString(output.UnauthorizedCacheControlHeaderStrategy),
     };
 };
@@ -10208,7 +10587,7 @@ var deserializeAws_restJson1AwsApiGatewayRestApiDetails = function (output, cont
             ? deserializeAws_restJson1AwsApiGatewayEndpointConfiguration(output.EndpointConfiguration, context)
             : undefined,
         Id: __expectString(output.Id),
-        MinimumCompressionSize: __expectInt(output.MinimumCompressionSize),
+        MinimumCompressionSize: __expectInt32(output.MinimumCompressionSize),
         Name: __expectString(output.Name),
         Version: __expectString(output.Version),
     };
@@ -10262,8 +10641,8 @@ var deserializeAws_restJson1AwsApiGatewayV2RouteSettings = function (output, con
         DataTraceEnabled: __expectBoolean(output.DataTraceEnabled),
         DetailedMetricsEnabled: __expectBoolean(output.DetailedMetricsEnabled),
         LoggingLevel: __expectString(output.LoggingLevel),
-        ThrottlingBurstLimit: __expectInt(output.ThrottlingBurstLimit),
-        ThrottlingRateLimit: __limitedParseFloat(output.ThrottlingRateLimit),
+        ThrottlingBurstLimit: __expectInt32(output.ThrottlingBurstLimit),
+        ThrottlingRateLimit: __limitedParseDouble(output.ThrottlingRateLimit),
     };
 };
 var deserializeAws_restJson1AwsApiGatewayV2StageDetails = function (output, context) {
@@ -10294,7 +10673,7 @@ var deserializeAws_restJson1AwsApiGatewayV2StageDetails = function (output, cont
 var deserializeAws_restJson1AwsAutoScalingAutoScalingGroupDetails = function (output, context) {
     return {
         CreatedTime: __expectString(output.CreatedTime),
-        HealthCheckGracePeriod: __expectInt(output.HealthCheckGracePeriod),
+        HealthCheckGracePeriod: __expectInt32(output.HealthCheckGracePeriod),
         HealthCheckType: __expectString(output.HealthCheckType),
         LaunchConfigurationName: __expectString(output.LaunchConfigurationName),
         LoadBalancerNames: output.LoadBalancerNames !== undefined && output.LoadBalancerNames !== null
@@ -10302,6 +10681,71 @@ var deserializeAws_restJson1AwsAutoScalingAutoScalingGroupDetails = function (ou
             : undefined,
     };
 };
+var deserializeAws_restJson1AwsAutoScalingLaunchConfigurationBlockDeviceMappingsDetails = function (output, context) {
+    return {
+        DeviceName: __expectString(output.DeviceName),
+        Ebs: output.Ebs !== undefined && output.Ebs !== null
+            ? deserializeAws_restJson1AwsAutoScalingLaunchConfigurationBlockDeviceMappingsEbsDetails(output.Ebs, context)
+            : undefined,
+        NoDevice: __expectBoolean(output.NoDevice),
+        VirtualName: __expectString(output.VirtualName),
+    };
+};
+var deserializeAws_restJson1AwsAutoScalingLaunchConfigurationBlockDeviceMappingsEbsDetails = function (output, context) {
+    return {
+        DeleteOnTermination: __expectBoolean(output.DeleteOnTermination),
+        Encrypted: __expectBoolean(output.Encrypted),
+        Iops: __expectInt32(output.Iops),
+        SnapshotId: __expectString(output.SnapshotId),
+        VolumeSize: __expectInt32(output.VolumeSize),
+        VolumeType: __expectString(output.VolumeType),
+    };
+};
+var deserializeAws_restJson1AwsAutoScalingLaunchConfigurationBlockDeviceMappingsList = function (output, context) {
+    return (output || [])
+        .filter(function (e) { return e != null; })
+        .map(function (entry) {
+        if (entry === null) {
+            return null;
+        }
+        return deserializeAws_restJson1AwsAutoScalingLaunchConfigurationBlockDeviceMappingsDetails(entry, context);
+    });
+};
+var deserializeAws_restJson1AwsAutoScalingLaunchConfigurationDetails = function (output, context) {
+    return {
+        AssociatePublicIpAddress: __expectBoolean(output.AssociatePublicIpAddress),
+        BlockDeviceMappings: output.BlockDeviceMappings !== undefined && output.BlockDeviceMappings !== null
+            ? deserializeAws_restJson1AwsAutoScalingLaunchConfigurationBlockDeviceMappingsList(output.BlockDeviceMappings, context)
+            : undefined,
+        ClassicLinkVpcId: __expectString(output.ClassicLinkVpcId),
+        ClassicLinkVpcSecurityGroups: output.ClassicLinkVpcSecurityGroups !== undefined && output.ClassicLinkVpcSecurityGroups !== null
+            ? deserializeAws_restJson1NonEmptyStringList(output.ClassicLinkVpcSecurityGroups, context)
+            : undefined,
+        CreatedTime: __expectString(output.CreatedTime),
+        EbsOptimized: __expectBoolean(output.EbsOptimized),
+        IamInstanceProfile: __expectString(output.IamInstanceProfile),
+        ImageId: __expectString(output.ImageId),
+        InstanceMonitoring: output.InstanceMonitoring !== undefined && output.InstanceMonitoring !== null
+            ? deserializeAws_restJson1AwsAutoScalingLaunchConfigurationInstanceMonitoringDetails(output.InstanceMonitoring, context)
+            : undefined,
+        InstanceType: __expectString(output.InstanceType),
+        KernelId: __expectString(output.KernelId),
+        KeyName: __expectString(output.KeyName),
+        LaunchConfigurationName: __expectString(output.LaunchConfigurationName),
+        PlacementTenancy: __expectString(output.PlacementTenancy),
+        RamdiskId: __expectString(output.RamdiskId),
+        SecurityGroups: output.SecurityGroups !== undefined && output.SecurityGroups !== null
+            ? deserializeAws_restJson1NonEmptyStringList(output.SecurityGroups, context)
+            : undefined,
+        SpotPrice: __expectString(output.SpotPrice),
+        UserData: __expectString(output.UserData),
+    };
+};
+var deserializeAws_restJson1AwsAutoScalingLaunchConfigurationInstanceMonitoringDetails = function (output, context) {
+    return {
+        Enabled: __expectBoolean(output.Enabled),
+    };
+};
 var deserializeAws_restJson1AwsCertificateManagerCertificateDetails = function (output, context) {
     return {
         CertificateAuthorityArn: __expectString(output.CertificateAuthorityArn),
@@ -10499,7 +10943,7 @@ var deserializeAws_restJson1AwsCloudFrontDistributionOriginGroupFailoverStatusCo
         Items: output.Items !== undefined && output.Items !== null
             ? deserializeAws_restJson1AwsCloudFrontDistributionOriginGroupFailoverStatusCodesItemList(output.Items, context)
             : undefined,
-        Quantity: __expectInt(output.Quantity),
+        Quantity: __expectInt32(output.Quantity),
     };
 };
 var deserializeAws_restJson1AwsCloudFrontDistributionOriginGroupFailoverStatusCodesItemList = function (output, context) {
@@ -10509,7 +10953,7 @@ var deserializeAws_restJson1AwsCloudFrontDistributionOriginGroupFailoverStatusCo
         if (entry === null) {
             return null;
         }
-        return __expectInt(entry);
+        return __expectInt32(entry);
     });
 };
 var deserializeAws_restJson1AwsCloudFrontDistributionOriginGroups = function (output, context) {
@@ -10614,7 +11058,7 @@ var deserializeAws_restJson1AwsCodeBuildProjectEnvironmentRegistryCredential = f
 };
 var deserializeAws_restJson1AwsCodeBuildProjectSource = function (output, context) {
     return {
-        GitCloneDepth: __expectInt(output.GitCloneDepth),
+        GitCloneDepth: __expectInt32(output.GitCloneDepth),
         InsecureSsl: __expectBoolean(output.InsecureSsl),
         Location: __expectString(output.Location),
         Type: __expectString(output.Type),
@@ -10646,7 +11090,7 @@ var deserializeAws_restJson1AwsCorsConfiguration = function (output, context) {
         ExposeHeaders: output.ExposeHeaders !== undefined && output.ExposeHeaders !== null
             ? deserializeAws_restJson1NonEmptyStringList(output.ExposeHeaders, context)
             : undefined,
-        MaxAge: __expectInt(output.MaxAge),
+        MaxAge: __expectInt32(output.MaxAge),
     };
 };
 var deserializeAws_restJson1AwsDynamoDbTableAttributeDefinition = function (output, context) {
@@ -10684,7 +11128,7 @@ var deserializeAws_restJson1AwsDynamoDbTableDetails = function (output, context)
             ? deserializeAws_restJson1AwsDynamoDbTableGlobalSecondaryIndexList(output.GlobalSecondaryIndexes, context)
             : undefined,
         GlobalTableVersion: __expectString(output.GlobalTableVersion),
-        ItemCount: __expectInt(output.ItemCount),
+        ItemCount: __expectInt32(output.ItemCount),
         KeySchema: output.KeySchema !== undefined && output.KeySchema !== null
             ? deserializeAws_restJson1AwsDynamoDbTableKeySchemaList(output.KeySchema, context)
             : undefined,
@@ -10710,7 +11154,7 @@ var deserializeAws_restJson1AwsDynamoDbTableDetails = function (output, context)
             : undefined,
         TableId: __expectString(output.TableId),
         TableName: __expectString(output.TableName),
-        TableSizeBytes: __expectInt(output.TableSizeBytes),
+        TableSizeBytes: __expectLong(output.TableSizeBytes),
         TableStatus: __expectString(output.TableStatus),
     };
 };
@@ -10719,9 +11163,9 @@ var deserializeAws_restJson1AwsDynamoDbTableGlobalSecondaryIndex = function (out
         Backfilling: __expectBoolean(output.Backfilling),
         IndexArn: __expectString(output.IndexArn),
         IndexName: __expectString(output.IndexName),
-        IndexSizeBytes: __expectInt(output.IndexSizeBytes),
+        IndexSizeBytes: __expectLong(output.IndexSizeBytes),
         IndexStatus: __expectString(output.IndexStatus),
-        ItemCount: __expectInt(output.ItemCount),
+        ItemCount: __expectInt32(output.ItemCount),
         KeySchema: output.KeySchema !== undefined && output.KeySchema !== null
             ? deserializeAws_restJson1AwsDynamoDbTableKeySchemaList(output.KeySchema, context)
             : undefined,
@@ -10793,14 +11237,14 @@ var deserializeAws_restJson1AwsDynamoDbTableProvisionedThroughput = function (ou
     return {
         LastDecreaseDateTime: __expectString(output.LastDecreaseDateTime),
         LastIncreaseDateTime: __expectString(output.LastIncreaseDateTime),
-        NumberOfDecreasesToday: __expectInt(output.NumberOfDecreasesToday),
-        ReadCapacityUnits: __expectInt(output.ReadCapacityUnits),
-        WriteCapacityUnits: __expectInt(output.WriteCapacityUnits),
+        NumberOfDecreasesToday: __expectInt32(output.NumberOfDecreasesToday),
+        ReadCapacityUnits: __expectInt32(output.ReadCapacityUnits),
+        WriteCapacityUnits: __expectInt32(output.WriteCapacityUnits),
     };
 };
 var deserializeAws_restJson1AwsDynamoDbTableProvisionedThroughputOverride = function (output, context) {
     return {
-        ReadCapacityUnits: __expectInt(output.ReadCapacityUnits),
+        ReadCapacityUnits: __expectInt32(output.ReadCapacityUnits),
     };
 };
 var deserializeAws_restJson1AwsDynamoDbTableReplica = function (output, context) {
@@ -10960,7 +11404,7 @@ var deserializeAws_restJson1AwsEc2NetworkAclEntry = function (output, context) {
             : undefined,
         Protocol: __expectString(output.Protocol),
         RuleAction: __expectString(output.RuleAction),
-        RuleNumber: __expectInt(output.RuleNumber),
+        RuleNumber: __expectInt32(output.RuleNumber),
     };
 };
 var deserializeAws_restJson1AwsEc2NetworkAclEntryList = function (output, context) {
@@ -10978,7 +11422,7 @@ var deserializeAws_restJson1AwsEc2NetworkInterfaceAttachment = function (output,
         AttachTime: __expectString(output.AttachTime),
         AttachmentId: __expectString(output.AttachmentId),
         DeleteOnTermination: __expectBoolean(output.DeleteOnTermination),
-        DeviceIndex: __expectInt(output.DeviceIndex),
+        DeviceIndex: __expectInt32(output.DeviceIndex),
         InstanceId: __expectString(output.InstanceId),
         InstanceOwnerId: __expectString(output.InstanceOwnerId),
         Status: __expectString(output.Status),
@@ -11067,7 +11511,7 @@ var deserializeAws_restJson1AwsEc2SecurityGroupDetails = function (output, conte
 };
 var deserializeAws_restJson1AwsEc2SecurityGroupIpPermission = function (output, context) {
     return {
-        FromPort: __expectInt(output.FromPort),
+        FromPort: __expectInt32(output.FromPort),
         IpProtocol: __expectString(output.IpProtocol),
         IpRanges: output.IpRanges !== undefined && output.IpRanges !== null
             ? deserializeAws_restJson1AwsEc2SecurityGroupIpRangeList(output.IpRanges, context)
@@ -11078,7 +11522,7 @@ var deserializeAws_restJson1AwsEc2SecurityGroupIpPermission = function (output,
         PrefixListIds: output.PrefixListIds !== undefined && output.PrefixListIds !== null
             ? deserializeAws_restJson1AwsEc2SecurityGroupPrefixListIdList(output.PrefixListIds, context)
             : undefined,
-        ToPort: __expectInt(output.ToPort),
+        ToPort: __expectInt32(output.ToPort),
         UserIdGroupPairs: output.UserIdGroupPairs !== undefined && output.UserIdGroupPairs !== null
             ? deserializeAws_restJson1AwsEc2SecurityGroupUserIdGroupPairList(output.UserIdGroupPairs, context)
             : undefined,
@@ -11164,7 +11608,7 @@ var deserializeAws_restJson1AwsEc2SubnetDetails = function (output, context) {
         AssignIpv6AddressOnCreation: __expectBoolean(output.AssignIpv6AddressOnCreation),
         AvailabilityZone: __expectString(output.AvailabilityZone),
         AvailabilityZoneId: __expectString(output.AvailabilityZoneId),
-        AvailableIpAddressCount: __expectInt(output.AvailableIpAddressCount),
+        AvailableIpAddressCount: __expectInt32(output.AvailableIpAddressCount),
         CidrBlock: __expectString(output.CidrBlock),
         DefaultForAz: __expectBoolean(output.DefaultForAz),
         Ipv6CidrBlockAssociationSet: output.Ipv6CidrBlockAssociationSet !== undefined && output.Ipv6CidrBlockAssociationSet !== null
@@ -11204,7 +11648,7 @@ var deserializeAws_restJson1AwsEc2VolumeDetails = function (output, context) {
         CreateTime: __expectString(output.CreateTime),
         Encrypted: __expectBoolean(output.Encrypted),
         KmsKeyId: __expectString(output.KmsKeyId),
-        Size: __expectInt(output.Size),
+        Size: __expectInt32(output.Size),
         SnapshotId: __expectString(output.SnapshotId),
         Status: __expectString(output.Status),
     };
@@ -11221,6 +11665,127 @@ var deserializeAws_restJson1AwsEc2VpcDetails = function (output, context) {
         State: __expectString(output.State),
     };
 };
+var deserializeAws_restJson1AwsEc2VpnConnectionDetails = function (output, context) {
+    return {
+        Category: __expectString(output.Category),
+        CustomerGatewayConfiguration: __expectString(output.CustomerGatewayConfiguration),
+        CustomerGatewayId: __expectString(output.CustomerGatewayId),
+        Options: output.Options !== undefined && output.Options !== null
+            ? deserializeAws_restJson1AwsEc2VpnConnectionOptionsDetails(output.Options, context)
+            : undefined,
+        Routes: output.Routes !== undefined && output.Routes !== null
+            ? deserializeAws_restJson1AwsEc2VpnConnectionRoutesList(output.Routes, context)
+            : undefined,
+        State: __expectString(output.State),
+        TransitGatewayId: __expectString(output.TransitGatewayId),
+        Type: __expectString(output.Type),
+        VgwTelemetry: output.VgwTelemetry !== undefined && output.VgwTelemetry !== null
+            ? deserializeAws_restJson1AwsEc2VpnConnectionVgwTelemetryList(output.VgwTelemetry, context)
+            : undefined,
+        VpnConnectionId: __expectString(output.VpnConnectionId),
+        VpnGatewayId: __expectString(output.VpnGatewayId),
+    };
+};
+var deserializeAws_restJson1AwsEc2VpnConnectionOptionsDetails = function (output, context) {
+    return {
+        StaticRoutesOnly: __expectBoolean(output.StaticRoutesOnly),
+        TunnelOptions: output.TunnelOptions !== undefined && output.TunnelOptions !== null
+            ? deserializeAws_restJson1AwsEc2VpnConnectionOptionsTunnelOptionsList(output.TunnelOptions, context)
+            : undefined,
+    };
+};
+var deserializeAws_restJson1AwsEc2VpnConnectionOptionsTunnelOptionsDetails = function (output, context) {
+    return {
+        DpdTimeoutSeconds: __expectInt32(output.DpdTimeoutSeconds),
+        IkeVersions: output.IkeVersions !== undefined && output.IkeVersions !== null
+            ? deserializeAws_restJson1NonEmptyStringList(output.IkeVersions, context)
+            : undefined,
+        OutsideIpAddress: __expectString(output.OutsideIpAddress),
+        Phase1DhGroupNumbers: output.Phase1DhGroupNumbers !== undefined && output.Phase1DhGroupNumbers !== null
+            ? deserializeAws_restJson1IntegerList(output.Phase1DhGroupNumbers, context)
+            : undefined,
+        Phase1EncryptionAlgorithms: output.Phase1EncryptionAlgorithms !== undefined && output.Phase1EncryptionAlgorithms !== null
+            ? deserializeAws_restJson1NonEmptyStringList(output.Phase1EncryptionAlgorithms, context)
+            : undefined,
+        Phase1IntegrityAlgorithms: output.Phase1IntegrityAlgorithms !== undefined && output.Phase1IntegrityAlgorithms !== null
+            ? deserializeAws_restJson1NonEmptyStringList(output.Phase1IntegrityAlgorithms, context)
+            : undefined,
+        Phase1LifetimeSeconds: __expectInt32(output.Phase1LifetimeSeconds),
+        Phase2DhGroupNumbers: output.Phase2DhGroupNumbers !== undefined && output.Phase2DhGroupNumbers !== null
+            ? deserializeAws_restJson1IntegerList(output.Phase2DhGroupNumbers, context)
+            : undefined,
+        Phase2EncryptionAlgorithms: output.Phase2EncryptionAlgorithms !== undefined && output.Phase2EncryptionAlgorithms !== null
+            ? deserializeAws_restJson1NonEmptyStringList(output.Phase2EncryptionAlgorithms, context)
+            : undefined,
+        Phase2IntegrityAlgorithms: output.Phase2IntegrityAlgorithms !== undefined && output.Phase2IntegrityAlgorithms !== null
+            ? deserializeAws_restJson1NonEmptyStringList(output.Phase2IntegrityAlgorithms, context)
+            : undefined,
+        Phase2LifetimeSeconds: __expectInt32(output.Phase2LifetimeSeconds),
+        PreSharedKey: __expectString(output.PreSharedKey),
+        RekeyFuzzPercentage: __expectInt32(output.RekeyFuzzPercentage),
+        RekeyMarginTimeSeconds: __expectInt32(output.RekeyMarginTimeSeconds),
+        ReplayWindowSize: __expectInt32(output.ReplayWindowSize),
+        TunnelInsideCidr: __expectString(output.TunnelInsideCidr),
+    };
+};
+var deserializeAws_restJson1AwsEc2VpnConnectionOptionsTunnelOptionsList = function (output, context) {
+    return (output || [])
+        .filter(function (e) { return e != null; })
+        .map(function (entry) {
+        if (entry === null) {
+            return null;
+        }
+        return deserializeAws_restJson1AwsEc2VpnConnectionOptionsTunnelOptionsDetails(entry, context);
+    });
+};
+var deserializeAws_restJson1AwsEc2VpnConnectionRoutesDetails = function (output, context) {
+    return {
+        DestinationCidrBlock: __expectString(output.DestinationCidrBlock),
+        State: __expectString(output.State),
+    };
+};
+var deserializeAws_restJson1AwsEc2VpnConnectionRoutesList = function (output, context) {
+    return (output || [])
+        .filter(function (e) { return e != null; })
+        .map(function (entry) {
+        if (entry === null) {
+            return null;
+        }
+        return deserializeAws_restJson1AwsEc2VpnConnectionRoutesDetails(entry, context);
+    });
+};
+var deserializeAws_restJson1AwsEc2VpnConnectionVgwTelemetryDetails = function (output, context) {
+    return {
+        AcceptedRouteCount: __expectInt32(output.AcceptedRouteCount),
+        CertificateArn: __expectString(output.CertificateArn),
+        LastStatusChange: __expectString(output.LastStatusChange),
+        OutsideIpAddress: __expectString(output.OutsideIpAddress),
+        Status: __expectString(output.Status),
+        StatusMessage: __expectString(output.StatusMessage),
+    };
+};
+var deserializeAws_restJson1AwsEc2VpnConnectionVgwTelemetryList = function (output, context) {
+    return (output || [])
+        .filter(function (e) { return e != null; })
+        .map(function (entry) {
+        if (entry === null) {
+            return null;
+        }
+        return deserializeAws_restJson1AwsEc2VpnConnectionVgwTelemetryDetails(entry, context);
+    });
+};
+var deserializeAws_restJson1AwsEcrContainerImageDetails = function (output, context) {
+    return {
+        Architecture: __expectString(output.Architecture),
+        ImageDigest: __expectString(output.ImageDigest),
+        ImagePublishedAt: __expectString(output.ImagePublishedAt),
+        ImageTags: output.ImageTags !== undefined && output.ImageTags !== null
+            ? deserializeAws_restJson1NonEmptyStringList(output.ImageTags, context)
+            : undefined,
+        RegistryId: __expectString(output.RegistryId),
+        RepositoryName: __expectString(output.RepositoryName),
+    };
+};
 var deserializeAws_restJson1AwsEcsClusterClusterSettingsDetails = function (output, context) {
     return {
         Name: __expectString(output.Name),
@@ -11264,9 +11829,9 @@ var deserializeAws_restJson1AwsEcsClusterConfigurationExecuteCommandConfiguratio
 };
 var deserializeAws_restJson1AwsEcsClusterDefaultCapacityProviderStrategyDetails = function (output, context) {
     return {
-        Base: __expectInt(output.Base),
+        Base: __expectInt32(output.Base),
         CapacityProvider: __expectString(output.CapacityProvider),
-        Weight: __expectInt(output.Weight),
+        Weight: __expectInt32(output.Weight),
     };
 };
 var deserializeAws_restJson1AwsEcsClusterDefaultCapacityProviderStrategyList = function (output, context) {
@@ -11297,9 +11862,9 @@ var deserializeAws_restJson1AwsEcsClusterDetails = function (output, context) {
 };
 var deserializeAws_restJson1AwsEcsServiceCapacityProviderStrategyDetails = function (output, context) {
     return {
-        Base: __expectInt(output.Base),
+        Base: __expectInt32(output.Base),
         CapacityProvider: __expectString(output.CapacityProvider),
-        Weight: __expectInt(output.Weight),
+        Weight: __expectInt32(output.Weight),
     };
 };
 var deserializeAws_restJson1AwsEcsServiceCapacityProviderStrategyList = function (output, context) {
@@ -11323,8 +11888,8 @@ var deserializeAws_restJson1AwsEcsServiceDeploymentConfigurationDetails = functi
         DeploymentCircuitBreaker: output.DeploymentCircuitBreaker !== undefined && output.DeploymentCircuitBreaker !== null
             ? deserializeAws_restJson1AwsEcsServiceDeploymentConfigurationDeploymentCircuitBreakerDetails(output.DeploymentCircuitBreaker, context)
             : undefined,
-        MaximumPercent: __expectInt(output.MaximumPercent),
-        MinimumHealthyPercent: __expectInt(output.MinimumHealthyPercent),
+        MaximumPercent: __expectInt32(output.MaximumPercent),
+        MinimumHealthyPercent: __expectInt32(output.MinimumHealthyPercent),
     };
 };
 var deserializeAws_restJson1AwsEcsServiceDeploymentControllerDetails = function (output, context) {
@@ -11344,10 +11909,10 @@ var deserializeAws_restJson1AwsEcsServiceDetails = function (output, context) {
         DeploymentController: output.DeploymentController !== undefined && output.DeploymentController !== null
             ? deserializeAws_restJson1AwsEcsServiceDeploymentControllerDetails(output.DeploymentController, context)
             : undefined,
-        DesiredCount: __expectInt(output.DesiredCount),
+        DesiredCount: __expectInt32(output.DesiredCount),
         EnableEcsManagedTags: __expectBoolean(output.EnableEcsManagedTags),
         EnableExecuteCommand: __expectBoolean(output.EnableExecuteCommand),
-        HealthCheckGracePeriodSeconds: __expectInt(output.HealthCheckGracePeriodSeconds),
+        HealthCheckGracePeriodSeconds: __expectInt32(output.HealthCheckGracePeriodSeconds),
         LaunchType: __expectString(output.LaunchType),
         LoadBalancers: output.LoadBalancers !== undefined && output.LoadBalancers !== null
             ? deserializeAws_restJson1AwsEcsServiceLoadBalancersList(output.LoadBalancers, context)
@@ -11377,7 +11942,7 @@ var deserializeAws_restJson1AwsEcsServiceDetails = function (output, context) {
 var deserializeAws_restJson1AwsEcsServiceLoadBalancersDetails = function (output, context) {
     return {
         ContainerName: __expectString(output.ContainerName),
-        ContainerPort: __expectInt(output.ContainerPort),
+        ContainerPort: __expectInt32(output.ContainerPort),
         LoadBalancerName: __expectString(output.LoadBalancerName),
         TargetGroupArn: __expectString(output.TargetGroupArn),
     };
@@ -11445,8 +12010,8 @@ var deserializeAws_restJson1AwsEcsServicePlacementStrategiesList = function (out
 var deserializeAws_restJson1AwsEcsServiceServiceRegistriesDetails = function (output, context) {
     return {
         ContainerName: __expectString(output.ContainerName),
-        ContainerPort: __expectInt(output.ContainerPort),
-        Port: __expectInt(output.Port),
+        ContainerPort: __expectInt32(output.ContainerPort),
+        Port: __expectInt32(output.Port),
         RegistryArn: __expectString(output.RegistryArn),
     };
 };
@@ -11481,7 +12046,7 @@ var deserializeAws_restJson1AwsEcsTaskDefinitionContainerDefinitionsDetails = fu
         Command: output.Command !== undefined && output.Command !== null
             ? deserializeAws_restJson1NonEmptyStringList(output.Command, context)
             : undefined,
-        Cpu: __expectInt(output.Cpu),
+        Cpu: __expectInt32(output.Cpu),
         DependsOn: output.DependsOn !== undefined && output.DependsOn !== null
             ? deserializeAws_restJson1AwsEcsTaskDefinitionContainerDefinitionsDependsOnList(output.DependsOn, context)
             : undefined,
@@ -11529,8 +12094,8 @@ var deserializeAws_restJson1AwsEcsTaskDefinitionContainerDefinitionsDetails = fu
         LogConfiguration: output.LogConfiguration !== undefined && output.LogConfiguration !== null
             ? deserializeAws_restJson1AwsEcsTaskDefinitionContainerDefinitionsLogConfigurationDetails(output.LogConfiguration, context)
             : undefined,
-        Memory: __expectInt(output.Memory),
-        MemoryReservation: __expectInt(output.MemoryReservation),
+        Memory: __expectInt32(output.Memory),
+        MemoryReservation: __expectInt32(output.MemoryReservation),
         MountPoints: output.MountPoints !== undefined && output.MountPoints !== null
             ? deserializeAws_restJson1AwsEcsTaskDefinitionContainerDefinitionsMountPointsList(output.MountPoints, context)
             : undefined,
@@ -11550,8 +12115,8 @@ var deserializeAws_restJson1AwsEcsTaskDefinitionContainerDefinitionsDetails = fu
         Secrets: output.Secrets !== undefined && output.Secrets !== null
             ? deserializeAws_restJson1AwsEcsTaskDefinitionContainerDefinitionsSecretsList(output.Secrets, context)
             : undefined,
-        StartTimeout: __expectInt(output.StartTimeout),
-        StopTimeout: __expectInt(output.StopTimeout),
+        StartTimeout: __expectInt32(output.StartTimeout),
+        StopTimeout: __expectInt32(output.StopTimeout),
         SystemControls: output.SystemControls !== undefined && output.SystemControls !== null
             ? deserializeAws_restJson1AwsEcsTaskDefinitionContainerDefinitionsSystemControlsList(output.SystemControls, context)
             : undefined,
@@ -11626,10 +12191,10 @@ var deserializeAws_restJson1AwsEcsTaskDefinitionContainerDefinitionsHealthCheckD
         Command: output.Command !== undefined && output.Command !== null
             ? deserializeAws_restJson1NonEmptyStringList(output.Command, context)
             : undefined,
-        Interval: __expectInt(output.Interval),
-        Retries: __expectInt(output.Retries),
-        StartPeriod: __expectInt(output.StartPeriod),
-        Timeout: __expectInt(output.Timeout),
+        Interval: __expectInt32(output.Interval),
+        Retries: __expectInt32(output.Retries),
+        StartPeriod: __expectInt32(output.StartPeriod),
+        Timeout: __expectInt32(output.Timeout),
     };
 };
 var deserializeAws_restJson1AwsEcsTaskDefinitionContainerDefinitionsLinuxParametersCapabilitiesDetails = function (output, context) {
@@ -11651,9 +12216,9 @@ var deserializeAws_restJson1AwsEcsTaskDefinitionContainerDefinitionsLinuxParamet
             ? deserializeAws_restJson1AwsEcsTaskDefinitionContainerDefinitionsLinuxParametersDevicesList(output.Devices, context)
             : undefined,
         InitProcessEnabled: __expectBoolean(output.InitProcessEnabled),
-        MaxSwap: __expectInt(output.MaxSwap),
-        SharedMemorySize: __expectInt(output.SharedMemorySize),
-        Swappiness: __expectInt(output.Swappiness),
+        MaxSwap: __expectInt32(output.MaxSwap),
+        SharedMemorySize: __expectInt32(output.SharedMemorySize),
+        Swappiness: __expectInt32(output.Swappiness),
         Tmpfs: output.Tmpfs !== undefined && output.Tmpfs !== null
             ? deserializeAws_restJson1AwsEcsTaskDefinitionContainerDefinitionsLinuxParametersTmpfsList(output.Tmpfs, context)
             : undefined,
@@ -11684,7 +12249,7 @@ var deserializeAws_restJson1AwsEcsTaskDefinitionContainerDefinitionsLinuxParamet
         MountOptions: output.MountOptions !== undefined && output.MountOptions !== null
             ? deserializeAws_restJson1NonEmptyStringList(output.MountOptions, context)
             : undefined,
-        Size: __expectInt(output.Size),
+        Size: __expectInt32(output.Size),
     };
 };
 var deserializeAws_restJson1AwsEcsTaskDefinitionContainerDefinitionsLinuxParametersTmpfsList = function (output, context) {
@@ -11753,8 +12318,8 @@ var deserializeAws_restJson1AwsEcsTaskDefinitionContainerDefinitionsMountPointsL
 };
 var deserializeAws_restJson1AwsEcsTaskDefinitionContainerDefinitionsPortMappingsDetails = function (output, context) {
     return {
-        ContainerPort: __expectInt(output.ContainerPort),
-        HostPort: __expectInt(output.HostPort),
+        ContainerPort: __expectInt32(output.ContainerPort),
+        HostPort: __expectInt32(output.HostPort),
         Protocol: __expectString(output.Protocol),
     };
 };
@@ -11823,9 +12388,9 @@ var deserializeAws_restJson1AwsEcsTaskDefinitionContainerDefinitionsSystemContro
 };
 var deserializeAws_restJson1AwsEcsTaskDefinitionContainerDefinitionsUlimitsDetails = function (output, context) {
     return {
-        HardLimit: __expectInt(output.HardLimit),
+        HardLimit: __expectInt32(output.HardLimit),
         Name: __expectString(output.Name),
-        SoftLimit: __expectInt(output.SoftLimit),
+        SoftLimit: __expectInt32(output.SoftLimit),
     };
 };
 var deserializeAws_restJson1AwsEcsTaskDefinitionContainerDefinitionsUlimitsList = function (output, context) {
@@ -11982,7 +12547,7 @@ var deserializeAws_restJson1AwsEcsTaskDefinitionVolumesEfsVolumeConfigurationDet
         FilesystemId: __expectString(output.FilesystemId),
         RootDirectory: __expectString(output.RootDirectory),
         TransitEncryption: __expectString(output.TransitEncryption),
-        TransitEncryptionPort: __expectInt(output.TransitEncryptionPort),
+        TransitEncryptionPort: __expectInt32(output.TransitEncryptionPort),
     };
 };
 var deserializeAws_restJson1AwsEcsTaskDefinitionVolumesHostDetails = function (output, context) {
@@ -12108,10 +12673,10 @@ var deserializeAws_restJson1AwsElasticsearchDomainDomainEndpointOptions = functi
 };
 var deserializeAws_restJson1AwsElasticsearchDomainElasticsearchClusterConfigDetails = function (output, context) {
     return {
-        DedicatedMasterCount: __expectInt(output.DedicatedMasterCount),
+        DedicatedMasterCount: __expectInt32(output.DedicatedMasterCount),
         DedicatedMasterEnabled: __expectBoolean(output.DedicatedMasterEnabled),
         DedicatedMasterType: __expectString(output.DedicatedMasterType),
-        InstanceCount: __expectInt(output.InstanceCount),
+        InstanceCount: __expectInt32(output.InstanceCount),
         InstanceType: __expectString(output.InstanceType),
         ZoneAwarenessConfig: output.ZoneAwarenessConfig !== undefined && output.ZoneAwarenessConfig !== null
             ? deserializeAws_restJson1AwsElasticsearchDomainElasticsearchClusterConfigZoneAwarenessConfigDetails(output.ZoneAwarenessConfig, context)
@@ -12121,7 +12686,7 @@ var deserializeAws_restJson1AwsElasticsearchDomainElasticsearchClusterConfigDeta
 };
 var deserializeAws_restJson1AwsElasticsearchDomainElasticsearchClusterConfigZoneAwarenessConfigDetails = function (output, context) {
     return {
-        AvailabilityZoneCount: __expectInt(output.AvailabilityZoneCount),
+        AvailabilityZoneCount: __expectInt32(output.AvailabilityZoneCount),
     };
 };
 var deserializeAws_restJson1AwsElasticsearchDomainEncryptionAtRestOptions = function (output, context) {
@@ -12207,13 +12772,13 @@ var deserializeAws_restJson1AwsElbLbCookieStickinessPolicies = function (output,
 };
 var deserializeAws_restJson1AwsElbLbCookieStickinessPolicy = function (output, context) {
     return {
-        CookieExpirationPeriod: __expectInt(output.CookieExpirationPeriod),
+        CookieExpirationPeriod: __expectLong(output.CookieExpirationPeriod),
         PolicyName: __expectString(output.PolicyName),
     };
 };
 var deserializeAws_restJson1AwsElbLoadBalancerAccessLog = function (output, context) {
     return {
-        EmitInterval: __expectInt(output.EmitInterval),
+        EmitInterval: __expectInt32(output.EmitInterval),
         Enabled: __expectBoolean(output.Enabled),
         S3BucketName: __expectString(output.S3BucketName),
         S3BucketPrefix: __expectString(output.S3BucketPrefix),
@@ -12237,7 +12802,7 @@ var deserializeAws_restJson1AwsElbLoadBalancerAttributes = function (output, con
 };
 var deserializeAws_restJson1AwsElbLoadBalancerBackendServerDescription = function (output, context) {
     return {
-        InstancePort: __expectInt(output.InstancePort),
+        InstancePort: __expectInt32(output.InstancePort),
         PolicyNames: output.PolicyNames !== undefined && output.PolicyNames !== null
             ? deserializeAws_restJson1StringList(output.PolicyNames, context)
             : undefined,
@@ -12256,12 +12821,12 @@ var deserializeAws_restJson1AwsElbLoadBalancerBackendServerDescriptions = functi
 var deserializeAws_restJson1AwsElbLoadBalancerConnectionDraining = function (output, context) {
     return {
         Enabled: __expectBoolean(output.Enabled),
-        Timeout: __expectInt(output.Timeout),
+        Timeout: __expectInt32(output.Timeout),
     };
 };
 var deserializeAws_restJson1AwsElbLoadBalancerConnectionSettings = function (output, context) {
     return {
-        IdleTimeout: __expectInt(output.IdleTimeout),
+        IdleTimeout: __expectInt32(output.IdleTimeout),
     };
 };
 var deserializeAws_restJson1AwsElbLoadBalancerCrossZoneLoadBalancing = function (output, context) {
@@ -12312,11 +12877,11 @@ var deserializeAws_restJson1AwsElbLoadBalancerDetails = function (output, contex
 };
 var deserializeAws_restJson1AwsElbLoadBalancerHealthCheck = function (output, context) {
     return {
-        HealthyThreshold: __expectInt(output.HealthyThreshold),
-        Interval: __expectInt(output.Interval),
+        HealthyThreshold: __expectInt32(output.HealthyThreshold),
+        Interval: __expectInt32(output.Interval),
         Target: __expectString(output.Target),
-        Timeout: __expectInt(output.Timeout),
-        UnhealthyThreshold: __expectInt(output.UnhealthyThreshold),
+        Timeout: __expectInt32(output.Timeout),
+        UnhealthyThreshold: __expectInt32(output.UnhealthyThreshold),
     };
 };
 var deserializeAws_restJson1AwsElbLoadBalancerInstance = function (output, context) {
@@ -12336,9 +12901,9 @@ var deserializeAws_restJson1AwsElbLoadBalancerInstances = function (output, cont
 };
 var deserializeAws_restJson1AwsElbLoadBalancerListener = function (output, context) {
     return {
-        InstancePort: __expectInt(output.InstancePort),
+        InstancePort: __expectInt32(output.InstancePort),
         InstanceProtocol: __expectString(output.InstanceProtocol),
-        LoadBalancerPort: __expectInt(output.LoadBalancerPort),
+        LoadBalancerPort: __expectInt32(output.LoadBalancerPort),
         Protocol: __expectString(output.Protocol),
         SslCertificateId: __expectString(output.SslCertificateId),
     };
@@ -12537,13 +13102,13 @@ var deserializeAws_restJson1AwsIamPermissionsBoundary = function (output, contex
 };
 var deserializeAws_restJson1AwsIamPolicyDetails = function (output, context) {
     return {
-        AttachmentCount: __expectInt(output.AttachmentCount),
+        AttachmentCount: __expectInt32(output.AttachmentCount),
         CreateDate: __expectString(output.CreateDate),
         DefaultVersionId: __expectString(output.DefaultVersionId),
         Description: __expectString(output.Description),
         IsAttachable: __expectBoolean(output.IsAttachable),
         Path: __expectString(output.Path),
-        PermissionsBoundaryUsageCount: __expectInt(output.PermissionsBoundaryUsageCount),
+        PermissionsBoundaryUsageCount: __expectInt32(output.PermissionsBoundaryUsageCount),
         PolicyId: __expectString(output.PolicyId),
         PolicyName: __expectString(output.PolicyName),
         PolicyVersionList: output.PolicyVersionList !== undefined && output.PolicyVersionList !== null
@@ -12579,7 +13144,7 @@ var deserializeAws_restJson1AwsIamRoleDetails = function (output, context) {
         InstanceProfileList: output.InstanceProfileList !== undefined && output.InstanceProfileList !== null
             ? deserializeAws_restJson1AwsIamInstanceProfileList(output.InstanceProfileList, context)
             : undefined,
-        MaxSessionDuration: __expectInt(output.MaxSessionDuration),
+        MaxSessionDuration: __expectInt32(output.MaxSessionDuration),
         Path: __expectString(output.Path),
         PermissionsBoundary: output.PermissionsBoundary !== undefined && output.PermissionsBoundary !== null
             ? deserializeAws_restJson1AwsIamPermissionsBoundary(output.PermissionsBoundary, context)
@@ -12644,10 +13209,11 @@ var deserializeAws_restJson1AwsIamUserPolicyList = function (output, context) {
 var deserializeAws_restJson1AwsKmsKeyDetails = function (output, context) {
     return {
         AWSAccountId: __expectString(output.AWSAccountId),
-        CreationDate: __limitedParseFloat(output.CreationDate),
+        CreationDate: __limitedParseDouble(output.CreationDate),
         Description: __expectString(output.Description),
         KeyId: __expectString(output.KeyId),
         KeyManager: __expectString(output.KeyManager),
+        KeyRotationStatus: __expectBoolean(output.KeyRotationStatus),
         KeyState: __expectString(output.KeyState),
         Origin: __expectString(output.Origin),
     };
@@ -12685,11 +13251,11 @@ var deserializeAws_restJson1AwsLambdaFunctionDetails = function (output, context
             ? deserializeAws_restJson1AwsLambdaFunctionLayerList(output.Layers, context)
             : undefined,
         MasterArn: __expectString(output.MasterArn),
-        MemorySize: __expectInt(output.MemorySize),
+        MemorySize: __expectInt32(output.MemorySize),
         RevisionId: __expectString(output.RevisionId),
         Role: __expectString(output.Role),
         Runtime: __expectString(output.Runtime),
-        Timeout: __expectInt(output.Timeout),
+        Timeout: __expectInt32(output.Timeout),
         TracingConfig: output.TracingConfig !== undefined && output.TracingConfig !== null
             ? deserializeAws_restJson1AwsLambdaFunctionTracingConfig(output.TracingConfig, context)
             : undefined,
@@ -12718,7 +13284,7 @@ var deserializeAws_restJson1AwsLambdaFunctionEnvironmentError = function (output
 var deserializeAws_restJson1AwsLambdaFunctionLayer = function (output, context) {
     return {
         Arn: __expectString(output.Arn),
-        CodeSize: __expectInt(output.CodeSize),
+        CodeSize: __expectInt32(output.CodeSize),
     };
 };
 var deserializeAws_restJson1AwsLambdaFunctionLayerList = function (output, context) {
@@ -12753,7 +13319,7 @@ var deserializeAws_restJson1AwsLambdaLayerVersionDetails = function (output, con
             ? deserializeAws_restJson1NonEmptyStringList(output.CompatibleRuntimes, context)
             : undefined,
         CreatedDate: __expectString(output.CreatedDate),
-        Version: __expectInt(output.Version),
+        Version: __expectLong(output.Version),
     };
 };
 var deserializeAws_restJson1AwsRdsDbClusterAssociatedRole = function (output, context) {
@@ -12775,14 +13341,14 @@ var deserializeAws_restJson1AwsRdsDbClusterAssociatedRoles = function (output, c
 var deserializeAws_restJson1AwsRdsDbClusterDetails = function (output, context) {
     return {
         ActivityStreamStatus: __expectString(output.ActivityStreamStatus),
-        AllocatedStorage: __expectInt(output.AllocatedStorage),
+        AllocatedStorage: __expectInt32(output.AllocatedStorage),
         AssociatedRoles: output.AssociatedRoles !== undefined && output.AssociatedRoles !== null
             ? deserializeAws_restJson1AwsRdsDbClusterAssociatedRoles(output.AssociatedRoles, context)
             : undefined,
         AvailabilityZones: output.AvailabilityZones !== undefined && output.AvailabilityZones !== null
             ? deserializeAws_restJson1StringList(output.AvailabilityZones, context)
             : undefined,
-        BackupRetentionPeriod: __expectInt(output.BackupRetentionPeriod),
+        BackupRetentionPeriod: __expectInt32(output.BackupRetentionPeriod),
         ClusterCreateTime: __expectString(output.ClusterCreateTime),
         CopyTagsToSnapshot: __expectBoolean(output.CopyTagsToSnapshot),
         CrossAccountClone: __expectBoolean(output.CrossAccountClone),
@@ -12817,7 +13383,7 @@ var deserializeAws_restJson1AwsRdsDbClusterDetails = function (output, context)
         KmsKeyId: __expectString(output.KmsKeyId),
         MasterUsername: __expectString(output.MasterUsername),
         MultiAz: __expectBoolean(output.MultiAz),
-        Port: __expectInt(output.Port),
+        Port: __expectInt32(output.Port),
         PreferredBackupWindow: __expectString(output.PreferredBackupWindow),
         PreferredMaintenanceWindow: __expectString(output.PreferredMaintenanceWindow),
         ReadReplicaIdentifiers: output.ReadReplicaIdentifiers !== undefined && output.ReadReplicaIdentifiers !== null
@@ -12836,7 +13402,7 @@ var deserializeAws_restJson1AwsRdsDbClusterMember = function (output, context) {
         DbClusterParameterGroupStatus: __expectString(output.DbClusterParameterGroupStatus),
         DbInstanceIdentifier: __expectString(output.DbInstanceIdentifier),
         IsClusterWriter: __expectBoolean(output.IsClusterWriter),
-        PromotionTier: __expectInt(output.PromotionTier),
+        PromotionTier: __expectInt32(output.PromotionTier),
     };
 };
 var deserializeAws_restJson1AwsRdsDbClusterMembers = function (output, context) {
@@ -12867,7 +13433,7 @@ var deserializeAws_restJson1AwsRdsDbClusterOptionGroupMemberships = function (ou
 };
 var deserializeAws_restJson1AwsRdsDbClusterSnapshotDetails = function (output, context) {
     return {
-        AllocatedStorage: __expectInt(output.AllocatedStorage),
+        AllocatedStorage: __expectInt32(output.AllocatedStorage),
         AvailabilityZones: output.AvailabilityZones !== undefined && output.AvailabilityZones !== null
             ? deserializeAws_restJson1StringList(output.AvailabilityZones, context)
             : undefined,
@@ -12880,8 +13446,8 @@ var deserializeAws_restJson1AwsRdsDbClusterSnapshotDetails = function (output, c
         KmsKeyId: __expectString(output.KmsKeyId),
         LicenseModel: __expectString(output.LicenseModel),
         MasterUsername: __expectString(output.MasterUsername),
-        PercentProgress: __expectInt(output.PercentProgress),
-        Port: __expectInt(output.Port),
+        PercentProgress: __expectInt32(output.PercentProgress),
+        Port: __expectInt32(output.Port),
         SnapshotCreateTime: __expectString(output.SnapshotCreateTime),
         SnapshotType: __expectString(output.SnapshotType),
         Status: __expectString(output.Status),
@@ -12926,13 +13492,13 @@ var deserializeAws_restJson1AwsRdsDbInstanceAssociatedRoles = function (output,
 };
 var deserializeAws_restJson1AwsRdsDbInstanceDetails = function (output, context) {
     return {
-        AllocatedStorage: __expectInt(output.AllocatedStorage),
+        AllocatedStorage: __expectInt32(output.AllocatedStorage),
         AssociatedRoles: output.AssociatedRoles !== undefined && output.AssociatedRoles !== null
             ? deserializeAws_restJson1AwsRdsDbInstanceAssociatedRoles(output.AssociatedRoles, context)
             : undefined,
         AutoMinorVersionUpgrade: __expectBoolean(output.AutoMinorVersionUpgrade),
         AvailabilityZone: __expectString(output.AvailabilityZone),
-        BackupRetentionPeriod: __expectInt(output.BackupRetentionPeriod),
+        BackupRetentionPeriod: __expectInt32(output.BackupRetentionPeriod),
         CACertificateIdentifier: __expectString(output.CACertificateIdentifier),
         CharacterSetName: __expectString(output.CharacterSetName),
         CopyTagsToSnapshot: __expectBoolean(output.CopyTagsToSnapshot),
@@ -12940,7 +13506,7 @@ var deserializeAws_restJson1AwsRdsDbInstanceDetails = function (output, context)
         DBInstanceClass: __expectString(output.DBInstanceClass),
         DBInstanceIdentifier: __expectString(output.DBInstanceIdentifier),
         DBName: __expectString(output.DBName),
-        DbInstancePort: __expectInt(output.DbInstancePort),
+        DbInstancePort: __expectInt32(output.DbInstancePort),
         DbInstanceStatus: __expectString(output.DbInstanceStatus),
         DbParameterGroups: output.DbParameterGroups !== undefined && output.DbParameterGroups !== null
             ? deserializeAws_restJson1AwsRdsDbParameterGroups(output.DbParameterGroups, context)
@@ -12967,7 +13533,7 @@ var deserializeAws_restJson1AwsRdsDbInstanceDetails = function (output, context)
         EnhancedMonitoringResourceArn: __expectString(output.EnhancedMonitoringResourceArn),
         IAMDatabaseAuthenticationEnabled: __expectBoolean(output.IAMDatabaseAuthenticationEnabled),
         InstanceCreateTime: __expectString(output.InstanceCreateTime),
-        Iops: __expectInt(output.Iops),
+        Iops: __expectInt32(output.Iops),
         KmsKeyId: __expectString(output.KmsKeyId),
         LatestRestorableTime: __expectString(output.LatestRestorableTime),
         LicenseModel: __expectString(output.LicenseModel),
@@ -12975,8 +13541,8 @@ var deserializeAws_restJson1AwsRdsDbInstanceDetails = function (output, context)
             ? deserializeAws_restJson1AwsRdsDbInstanceEndpoint(output.ListenerEndpoint, context)
             : undefined,
         MasterUsername: __expectString(output.MasterUsername),
-        MaxAllocatedStorage: __expectInt(output.MaxAllocatedStorage),
-        MonitoringInterval: __expectInt(output.MonitoringInterval),
+        MaxAllocatedStorage: __expectInt32(output.MaxAllocatedStorage),
+        MonitoringInterval: __expectInt32(output.MonitoringInterval),
         MonitoringRoleArn: __expectString(output.MonitoringRoleArn),
         MultiAz: __expectBoolean(output.MultiAz),
         OptionGroupMemberships: output.OptionGroupMemberships !== undefined && output.OptionGroupMemberships !== null
@@ -12987,13 +13553,13 @@ var deserializeAws_restJson1AwsRdsDbInstanceDetails = function (output, context)
             : undefined,
         PerformanceInsightsEnabled: __expectBoolean(output.PerformanceInsightsEnabled),
         PerformanceInsightsKmsKeyId: __expectString(output.PerformanceInsightsKmsKeyId),
-        PerformanceInsightsRetentionPeriod: __expectInt(output.PerformanceInsightsRetentionPeriod),
+        PerformanceInsightsRetentionPeriod: __expectInt32(output.PerformanceInsightsRetentionPeriod),
         PreferredBackupWindow: __expectString(output.PreferredBackupWindow),
         PreferredMaintenanceWindow: __expectString(output.PreferredMaintenanceWindow),
         ProcessorFeatures: output.ProcessorFeatures !== undefined && output.ProcessorFeatures !== null
             ? deserializeAws_restJson1AwsRdsDbProcessorFeatures(output.ProcessorFeatures, context)
             : undefined,
-        PromotionTier: __expectInt(output.PromotionTier),
+        PromotionTier: __expectInt32(output.PromotionTier),
         PubliclyAccessible: __expectBoolean(output.PubliclyAccessible),
         ReadReplicaDBClusterIdentifiers: output.ReadReplicaDBClusterIdentifiers !== undefined && output.ReadReplicaDBClusterIdentifiers !== null
             ? deserializeAws_restJson1StringList(output.ReadReplicaDBClusterIdentifiers, context)
@@ -13019,7 +13585,7 @@ var deserializeAws_restJson1AwsRdsDbInstanceEndpoint = function (output, context
     return {
         Address: __expectString(output.Address),
         HostedZoneId: __expectString(output.HostedZoneId),
-        Port: __expectInt(output.Port),
+        Port: __expectInt32(output.Port),
     };
 };
 var deserializeAws_restJson1AwsRdsDbInstanceVpcSecurityGroup = function (output, context) {
@@ -13072,21 +13638,21 @@ var deserializeAws_restJson1AwsRdsDbParameterGroups = function (output, context)
 };
 var deserializeAws_restJson1AwsRdsDbPendingModifiedValues = function (output, context) {
     return {
-        AllocatedStorage: __expectInt(output.AllocatedStorage),
-        BackupRetentionPeriod: __expectInt(output.BackupRetentionPeriod),
+        AllocatedStorage: __expectInt32(output.AllocatedStorage),
+        BackupRetentionPeriod: __expectInt32(output.BackupRetentionPeriod),
         CaCertificateIdentifier: __expectString(output.CaCertificateIdentifier),
         DbInstanceClass: __expectString(output.DbInstanceClass),
         DbInstanceIdentifier: __expectString(output.DbInstanceIdentifier),
         DbSubnetGroupName: __expectString(output.DbSubnetGroupName),
         EngineVersion: __expectString(output.EngineVersion),
-        Iops: __expectInt(output.Iops),
+        Iops: __expectInt32(output.Iops),
         LicenseModel: __expectString(output.LicenseModel),
         MasterUserPassword: __expectString(output.MasterUserPassword),
         MultiAZ: __expectBoolean(output.MultiAZ),
         PendingCloudWatchLogsExports: output.PendingCloudWatchLogsExports !== undefined && output.PendingCloudWatchLogsExports !== null
             ? deserializeAws_restJson1AwsRdsPendingCloudWatchLogsExports(output.PendingCloudWatchLogsExports, context)
             : undefined,
-        Port: __expectInt(output.Port),
+        Port: __expectInt32(output.Port),
         ProcessorFeatures: output.ProcessorFeatures !== undefined && output.ProcessorFeatures !== null
             ? deserializeAws_restJson1AwsRdsDbProcessorFeatures(output.ProcessorFeatures, context)
             : undefined,
@@ -13111,7 +13677,7 @@ var deserializeAws_restJson1AwsRdsDbProcessorFeatures = function (output, contex
 };
 var deserializeAws_restJson1AwsRdsDbSnapshotDetails = function (output, context) {
     return {
-        AllocatedStorage: __expectInt(output.AllocatedStorage),
+        AllocatedStorage: __expectInt32(output.AllocatedStorage),
         AvailabilityZone: __expectString(output.AvailabilityZone),
         DbInstanceIdentifier: __expectString(output.DbInstanceIdentifier),
         DbSnapshotIdentifier: __expectString(output.DbSnapshotIdentifier),
@@ -13121,13 +13687,13 @@ var deserializeAws_restJson1AwsRdsDbSnapshotDetails = function (output, context)
         EngineVersion: __expectString(output.EngineVersion),
         IamDatabaseAuthenticationEnabled: __expectBoolean(output.IamDatabaseAuthenticationEnabled),
         InstanceCreateTime: __expectString(output.InstanceCreateTime),
-        Iops: __expectInt(output.Iops),
+        Iops: __expectInt32(output.Iops),
         KmsKeyId: __expectString(output.KmsKeyId),
         LicenseModel: __expectString(output.LicenseModel),
         MasterUsername: __expectString(output.MasterUsername),
         OptionGroupName: __expectString(output.OptionGroupName),
-        PercentProgress: __expectInt(output.PercentProgress),
-        Port: __expectInt(output.Port),
+        PercentProgress: __expectInt32(output.PercentProgress),
+        Port: __expectInt32(output.Port),
         ProcessorFeatures: output.ProcessorFeatures !== undefined && output.ProcessorFeatures !== null
             ? deserializeAws_restJson1AwsRdsDbProcessorFeatures(output.ProcessorFeatures, context)
             : undefined,
@@ -13296,8 +13862,8 @@ var deserializeAws_restJson1AwsRedshiftClusterClusterSecurityGroups = function (
 var deserializeAws_restJson1AwsRedshiftClusterClusterSnapshotCopyStatus = function (output, context) {
     return {
         DestinationRegion: __expectString(output.DestinationRegion),
-        ManualSnapshotRetentionPeriod: __expectInt(output.ManualSnapshotRetentionPeriod),
-        RetentionPeriod: __expectInt(output.RetentionPeriod),
+        ManualSnapshotRetentionPeriod: __expectInt32(output.ManualSnapshotRetentionPeriod),
+        RetentionPeriod: __expectInt32(output.RetentionPeriod),
         SnapshotCopyGrantName: __expectString(output.SnapshotCopyGrantName),
     };
 };
@@ -13321,7 +13887,7 @@ var deserializeAws_restJson1AwsRedshiftClusterDeferredMaintenanceWindows = funct
 var deserializeAws_restJson1AwsRedshiftClusterDetails = function (output, context) {
     return {
         AllowVersionUpgrade: __expectBoolean(output.AllowVersionUpgrade),
-        AutomatedSnapshotRetentionPeriod: __expectInt(output.AutomatedSnapshotRetentionPeriod),
+        AutomatedSnapshotRetentionPeriod: __expectInt32(output.AutomatedSnapshotRetentionPeriod),
         AvailabilityZone: __expectString(output.AvailabilityZone),
         ClusterAvailabilityStatus: __expectString(output.ClusterAvailabilityStatus),
         ClusterCreateTime: __expectString(output.ClusterCreateTime),
@@ -13366,11 +13932,11 @@ var deserializeAws_restJson1AwsRedshiftClusterDetails = function (output, contex
             : undefined,
         KmsKeyId: __expectString(output.KmsKeyId),
         MaintenanceTrackName: __expectString(output.MaintenanceTrackName),
-        ManualSnapshotRetentionPeriod: __expectInt(output.ManualSnapshotRetentionPeriod),
+        ManualSnapshotRetentionPeriod: __expectInt32(output.ManualSnapshotRetentionPeriod),
         MasterUsername: __expectString(output.MasterUsername),
         NextMaintenanceWindowStartTime: __expectString(output.NextMaintenanceWindowStartTime),
         NodeType: __expectString(output.NodeType),
-        NumberOfNodes: __expectInt(output.NumberOfNodes),
+        NumberOfNodes: __expectInt32(output.NumberOfNodes),
         PendingActions: output.PendingActions !== undefined && output.PendingActions !== null
             ? deserializeAws_restJson1StringList(output.PendingActions, context)
             : undefined,
@@ -13402,7 +13968,7 @@ var deserializeAws_restJson1AwsRedshiftClusterElasticIpStatus = function (output
 var deserializeAws_restJson1AwsRedshiftClusterEndpoint = function (output, context) {
     return {
         Address: __expectString(output.Address),
-        Port: __expectInt(output.Port),
+        Port: __expectInt32(output.Port),
     };
 };
 var deserializeAws_restJson1AwsRedshiftClusterHsmStatus = function (output, context) {
@@ -13430,7 +13996,7 @@ var deserializeAws_restJson1AwsRedshiftClusterIamRoles = function (output, conte
 };
 var deserializeAws_restJson1AwsRedshiftClusterPendingModifiedValues = function (output, context) {
     return {
-        AutomatedSnapshotRetentionPeriod: __expectInt(output.AutomatedSnapshotRetentionPeriod),
+        AutomatedSnapshotRetentionPeriod: __expectInt32(output.AutomatedSnapshotRetentionPeriod),
         ClusterIdentifier: __expectString(output.ClusterIdentifier),
         ClusterType: __expectString(output.ClusterType),
         ClusterVersion: __expectString(output.ClusterVersion),
@@ -13439,7 +14005,7 @@ var deserializeAws_restJson1AwsRedshiftClusterPendingModifiedValues = function (
         MaintenanceTrackName: __expectString(output.MaintenanceTrackName),
         MasterUserPassword: __expectString(output.MasterUserPassword),
         NodeType: __expectString(output.NodeType),
-        NumberOfNodes: __expectInt(output.NumberOfNodes),
+        NumberOfNodes: __expectInt32(output.NumberOfNodes),
         PubliclyAccessible: __expectBoolean(output.PubliclyAccessible),
     };
 };
@@ -13451,11 +14017,11 @@ var deserializeAws_restJson1AwsRedshiftClusterResizeInfo = function (output, con
 };
 var deserializeAws_restJson1AwsRedshiftClusterRestoreStatus = function (output, context) {
     return {
-        CurrentRestoreRateInMegaBytesPerSecond: __limitedParseFloat(output.CurrentRestoreRateInMegaBytesPerSecond),
-        ElapsedTimeInSeconds: __expectInt(output.ElapsedTimeInSeconds),
-        EstimatedTimeToCompletionInSeconds: __expectInt(output.EstimatedTimeToCompletionInSeconds),
-        ProgressInMegaBytes: __expectInt(output.ProgressInMegaBytes),
-        SnapshotSizeInMegaBytes: __expectInt(output.SnapshotSizeInMegaBytes),
+        CurrentRestoreRateInMegaBytesPerSecond: __limitedParseDouble(output.CurrentRestoreRateInMegaBytesPerSecond),
+        ElapsedTimeInSeconds: __expectLong(output.ElapsedTimeInSeconds),
+        EstimatedTimeToCompletionInSeconds: __expectLong(output.EstimatedTimeToCompletionInSeconds),
+        ProgressInMegaBytes: __expectLong(output.ProgressInMegaBytes),
+        SnapshotSizeInMegaBytes: __expectLong(output.SnapshotSizeInMegaBytes),
         Status: __expectString(output.Status),
     };
 };
@@ -13492,7 +14058,7 @@ var deserializeAws_restJson1AwsS3BucketBucketLifecycleConfigurationDetails = fun
 };
 var deserializeAws_restJson1AwsS3BucketBucketLifecycleConfigurationRulesAbortIncompleteMultipartUploadDetails = function (output, context) {
     return {
-        DaysAfterInitiation: __expectInt(output.DaysAfterInitiation),
+        DaysAfterInitiation: __expectInt32(output.DaysAfterInitiation),
     };
 };
 var deserializeAws_restJson1AwsS3BucketBucketLifecycleConfigurationRulesDetails = function (output, context) {
@@ -13501,13 +14067,13 @@ var deserializeAws_restJson1AwsS3BucketBucketLifecycleConfigurationRulesDetails
             ? deserializeAws_restJson1AwsS3BucketBucketLifecycleConfigurationRulesAbortIncompleteMultipartUploadDetails(output.AbortIncompleteMultipartUpload, context)
             : undefined,
         ExpirationDate: __expectString(output.ExpirationDate),
-        ExpirationInDays: __expectInt(output.ExpirationInDays),
+        ExpirationInDays: __expectInt32(output.ExpirationInDays),
         ExpiredObjectDeleteMarker: __expectBoolean(output.ExpiredObjectDeleteMarker),
         Filter: output.Filter !== undefined && output.Filter !== null
             ? deserializeAws_restJson1AwsS3BucketBucketLifecycleConfigurationRulesFilterDetails(output.Filter, context)
             : undefined,
         ID: __expectString(output.ID),
-        NoncurrentVersionExpirationInDays: __expectInt(output.NoncurrentVersionExpirationInDays),
+        NoncurrentVersionExpirationInDays: __expectInt32(output.NoncurrentVersionExpirationInDays),
         NoncurrentVersionTransitions: output.NoncurrentVersionTransitions !== undefined && output.NoncurrentVersionTransitions !== null
             ? deserializeAws_restJson1AwsS3BucketBucketLifecycleConfigurationRulesNoncurrentVersionTransitionsList(output.NoncurrentVersionTransitions, context)
             : undefined,
@@ -13580,7 +14146,7 @@ var deserializeAws_restJson1AwsS3BucketBucketLifecycleConfigurationRulesList = f
 };
 var deserializeAws_restJson1AwsS3BucketBucketLifecycleConfigurationRulesNoncurrentVersionTransitionsDetails = function (output, context) {
     return {
-        Days: __expectInt(output.Days),
+        Days: __expectInt32(output.Days),
         StorageClass: __expectString(output.StorageClass),
     };
 };
@@ -13597,7 +14163,7 @@ var deserializeAws_restJson1AwsS3BucketBucketLifecycleConfigurationRulesNoncurre
 var deserializeAws_restJson1AwsS3BucketBucketLifecycleConfigurationRulesTransitionsDetails = function (output, context) {
     return {
         Date: __expectString(output.Date),
-        Days: __expectInt(output.Days),
+        Days: __expectInt32(output.Days),
         StorageClass: __expectString(output.StorageClass),
     };
 };
@@ -13613,9 +14179,19 @@ var deserializeAws_restJson1AwsS3BucketBucketLifecycleConfigurationRulesTransiti
 };
 var deserializeAws_restJson1AwsS3BucketDetails = function (output, context) {
     return {
+        AccessControlList: __expectString(output.AccessControlList),
         BucketLifecycleConfiguration: output.BucketLifecycleConfiguration !== undefined && output.BucketLifecycleConfiguration !== null
             ? deserializeAws_restJson1AwsS3BucketBucketLifecycleConfigurationDetails(output.BucketLifecycleConfiguration, context)
             : undefined,
+        BucketLoggingConfiguration: output.BucketLoggingConfiguration !== undefined && output.BucketLoggingConfiguration !== null
+            ? deserializeAws_restJson1AwsS3BucketLoggingConfiguration(output.BucketLoggingConfiguration, context)
+            : undefined,
+        BucketNotificationConfiguration: output.BucketNotificationConfiguration !== undefined && output.BucketNotificationConfiguration !== null
+            ? deserializeAws_restJson1AwsS3BucketNotificationConfiguration(output.BucketNotificationConfiguration, context)
+            : undefined,
+        BucketWebsiteConfiguration: output.BucketWebsiteConfiguration !== undefined && output.BucketWebsiteConfiguration !== null
+            ? deserializeAws_restJson1AwsS3BucketWebsiteConfiguration(output.BucketWebsiteConfiguration, context)
+            : undefined,
         CreatedAt: __expectString(output.CreatedAt),
         OwnerId: __expectString(output.OwnerId),
         OwnerName: __expectString(output.OwnerName),
@@ -13627,6 +14203,81 @@ var deserializeAws_restJson1AwsS3BucketDetails = function (output, context) {
             : undefined,
     };
 };
+var deserializeAws_restJson1AwsS3BucketLoggingConfiguration = function (output, context) {
+    return {
+        DestinationBucketName: __expectString(output.DestinationBucketName),
+        LogFilePrefix: __expectString(output.LogFilePrefix),
+    };
+};
+var deserializeAws_restJson1AwsS3BucketNotificationConfiguration = function (output, context) {
+    return {
+        Configurations: output.Configurations !== undefined && output.Configurations !== null
+            ? deserializeAws_restJson1AwsS3BucketNotificationConfigurationDetails(output.Configurations, context)
+            : undefined,
+    };
+};
+var deserializeAws_restJson1AwsS3BucketNotificationConfigurationDetail = function (output, context) {
+    return {
+        Destination: __expectString(output.Destination),
+        Events: output.Events !== undefined && output.Events !== null
+            ? deserializeAws_restJson1AwsS3BucketNotificationConfigurationEvents(output.Events, context)
+            : undefined,
+        Filter: output.Filter !== undefined && output.Filter !== null
+            ? deserializeAws_restJson1AwsS3BucketNotificationConfigurationFilter(output.Filter, context)
+            : undefined,
+        Type: __expectString(output.Type),
+    };
+};
+var deserializeAws_restJson1AwsS3BucketNotificationConfigurationDetails = function (output, context) {
+    return (output || [])
+        .filter(function (e) { return e != null; })
+        .map(function (entry) {
+        if (entry === null) {
+            return null;
+        }
+        return deserializeAws_restJson1AwsS3BucketNotificationConfigurationDetail(entry, context);
+    });
+};
+var deserializeAws_restJson1AwsS3BucketNotificationConfigurationEvents = function (output, context) {
+    return (output || [])
+        .filter(function (e) { return e != null; })
+        .map(function (entry) {
+        if (entry === null) {
+            return null;
+        }
+        return __expectString(entry);
+    });
+};
+var deserializeAws_restJson1AwsS3BucketNotificationConfigurationFilter = function (output, context) {
+    return {
+        S3KeyFilter: output.S3KeyFilter !== undefined && output.S3KeyFilter !== null
+            ? deserializeAws_restJson1AwsS3BucketNotificationConfigurationS3KeyFilter(output.S3KeyFilter, context)
+            : undefined,
+    };
+};
+var deserializeAws_restJson1AwsS3BucketNotificationConfigurationS3KeyFilter = function (output, context) {
+    return {
+        FilterRules: output.FilterRules !== undefined && output.FilterRules !== null
+            ? deserializeAws_restJson1AwsS3BucketNotificationConfigurationS3KeyFilterRules(output.FilterRules, context)
+            : undefined,
+    };
+};
+var deserializeAws_restJson1AwsS3BucketNotificationConfigurationS3KeyFilterRule = function (output, context) {
+    return {
+        Name: __expectString(output.Name),
+        Value: __expectString(output.Value),
+    };
+};
+var deserializeAws_restJson1AwsS3BucketNotificationConfigurationS3KeyFilterRules = function (output, context) {
+    return (output || [])
+        .filter(function (e) { return e != null; })
+        .map(function (entry) {
+        if (entry === null) {
+            return null;
+        }
+        return deserializeAws_restJson1AwsS3BucketNotificationConfigurationS3KeyFilterRule(entry, context);
+    });
+};
 var deserializeAws_restJson1AwsS3BucketServerSideEncryptionByDefault = function (output, context) {
     return {
         KMSMasterKeyID: __expectString(output.KMSMasterKeyID),
@@ -13657,6 +14308,59 @@ var deserializeAws_restJson1AwsS3BucketServerSideEncryptionRules = function (out
         return deserializeAws_restJson1AwsS3BucketServerSideEncryptionRule(entry, context);
     });
 };
+var deserializeAws_restJson1AwsS3BucketWebsiteConfiguration = function (output, context) {
+    return {
+        ErrorDocument: __expectString(output.ErrorDocument),
+        IndexDocumentSuffix: __expectString(output.IndexDocumentSuffix),
+        RedirectAllRequestsTo: output.RedirectAllRequestsTo !== undefined && output.RedirectAllRequestsTo !== null
+            ? deserializeAws_restJson1AwsS3BucketWebsiteConfigurationRedirectTo(output.RedirectAllRequestsTo, context)
+            : undefined,
+        RoutingRules: output.RoutingRules !== undefined && output.RoutingRules !== null
+            ? deserializeAws_restJson1AwsS3BucketWebsiteConfigurationRoutingRules(output.RoutingRules, context)
+            : undefined,
+    };
+};
+var deserializeAws_restJson1AwsS3BucketWebsiteConfigurationRedirectTo = function (output, context) {
+    return {
+        Hostname: __expectString(output.Hostname),
+        Protocol: __expectString(output.Protocol),
+    };
+};
+var deserializeAws_restJson1AwsS3BucketWebsiteConfigurationRoutingRule = function (output, context) {
+    return {
+        Condition: output.Condition !== undefined && output.Condition !== null
+            ? deserializeAws_restJson1AwsS3BucketWebsiteConfigurationRoutingRuleCondition(output.Condition, context)
+            : undefined,
+        Redirect: output.Redirect !== undefined && output.Redirect !== null
+            ? deserializeAws_restJson1AwsS3BucketWebsiteConfigurationRoutingRuleRedirect(output.Redirect, context)
+            : undefined,
+    };
+};
+var deserializeAws_restJson1AwsS3BucketWebsiteConfigurationRoutingRuleCondition = function (output, context) {
+    return {
+        HttpErrorCodeReturnedEquals: __expectString(output.HttpErrorCodeReturnedEquals),
+        KeyPrefixEquals: __expectString(output.KeyPrefixEquals),
+    };
+};
+var deserializeAws_restJson1AwsS3BucketWebsiteConfigurationRoutingRuleRedirect = function (output, context) {
+    return {
+        Hostname: __expectString(output.Hostname),
+        HttpRedirectCode: __expectString(output.HttpRedirectCode),
+        Protocol: __expectString(output.Protocol),
+        ReplaceKeyPrefixWith: __expectString(output.ReplaceKeyPrefixWith),
+        ReplaceKeyWith: __expectString(output.ReplaceKeyWith),
+    };
+};
+var deserializeAws_restJson1AwsS3BucketWebsiteConfigurationRoutingRules = function (output, context) {
+    return (output || [])
+        .filter(function (e) { return e != null; })
+        .map(function (entry) {
+        if (entry === null) {
+            return null;
+        }
+        return deserializeAws_restJson1AwsS3BucketWebsiteConfigurationRoutingRule(entry, context);
+    });
+};
 var deserializeAws_restJson1AwsS3ObjectDetails = function (output, context) {
     return {
         ContentType: __expectString(output.ContentType),
@@ -13683,7 +14387,7 @@ var deserializeAws_restJson1AwsSecretsManagerSecretDetails = function (output, c
 };
 var deserializeAws_restJson1AwsSecretsManagerSecretRotationRules = function (output, context) {
     return {
-        AutomaticallyAfterDays: __expectInt(output.AutomaticallyAfterDays),
+        AutomaticallyAfterDays: __expectInt32(output.AutomaticallyAfterDays),
     };
 };
 var deserializeAws_restJson1AwsSecurityFinding = function (output, context) {
@@ -13696,9 +14400,9 @@ var deserializeAws_restJson1AwsSecurityFinding = function (output, context) {
         Compliance: output.Compliance !== undefined && output.Compliance !== null
             ? deserializeAws_restJson1Compliance(output.Compliance, context)
             : undefined,
-        Confidence: __expectInt(output.Confidence),
+        Confidence: __expectInt32(output.Confidence),
         CreatedAt: __expectString(output.CreatedAt),
-        Criticality: __expectInt(output.Criticality),
+        Criticality: __expectInt32(output.Criticality),
         Description: __expectString(output.Description),
         FindingProviderFields: output.FindingProviderFields !== undefined && output.FindingProviderFields !== null
             ? deserializeAws_restJson1FindingProviderFields(output.FindingProviderFields, context)
@@ -14112,7 +14816,7 @@ var deserializeAws_restJson1AwsSnsTopicSubscriptionList = function (output, cont
 var deserializeAws_restJson1AwsSqsQueueDetails = function (output, context) {
     return {
         DeadLetterTargetArn: __expectString(output.DeadLetterTargetArn),
-        KmsDataKeyReusePeriodSeconds: __expectInt(output.KmsDataKeyReusePeriodSeconds),
+        KmsDataKeyReusePeriodSeconds: __expectInt32(output.KmsDataKeyReusePeriodSeconds),
         KmsMasterKeyId: __expectString(output.KmsMasterKeyId),
         QueueName: __expectString(output.QueueName),
     };
@@ -14120,19 +14824,19 @@ var deserializeAws_restJson1AwsSqsQueueDetails = function (output, context) {
 var deserializeAws_restJson1AwsSsmComplianceSummary = function (output, context) {
     return {
         ComplianceType: __expectString(output.ComplianceType),
-        CompliantCriticalCount: __expectInt(output.CompliantCriticalCount),
-        CompliantHighCount: __expectInt(output.CompliantHighCount),
-        CompliantInformationalCount: __expectInt(output.CompliantInformationalCount),
-        CompliantLowCount: __expectInt(output.CompliantLowCount),
-        CompliantMediumCount: __expectInt(output.CompliantMediumCount),
-        CompliantUnspecifiedCount: __expectInt(output.CompliantUnspecifiedCount),
+        CompliantCriticalCount: __expectInt32(output.CompliantCriticalCount),
+        CompliantHighCount: __expectInt32(output.CompliantHighCount),
+        CompliantInformationalCount: __expectInt32(output.CompliantInformationalCount),
+        CompliantLowCount: __expectInt32(output.CompliantLowCount),
+        CompliantMediumCount: __expectInt32(output.CompliantMediumCount),
+        CompliantUnspecifiedCount: __expectInt32(output.CompliantUnspecifiedCount),
         ExecutionType: __expectString(output.ExecutionType),
-        NonCompliantCriticalCount: __expectInt(output.NonCompliantCriticalCount),
-        NonCompliantHighCount: __expectInt(output.NonCompliantHighCount),
-        NonCompliantInformationalCount: __expectInt(output.NonCompliantInformationalCount),
-        NonCompliantLowCount: __expectInt(output.NonCompliantLowCount),
-        NonCompliantMediumCount: __expectInt(output.NonCompliantMediumCount),
-        NonCompliantUnspecifiedCount: __expectInt(output.NonCompliantUnspecifiedCount),
+        NonCompliantCriticalCount: __expectInt32(output.NonCompliantCriticalCount),
+        NonCompliantHighCount: __expectInt32(output.NonCompliantHighCount),
+        NonCompliantInformationalCount: __expectInt32(output.NonCompliantInformationalCount),
+        NonCompliantLowCount: __expectInt32(output.NonCompliantLowCount),
+        NonCompliantMediumCount: __expectInt32(output.NonCompliantMediumCount),
+        NonCompliantUnspecifiedCount: __expectInt32(output.NonCompliantUnspecifiedCount),
         OverallSeverity: __expectString(output.OverallSeverity),
         PatchBaselineId: __expectString(output.PatchBaselineId),
         PatchGroup: __expectString(output.PatchGroup),
@@ -14174,7 +14878,7 @@ var deserializeAws_restJson1AwsWafWebAclRule = function (output, context) {
         OverrideAction: output.OverrideAction !== undefined && output.OverrideAction !== null
             ? deserializeAws_restJson1WafOverrideAction(output.OverrideAction, context)
             : undefined,
-        Priority: __expectInt(output.Priority),
+        Priority: __expectInt32(output.Priority),
         RuleId: __expectString(output.RuleId),
         Type: __expectString(output.Type),
     };
@@ -14221,9 +14925,9 @@ var deserializeAws_restJson1CategoryList = function (output, context) {
 var deserializeAws_restJson1Cell = function (output, context) {
     return {
         CellReference: __expectString(output.CellReference),
-        Column: __expectInt(output.Column),
+        Column: __expectLong(output.Column),
         ColumnName: __expectString(output.ColumnName),
-        Row: __expectInt(output.Row),
+        Row: __expectLong(output.Row),
     };
 };
 var deserializeAws_restJson1Cells = function (output, context) {
@@ -14268,7 +14972,7 @@ var deserializeAws_restJson1ClassificationResult = function (output, context) {
         SensitiveData: output.SensitiveData !== undefined && output.SensitiveData !== null
             ? deserializeAws_restJson1SensitiveDataResultList(output.SensitiveData, context)
             : undefined,
-        SizeClassified: __expectInt(output.SizeClassified),
+        SizeClassified: __expectLong(output.SizeClassified),
         Status: output.Status !== undefined && output.Status !== null
             ? deserializeAws_restJson1ClassificationStatus(output.Status, context)
             : undefined,
@@ -14308,7 +15012,7 @@ var deserializeAws_restJson1Country = function (output, context) {
 var deserializeAws_restJson1CustomDataIdentifiersDetections = function (output, context) {
     return {
         Arn: __expectString(output.Arn),
-        Count: __expectInt(output.Count),
+        Count: __expectLong(output.Count),
         Name: __expectString(output.Name),
         Occurrences: output.Occurrences !== undefined && output.Occurrences !== null
             ? deserializeAws_restJson1Occurrences(output.Occurrences, context)
@@ -14330,13 +15034,17 @@ var deserializeAws_restJson1CustomDataIdentifiersResult = function (output, cont
         Detections: output.Detections !== undefined && output.Detections !== null
             ? deserializeAws_restJson1CustomDataIdentifiersDetectionsList(output.Detections, context)
             : undefined,
-        TotalCount: __expectInt(output.TotalCount),
+        TotalCount: __expectLong(output.TotalCount),
     };
 };
 var deserializeAws_restJson1Cvss = function (output, context) {
     return {
-        BaseScore: __limitedParseFloat(output.BaseScore),
+        Adjustments: output.Adjustments !== undefined && output.Adjustments !== null
+            ? deserializeAws_restJson1AdjustmentList(output.Adjustments, context)
+            : undefined,
+        BaseScore: __limitedParseDouble(output.BaseScore),
         BaseVector: __expectString(output.BaseVector),
+        Source: __expectString(output.Source),
         Version: __expectString(output.Version),
     };
 };
@@ -14380,7 +15088,7 @@ var deserializeAws_restJson1DateFilterList = function (output, context) {
 var deserializeAws_restJson1DateRange = function (output, context) {
     return {
         Unit: __expectString(output.Unit),
-        Value: __expectInt(output.Value),
+        Value: __expectInt32(output.Value),
     };
 };
 var deserializeAws_restJson1DnsRequestAction = function (output, context) {
@@ -14402,8 +15110,8 @@ var deserializeAws_restJson1FieldMap = function (output, context) {
 };
 var deserializeAws_restJson1FindingProviderFields = function (output, context) {
     return {
-        Confidence: __expectInt(output.Confidence),
-        Criticality: __expectInt(output.Criticality),
+        Confidence: __expectInt32(output.Confidence),
+        Criticality: __expectInt32(output.Criticality),
         RelatedFindings: output.RelatedFindings !== undefined && output.RelatedFindings !== null
             ? deserializeAws_restJson1RelatedFindingList(output.RelatedFindings, context)
             : undefined,
@@ -14423,14 +15131,14 @@ var deserializeAws_restJson1FindingProviderSeverity = function (output, context)
 };
 var deserializeAws_restJson1GeoLocation = function (output, context) {
     return {
-        Lat: __limitedParseFloat(output.Lat),
-        Lon: __limitedParseFloat(output.Lon),
+        Lat: __limitedParseDouble(output.Lat),
+        Lon: __limitedParseDouble(output.Lon),
     };
 };
 var deserializeAws_restJson1IcmpTypeCode = function (output, context) {
     return {
-        Code: __expectInt(output.Code),
-        Type: __expectInt(output.Type),
+        Code: __expectInt32(output.Code),
+        Type: __expectInt32(output.Type),
     };
 };
 var deserializeAws_restJson1ImportFindingsError = function (output, context) {
@@ -14481,7 +15189,7 @@ var deserializeAws_restJson1InsightResults = function (output, context) {
 };
 var deserializeAws_restJson1InsightResultValue = function (output, context) {
     return {
-        Count: __expectInt(output.Count),
+        Count: __expectInt32(output.Count),
         GroupByAttributeValue: __expectString(output.GroupByAttributeValue),
     };
 };
@@ -14495,6 +15203,16 @@ var deserializeAws_restJson1InsightResultValueList = function (output, context)
         return deserializeAws_restJson1InsightResultValue(entry, context);
     });
 };
+var deserializeAws_restJson1IntegerList = function (output, context) {
+    return (output || [])
+        .filter(function (e) { return e != null; })
+        .map(function (entry) {
+        if (entry === null) {
+            return null;
+        }
+        return __expectInt32(entry);
+    });
+};
 var deserializeAws_restJson1IntegrationTypeList = function (output, context) {
     return (output || [])
         .filter(function (e) { return e != null; })
@@ -14509,7 +15227,9 @@ var deserializeAws_restJson1Invitation = function (output, context) {
     return {
         AccountId: __expectString(output.AccountId),
         InvitationId: __expectString(output.InvitationId),
-        InvitedAt: output.InvitedAt !== undefined && output.InvitedAt !== null ? new Date(output.InvitedAt) : undefined,
+        InvitedAt: output.InvitedAt !== undefined && output.InvitedAt !== null
+            ? __expectNonNull(__parseRfc3339DateTime(output.InvitedAt))
+            : undefined,
         MemberStatus: __expectString(output.MemberStatus),
     };
 };
@@ -14540,7 +15260,7 @@ var deserializeAws_restJson1IpFilterList = function (output, context) {
 };
 var deserializeAws_restJson1IpOrganizationDetails = function (output, context) {
     return {
-        Asn: __expectInt(output.Asn),
+        Asn: __expectInt32(output.Asn),
         AsnOrg: __expectString(output.AsnOrg),
         Isp: __expectString(output.Isp),
         Org: __expectString(output.Org),
@@ -14624,10 +15344,14 @@ var deserializeAws_restJson1Member = function (output, context) {
         AccountId: __expectString(output.AccountId),
         AdministratorId: __expectString(output.AdministratorId),
         Email: __expectString(output.Email),
-        InvitedAt: output.InvitedAt !== undefined && output.InvitedAt !== null ? new Date(output.InvitedAt) : undefined,
+        InvitedAt: output.InvitedAt !== undefined && output.InvitedAt !== null
+            ? __expectNonNull(__parseRfc3339DateTime(output.InvitedAt))
+            : undefined,
         MasterId: __expectString(output.MasterId),
         MemberStatus: __expectString(output.MemberStatus),
-        UpdatedAt: output.UpdatedAt !== undefined && output.UpdatedAt !== null ? new Date(output.UpdatedAt) : undefined,
+        UpdatedAt: output.UpdatedAt !== undefined && output.UpdatedAt !== null
+            ? __expectNonNull(__parseRfc3339DateTime(output.UpdatedAt))
+            : undefined,
     };
 };
 var deserializeAws_restJson1MemberList = function (output, context) {
@@ -14645,7 +15369,7 @@ var deserializeAws_restJson1Network = function (output, context) {
         DestinationDomain: __expectString(output.DestinationDomain),
         DestinationIpV4: __expectString(output.DestinationIpV4),
         DestinationIpV6: __expectString(output.DestinationIpV6),
-        DestinationPort: __expectInt(output.DestinationPort),
+        DestinationPort: __expectInt32(output.DestinationPort),
         Direction: __expectString(output.Direction),
         OpenPortRange: output.OpenPortRange !== undefined && output.OpenPortRange !== null
             ? deserializeAws_restJson1PortRange(output.OpenPortRange, context)
@@ -14655,7 +15379,7 @@ var deserializeAws_restJson1Network = function (output, context) {
         SourceIpV4: __expectString(output.SourceIpV4),
         SourceIpV6: __expectString(output.SourceIpV6),
         SourceMac: __expectString(output.SourceMac),
-        SourcePort: __expectInt(output.SourcePort),
+        SourcePort: __expectInt32(output.SourcePort),
     };
 };
 var deserializeAws_restJson1NetworkConnectionAction = function (output, context) {
@@ -14736,9 +15460,9 @@ var deserializeAws_restJson1Note = function (output, context) {
 };
 var deserializeAws_restJson1NumberFilter = function (output, context) {
     return {
-        Eq: __limitedParseFloat(output.Eq),
-        Gte: __limitedParseFloat(output.Gte),
-        Lte: __limitedParseFloat(output.Lte),
+        Eq: __limitedParseDouble(output.Eq),
+        Gte: __limitedParseDouble(output.Gte),
+        Lte: __limitedParseDouble(output.Lte),
     };
 };
 var deserializeAws_restJson1NumberFilterList = function (output, context) {
@@ -14778,7 +15502,7 @@ var deserializeAws_restJson1Page = function (output, context) {
         OffsetRange: output.OffsetRange !== undefined && output.OffsetRange !== null
             ? deserializeAws_restJson1Range(output.OffsetRange, context)
             : undefined,
-        PageNumber: __expectInt(output.PageNumber),
+        PageNumber: __expectLong(output.PageNumber),
     };
 };
 var deserializeAws_restJson1Pages = function (output, context) {
@@ -14793,13 +15517,13 @@ var deserializeAws_restJson1Pages = function (output, context) {
 };
 var deserializeAws_restJson1PatchSummary = function (output, context) {
     return {
-        FailedCount: __expectInt(output.FailedCount),
+        FailedCount: __expectInt32(output.FailedCount),
         Id: __expectString(output.Id),
-        InstalledCount: __expectInt(output.InstalledCount),
-        InstalledOtherCount: __expectInt(output.InstalledOtherCount),
-        InstalledPendingReboot: __expectInt(output.InstalledPendingReboot),
-        InstalledRejectedCount: __expectInt(output.InstalledRejectedCount),
-        MissingCount: __expectInt(output.MissingCount),
+        InstalledCount: __expectInt32(output.InstalledCount),
+        InstalledOtherCount: __expectInt32(output.InstalledOtherCount),
+        InstalledPendingReboot: __expectInt32(output.InstalledPendingReboot),
+        InstalledRejectedCount: __expectInt32(output.InstalledRejectedCount),
+        MissingCount: __expectInt32(output.MissingCount),
         Operation: __expectString(output.Operation),
         OperationEndTime: __expectString(output.OperationEndTime),
         OperationStartTime: __expectString(output.OperationStartTime),
@@ -14839,14 +15563,14 @@ var deserializeAws_restJson1PortProbeDetailList = function (output, context) {
 };
 var deserializeAws_restJson1PortRange = function (output, context) {
     return {
-        Begin: __expectInt(output.Begin),
-        End: __expectInt(output.End),
+        Begin: __expectInt32(output.Begin),
+        End: __expectInt32(output.End),
     };
 };
 var deserializeAws_restJson1PortRangeFromTo = function (output, context) {
     return {
-        From: __expectInt(output.From),
-        To: __expectInt(output.To),
+        From: __expectInt32(output.From),
+        To: __expectInt32(output.To),
     };
 };
 var deserializeAws_restJson1PortRangeList = function (output, context) {
@@ -14863,9 +15587,9 @@ var deserializeAws_restJson1ProcessDetails = function (output, context) {
     return {
         LaunchedAt: __expectString(output.LaunchedAt),
         Name: __expectString(output.Name),
-        ParentPid: __expectInt(output.ParentPid),
+        ParentPid: __expectInt32(output.ParentPid),
         Path: __expectString(output.Path),
-        Pid: __expectInt(output.Pid),
+        Pid: __expectInt32(output.Pid),
         TerminatedAt: __expectString(output.TerminatedAt),
     };
 };
@@ -14908,9 +15632,9 @@ var deserializeAws_restJson1ProductSubscriptionArnList = function (output, conte
 };
 var deserializeAws_restJson1Range = function (output, context) {
     return {
-        End: __expectInt(output.End),
-        Start: __expectInt(output.Start),
-        StartColumn: __expectInt(output.StartColumn),
+        End: __expectLong(output.End),
+        Start: __expectLong(output.Start),
+        StartColumn: __expectLong(output.StartColumn),
     };
 };
 var deserializeAws_restJson1Ranges = function (output, context) {
@@ -14932,7 +15656,7 @@ var deserializeAws_restJson1Recommendation = function (output, context) {
 var deserializeAws_restJson1_Record = function (output, context) {
     return {
         JsonPath: __expectString(output.JsonPath),
-        RecordIndex: __expectInt(output.RecordIndex),
+        RecordIndex: __expectLong(output.RecordIndex),
     };
 };
 var deserializeAws_restJson1Records = function (output, context) {
@@ -15013,6 +15737,9 @@ var deserializeAws_restJson1ResourceDetails = function (output, context) {
         AwsAutoScalingAutoScalingGroup: output.AwsAutoScalingAutoScalingGroup !== undefined && output.AwsAutoScalingAutoScalingGroup !== null
             ? deserializeAws_restJson1AwsAutoScalingAutoScalingGroupDetails(output.AwsAutoScalingAutoScalingGroup, context)
             : undefined,
+        AwsAutoScalingLaunchConfiguration: output.AwsAutoScalingLaunchConfiguration !== undefined && output.AwsAutoScalingLaunchConfiguration !== null
+            ? deserializeAws_restJson1AwsAutoScalingLaunchConfigurationDetails(output.AwsAutoScalingLaunchConfiguration, context)
+            : undefined,
         AwsCertificateManagerCertificate: output.AwsCertificateManagerCertificate !== undefined && output.AwsCertificateManagerCertificate !== null
             ? deserializeAws_restJson1AwsCertificateManagerCertificateDetails(output.AwsCertificateManagerCertificate, context)
             : undefined,
@@ -15052,6 +15779,12 @@ var deserializeAws_restJson1ResourceDetails = function (output, context) {
         AwsEc2Vpc: output.AwsEc2Vpc !== undefined && output.AwsEc2Vpc !== null
             ? deserializeAws_restJson1AwsEc2VpcDetails(output.AwsEc2Vpc, context)
             : undefined,
+        AwsEc2VpnConnection: output.AwsEc2VpnConnection !== undefined && output.AwsEc2VpnConnection !== null
+            ? deserializeAws_restJson1AwsEc2VpnConnectionDetails(output.AwsEc2VpnConnection, context)
+            : undefined,
+        AwsEcrContainerImage: output.AwsEcrContainerImage !== undefined && output.AwsEcrContainerImage !== null
+            ? deserializeAws_restJson1AwsEcrContainerImageDetails(output.AwsEcrContainerImage, context)
+            : undefined,
         AwsEcsCluster: output.AwsEcsCluster !== undefined && output.AwsEcsCluster !== null
             ? deserializeAws_restJson1AwsEcsClusterDetails(output.AwsEcsCluster, context)
             : undefined,
@@ -15185,7 +15918,7 @@ var deserializeAws_restJson1SecurityGroups = function (output, context) {
 };
 var deserializeAws_restJson1SensitiveDataDetections = function (output, context) {
     return {
-        Count: __expectInt(output.Count),
+        Count: __expectLong(output.Count),
         Occurrences: output.Occurrences !== undefined && output.Occurrences !== null
             ? deserializeAws_restJson1Occurrences(output.Occurrences, context)
             : undefined,
@@ -15208,7 +15941,7 @@ var deserializeAws_restJson1SensitiveDataResult = function (output, context) {
         Detections: output.Detections !== undefined && output.Detections !== null
             ? deserializeAws_restJson1SensitiveDataDetectionsList(output.Detections, context)
             : undefined,
-        TotalCount: __expectInt(output.TotalCount),
+        TotalCount: __expectLong(output.TotalCount),
     };
 };
 var deserializeAws_restJson1SensitiveDataResultList = function (output, context) {
@@ -15224,16 +15957,18 @@ var deserializeAws_restJson1SensitiveDataResultList = function (output, context)
 var deserializeAws_restJson1Severity = function (output, context) {
     return {
         Label: __expectString(output.Label),
-        Normalized: __expectInt(output.Normalized),
+        Normalized: __expectInt32(output.Normalized),
         Original: __expectString(output.Original),
-        Product: __limitedParseFloat(output.Product),
+        Product: __limitedParseDouble(output.Product),
     };
 };
 var deserializeAws_restJson1SoftwarePackage = function (output, context) {
     return {
         Architecture: __expectString(output.Architecture),
         Epoch: __expectString(output.Epoch),
+        FilePath: __expectString(output.FilePath),
         Name: __expectString(output.Name),
+        PackageManager: __expectString(output.PackageManager),
         Release: __expectString(output.Release),
         Version: __expectString(output.Version),
     };
@@ -15271,7 +16006,7 @@ var deserializeAws_restJson1StandardsControl = function (output, context) {
         ControlId: __expectString(output.ControlId),
         ControlStatus: __expectString(output.ControlStatus),
         ControlStatusUpdatedAt: output.ControlStatusUpdatedAt !== undefined && output.ControlStatusUpdatedAt !== null
-            ? new Date(output.ControlStatusUpdatedAt)
+            ? __expectNonNull(__parseRfc3339DateTime(output.ControlStatusUpdatedAt))
             : undefined,
         Description: __expectString(output.Description),
         DisabledReason: __expectString(output.DisabledReason),