@aws-sdk/client-elasticsearch-service 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, expectNumber as __expectNumber, expectObject as __expectObject, expectString as __expectString, extendedEncodeURIComponent as __extendedEncodeURIComponent, limitedParseDouble as __limitedParseDouble, parseEpochTimestamp as __parseEpochTimestamp, } from "@aws-sdk/smithy-client";
 export var serializeAws_restJson1AcceptInboundCrossClusterSearchConnectionCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
     var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, labelValue, body;
     return __generator(this, function (_c) {
@@ -851,17 +851,15 @@ export var serializeAws_restJson1GetUpgradeStatusCommand = function (input, cont
     });
 }); };
 export var serializeAws_restJson1ListDomainNamesCommand = function (input, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, body;
+    var _a, hostname, _b, protocol, port, basePath, headers, resolvedPath, query, 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",
-                };
+                headers = {};
                 resolvedPath = "" + ((basePath === null || basePath === void 0 ? void 0 : basePath.endsWith("/")) ? basePath.slice(0, -1) : basePath || "") + "/2015-01-01/domain";
-                body = "";
+                query = __assign({}, (input.EngineType !== undefined && { engineType: input.EngineType }));
                 return [2 /*return*/, new __HttpRequest({
                         protocol: protocol,
                         hostname: hostname,
@@ -869,6 +867,7 @@ export var serializeAws_restJson1ListDomainNamesCommand = function (input, conte
                         method: "GET",
                         headers: headers,
                         path: resolvedPath,
+                        query: query,
                         body: body,
                     })];
         }
@@ -1252,9 +1251,9 @@ export var serializeAws_restJson1UpgradeElasticsearchDomainCommand = function (i
     });
 }); };
 export var deserializeAws_restJson1AcceptInboundCrossClusterSearchConnectionCommand = 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_restJson1AcceptInboundCrossClusterSearchConnectionCommandError(output, context)];
@@ -1263,9 +1262,11 @@ export var deserializeAws_restJson1AcceptInboundCrossClusterSearchConnectionComm
                     $metadata: deserializeMetadata(output),
                     CrossClusterSearchConnection: 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.CrossClusterSearchConnection !== undefined && data.CrossClusterSearchConnection !== null) {
                     contents.CrossClusterSearchConnection = deserializeAws_restJson1InboundCrossClusterSearchConnection(data.CrossClusterSearchConnection, context);
                 }
@@ -1408,9 +1409,9 @@ var deserializeAws_restJson1AddTagsCommandError = function (output, context) { r
     });
 }); };
 export var deserializeAws_restJson1AssociatePackageCommand = 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_restJson1AssociatePackageCommandError(output, context)];
@@ -1419,9 +1420,11 @@ export var deserializeAws_restJson1AssociatePackageCommand = function (output, c
                     $metadata: deserializeMetadata(output),
                     DomainPackageDetails: 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.DomainPackageDetails !== undefined && data.DomainPackageDetails !== null) {
                     contents.DomainPackageDetails = deserializeAws_restJson1DomainPackageDetails(data.DomainPackageDetails, context);
                 }
@@ -1508,9 +1511,9 @@ var deserializeAws_restJson1AssociatePackageCommandError = function (output, con
     });
 }); };
 export var deserializeAws_restJson1CancelElasticsearchServiceSoftwareUpdateCommand = 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_restJson1CancelElasticsearchServiceSoftwareUpdateCommandError(output, context)];
@@ -1519,9 +1522,11 @@ export var deserializeAws_restJson1CancelElasticsearchServiceSoftwareUpdateComma
                     $metadata: deserializeMetadata(output),
                     ServiceSoftwareOptions: 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.ServiceSoftwareOptions !== undefined && data.ServiceSoftwareOptions !== null) {
                     contents.ServiceSoftwareOptions = deserializeAws_restJson1ServiceSoftwareOptions(data.ServiceSoftwareOptions, context);
                 }
@@ -1592,9 +1597,9 @@ var deserializeAws_restJson1CancelElasticsearchServiceSoftwareUpdateCommandError
     });
 }); };
 export var deserializeAws_restJson1CreateElasticsearchDomainCommand = 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_restJson1CreateElasticsearchDomainCommandError(output, context)];
@@ -1603,9 +1608,11 @@ export var deserializeAws_restJson1CreateElasticsearchDomainCommand = function (
                     $metadata: deserializeMetadata(output),
                     DomainStatus: 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.DomainStatus !== undefined && data.DomainStatus !== null) {
                     contents.DomainStatus = deserializeAws_restJson1ElasticsearchDomainStatus(data.DomainStatus, context);
                 }
@@ -1700,9 +1707,9 @@ var deserializeAws_restJson1CreateElasticsearchDomainCommandError = function (ou
     });
 }); };
 export var deserializeAws_restJson1CreateOutboundCrossClusterSearchConnectionCommand = 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_restJson1CreateOutboundCrossClusterSearchConnectionCommandError(output, context)];
@@ -1715,9 +1722,11 @@ export var deserializeAws_restJson1CreateOutboundCrossClusterSearchConnectionCom
                     DestinationDomainInfo: undefined,
                     SourceDomainInfo: 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.ConnectionAlias !== undefined && data.ConnectionAlias !== null) {
                     contents.ConnectionAlias = __expectString(data.ConnectionAlias);
                 }
@@ -1800,9 +1809,9 @@ var deserializeAws_restJson1CreateOutboundCrossClusterSearchConnectionCommandErr
     });
 }); };
 export var deserializeAws_restJson1CreatePackageCommand = 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_restJson1CreatePackageCommandError(output, context)];
@@ -1811,9 +1820,11 @@ export var deserializeAws_restJson1CreatePackageCommand = function (output, cont
                     $metadata: deserializeMetadata(output),
                     PackageDetails: 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.PackageDetails !== undefined && data.PackageDetails !== null) {
                     contents.PackageDetails = deserializeAws_restJson1PackageDetails(data.PackageDetails, context);
                 }
@@ -1908,9 +1919,9 @@ var deserializeAws_restJson1CreatePackageCommandError = function (output, contex
     });
 }); };
 export var deserializeAws_restJson1DeleteElasticsearchDomainCommand = 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_restJson1DeleteElasticsearchDomainCommandError(output, context)];
@@ -1919,9 +1930,11 @@ export var deserializeAws_restJson1DeleteElasticsearchDomainCommand = function (
                     $metadata: deserializeMetadata(output),
                     DomainStatus: 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.DomainStatus !== undefined && data.DomainStatus !== null) {
                     contents.DomainStatus = deserializeAws_restJson1ElasticsearchDomainStatus(data.DomainStatus, context);
                 }
@@ -2064,9 +2077,9 @@ var deserializeAws_restJson1DeleteElasticsearchServiceRoleCommandError = functio
     });
 }); };
 export var deserializeAws_restJson1DeleteInboundCrossClusterSearchConnectionCommand = 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_restJson1DeleteInboundCrossClusterSearchConnectionCommandError(output, context)];
@@ -2075,9 +2088,11 @@ export var deserializeAws_restJson1DeleteInboundCrossClusterSearchConnectionComm
                     $metadata: deserializeMetadata(output),
                     CrossClusterSearchConnection: 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.CrossClusterSearchConnection !== undefined && data.CrossClusterSearchConnection !== null) {
                     contents.CrossClusterSearchConnection = deserializeAws_restJson1InboundCrossClusterSearchConnection(data.CrossClusterSearchConnection, context);
                 }
@@ -2132,9 +2147,9 @@ var deserializeAws_restJson1DeleteInboundCrossClusterSearchConnectionCommandErro
     });
 }); };
 export var deserializeAws_restJson1DeleteOutboundCrossClusterSearchConnectionCommand = 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_restJson1DeleteOutboundCrossClusterSearchConnectionCommandError(output, context)];
@@ -2143,9 +2158,11 @@ export var deserializeAws_restJson1DeleteOutboundCrossClusterSearchConnectionCom
                     $metadata: deserializeMetadata(output),
                     CrossClusterSearchConnection: 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.CrossClusterSearchConnection !== undefined && data.CrossClusterSearchConnection !== null) {
                     contents.CrossClusterSearchConnection = deserializeAws_restJson1OutboundCrossClusterSearchConnection(data.CrossClusterSearchConnection, context);
                 }
@@ -2200,9 +2217,9 @@ var deserializeAws_restJson1DeleteOutboundCrossClusterSearchConnectionCommandErr
     });
 }); };
 export var deserializeAws_restJson1DeletePackageCommand = 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_restJson1DeletePackageCommandError(output, context)];
@@ -2211,9 +2228,11 @@ export var deserializeAws_restJson1DeletePackageCommand = function (output, cont
                     $metadata: deserializeMetadata(output),
                     PackageDetails: 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.PackageDetails !== undefined && data.PackageDetails !== null) {
                     contents.PackageDetails = deserializeAws_restJson1PackageDetails(data.PackageDetails, context);
                 }
@@ -2300,9 +2319,9 @@ var deserializeAws_restJson1DeletePackageCommandError = function (output, contex
     });
 }); };
 export var deserializeAws_restJson1DescribeDomainAutoTunesCommand = 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_restJson1DescribeDomainAutoTunesCommandError(output, context)];
@@ -2312,9 +2331,11 @@ export var deserializeAws_restJson1DescribeDomainAutoTunesCommand = function (ou
                     AutoTunes: 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.AutoTunes !== undefined && data.AutoTunes !== null) {
                     contents.AutoTunes = deserializeAws_restJson1AutoTuneList(data.AutoTunes, context);
                 }
@@ -2388,9 +2409,9 @@ var deserializeAws_restJson1DescribeDomainAutoTunesCommandError = function (outp
     });
 }); };
 export var deserializeAws_restJson1DescribeElasticsearchDomainCommand = 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_restJson1DescribeElasticsearchDomainCommandError(output, context)];
@@ -2399,9 +2420,11 @@ export var deserializeAws_restJson1DescribeElasticsearchDomainCommand = function
                     $metadata: deserializeMetadata(output),
                     DomainStatus: 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.DomainStatus !== undefined && data.DomainStatus !== null) {
                     contents.DomainStatus = deserializeAws_restJson1ElasticsearchDomainStatus(data.DomainStatus, context);
                 }
@@ -2472,9 +2495,9 @@ var deserializeAws_restJson1DescribeElasticsearchDomainCommandError = function (
     });
 }); };
 export var deserializeAws_restJson1DescribeElasticsearchDomainConfigCommand = 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_restJson1DescribeElasticsearchDomainConfigCommandError(output, context)];
@@ -2483,9 +2506,11 @@ export var deserializeAws_restJson1DescribeElasticsearchDomainConfigCommand = fu
                     $metadata: deserializeMetadata(output),
                     DomainConfig: 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.DomainConfig !== undefined && data.DomainConfig !== null) {
                     contents.DomainConfig = deserializeAws_restJson1ElasticsearchDomainConfig(data.DomainConfig, context);
                 }
@@ -2556,9 +2581,9 @@ var deserializeAws_restJson1DescribeElasticsearchDomainConfigCommandError = func
     });
 }); };
 export var deserializeAws_restJson1DescribeElasticsearchDomainsCommand = 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_restJson1DescribeElasticsearchDomainsCommandError(output, context)];
@@ -2567,9 +2592,11 @@ export var deserializeAws_restJson1DescribeElasticsearchDomainsCommand = functio
                     $metadata: deserializeMetadata(output),
                     DomainStatusList: 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.DomainStatusList !== undefined && data.DomainStatusList !== null) {
                     contents.DomainStatusList = deserializeAws_restJson1ElasticsearchDomainStatusList(data.DomainStatusList, context);
                 }
@@ -2632,9 +2659,9 @@ var deserializeAws_restJson1DescribeElasticsearchDomainsCommandError = function
     });
 }); };
 export var deserializeAws_restJson1DescribeElasticsearchInstanceTypeLimitsCommand = 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_restJson1DescribeElasticsearchInstanceTypeLimitsCommandError(output, context)];
@@ -2643,9 +2670,11 @@ export var deserializeAws_restJson1DescribeElasticsearchInstanceTypeLimitsComman
                     $metadata: deserializeMetadata(output),
                     LimitsByRole: 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.LimitsByRole !== undefined && data.LimitsByRole !== null) {
                     contents.LimitsByRole = deserializeAws_restJson1LimitsByRole(data.LimitsByRole, context);
                 }
@@ -2732,9 +2761,9 @@ var deserializeAws_restJson1DescribeElasticsearchInstanceTypeLimitsCommandError
     });
 }); };
 export var deserializeAws_restJson1DescribeInboundCrossClusterSearchConnectionsCommand = 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_restJson1DescribeInboundCrossClusterSearchConnectionsCommandError(output, context)];
@@ -2744,9 +2773,11 @@ export var deserializeAws_restJson1DescribeInboundCrossClusterSearchConnectionsC
                     CrossClusterSearchConnections: 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.CrossClusterSearchConnections !== undefined && data.CrossClusterSearchConnections !== null) {
                     contents.CrossClusterSearchConnections = deserializeAws_restJson1InboundCrossClusterSearchConnections(data.CrossClusterSearchConnections, context);
                 }
@@ -2804,9 +2835,9 @@ var deserializeAws_restJson1DescribeInboundCrossClusterSearchConnectionsCommandE
     });
 }); };
 export var deserializeAws_restJson1DescribeOutboundCrossClusterSearchConnectionsCommand = 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_restJson1DescribeOutboundCrossClusterSearchConnectionsCommandError(output, context)];
@@ -2816,9 +2847,11 @@ export var deserializeAws_restJson1DescribeOutboundCrossClusterSearchConnections
                     CrossClusterSearchConnections: 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.CrossClusterSearchConnections !== undefined && data.CrossClusterSearchConnections !== null) {
                     contents.CrossClusterSearchConnections = deserializeAws_restJson1OutboundCrossClusterSearchConnections(data.CrossClusterSearchConnections, context);
                 }
@@ -2876,9 +2909,9 @@ var deserializeAws_restJson1DescribeOutboundCrossClusterSearchConnectionsCommand
     });
 }); };
 export var deserializeAws_restJson1DescribePackagesCommand = 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_restJson1DescribePackagesCommandError(output, context)];
@@ -2888,9 +2921,11 @@ export var deserializeAws_restJson1DescribePackagesCommand = function (output, c
                     NextToken: undefined,
                     PackageDetailsList: 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);
                 }
@@ -2972,9 +3007,9 @@ var deserializeAws_restJson1DescribePackagesCommandError = function (output, con
     });
 }); };
 export var deserializeAws_restJson1DescribeReservedElasticsearchInstanceOfferingsCommand = 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_restJson1DescribeReservedElasticsearchInstanceOfferingsCommandError(output, context)];
@@ -2984,9 +3019,11 @@ export var deserializeAws_restJson1DescribeReservedElasticsearchInstanceOffering
                     NextToken: undefined,
                     ReservedElasticsearchInstanceOfferings: 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);
                 }
@@ -3061,9 +3098,9 @@ var deserializeAws_restJson1DescribeReservedElasticsearchInstanceOfferingsComman
     });
 }); };
 export var deserializeAws_restJson1DescribeReservedElasticsearchInstancesCommand = 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_restJson1DescribeReservedElasticsearchInstancesCommandError(output, context)];
@@ -3073,9 +3110,11 @@ export var deserializeAws_restJson1DescribeReservedElasticsearchInstancesCommand
                     NextToken: undefined,
                     ReservedElasticsearchInstances: 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);
                 }
@@ -3149,9 +3188,9 @@ var deserializeAws_restJson1DescribeReservedElasticsearchInstancesCommandError =
     });
 }); };
 export var deserializeAws_restJson1DissociatePackageCommand = 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_restJson1DissociatePackageCommandError(output, context)];
@@ -3160,9 +3199,11 @@ export var deserializeAws_restJson1DissociatePackageCommand = function (output,
                     $metadata: deserializeMetadata(output),
                     DomainPackageDetails: 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.DomainPackageDetails !== undefined && data.DomainPackageDetails !== null) {
                     contents.DomainPackageDetails = deserializeAws_restJson1DomainPackageDetails(data.DomainPackageDetails, context);
                 }
@@ -3249,9 +3290,9 @@ var deserializeAws_restJson1DissociatePackageCommandError = function (output, co
     });
 }); };
 export var deserializeAws_restJson1GetCompatibleElasticsearchVersionsCommand = 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_restJson1GetCompatibleElasticsearchVersionsCommandError(output, context)];
@@ -3260,9 +3301,11 @@ export var deserializeAws_restJson1GetCompatibleElasticsearchVersionsCommand = f
                     $metadata: deserializeMetadata(output),
                     CompatibleElasticsearchVersions: 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.CompatibleElasticsearchVersions !== undefined && data.CompatibleElasticsearchVersions !== null) {
                     contents.CompatibleElasticsearchVersions = deserializeAws_restJson1CompatibleElasticsearchVersionsList(data.CompatibleElasticsearchVersions, context);
                 }
@@ -3341,9 +3384,9 @@ var deserializeAws_restJson1GetCompatibleElasticsearchVersionsCommandError = fun
     });
 }); };
 export var deserializeAws_restJson1GetPackageVersionHistoryCommand = 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_restJson1GetPackageVersionHistoryCommandError(output, context)];
@@ -3354,9 +3397,11 @@ export var deserializeAws_restJson1GetPackageVersionHistoryCommand = function (o
                     PackageID: undefined,
                     PackageVersionHistoryList: 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);
                 }
@@ -3441,9 +3486,9 @@ var deserializeAws_restJson1GetPackageVersionHistoryCommandError = function (out
     });
 }); };
 export var deserializeAws_restJson1GetUpgradeHistoryCommand = 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_restJson1GetUpgradeHistoryCommandError(output, context)];
@@ -3453,9 +3498,11 @@ export var deserializeAws_restJson1GetUpgradeHistoryCommand = function (output,
                     NextToken: undefined,
                     UpgradeHistories: 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);
                 }
@@ -3537,9 +3584,9 @@ var deserializeAws_restJson1GetUpgradeHistoryCommandError = function (output, co
     });
 }); };
 export var deserializeAws_restJson1GetUpgradeStatusCommand = 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_restJson1GetUpgradeStatusCommandError(output, context)];
@@ -3550,9 +3597,11 @@ export var deserializeAws_restJson1GetUpgradeStatusCommand = function (output, c
                     UpgradeName: undefined,
                     UpgradeStep: 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.StepStatus !== undefined && data.StepStatus !== null) {
                     contents.StepStatus = __expectString(data.StepStatus);
                 }
@@ -3637,9 +3686,9 @@ var deserializeAws_restJson1GetUpgradeStatusCommandError = function (output, con
     });
 }); };
 export var deserializeAws_restJson1ListDomainNamesCommand = 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_restJson1ListDomainNamesCommandError(output, context)];
@@ -3648,9 +3697,11 @@ export var deserializeAws_restJson1ListDomainNamesCommand = function (output, co
                     $metadata: deserializeMetadata(output),
                     DomainNames: 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.DomainNames !== undefined && data.DomainNames !== null) {
                     contents.DomainNames = deserializeAws_restJson1DomainInfoList(data.DomainNames, context);
                 }
@@ -3705,9 +3756,9 @@ var deserializeAws_restJson1ListDomainNamesCommandError = function (output, cont
     });
 }); };
 export var deserializeAws_restJson1ListDomainsForPackageCommand = 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_restJson1ListDomainsForPackageCommandError(output, context)];
@@ -3717,9 +3768,11 @@ export var deserializeAws_restJson1ListDomainsForPackageCommand = function (outp
                     DomainPackageDetailsList: 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.DomainPackageDetailsList !== undefined && data.DomainPackageDetailsList !== null) {
                     contents.DomainPackageDetailsList = deserializeAws_restJson1DomainPackageDetailsList(data.DomainPackageDetailsList, context);
                 }
@@ -3801,9 +3854,9 @@ var deserializeAws_restJson1ListDomainsForPackageCommandError = function (output
     });
 }); };
 export var deserializeAws_restJson1ListElasticsearchInstanceTypesCommand = 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_restJson1ListElasticsearchInstanceTypesCommandError(output, context)];
@@ -3813,9 +3866,11 @@ export var deserializeAws_restJson1ListElasticsearchInstanceTypesCommand = funct
                     ElasticsearchInstanceTypes: 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.ElasticsearchInstanceTypes !== undefined && data.ElasticsearchInstanceTypes !== null) {
                     contents.ElasticsearchInstanceTypes = deserializeAws_restJson1ElasticsearchInstanceTypeList(data.ElasticsearchInstanceTypes, context);
                 }
@@ -3889,9 +3944,9 @@ var deserializeAws_restJson1ListElasticsearchInstanceTypesCommandError = functio
     });
 }); };
 export var deserializeAws_restJson1ListElasticsearchVersionsCommand = 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_restJson1ListElasticsearchVersionsCommandError(output, context)];
@@ -3901,9 +3956,11 @@ export var deserializeAws_restJson1ListElasticsearchVersionsCommand = function (
                     ElasticsearchVersions: 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.ElasticsearchVersions !== undefined && data.ElasticsearchVersions !== null) {
                     contents.ElasticsearchVersions = deserializeAws_restJson1ElasticsearchVersionList(data.ElasticsearchVersions, context);
                 }
@@ -3977,9 +4034,9 @@ var deserializeAws_restJson1ListElasticsearchVersionsCommandError = function (ou
     });
 }); };
 export var deserializeAws_restJson1ListPackagesForDomainCommand = 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_restJson1ListPackagesForDomainCommandError(output, context)];
@@ -3989,9 +4046,11 @@ export var deserializeAws_restJson1ListPackagesForDomainCommand = function (outp
                     DomainPackageDetailsList: 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.DomainPackageDetailsList !== undefined && data.DomainPackageDetailsList !== null) {
                     contents.DomainPackageDetailsList = deserializeAws_restJson1DomainPackageDetailsList(data.DomainPackageDetailsList, context);
                 }
@@ -4073,9 +4132,9 @@ var deserializeAws_restJson1ListPackagesForDomainCommandError = function (output
     });
 }); };
 export var deserializeAws_restJson1ListTagsCommand = 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_restJson1ListTagsCommandError(output, context)];
@@ -4084,9 +4143,11 @@ export var deserializeAws_restJson1ListTagsCommand = function (output, context)
                     $metadata: deserializeMetadata(output),
                     TagList: 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.TagList !== undefined && data.TagList !== null) {
                     contents.TagList = deserializeAws_restJson1TagList(data.TagList, context);
                 }
@@ -4157,9 +4218,9 @@ var deserializeAws_restJson1ListTagsCommandError = function (output, context) {
     });
 }); };
 export var deserializeAws_restJson1PurchaseReservedElasticsearchInstanceOfferingCommand = 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_restJson1PurchaseReservedElasticsearchInstanceOfferingCommandError(output, context)];
@@ -4169,9 +4230,11 @@ export var deserializeAws_restJson1PurchaseReservedElasticsearchInstanceOffering
                     ReservationName: undefined,
                     ReservedElasticsearchInstanceId: 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.ReservationName !== undefined && data.ReservationName !== null) {
                     contents.ReservationName = __expectString(data.ReservationName);
                 }
@@ -4261,9 +4324,9 @@ var deserializeAws_restJson1PurchaseReservedElasticsearchInstanceOfferingCommand
     });
 }); };
 export var deserializeAws_restJson1RejectInboundCrossClusterSearchConnectionCommand = 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_restJson1RejectInboundCrossClusterSearchConnectionCommandError(output, context)];
@@ -4272,9 +4335,11 @@ export var deserializeAws_restJson1RejectInboundCrossClusterSearchConnectionComm
                     $metadata: deserializeMetadata(output),
                     CrossClusterSearchConnection: 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.CrossClusterSearchConnection !== undefined && data.CrossClusterSearchConnection !== null) {
                     contents.CrossClusterSearchConnection = deserializeAws_restJson1InboundCrossClusterSearchConnection(data.CrossClusterSearchConnection, context);
                 }
@@ -4401,9 +4466,9 @@ var deserializeAws_restJson1RemoveTagsCommandError = function (output, context)
     });
 }); };
 export var deserializeAws_restJson1StartElasticsearchServiceSoftwareUpdateCommand = 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_restJson1StartElasticsearchServiceSoftwareUpdateCommandError(output, context)];
@@ -4412,9 +4477,11 @@ export var deserializeAws_restJson1StartElasticsearchServiceSoftwareUpdateComman
                     $metadata: deserializeMetadata(output),
                     ServiceSoftwareOptions: 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.ServiceSoftwareOptions !== undefined && data.ServiceSoftwareOptions !== null) {
                     contents.ServiceSoftwareOptions = deserializeAws_restJson1ServiceSoftwareOptions(data.ServiceSoftwareOptions, context);
                 }
@@ -4485,9 +4552,9 @@ var deserializeAws_restJson1StartElasticsearchServiceSoftwareUpdateCommandError
     });
 }); };
 export var deserializeAws_restJson1UpdateElasticsearchDomainConfigCommand = 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_restJson1UpdateElasticsearchDomainConfigCommandError(output, context)];
@@ -4496,9 +4563,11 @@ export var deserializeAws_restJson1UpdateElasticsearchDomainConfigCommand = func
                     $metadata: deserializeMetadata(output),
                     DomainConfig: 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.DomainConfig !== undefined && data.DomainConfig !== null) {
                     contents.DomainConfig = deserializeAws_restJson1ElasticsearchDomainConfig(data.DomainConfig, context);
                 }
@@ -4585,9 +4654,9 @@ var deserializeAws_restJson1UpdateElasticsearchDomainConfigCommandError = functi
     });
 }); };
 export var deserializeAws_restJson1UpdatePackageCommand = 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_restJson1UpdatePackageCommandError(output, context)];
@@ -4596,9 +4665,11 @@ export var deserializeAws_restJson1UpdatePackageCommand = function (output, cont
                     $metadata: deserializeMetadata(output),
                     PackageDetails: 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.PackageDetails !== undefined && data.PackageDetails !== null) {
                     contents.PackageDetails = deserializeAws_restJson1PackageDetails(data.PackageDetails, context);
                 }
@@ -4685,9 +4756,9 @@ var deserializeAws_restJson1UpdatePackageCommandError = function (output, contex
     });
 }); };
 export var deserializeAws_restJson1UpgradeElasticsearchDomainCommand = 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_restJson1UpgradeElasticsearchDomainCommandError(output, context)];
@@ -4698,9 +4769,11 @@ export var deserializeAws_restJson1UpgradeElasticsearchDomainCommand = function
                     PerformCheckOnly: undefined,
                     TargetVersion: 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.DomainName !== undefined && data.DomainName !== null) {
                     contents.DomainName = __expectString(data.DomainName);
                 }
@@ -5285,7 +5358,9 @@ var deserializeAws_restJson1AutoTuneMaintenanceSchedule = function (output, cont
         Duration: output.Duration !== undefined && output.Duration !== null
             ? deserializeAws_restJson1Duration(output.Duration, context)
             : undefined,
-        StartAt: output.StartAt !== undefined && output.StartAt !== null ? new Date(Math.round(output.StartAt * 1000)) : undefined,
+        StartAt: output.StartAt !== undefined && output.StartAt !== null
+            ? __expectNonNull(__parseEpochTimestamp(__expectNumber(output.StartAt)))
+            : undefined,
     };
 };
 var deserializeAws_restJson1AutoTuneMaintenanceScheduleList = function (output, context) {
@@ -5326,15 +5401,15 @@ var deserializeAws_restJson1AutoTuneOptionsStatus = function (output, context) {
 var deserializeAws_restJson1AutoTuneStatus = function (output, context) {
     return {
         CreationDate: output.CreationDate !== undefined && output.CreationDate !== null
-            ? new Date(Math.round(output.CreationDate * 1000))
+            ? __expectNonNull(__parseEpochTimestamp(__expectNumber(output.CreationDate)))
             : undefined,
         ErrorMessage: __expectString(output.ErrorMessage),
         PendingDeletion: __expectBoolean(output.PendingDeletion),
         State: __expectString(output.State),
         UpdateDate: output.UpdateDate !== undefined && output.UpdateDate !== null
-            ? new Date(Math.round(output.UpdateDate * 1000))
+            ? __expectNonNull(__parseEpochTimestamp(__expectNumber(output.UpdateDate)))
             : undefined,
-        UpdateVersion: __expectInt(output.UpdateVersion),
+        UpdateVersion: __expectInt32(output.UpdateVersion),
     };
 };
 var deserializeAws_restJson1CognitoOptions = function (output, context) {
@@ -5400,6 +5475,7 @@ var deserializeAws_restJson1DomainEndpointOptionsStatus = function (output, cont
 var deserializeAws_restJson1DomainInfo = function (output, context) {
     return {
         DomainName: __expectString(output.DomainName),
+        EngineType: __expectString(output.EngineType),
     };
 };
 var deserializeAws_restJson1DomainInfoList = function (output, context) {
@@ -5427,7 +5503,7 @@ var deserializeAws_restJson1DomainPackageDetails = function (output, context) {
             ? deserializeAws_restJson1ErrorDetails(output.ErrorDetails, context)
             : undefined,
         LastUpdated: output.LastUpdated !== undefined && output.LastUpdated !== null
-            ? new Date(Math.round(output.LastUpdated * 1000))
+            ? __expectNonNull(__parseEpochTimestamp(__expectNumber(output.LastUpdated)))
             : undefined,
         PackageID: __expectString(output.PackageID),
         PackageName: __expectString(output.PackageName),
@@ -5449,14 +5525,14 @@ var deserializeAws_restJson1DomainPackageDetailsList = function (output, context
 var deserializeAws_restJson1Duration = function (output, context) {
     return {
         Unit: __expectString(output.Unit),
-        Value: __expectInt(output.Value),
+        Value: __expectLong(output.Value),
     };
 };
 var deserializeAws_restJson1EBSOptions = function (output, context) {
     return {
         EBSEnabled: __expectBoolean(output.EBSEnabled),
-        Iops: __expectInt(output.Iops),
-        VolumeSize: __expectInt(output.VolumeSize),
+        Iops: __expectInt32(output.Iops),
+        VolumeSize: __expectInt32(output.VolumeSize),
         VolumeType: __expectString(output.VolumeType),
     };
 };
@@ -5475,12 +5551,12 @@ var deserializeAws_restJson1ElasticsearchClusterConfig = function (output, conte
         ColdStorageOptions: output.ColdStorageOptions !== undefined && output.ColdStorageOptions !== null
             ? deserializeAws_restJson1ColdStorageOptions(output.ColdStorageOptions, context)
             : undefined,
-        DedicatedMasterCount: __expectInt(output.DedicatedMasterCount),
+        DedicatedMasterCount: __expectInt32(output.DedicatedMasterCount),
         DedicatedMasterEnabled: __expectBoolean(output.DedicatedMasterEnabled),
         DedicatedMasterType: __expectString(output.DedicatedMasterType),
-        InstanceCount: __expectInt(output.InstanceCount),
+        InstanceCount: __expectInt32(output.InstanceCount),
         InstanceType: __expectString(output.InstanceType),
-        WarmCount: __expectInt(output.WarmCount),
+        WarmCount: __expectInt32(output.WarmCount),
         WarmEnabled: __expectBoolean(output.WarmEnabled),
         WarmType: __expectString(output.WarmType),
         ZoneAwarenessConfig: output.ZoneAwarenessConfig !== undefined && output.ZoneAwarenessConfig !== null
@@ -5703,8 +5779,8 @@ var deserializeAws_restJson1InboundCrossClusterSearchConnectionStatus = function
 };
 var deserializeAws_restJson1InstanceCountLimits = function (output, context) {
     return {
-        MaximumInstanceCount: __expectInt(output.MaximumInstanceCount),
-        MinimumInstanceCount: __expectInt(output.MinimumInstanceCount),
+        MaximumInstanceCount: __expectInt32(output.MaximumInstanceCount),
+        MinimumInstanceCount: __expectInt32(output.MinimumInstanceCount),
     };
 };
 var deserializeAws_restJson1InstanceLimits = function (output, context) {
@@ -5801,14 +5877,14 @@ var deserializeAws_restJson1NodeToNodeEncryptionOptionsStatus = function (output
 var deserializeAws_restJson1OptionStatus = function (output, context) {
     return {
         CreationDate: output.CreationDate !== undefined && output.CreationDate !== null
-            ? new Date(Math.round(output.CreationDate * 1000))
+            ? __expectNonNull(__parseEpochTimestamp(__expectNumber(output.CreationDate)))
             : undefined,
         PendingDeletion: __expectBoolean(output.PendingDeletion),
         State: __expectString(output.State),
         UpdateDate: output.UpdateDate !== undefined && output.UpdateDate !== null
-            ? new Date(Math.round(output.UpdateDate * 1000))
+            ? __expectNonNull(__parseEpochTimestamp(__expectNumber(output.UpdateDate)))
             : undefined,
-        UpdateVersion: __expectInt(output.UpdateVersion),
+        UpdateVersion: __expectInt32(output.UpdateVersion),
     };
 };
 var deserializeAws_restJson1OutboundCrossClusterSearchConnection = function (output, context) {
@@ -5846,13 +5922,13 @@ var deserializeAws_restJson1PackageDetails = function (output, context) {
     return {
         AvailablePackageVersion: __expectString(output.AvailablePackageVersion),
         CreatedAt: output.CreatedAt !== undefined && output.CreatedAt !== null
-            ? new Date(Math.round(output.CreatedAt * 1000))
+            ? __expectNonNull(__parseEpochTimestamp(__expectNumber(output.CreatedAt)))
             : undefined,
         ErrorDetails: output.ErrorDetails !== undefined && output.ErrorDetails !== null
             ? deserializeAws_restJson1ErrorDetails(output.ErrorDetails, context)
             : undefined,
         LastUpdatedAt: output.LastUpdatedAt !== undefined && output.LastUpdatedAt !== null
-            ? new Date(Math.round(output.LastUpdatedAt * 1000))
+            ? __expectNonNull(__parseEpochTimestamp(__expectNumber(output.LastUpdatedAt)))
             : undefined,
         PackageDescription: __expectString(output.PackageDescription),
         PackageID: __expectString(output.PackageID),
@@ -5875,7 +5951,7 @@ var deserializeAws_restJson1PackageVersionHistory = function (output, context) {
     return {
         CommitMessage: __expectString(output.CommitMessage),
         CreatedAt: output.CreatedAt !== undefined && output.CreatedAt !== null
-            ? new Date(Math.round(output.CreatedAt * 1000))
+            ? __expectNonNull(__parseEpochTimestamp(__expectNumber(output.CreatedAt)))
             : undefined,
         PackageVersion: __expectString(output.PackageVersion),
     };
@@ -5892,7 +5968,7 @@ var deserializeAws_restJson1PackageVersionHistoryList = function (output, contex
 };
 var deserializeAws_restJson1RecurringCharge = function (output, context) {
     return {
-        RecurringChargeAmount: __limitedParseFloat(output.RecurringChargeAmount),
+        RecurringChargeAmount: __limitedParseDouble(output.RecurringChargeAmount),
         RecurringChargeFrequency: __expectString(output.RecurringChargeFrequency),
     };
 };
@@ -5909,10 +5985,10 @@ var deserializeAws_restJson1RecurringChargeList = function (output, context) {
 var deserializeAws_restJson1ReservedElasticsearchInstance = function (output, context) {
     return {
         CurrencyCode: __expectString(output.CurrencyCode),
-        Duration: __expectInt(output.Duration),
-        ElasticsearchInstanceCount: __expectInt(output.ElasticsearchInstanceCount),
+        Duration: __expectInt32(output.Duration),
+        ElasticsearchInstanceCount: __expectInt32(output.ElasticsearchInstanceCount),
         ElasticsearchInstanceType: __expectString(output.ElasticsearchInstanceType),
-        FixedPrice: __limitedParseFloat(output.FixedPrice),
+        FixedPrice: __limitedParseDouble(output.FixedPrice),
         PaymentOption: __expectString(output.PaymentOption),
         RecurringCharges: output.RecurringCharges !== undefined && output.RecurringCharges !== null
             ? deserializeAws_restJson1RecurringChargeList(output.RecurringCharges, context)
@@ -5921,10 +5997,10 @@ var deserializeAws_restJson1ReservedElasticsearchInstance = function (output, co
         ReservedElasticsearchInstanceId: __expectString(output.ReservedElasticsearchInstanceId),
         ReservedElasticsearchInstanceOfferingId: __expectString(output.ReservedElasticsearchInstanceOfferingId),
         StartTime: output.StartTime !== undefined && output.StartTime !== null
-            ? new Date(Math.round(output.StartTime * 1000))
+            ? __expectNonNull(__parseEpochTimestamp(__expectNumber(output.StartTime)))
             : undefined,
         State: __expectString(output.State),
-        UsagePrice: __limitedParseFloat(output.UsagePrice),
+        UsagePrice: __limitedParseDouble(output.UsagePrice),
     };
 };
 var deserializeAws_restJson1ReservedElasticsearchInstanceList = function (output, context) {
@@ -5940,15 +6016,15 @@ var deserializeAws_restJson1ReservedElasticsearchInstanceList = function (output
 var deserializeAws_restJson1ReservedElasticsearchInstanceOffering = function (output, context) {
     return {
         CurrencyCode: __expectString(output.CurrencyCode),
-        Duration: __expectInt(output.Duration),
+        Duration: __expectInt32(output.Duration),
         ElasticsearchInstanceType: __expectString(output.ElasticsearchInstanceType),
-        FixedPrice: __limitedParseFloat(output.FixedPrice),
+        FixedPrice: __limitedParseDouble(output.FixedPrice),
         PaymentOption: __expectString(output.PaymentOption),
         RecurringCharges: output.RecurringCharges !== undefined && output.RecurringCharges !== null
             ? deserializeAws_restJson1RecurringChargeList(output.RecurringCharges, context)
             : undefined,
         ReservedElasticsearchInstanceOfferingId: __expectString(output.ReservedElasticsearchInstanceOfferingId),
-        UsagePrice: __limitedParseFloat(output.UsagePrice),
+        UsagePrice: __limitedParseDouble(output.UsagePrice),
     };
 };
 var deserializeAws_restJson1ReservedElasticsearchInstanceOfferingList = function (output, context) {
@@ -5974,7 +6050,7 @@ var deserializeAws_restJson1SAMLOptionsOutput = function (output, context) {
             ? deserializeAws_restJson1SAMLIdp(output.Idp, context)
             : undefined,
         RolesKey: __expectString(output.RolesKey),
-        SessionTimeoutMinutes: __expectInt(output.SessionTimeoutMinutes),
+        SessionTimeoutMinutes: __expectInt32(output.SessionTimeoutMinutes),
         SubjectKey: __expectString(output.SubjectKey),
     };
 };
@@ -5982,14 +6058,16 @@ var deserializeAws_restJson1ScheduledAutoTuneDetails = function (output, context
     return {
         Action: __expectString(output.Action),
         ActionType: __expectString(output.ActionType),
-        Date: output.Date !== undefined && output.Date !== null ? new Date(Math.round(output.Date * 1000)) : undefined,
+        Date: output.Date !== undefined && output.Date !== null
+            ? __expectNonNull(__parseEpochTimestamp(__expectNumber(output.Date)))
+            : undefined,
         Severity: __expectString(output.Severity),
     };
 };
 var deserializeAws_restJson1ServiceSoftwareOptions = function (output, context) {
     return {
         AutomatedUpdateDate: output.AutomatedUpdateDate !== undefined && output.AutomatedUpdateDate !== null
-            ? new Date(Math.round(output.AutomatedUpdateDate * 1000))
+            ? __expectNonNull(__parseEpochTimestamp(__expectNumber(output.AutomatedUpdateDate)))
             : undefined,
         Cancellable: __expectBoolean(output.Cancellable),
         CurrentVersion: __expectString(output.CurrentVersion),
@@ -6002,7 +6080,7 @@ var deserializeAws_restJson1ServiceSoftwareOptions = function (output, context)
 };
 var deserializeAws_restJson1SnapshotOptions = function (output, context) {
     return {
-        AutomatedSnapshotStartHour: __expectInt(output.AutomatedSnapshotStartHour),
+        AutomatedSnapshotStartHour: __expectInt32(output.AutomatedSnapshotStartHour),
     };
 };
 var deserializeAws_restJson1SnapshotOptionsStatus = function (output, context) {
@@ -6081,7 +6159,7 @@ var deserializeAws_restJson1TagList = function (output, context) {
 var deserializeAws_restJson1UpgradeHistory = function (output, context) {
     return {
         StartTimestamp: output.StartTimestamp !== undefined && output.StartTimestamp !== null
-            ? new Date(Math.round(output.StartTimestamp * 1000))
+            ? __expectNonNull(__parseEpochTimestamp(__expectNumber(output.StartTimestamp)))
             : undefined,
         StepsList: output.StepsList !== undefined && output.StepsList !== null
             ? deserializeAws_restJson1UpgradeStepsList(output.StepsList, context)
@@ -6105,7 +6183,7 @@ var deserializeAws_restJson1UpgradeStepItem = function (output, context) {
         Issues: output.Issues !== undefined && output.Issues !== null
             ? deserializeAws_restJson1Issues(output.Issues, context)
             : undefined,
-        ProgressPercent: __limitedParseFloat(output.ProgressPercent),
+        ProgressPercent: __limitedParseDouble(output.ProgressPercent),
         UpgradeStep: __expectString(output.UpgradeStep),
         UpgradeStepStatus: __expectString(output.UpgradeStepStatus),
     };
@@ -6146,7 +6224,7 @@ var deserializeAws_restJson1VPCDerivedInfoStatus = function (output, context) {
 };
 var deserializeAws_restJson1ZoneAwarenessConfig = function (output, context) {
     return {
-        AvailabilityZoneCount: __expectInt(output.AvailabilityZoneCount),
+        AvailabilityZoneCount: __expectInt32(output.AvailabilityZoneCount),
     };
 };
 var deserializeMetadata = function (output) {