@aws-sdk/client-macie2 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, } 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, } from "@aws-sdk/smithy-client";
 import { v4 as generateIdempotencyToken } from "uuid";
 export var serializeAws_restJson1AcceptInvitationCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
     var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, body;
@@ -64,10 +64,16 @@ export var serializeAws_restJson1CreateClassificationJobCommand = function (inpu
                     "content-type": "application/json",
                 };
                 resolvedPath = "" + ((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/jobs";
-                body = JSON.stringify(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign({ clientToken: (_c = input.clientToken) !== null && _c !== void 0 ? _c : generateIdempotencyToken() }, (input.customDataIdentifierIds !== undefined &&
+                body = JSON.stringify(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign({ clientToken: (_c = input.clientToken) !== null && _c !== void 0 ? _c : generateIdempotencyToken() }, (input.customDataIdentifierIds !== undefined &&
                     input.customDataIdentifierIds !== null && {
                     customDataIdentifierIds: serializeAws_restJson1__listOf__string(input.customDataIdentifierIds, context),
-                })), (input.description !== undefined && input.description !== null && { description: input.description })), (input.initialRun !== undefined && input.initialRun !== null && { initialRun: input.initialRun })), (input.jobType !== undefined && input.jobType !== null && { jobType: input.jobType })), (input.name !== undefined && input.name !== null && { name: input.name })), (input.s3JobDefinition !== undefined &&
+                })), (input.description !== undefined && input.description !== null && { description: input.description })), (input.initialRun !== undefined && input.initialRun !== null && { initialRun: input.initialRun })), (input.jobType !== undefined && input.jobType !== null && { jobType: input.jobType })), (input.managedDataIdentifierIds !== undefined &&
+                    input.managedDataIdentifierIds !== null && {
+                    managedDataIdentifierIds: serializeAws_restJson1__listOf__string(input.managedDataIdentifierIds, context),
+                })), (input.managedDataIdentifierSelector !== undefined &&
+                    input.managedDataIdentifierSelector !== null && {
+                    managedDataIdentifierSelector: input.managedDataIdentifierSelector,
+                })), (input.name !== undefined && input.name !== null && { name: input.name })), (input.s3JobDefinition !== undefined &&
                     input.s3JobDefinition !== null && {
                     s3JobDefinition: serializeAws_restJson1S3JobDefinition(input.s3JobDefinition, context),
                 })), (input.samplingPercentage !== undefined &&
@@ -1123,6 +1129,30 @@ export var serializeAws_restJson1ListInvitationsCommand = function (input, conte
         }
     });
 }); };
+export var serializeAws_restJson1ListManagedDataIdentifiersCommand = 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) {
+        switch (_c.label) {
+            case 0: return [4 /*yield*/, context.endpoint()];
+            case 1:
+                _a = _c.sent(), hostname = _a.hostname, _b = _a.protocol, protocol = _b === void 0 ? "https" : _b, port = _a.port, basePath = _a.path;
+                headers = {
+                    "content-type": "application/json",
+                };
+                resolvedPath = "" + ((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/managed-data-identifiers/list";
+                body = JSON.stringify(__assign({}, (input.nextToken !== undefined && input.nextToken !== null && { nextToken: input.nextToken })));
+                return [2 /*return*/, new __HttpRequest({
+                        protocol: protocol,
+                        hostname: hostname,
+                        port: port,
+                        method: "POST",
+                        headers: headers,
+                        path: resolvedPath,
+                        body: body,
+                    })];
+        }
+    });
+}); };
 export var serializeAws_restJson1ListMembersCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
     var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, query, body;
     return __generator(this, function (_c) {
@@ -1641,9 +1671,9 @@ var deserializeAws_restJson1AcceptInvitationCommandError = function (output, con
     });
 }); };
 export var deserializeAws_restJson1BatchGetCustomDataIdentifiersCommand = 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_restJson1BatchGetCustomDataIdentifiersCommandError(output, context)];
@@ -1653,9 +1683,11 @@ export var deserializeAws_restJson1BatchGetCustomDataIdentifiersCommand = functi
                     customDataIdentifiers: undefined,
                     notFoundIdentifierIds: 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.customDataIdentifiers !== undefined && data.customDataIdentifiers !== null) {
                     contents.customDataIdentifiers = deserializeAws_restJson1__listOfBatchGetCustomDataIdentifierSummary(data.customDataIdentifiers, context);
                 }
@@ -1753,9 +1785,9 @@ var deserializeAws_restJson1BatchGetCustomDataIdentifiersCommandError = function
     });
 }); };
 export var deserializeAws_restJson1CreateClassificationJobCommand = 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_restJson1CreateClassificationJobCommandError(output, context)];
@@ -1765,9 +1797,11 @@ export var deserializeAws_restJson1CreateClassificationJobCommand = function (ou
                     jobArn: undefined,
                     jobId: 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.jobArn !== undefined && data.jobArn !== null) {
                     contents.jobArn = __expectString(data.jobArn);
                 }
@@ -1865,9 +1899,9 @@ var deserializeAws_restJson1CreateClassificationJobCommandError = function (outp
     });
 }); };
 export var deserializeAws_restJson1CreateCustomDataIdentifierCommand = 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_restJson1CreateCustomDataIdentifierCommandError(output, context)];
@@ -1876,9 +1910,11 @@ export var deserializeAws_restJson1CreateCustomDataIdentifierCommand = function
                     $metadata: deserializeMetadata(output),
                     customDataIdentifierId: 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.customDataIdentifierId !== undefined && data.customDataIdentifierId !== null) {
                     contents.customDataIdentifierId = __expectString(data.customDataIdentifierId);
                 }
@@ -1973,9 +2009,9 @@ var deserializeAws_restJson1CreateCustomDataIdentifierCommandError = function (o
     });
 }); };
 export var deserializeAws_restJson1CreateFindingsFilterCommand = 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_restJson1CreateFindingsFilterCommandError(output, context)];
@@ -1985,9 +2021,11 @@ export var deserializeAws_restJson1CreateFindingsFilterCommand = function (outpu
                     arn: undefined,
                     id: 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.arn !== undefined && data.arn !== null) {
                     contents.arn = __expectString(data.arn);
                 }
@@ -2085,9 +2123,9 @@ var deserializeAws_restJson1CreateFindingsFilterCommandError = function (output,
     });
 }); };
 export var deserializeAws_restJson1CreateInvitationsCommand = 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_restJson1CreateInvitationsCommandError(output, context)];
@@ -2096,9 +2134,11 @@ export var deserializeAws_restJson1CreateInvitationsCommand = 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_restJson1__listOfUnprocessedAccount(data.unprocessedAccounts, context);
                 }
@@ -2193,9 +2233,9 @@ var deserializeAws_restJson1CreateInvitationsCommandError = function (output, co
     });
 }); };
 export var deserializeAws_restJson1CreateMemberCommand = 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_restJson1CreateMemberCommandError(output, context)];
@@ -2204,9 +2244,11 @@ export var deserializeAws_restJson1CreateMemberCommand = function (output, conte
                     $metadata: deserializeMetadata(output),
                     arn: 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.arn !== undefined && data.arn !== null) {
                     contents.arn = __expectString(data.arn);
                 }
@@ -2405,9 +2447,9 @@ var deserializeAws_restJson1CreateSampleFindingsCommandError = function (output,
     });
 }); };
 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)];
@@ -2416,9 +2458,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_restJson1__listOfUnprocessedAccount(data.unprocessedAccounts, context);
                 }
@@ -2721,9 +2765,9 @@ var deserializeAws_restJson1DeleteFindingsFilterCommandError = function (output,
     });
 }); };
 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)];
@@ -2732,9 +2776,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_restJson1__listOfUnprocessedAccount(data.unprocessedAccounts, context);
                 }
@@ -2933,9 +2979,9 @@ var deserializeAws_restJson1DeleteMemberCommandError = function (output, context
     });
 }); };
 export var deserializeAws_restJson1DescribeBucketsCommand = 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_restJson1DescribeBucketsCommandError(output, context)];
@@ -2945,9 +2991,11 @@ export var deserializeAws_restJson1DescribeBucketsCommand = function (output, co
                     buckets: 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.buckets !== undefined && data.buckets !== null) {
                     contents.buckets = deserializeAws_restJson1__listOfBucketMetadata(data.buckets, context);
                 }
@@ -3045,9 +3093,9 @@ var deserializeAws_restJson1DescribeBucketsCommandError = function (output, cont
     });
 }); };
 export var deserializeAws_restJson1DescribeClassificationJobCommand = 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_restJson1DescribeClassificationJobCommandError(output, context)];
@@ -3065,6 +3113,8 @@ export var deserializeAws_restJson1DescribeClassificationJobCommand = function (
                     jobType: undefined,
                     lastRunErrorStatus: undefined,
                     lastRunTime: undefined,
+                    managedDataIdentifierIds: undefined,
+                    managedDataIdentifierSelector: undefined,
                     name: undefined,
                     s3JobDefinition: undefined,
                     samplingPercentage: undefined,
@@ -3073,14 +3123,16 @@ export var deserializeAws_restJson1DescribeClassificationJobCommand = function (
                     tags: undefined,
                     userPausedDetails: 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.clientToken !== undefined && data.clientToken !== null) {
                     contents.clientToken = __expectString(data.clientToken);
                 }
                 if (data.createdAt !== undefined && data.createdAt !== null) {
-                    contents.createdAt = new Date(data.createdAt);
+                    contents.createdAt = __expectNonNull(__parseRfc3339DateTime(data.createdAt));
                 }
                 if (data.customDataIdentifierIds !== undefined && data.customDataIdentifierIds !== null) {
                     contents.customDataIdentifierIds = deserializeAws_restJson1__listOf__string(data.customDataIdentifierIds, context);
@@ -3107,7 +3159,13 @@ export var deserializeAws_restJson1DescribeClassificationJobCommand = function (
                     contents.lastRunErrorStatus = deserializeAws_restJson1LastRunErrorStatus(data.lastRunErrorStatus, context);
                 }
                 if (data.lastRunTime !== undefined && data.lastRunTime !== null) {
-                    contents.lastRunTime = new Date(data.lastRunTime);
+                    contents.lastRunTime = __expectNonNull(__parseRfc3339DateTime(data.lastRunTime));
+                }
+                if (data.managedDataIdentifierIds !== undefined && data.managedDataIdentifierIds !== null) {
+                    contents.managedDataIdentifierIds = deserializeAws_restJson1__listOf__string(data.managedDataIdentifierIds, context);
+                }
+                if (data.managedDataIdentifierSelector !== undefined && data.managedDataIdentifierSelector !== null) {
+                    contents.managedDataIdentifierSelector = __expectString(data.managedDataIdentifierSelector);
                 }
                 if (data.name !== undefined && data.name !== null) {
                     contents.name = __expectString(data.name);
@@ -3116,7 +3174,7 @@ export var deserializeAws_restJson1DescribeClassificationJobCommand = function (
                     contents.s3JobDefinition = deserializeAws_restJson1S3JobDefinition(data.s3JobDefinition, context);
                 }
                 if (data.samplingPercentage !== undefined && data.samplingPercentage !== null) {
-                    contents.samplingPercentage = __expectInt(data.samplingPercentage);
+                    contents.samplingPercentage = __expectInt32(data.samplingPercentage);
                 }
                 if (data.scheduleFrequency !== undefined && data.scheduleFrequency !== null) {
                     contents.scheduleFrequency = deserializeAws_restJson1JobScheduleFrequency(data.scheduleFrequency, context);
@@ -3221,9 +3279,9 @@ var deserializeAws_restJson1DescribeClassificationJobCommandError = function (ou
     });
 }); };
 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)];
@@ -3233,9 +3291,11 @@ export var deserializeAws_restJson1DescribeOrganizationConfigurationCommand = fu
                     autoEnable: undefined,
                     maxAccountLimitReached: 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);
                 }
@@ -4061,9 +4121,9 @@ var deserializeAws_restJson1EnableOrganizationAdminAccountCommandError = functio
     });
 }); };
 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)];
@@ -4072,9 +4132,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);
                 }
@@ -4169,9 +4231,9 @@ var deserializeAws_restJson1GetAdministratorAccountCommandError = function (outp
     });
 }); };
 export var deserializeAws_restJson1GetBucketStatisticsCommand = 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_restJson1GetBucketStatisticsCommandError(output, context)];
@@ -4192,11 +4254,13 @@ export var deserializeAws_restJson1GetBucketStatisticsCommand = function (output
                     unclassifiableObjectCount: undefined,
                     unclassifiableObjectSizeInBytes: 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.bucketCount !== undefined && data.bucketCount !== null) {
-                    contents.bucketCount = __expectInt(data.bucketCount);
+                    contents.bucketCount = __expectLong(data.bucketCount);
                 }
                 if (data.bucketCountByEffectivePermission !== undefined && data.bucketCountByEffectivePermission !== null) {
                     contents.bucketCountByEffectivePermission = deserializeAws_restJson1BucketCountByEffectivePermission(data.bucketCountByEffectivePermission, context);
@@ -4213,22 +4277,22 @@ export var deserializeAws_restJson1GetBucketStatisticsCommand = function (output
                     contents.bucketCountBySharedAccessType = deserializeAws_restJson1BucketCountBySharedAccessType(data.bucketCountBySharedAccessType, context);
                 }
                 if (data.classifiableObjectCount !== undefined && data.classifiableObjectCount !== null) {
-                    contents.classifiableObjectCount = __expectInt(data.classifiableObjectCount);
+                    contents.classifiableObjectCount = __expectLong(data.classifiableObjectCount);
                 }
                 if (data.classifiableSizeInBytes !== undefined && data.classifiableSizeInBytes !== null) {
-                    contents.classifiableSizeInBytes = __expectInt(data.classifiableSizeInBytes);
+                    contents.classifiableSizeInBytes = __expectLong(data.classifiableSizeInBytes);
                 }
                 if (data.lastUpdated !== undefined && data.lastUpdated !== null) {
-                    contents.lastUpdated = new Date(data.lastUpdated);
+                    contents.lastUpdated = __expectNonNull(__parseRfc3339DateTime(data.lastUpdated));
                 }
                 if (data.objectCount !== undefined && data.objectCount !== null) {
-                    contents.objectCount = __expectInt(data.objectCount);
+                    contents.objectCount = __expectLong(data.objectCount);
                 }
                 if (data.sizeInBytes !== undefined && data.sizeInBytes !== null) {
-                    contents.sizeInBytes = __expectInt(data.sizeInBytes);
+                    contents.sizeInBytes = __expectLong(data.sizeInBytes);
                 }
                 if (data.sizeInBytesCompressed !== undefined && data.sizeInBytesCompressed !== null) {
-                    contents.sizeInBytesCompressed = __expectInt(data.sizeInBytesCompressed);
+                    contents.sizeInBytesCompressed = __expectLong(data.sizeInBytesCompressed);
                 }
                 if (data.unclassifiableObjectCount !== undefined && data.unclassifiableObjectCount !== null) {
                     contents.unclassifiableObjectCount = deserializeAws_restJson1ObjectLevelStatistics(data.unclassifiableObjectCount, context);
@@ -4327,9 +4391,9 @@ var deserializeAws_restJson1GetBucketStatisticsCommandError = function (output,
     });
 }); };
 export var deserializeAws_restJson1GetClassificationExportConfigurationCommand = 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_restJson1GetClassificationExportConfigurationCommandError(output, context)];
@@ -4338,9 +4402,11 @@ export var deserializeAws_restJson1GetClassificationExportConfigurationCommand =
                     $metadata: deserializeMetadata(output),
                     configuration: 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.configuration !== undefined && data.configuration !== null) {
                     contents.configuration = deserializeAws_restJson1ClassificationExportConfiguration(data.configuration, context);
                 }
@@ -4435,9 +4501,9 @@ var deserializeAws_restJson1GetClassificationExportConfigurationCommandError = f
     });
 }); };
 export var deserializeAws_restJson1GetCustomDataIdentifierCommand = 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_restJson1GetCustomDataIdentifierCommandError(output, context)];
@@ -4456,14 +4522,16 @@ export var deserializeAws_restJson1GetCustomDataIdentifierCommand = function (ou
                     regex: undefined,
                     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.arn !== undefined && data.arn !== null) {
                     contents.arn = __expectString(data.arn);
                 }
                 if (data.createdAt !== undefined && data.createdAt !== null) {
-                    contents.createdAt = new Date(data.createdAt);
+                    contents.createdAt = __expectNonNull(__parseRfc3339DateTime(data.createdAt));
                 }
                 if (data.deleted !== undefined && data.deleted !== null) {
                     contents.deleted = __expectBoolean(data.deleted);
@@ -4481,7 +4549,7 @@ export var deserializeAws_restJson1GetCustomDataIdentifierCommand = function (ou
                     contents.keywords = deserializeAws_restJson1__listOf__string(data.keywords, context);
                 }
                 if (data.maximumMatchDistance !== undefined && data.maximumMatchDistance !== null) {
-                    contents.maximumMatchDistance = __expectInt(data.maximumMatchDistance);
+                    contents.maximumMatchDistance = __expectInt32(data.maximumMatchDistance);
                 }
                 if (data.name !== undefined && data.name !== null) {
                     contents.name = __expectString(data.name);
@@ -4583,9 +4651,9 @@ var deserializeAws_restJson1GetCustomDataIdentifierCommandError = function (outp
     });
 }); };
 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)];
@@ -4594,9 +4662,11 @@ export var deserializeAws_restJson1GetFindingsCommand = function (output, contex
                     $metadata: deserializeMetadata(output),
                     findings: 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_restJson1__listOfFinding(data.findings, context);
                 }
@@ -4691,9 +4761,9 @@ var deserializeAws_restJson1GetFindingsCommandError = function (output, context)
     });
 }); };
 export var deserializeAws_restJson1GetFindingsFilterCommand = 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_restJson1GetFindingsFilterCommandError(output, context)];
@@ -4709,9 +4779,11 @@ export var deserializeAws_restJson1GetFindingsFilterCommand = function (output,
                     position: undefined,
                     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.action !== undefined && data.action !== null) {
                     contents.action = __expectString(data.action);
                 }
@@ -4731,7 +4803,7 @@ export var deserializeAws_restJson1GetFindingsFilterCommand = function (output,
                     contents.name = __expectString(data.name);
                 }
                 if (data.position !== undefined && data.position !== null) {
-                    contents.position = __expectInt(data.position);
+                    contents.position = __expectInt32(data.position);
                 }
                 if (data.tags !== undefined && data.tags !== null) {
                     contents.tags = deserializeAws_restJson1TagMap(data.tags, context);
@@ -4827,9 +4899,9 @@ var deserializeAws_restJson1GetFindingsFilterCommandError = function (output, co
     });
 }); };
 export var deserializeAws_restJson1GetFindingsPublicationConfigurationCommand = 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_restJson1GetFindingsPublicationConfigurationCommandError(output, context)];
@@ -4838,9 +4910,11 @@ export var deserializeAws_restJson1GetFindingsPublicationConfigurationCommand =
                     $metadata: deserializeMetadata(output),
                     securityHubConfiguration: 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.securityHubConfiguration !== undefined && data.securityHubConfiguration !== null) {
                     contents.securityHubConfiguration = deserializeAws_restJson1SecurityHubConfiguration(data.securityHubConfiguration, context);
                 }
@@ -4935,9 +5009,9 @@ var deserializeAws_restJson1GetFindingsPublicationConfigurationCommandError = fu
     });
 }); };
 export var deserializeAws_restJson1GetFindingStatisticsCommand = 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_restJson1GetFindingStatisticsCommandError(output, context)];
@@ -4946,9 +5020,11 @@ export var deserializeAws_restJson1GetFindingStatisticsCommand = function (outpu
                     $metadata: deserializeMetadata(output),
                     countsByGroup: 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.countsByGroup !== undefined && data.countsByGroup !== null) {
                     contents.countsByGroup = deserializeAws_restJson1__listOfGroupCount(data.countsByGroup, context);
                 }
@@ -5043,9 +5119,9 @@ var deserializeAws_restJson1GetFindingStatisticsCommandError = function (output,
     });
 }); };
 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)];
@@ -5054,11 +5130,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 = __expectLong(data.invitationsCount);
                 }
                 return [2 /*return*/, Promise.resolve(contents)];
         }
@@ -5151,9 +5229,9 @@ var deserializeAws_restJson1GetInvitationsCountCommandError = function (output,
     });
 }); };
 export var deserializeAws_restJson1GetMacieSessionCommand = 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_restJson1GetMacieSessionCommandError(output, context)];
@@ -5166,11 +5244,13 @@ export var deserializeAws_restJson1GetMacieSessionCommand = function (output, co
                     status: undefined,
                     updatedAt: 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.createdAt !== undefined && data.createdAt !== null) {
-                    contents.createdAt = new Date(data.createdAt);
+                    contents.createdAt = __expectNonNull(__parseRfc3339DateTime(data.createdAt));
                 }
                 if (data.findingPublishingFrequency !== undefined && data.findingPublishingFrequency !== null) {
                     contents.findingPublishingFrequency = __expectString(data.findingPublishingFrequency);
@@ -5182,7 +5262,7 @@ export var deserializeAws_restJson1GetMacieSessionCommand = function (output, co
                     contents.status = __expectString(data.status);
                 }
                 if (data.updatedAt !== undefined && data.updatedAt !== null) {
-                    contents.updatedAt = new Date(data.updatedAt);
+                    contents.updatedAt = __expectNonNull(__parseRfc3339DateTime(data.updatedAt));
                 }
                 return [2 /*return*/, Promise.resolve(contents)];
         }
@@ -5275,9 +5355,9 @@ var deserializeAws_restJson1GetMacieSessionCommandError = function (output, cont
     });
 }); };
 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)];
@@ -5286,9 +5366,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);
                 }
@@ -5383,9 +5465,9 @@ var deserializeAws_restJson1GetMasterAccountCommandError = function (output, con
     });
 }); };
 export var deserializeAws_restJson1GetMemberCommand = 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_restJson1GetMemberCommandError(output, context)];
@@ -5402,9 +5484,11 @@ export var deserializeAws_restJson1GetMemberCommand = function (output, context)
                     tags: undefined,
                     updatedAt: 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.accountId !== undefined && data.accountId !== null) {
                     contents.accountId = __expectString(data.accountId);
                 }
@@ -5418,7 +5502,7 @@ export var deserializeAws_restJson1GetMemberCommand = function (output, context)
                     contents.email = __expectString(data.email);
                 }
                 if (data.invitedAt !== undefined && data.invitedAt !== null) {
-                    contents.invitedAt = new Date(data.invitedAt);
+                    contents.invitedAt = __expectNonNull(__parseRfc3339DateTime(data.invitedAt));
                 }
                 if (data.masterAccountId !== undefined && data.masterAccountId !== null) {
                     contents.masterAccountId = __expectString(data.masterAccountId);
@@ -5430,7 +5514,7 @@ export var deserializeAws_restJson1GetMemberCommand = function (output, context)
                     contents.tags = deserializeAws_restJson1TagMap(data.tags, context);
                 }
                 if (data.updatedAt !== undefined && data.updatedAt !== null) {
-                    contents.updatedAt = new Date(data.updatedAt);
+                    contents.updatedAt = __expectNonNull(__parseRfc3339DateTime(data.updatedAt));
                 }
                 return [2 /*return*/, Promise.resolve(contents)];
         }
@@ -5523,9 +5607,9 @@ var deserializeAws_restJson1GetMemberCommandError = function (output, context) {
     });
 }); };
 export var deserializeAws_restJson1GetUsageStatisticsCommand = 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_restJson1GetUsageStatisticsCommandError(output, context)];
@@ -5536,9 +5620,11 @@ export var deserializeAws_restJson1GetUsageStatisticsCommand = function (output,
                     records: undefined,
                     timeRange: 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);
                 }
@@ -5639,9 +5725,9 @@ var deserializeAws_restJson1GetUsageStatisticsCommandError = function (output, c
     });
 }); };
 export var deserializeAws_restJson1GetUsageTotalsCommand = 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_restJson1GetUsageTotalsCommandError(output, context)];
@@ -5651,9 +5737,11 @@ export var deserializeAws_restJson1GetUsageTotalsCommand = function (output, con
                     timeRange: undefined,
                     usageTotals: 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.timeRange !== undefined && data.timeRange !== null) {
                     contents.timeRange = __expectString(data.timeRange);
                 }
@@ -5751,9 +5839,9 @@ var deserializeAws_restJson1GetUsageTotalsCommandError = function (output, conte
     });
 }); };
 export var deserializeAws_restJson1ListClassificationJobsCommand = 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_restJson1ListClassificationJobsCommandError(output, context)];
@@ -5763,9 +5851,11 @@ export var deserializeAws_restJson1ListClassificationJobsCommand = function (out
                     items: 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.items !== undefined && data.items !== null) {
                     contents.items = deserializeAws_restJson1__listOfJobSummary(data.items, context);
                 }
@@ -5863,9 +5953,9 @@ var deserializeAws_restJson1ListClassificationJobsCommandError = function (outpu
     });
 }); };
 export var deserializeAws_restJson1ListCustomDataIdentifiersCommand = 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_restJson1ListCustomDataIdentifiersCommandError(output, context)];
@@ -5875,9 +5965,11 @@ export var deserializeAws_restJson1ListCustomDataIdentifiersCommand = function (
                     items: 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.items !== undefined && data.items !== null) {
                     contents.items = deserializeAws_restJson1__listOfCustomDataIdentifierSummary(data.items, context);
                 }
@@ -5975,9 +6067,9 @@ var deserializeAws_restJson1ListCustomDataIdentifiersCommandError = function (ou
     });
 }); };
 export var deserializeAws_restJson1ListFindingsCommand = 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_restJson1ListFindingsCommandError(output, context)];
@@ -5987,9 +6079,11 @@ export var deserializeAws_restJson1ListFindingsCommand = function (output, conte
                     findingIds: 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.findingIds !== undefined && data.findingIds !== null) {
                     contents.findingIds = deserializeAws_restJson1__listOf__string(data.findingIds, context);
                 }
@@ -6087,9 +6181,9 @@ var deserializeAws_restJson1ListFindingsCommandError = function (output, context
     });
 }); };
 export var deserializeAws_restJson1ListFindingsFiltersCommand = 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_restJson1ListFindingsFiltersCommandError(output, context)];
@@ -6099,9 +6193,11 @@ export var deserializeAws_restJson1ListFindingsFiltersCommand = function (output
                     findingsFilterListItems: 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.findingsFilterListItems !== undefined && data.findingsFilterListItems !== null) {
                     contents.findingsFilterListItems = deserializeAws_restJson1__listOfFindingsFilterListItem(data.findingsFilterListItems, context);
                 }
@@ -6199,9 +6295,9 @@ var deserializeAws_restJson1ListFindingsFiltersCommandError = function (output,
     });
 }); };
 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)];
@@ -6211,9 +6307,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_restJson1__listOfInvitation(data.invitations, context);
                 }
@@ -6310,10 +6408,64 @@ var deserializeAws_restJson1ListInvitationsCommandError = function (output, cont
         }
     });
 }); };
+export var deserializeAws_restJson1ListManagedDataIdentifiersCommand = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
+    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_restJson1ListManagedDataIdentifiersCommandError(output, context)];
+                }
+                contents = {
+                    $metadata: deserializeMetadata(output),
+                    items: undefined,
+                    nextToken: undefined,
+                };
+                _a = __expectNonNull;
+                _b = __expectObject;
+                return [4 /*yield*/, parseBody(output.body, context)];
+            case 1:
+                data = _a.apply(void 0, [_b.apply(void 0, [_c.sent()]), "body"]);
+                if (data.items !== undefined && data.items !== null) {
+                    contents.items = deserializeAws_restJson1__listOfManagedDataIdentifierSummary(data.items, context);
+                }
+                if (data.nextToken !== undefined && data.nextToken !== null) {
+                    contents.nextToken = __expectString(data.nextToken);
+                }
+                return [2 /*return*/, Promise.resolve(contents)];
+        }
+    });
+}); };
+var deserializeAws_restJson1ListManagedDataIdentifiersCommandError = function (output, context) { return __awaiter(void 0, void 0, void 0, function () {
+    var parsedOutput, _a, response, errorCode, parsedBody, message;
+    var _b;
+    return __generator(this, function (_c) {
+        switch (_c.label) {
+            case 0:
+                _a = [__assign({}, output)];
+                _b = {};
+                return [4 /*yield*/, parseBody(output.body, context)];
+            case 1:
+                parsedOutput = __assign.apply(void 0, _a.concat([(_b.body = _c.sent(), _b)]));
+                errorCode = "UnknownError";
+                errorCode = loadRestJsonErrorCode(output, parsedOutput.body);
+                switch (errorCode) {
+                    default:
+                        parsedBody = parsedOutput.body;
+                        errorCode = parsedBody.code || parsedBody.Code || errorCode;
+                        response = __assign(__assign({}, parsedBody), { name: "" + errorCode, message: parsedBody.message || parsedBody.Message || errorCode, $fault: "client", $metadata: deserializeMetadata(output) });
+                }
+                message = response.message || response.Message || errorCode;
+                response.message = message;
+                delete response.Message;
+                return [2 /*return*/, Promise.reject(Object.assign(new Error(message), response))];
+        }
+    });
+}); };
 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)];
@@ -6323,9 +6475,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_restJson1__listOfMember(data.members, context);
                 }
@@ -6423,9 +6577,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)];
@@ -6435,9 +6589,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_restJson1__listOfAdminAccount(data.adminAccounts, context);
                 }
@@ -6535,9 +6691,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)];
@@ -6546,9 +6702,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);
                 }
@@ -6583,9 +6741,9 @@ var deserializeAws_restJson1ListTagsForResourceCommandError = function (output,
     });
 }); };
 export var deserializeAws_restJson1PutClassificationExportConfigurationCommand = 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_restJson1PutClassificationExportConfigurationCommandError(output, context)];
@@ -6594,9 +6752,11 @@ export var deserializeAws_restJson1PutClassificationExportConfigurationCommand =
                     $metadata: deserializeMetadata(output),
                     configuration: 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.configuration !== undefined && data.configuration !== null) {
                     contents.configuration = deserializeAws_restJson1ClassificationExportConfiguration(data.configuration, context);
                 }
@@ -6795,9 +6955,9 @@ var deserializeAws_restJson1PutFindingsPublicationConfigurationCommandError = fu
     });
 }); };
 export var deserializeAws_restJson1SearchResourcesCommand = 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_restJson1SearchResourcesCommandError(output, context)];
@@ -6807,9 +6967,11 @@ export var deserializeAws_restJson1SearchResourcesCommand = function (output, co
                     matchingResources: 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.matchingResources !== undefined && data.matchingResources !== null) {
                     contents.matchingResources = deserializeAws_restJson1__listOfMatchingResource(data.matchingResources, context);
                 }
@@ -6951,9 +7113,9 @@ var deserializeAws_restJson1TagResourceCommandError = function (output, context)
     });
 }); };
 export var deserializeAws_restJson1TestCustomDataIdentifierCommand = 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_restJson1TestCustomDataIdentifierCommandError(output, context)];
@@ -6962,11 +7124,13 @@ export var deserializeAws_restJson1TestCustomDataIdentifierCommand = function (o
                     $metadata: deserializeMetadata(output),
                     matchCount: 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.matchCount !== undefined && data.matchCount !== null) {
-                    contents.matchCount = __expectInt(data.matchCount);
+                    contents.matchCount = __expectInt32(data.matchCount);
                 }
                 return [2 /*return*/, Promise.resolve(contents)];
         }
@@ -7207,9 +7371,9 @@ var deserializeAws_restJson1UpdateClassificationJobCommandError = function (outp
     });
 }); };
 export var deserializeAws_restJson1UpdateFindingsFilterCommand = 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_restJson1UpdateFindingsFilterCommandError(output, context)];
@@ -7219,9 +7383,11 @@ export var deserializeAws_restJson1UpdateFindingsFilterCommand = function (outpu
                     arn: undefined,
                     id: 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.arn !== undefined && data.arn !== null) {
                     contents.arn = __expectString(data.arn);
                 }
@@ -8211,6 +8377,16 @@ var deserializeAws_restJson1__listOfKeyValuePair = function (output, context) {
         return deserializeAws_restJson1KeyValuePair(entry, context);
     });
 };
+var deserializeAws_restJson1__listOfManagedDataIdentifierSummary = function (output, context) {
+    return (output || [])
+        .filter(function (e) { return e != null; })
+        .map(function (entry) {
+        if (entry === null) {
+            return null;
+        }
+        return deserializeAws_restJson1ManagedDataIdentifierSummary(entry, context);
+    });
+};
 var deserializeAws_restJson1__listOfMatchingResource = function (output, context) {
     return (output || [])
         .filter(function (e) { return e != null; })
@@ -8324,8 +8500,12 @@ var deserializeAws_restJson1ApiCallDetails = function (output, context) {
     return {
         api: __expectString(output.api),
         apiServiceName: __expectString(output.apiServiceName),
-        firstSeen: output.firstSeen !== undefined && output.firstSeen !== null ? new Date(output.firstSeen) : undefined,
-        lastSeen: output.lastSeen !== undefined && output.lastSeen !== null ? new Date(output.lastSeen) : undefined,
+        firstSeen: output.firstSeen !== undefined && output.firstSeen !== null
+            ? __expectNonNull(__parseRfc3339DateTime(output.firstSeen))
+            : undefined,
+        lastSeen: output.lastSeen !== undefined && output.lastSeen !== null
+            ? __expectNonNull(__parseRfc3339DateTime(output.lastSeen))
+            : undefined,
     };
 };
 var deserializeAws_restJson1AssumedRole = function (output, context) {
@@ -8353,7 +8533,9 @@ var deserializeAws_restJson1AwsService = function (output, context) {
 var deserializeAws_restJson1BatchGetCustomDataIdentifierSummary = function (output, context) {
     return {
         arn: __expectString(output.arn),
-        createdAt: output.createdAt !== undefined && output.createdAt !== null ? new Date(output.createdAt) : undefined,
+        createdAt: output.createdAt !== undefined && output.createdAt !== null
+            ? __expectNonNull(__parseRfc3339DateTime(output.createdAt))
+            : undefined,
         deleted: __expectBoolean(output.deleted),
         description: __expectString(output.description),
         id: __expectString(output.id),
@@ -8370,33 +8552,33 @@ var deserializeAws_restJson1BlockPublicAccess = function (output, context) {
 };
 var deserializeAws_restJson1BucketCountByEffectivePermission = function (output, context) {
     return {
-        publiclyAccessible: __expectInt(output.publiclyAccessible),
-        publiclyReadable: __expectInt(output.publiclyReadable),
-        publiclyWritable: __expectInt(output.publiclyWritable),
-        unknown: __expectInt(output.unknown),
+        publiclyAccessible: __expectLong(output.publiclyAccessible),
+        publiclyReadable: __expectLong(output.publiclyReadable),
+        publiclyWritable: __expectLong(output.publiclyWritable),
+        unknown: __expectLong(output.unknown),
     };
 };
 var deserializeAws_restJson1BucketCountByEncryptionType = function (output, context) {
     return {
-        kmsManaged: __expectInt(output.kmsManaged),
-        s3Managed: __expectInt(output.s3Managed),
-        unencrypted: __expectInt(output.unencrypted),
-        unknown: __expectInt(output.unknown),
+        kmsManaged: __expectLong(output.kmsManaged),
+        s3Managed: __expectLong(output.s3Managed),
+        unencrypted: __expectLong(output.unencrypted),
+        unknown: __expectLong(output.unknown),
     };
 };
 var deserializeAws_restJson1BucketCountBySharedAccessType = function (output, context) {
     return {
-        external: __expectInt(output.external),
-        internal: __expectInt(output.internal),
-        notShared: __expectInt(output.notShared),
-        unknown: __expectInt(output.unknown),
+        external: __expectLong(output.external),
+        internal: __expectLong(output.internal),
+        notShared: __expectLong(output.notShared),
+        unknown: __expectLong(output.unknown),
     };
 };
 var deserializeAws_restJson1BucketCountPolicyAllowsUnencryptedObjectUploads = function (output, context) {
     return {
-        allowsUnencryptedObjectUploads: __expectInt(output.allowsUnencryptedObjectUploads),
-        deniesUnencryptedObjectUploads: __expectInt(output.deniesUnencryptedObjectUploads),
-        unknown: __expectInt(output.unknown),
+        allowsUnencryptedObjectUploads: __expectLong(output.allowsUnencryptedObjectUploads),
+        deniesUnencryptedObjectUploads: __expectLong(output.deniesUnencryptedObjectUploads),
+        unknown: __expectLong(output.unknown),
     };
 };
 var deserializeAws_restJson1BucketLevelPermissions = function (output, context) {
@@ -8418,16 +8600,18 @@ var deserializeAws_restJson1BucketMetadata = function (output, context) {
         allowsUnencryptedObjectUploads: __expectString(output.allowsUnencryptedObjectUploads),
         bucketArn: __expectString(output.bucketArn),
         bucketCreatedAt: output.bucketCreatedAt !== undefined && output.bucketCreatedAt !== null
-            ? new Date(output.bucketCreatedAt)
+            ? __expectNonNull(__parseRfc3339DateTime(output.bucketCreatedAt))
             : undefined,
         bucketName: __expectString(output.bucketName),
-        classifiableObjectCount: __expectInt(output.classifiableObjectCount),
-        classifiableSizeInBytes: __expectInt(output.classifiableSizeInBytes),
+        classifiableObjectCount: __expectLong(output.classifiableObjectCount),
+        classifiableSizeInBytes: __expectLong(output.classifiableSizeInBytes),
         jobDetails: output.jobDetails !== undefined && output.jobDetails !== null
             ? deserializeAws_restJson1JobDetails(output.jobDetails, context)
             : undefined,
-        lastUpdated: output.lastUpdated !== undefined && output.lastUpdated !== null ? new Date(output.lastUpdated) : undefined,
-        objectCount: __expectInt(output.objectCount),
+        lastUpdated: output.lastUpdated !== undefined && output.lastUpdated !== null
+            ? __expectNonNull(__parseRfc3339DateTime(output.lastUpdated))
+            : undefined,
+        objectCount: __expectLong(output.objectCount),
         objectCountByEncryptionType: output.objectCountByEncryptionType !== undefined && output.objectCountByEncryptionType !== null
             ? deserializeAws_restJson1ObjectCountByEncryptionType(output.objectCountByEncryptionType, context)
             : undefined,
@@ -8442,8 +8626,8 @@ var deserializeAws_restJson1BucketMetadata = function (output, context) {
             ? deserializeAws_restJson1BucketServerSideEncryption(output.serverSideEncryption, context)
             : undefined,
         sharedAccess: __expectString(output.sharedAccess),
-        sizeInBytes: __expectInt(output.sizeInBytes),
-        sizeInBytesCompressed: __expectInt(output.sizeInBytesCompressed),
+        sizeInBytes: __expectLong(output.sizeInBytes),
+        sizeInBytesCompressed: __expectLong(output.sizeInBytesCompressed),
         tags: output.tags !== undefined && output.tags !== null
             ? deserializeAws_restJson1__listOfKeyValuePair(output.tags, context)
             : undefined,
@@ -8489,9 +8673,9 @@ var deserializeAws_restJson1BucketServerSideEncryption = function (output, conte
 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) {
@@ -8531,7 +8715,7 @@ var deserializeAws_restJson1ClassificationResult = function (output, context) {
         sensitiveData: output.sensitiveData !== undefined && output.sensitiveData !== null
             ? deserializeAws_restJson1SensitiveData(output.sensitiveData, context)
             : undefined,
-        sizeClassified: __expectInt(output.sizeClassified),
+        sizeClassified: __expectLong(output.sizeClassified),
         status: output.status !== undefined && output.status !== null
             ? deserializeAws_restJson1ClassificationResultStatus(output.status, context)
             : undefined,
@@ -8578,10 +8762,10 @@ var deserializeAws_restJson1CriterionAdditionalProperties = function (output, co
         eqExactMatch: output.eqExactMatch !== undefined && output.eqExactMatch !== null
             ? deserializeAws_restJson1__listOf__string(output.eqExactMatch, context)
             : undefined,
-        gt: __expectInt(output.gt),
-        gte: __expectInt(output.gte),
-        lt: __expectInt(output.lt),
-        lte: __expectInt(output.lte),
+        gt: __expectLong(output.gt),
+        gte: __expectLong(output.gte),
+        lt: __expectLong(output.lt),
+        lte: __expectLong(output.lte),
         neq: output.neq !== undefined && output.neq !== null
             ? deserializeAws_restJson1__listOf__string(output.neq, context)
             : undefined,
@@ -8592,13 +8776,15 @@ var deserializeAws_restJson1CustomDataIdentifiers = function (output, context) {
         detections: output.detections !== undefined && output.detections !== null
             ? deserializeAws_restJson1CustomDetections(output.detections, context)
             : undefined,
-        totalCount: __expectInt(output.totalCount),
+        totalCount: __expectLong(output.totalCount),
     };
 };
 var deserializeAws_restJson1CustomDataIdentifierSummary = function (output, context) {
     return {
         arn: __expectString(output.arn),
-        createdAt: output.createdAt !== undefined && output.createdAt !== null ? new Date(output.createdAt) : undefined,
+        createdAt: output.createdAt !== undefined && output.createdAt !== null
+            ? __expectNonNull(__parseRfc3339DateTime(output.createdAt))
+            : undefined,
         description: __expectString(output.description),
         id: __expectString(output.id),
         name: __expectString(output.name),
@@ -8607,7 +8793,7 @@ var deserializeAws_restJson1CustomDataIdentifierSummary = function (output, cont
 var deserializeAws_restJson1CustomDetection = 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)
@@ -8629,7 +8815,7 @@ var deserializeAws_restJson1DailySchedule = function (output, context) {
 };
 var deserializeAws_restJson1DefaultDetection = 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,
@@ -8670,8 +8856,10 @@ var deserializeAws_restJson1Finding = function (output, context) {
         classificationDetails: output.classificationDetails !== undefined && output.classificationDetails !== null
             ? deserializeAws_restJson1ClassificationDetails(output.classificationDetails, context)
             : undefined,
-        count: __expectInt(output.count),
-        createdAt: output.createdAt !== undefined && output.createdAt !== null ? new Date(output.createdAt) : undefined,
+        count: __expectLong(output.count),
+        createdAt: output.createdAt !== undefined && output.createdAt !== null
+            ? __expectNonNull(__parseRfc3339DateTime(output.createdAt))
+            : undefined,
         description: __expectString(output.description),
         id: __expectString(output.id),
         partition: __expectString(output.partition),
@@ -8689,7 +8877,9 @@ var deserializeAws_restJson1Finding = function (output, context) {
             : undefined,
         title: __expectString(output.title),
         type: __expectString(output.type),
-        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_restJson1FindingAction = function (output, context) {
@@ -8733,7 +8923,7 @@ var deserializeAws_restJson1FindingsFilterListItem = function (output, context)
 };
 var deserializeAws_restJson1GroupCount = function (output, context) {
     return {
-        count: __expectInt(output.count),
+        count: __expectLong(output.count),
         groupKey: __expectString(output.groupKey),
     };
 };
@@ -8749,7 +8939,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,
         relationshipStatus: __expectString(output.relationshipStatus),
     };
 };
@@ -8783,8 +8975,8 @@ var deserializeAws_restJson1IpCountry = function (output, context) {
 };
 var deserializeAws_restJson1IpGeoLocation = function (output, context) {
     return {
-        lat: __limitedParseFloat(output.lat),
-        lon: __limitedParseFloat(output.lon),
+        lat: __limitedParseDouble(output.lat),
+        lon: __limitedParseDouble(output.lon),
     };
 };
 var deserializeAws_restJson1IpOwner = function (output, context) {
@@ -8801,7 +8993,7 @@ var deserializeAws_restJson1JobDetails = function (output, context) {
         isMonitoredByJob: __expectString(output.isMonitoredByJob),
         lastJobId: __expectString(output.lastJobId),
         lastJobRunTime: output.lastJobRunTime !== undefined && output.lastJobRunTime !== null
-            ? new Date(output.lastJobRunTime)
+            ? __expectNonNull(__parseRfc3339DateTime(output.lastJobRunTime))
             : undefined,
     };
 };
@@ -8843,7 +9035,9 @@ var deserializeAws_restJson1JobSummary = function (output, context) {
         bucketDefinitions: output.bucketDefinitions !== undefined && output.bucketDefinitions !== null
             ? deserializeAws_restJson1__listOfS3BucketDefinitionForJob(output.bucketDefinitions, context)
             : undefined,
-        createdAt: output.createdAt !== undefined && output.createdAt !== null ? new Date(output.createdAt) : undefined,
+        createdAt: output.createdAt !== undefined && output.createdAt !== null
+            ? __expectNonNull(__parseRfc3339DateTime(output.createdAt))
+            : undefined,
         jobId: __expectString(output.jobId),
         jobStatus: __expectString(output.jobStatus),
         jobType: __expectString(output.jobType),
@@ -8877,21 +9071,27 @@ var deserializeAws_restJson1LastRunErrorStatus = function (output, context) {
         code: __expectString(output.code),
     };
 };
+var deserializeAws_restJson1ManagedDataIdentifierSummary = function (output, context) {
+    return {
+        category: __expectString(output.category),
+        id: __expectString(output.id),
+    };
+};
 var deserializeAws_restJson1MatchingBucket = function (output, context) {
     return {
         accountId: __expectString(output.accountId),
         bucketName: __expectString(output.bucketName),
-        classifiableObjectCount: __expectInt(output.classifiableObjectCount),
-        classifiableSizeInBytes: __expectInt(output.classifiableSizeInBytes),
+        classifiableObjectCount: __expectLong(output.classifiableObjectCount),
+        classifiableSizeInBytes: __expectLong(output.classifiableSizeInBytes),
         jobDetails: output.jobDetails !== undefined && output.jobDetails !== null
             ? deserializeAws_restJson1JobDetails(output.jobDetails, context)
             : undefined,
-        objectCount: __expectInt(output.objectCount),
+        objectCount: __expectLong(output.objectCount),
         objectCountByEncryptionType: output.objectCountByEncryptionType !== undefined && output.objectCountByEncryptionType !== null
             ? deserializeAws_restJson1ObjectCountByEncryptionType(output.objectCountByEncryptionType, context)
             : undefined,
-        sizeInBytes: __expectInt(output.sizeInBytes),
-        sizeInBytesCompressed: __expectInt(output.sizeInBytesCompressed),
+        sizeInBytes: __expectLong(output.sizeInBytes),
+        sizeInBytesCompressed: __expectLong(output.sizeInBytesCompressed),
         unclassifiableObjectCount: output.unclassifiableObjectCount !== undefined && output.unclassifiableObjectCount !== null
             ? deserializeAws_restJson1ObjectLevelStatistics(output.unclassifiableObjectCount, context)
             : undefined,
@@ -8913,34 +9113,38 @@ var deserializeAws_restJson1Member = function (output, context) {
         administratorAccountId: __expectString(output.administratorAccountId),
         arn: __expectString(output.arn),
         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,
         masterAccountId: __expectString(output.masterAccountId),
         relationshipStatus: __expectString(output.relationshipStatus),
         tags: output.tags !== undefined && output.tags !== null
             ? deserializeAws_restJson1TagMap(output.tags, context)
             : undefined,
-        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_restJson1MonthlySchedule = function (output, context) {
     return {
-        dayOfMonth: __expectInt(output.dayOfMonth),
+        dayOfMonth: __expectInt32(output.dayOfMonth),
     };
 };
 var deserializeAws_restJson1ObjectCountByEncryptionType = function (output, context) {
     return {
-        customerManaged: __expectInt(output.customerManaged),
-        kmsManaged: __expectInt(output.kmsManaged),
-        s3Managed: __expectInt(output.s3Managed),
-        unencrypted: __expectInt(output.unencrypted),
-        unknown: __expectInt(output.unknown),
+        customerManaged: __expectLong(output.customerManaged),
+        kmsManaged: __expectLong(output.kmsManaged),
+        s3Managed: __expectLong(output.s3Managed),
+        unencrypted: __expectLong(output.unencrypted),
+        unknown: __expectLong(output.unknown),
     };
 };
 var deserializeAws_restJson1ObjectLevelStatistics = function (output, context) {
     return {
-        fileType: __expectInt(output.fileType),
-        storageClass: __expectInt(output.storageClass),
-        total: __expectInt(output.total),
+        fileType: __expectLong(output.fileType),
+        storageClass: __expectLong(output.storageClass),
+        total: __expectLong(output.total),
     };
 };
 var deserializeAws_restJson1Occurrences = function (output, context) {
@@ -8970,7 +9174,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) {
@@ -8995,9 +9199,9 @@ var deserializeAws_restJson1PolicyDetails = function (output, context) {
 };
 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) {
@@ -9013,7 +9217,7 @@ var deserializeAws_restJson1Ranges = 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) {
@@ -9049,7 +9253,9 @@ var deserializeAws_restJson1S3Bucket = function (output, context) {
     return {
         allowsUnencryptedObjectUploads: __expectString(output.allowsUnencryptedObjectUploads),
         arn: __expectString(output.arn),
-        createdAt: output.createdAt !== undefined && output.createdAt !== null ? new Date(output.createdAt) : undefined,
+        createdAt: output.createdAt !== undefined && output.createdAt !== null
+            ? __expectNonNull(__parseRfc3339DateTime(output.createdAt))
+            : undefined,
         defaultServerSideEncryption: output.defaultServerSideEncryption !== undefined && output.defaultServerSideEncryption !== null
             ? deserializeAws_restJson1ServerSideEncryption(output.defaultServerSideEncryption, context)
             : undefined,
@@ -9115,13 +9321,15 @@ var deserializeAws_restJson1S3Object = function (output, context) {
         eTag: __expectString(output.eTag),
         extension: __expectString(output.extension),
         key: __expectString(output.key),
-        lastModified: output.lastModified !== undefined && output.lastModified !== null ? new Date(output.lastModified) : undefined,
+        lastModified: output.lastModified !== undefined && output.lastModified !== null
+            ? __expectNonNull(__parseRfc3339DateTime(output.lastModified))
+            : undefined,
         path: __expectString(output.path),
         publicAccess: __expectBoolean(output.publicAccess),
         serverSideEncryption: output.serverSideEncryption !== undefined && output.serverSideEncryption !== null
             ? deserializeAws_restJson1ServerSideEncryption(output.serverSideEncryption, context)
             : undefined,
-        size: __expectInt(output.size),
+        size: __expectLong(output.size),
         storageClass: __expectString(output.storageClass),
         tags: output.tags !== undefined && output.tags !== null
             ? deserializeAws_restJson1KeyValuePairList(output.tags, context)
@@ -9161,7 +9369,7 @@ var deserializeAws_restJson1SensitiveDataItem = function (output, context) {
         detections: output.detections !== undefined && output.detections !== null
             ? deserializeAws_restJson1DefaultDetections(output.detections, context)
             : undefined,
-        totalCount: __expectInt(output.totalCount),
+        totalCount: __expectLong(output.totalCount),
     };
 };
 var deserializeAws_restJson1ServerSideEncryption = function (output, context) {
@@ -9174,7 +9382,7 @@ var deserializeAws_restJson1ServiceLimit = function (output, context) {
     return {
         isServiceLimited: __expectBoolean(output.isServiceLimited),
         unit: __expectString(output.unit),
-        value: __expectInt(output.value),
+        value: __expectLong(output.value),
     };
 };
 var deserializeAws_restJson1SessionContext = function (output, context) {
@@ -9189,7 +9397,9 @@ var deserializeAws_restJson1SessionContext = function (output, context) {
 };
 var deserializeAws_restJson1SessionContextAttributes = function (output, context) {
     return {
-        creationDate: output.creationDate !== undefined && output.creationDate !== null ? new Date(output.creationDate) : undefined,
+        creationDate: output.creationDate !== undefined && output.creationDate !== null
+            ? __expectNonNull(__parseRfc3339DateTime(output.creationDate))
+            : undefined,
         mfaAuthenticated: __expectBoolean(output.mfaAuthenticated),
     };
 };
@@ -9205,7 +9415,7 @@ var deserializeAws_restJson1SessionIssuer = function (output, context) {
 var deserializeAws_restJson1Severity = function (output, context) {
     return {
         description: __expectString(output.description),
-        score: __expectInt(output.score),
+        score: __expectLong(output.score),
     };
 };
 var deserializeAws_restJson1SimpleCriterionForJob = function (output, context) {
@@ -9228,8 +9438,8 @@ var deserializeAws_restJson1SimpleScopeTerm = function (output, context) {
 };
 var deserializeAws_restJson1Statistics = function (output, context) {
     return {
-        approximateNumberOfObjectsToProcess: __limitedParseFloat(output.approximateNumberOfObjectsToProcess),
-        numberOfRuns: __limitedParseFloat(output.numberOfRuns),
+        approximateNumberOfObjectsToProcess: __limitedParseDouble(output.approximateNumberOfObjectsToProcess),
+        numberOfRuns: __limitedParseDouble(output.numberOfRuns),
     };
 };
 var deserializeAws_restJson1TagCriterionForJob = function (output, context) {
@@ -9293,7 +9503,7 @@ var deserializeAws_restJson1UsageRecord = function (output, context) {
     return {
         accountId: __expectString(output.accountId),
         freeTrialStartDate: output.freeTrialStartDate !== undefined && output.freeTrialStartDate !== null
-            ? new Date(output.freeTrialStartDate)
+            ? __expectNonNull(__parseRfc3339DateTime(output.freeTrialStartDate))
             : undefined,
         usage: output.usage !== undefined && output.usage !== null
             ? deserializeAws_restJson1__listOfUsageByAccount(output.usage, context)
@@ -9339,9 +9549,13 @@ var deserializeAws_restJson1UserIdentityRoot = function (output, context) {
 };
 var deserializeAws_restJson1UserPausedDetails = function (output, context) {
     return {
-        jobExpiresAt: output.jobExpiresAt !== undefined && output.jobExpiresAt !== null ? new Date(output.jobExpiresAt) : undefined,
+        jobExpiresAt: output.jobExpiresAt !== undefined && output.jobExpiresAt !== null
+            ? __expectNonNull(__parseRfc3339DateTime(output.jobExpiresAt))
+            : undefined,
         jobImminentExpirationHealthEventArn: __expectString(output.jobImminentExpirationHealthEventArn),
-        jobPausedAt: output.jobPausedAt !== undefined && output.jobPausedAt !== null ? new Date(output.jobPausedAt) : undefined,
+        jobPausedAt: output.jobPausedAt !== undefined && output.jobPausedAt !== null
+            ? __expectNonNull(__parseRfc3339DateTime(output.jobPausedAt))
+            : undefined,
     };
 };
 var deserializeAws_restJson1WeeklySchedule = function (output, context) {