npm - @aws-sdk/client-elasticsearch-service - Versions diffs - 3.50.0 → 3.53.0 - Mend

@aws-sdk/client-elasticsearch-service 3.50.0 → 3.53.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (81) hide show

package/dist-cjs/protocols/Aws_restJson1.js CHANGED Viewed

@@ -4,6 +4,8 @@ exports.deserializeAws_restJson1DeleteElasticsearchServiceRoleCommand = exports.
 exports.deserializeAws_restJson1UpgradeElasticsearchDomainCommand = exports.deserializeAws_restJson1UpdatePackageCommand = exports.deserializeAws_restJson1UpdateElasticsearchDomainConfigCommand = exports.deserializeAws_restJson1StartElasticsearchServiceSoftwareUpdateCommand = exports.deserializeAws_restJson1RemoveTagsCommand = exports.deserializeAws_restJson1RejectInboundCrossClusterSearchConnectionCommand = exports.deserializeAws_restJson1PurchaseReservedElasticsearchInstanceOfferingCommand = exports.deserializeAws_restJson1ListTagsCommand = exports.deserializeAws_restJson1ListPackagesForDomainCommand = exports.deserializeAws_restJson1ListElasticsearchVersionsCommand = exports.deserializeAws_restJson1ListElasticsearchInstanceTypesCommand = exports.deserializeAws_restJson1ListDomainsForPackageCommand = exports.deserializeAws_restJson1ListDomainNamesCommand = exports.deserializeAws_restJson1GetUpgradeStatusCommand = exports.deserializeAws_restJson1GetUpgradeHistoryCommand = exports.deserializeAws_restJson1GetPackageVersionHistoryCommand = exports.deserializeAws_restJson1GetCompatibleElasticsearchVersionsCommand = exports.deserializeAws_restJson1DissociatePackageCommand = exports.deserializeAws_restJson1DescribeReservedElasticsearchInstancesCommand = exports.deserializeAws_restJson1DescribeReservedElasticsearchInstanceOfferingsCommand = exports.deserializeAws_restJson1DescribePackagesCommand = exports.deserializeAws_restJson1DescribeOutboundCrossClusterSearchConnectionsCommand = exports.deserializeAws_restJson1DescribeInboundCrossClusterSearchConnectionsCommand = exports.deserializeAws_restJson1DescribeElasticsearchInstanceTypeLimitsCommand = exports.deserializeAws_restJson1DescribeElasticsearchDomainsCommand = exports.deserializeAws_restJson1DescribeElasticsearchDomainConfigCommand = exports.deserializeAws_restJson1DescribeElasticsearchDomainCommand = exports.deserializeAws_restJson1DescribeDomainChangeProgressCommand = exports.deserializeAws_restJson1DescribeDomainAutoTunesCommand = exports.deserializeAws_restJson1DeletePackageCommand = exports.deserializeAws_restJson1DeleteOutboundCrossClusterSearchConnectionCommand = exports.deserializeAws_restJson1DeleteInboundCrossClusterSearchConnectionCommand = void 0;
 const protocol_http_1 = require("@aws-sdk/protocol-http");
 const smithy_client_1 = require("@aws-sdk/smithy-client");
+const ElasticsearchServiceServiceException_1 = require("../models/ElasticsearchServiceServiceException");
+const models_0_1 = require("../models/models_0");
 const serializeAws_restJson1AcceptInboundCrossClusterSearchConnectionCommand = async (input, context) => {
     const { hostname, protocol = "https", port, path: basePath } = await context.endpoint();
     const headers = {};
@@ -1226,43 +1228,22 @@ const deserializeAws_restJson1AcceptInboundCrossClusterSearchConnectionCommandEr
     switch (errorCode) {
         case "DisabledOperationException":
         case "com.amazonaws.elasticsearchservice#DisabledOperationException":
-            response = {
-                ...(await deserializeAws_restJson1DisabledOperationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1DisabledOperationExceptionResponse(parsedOutput, context);
         case "LimitExceededException":
         case "com.amazonaws.elasticsearchservice#LimitExceededException":
-            response = {
-                ...(await deserializeAws_restJson1LimitExceededExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1LimitExceededExceptionResponse(parsedOutput, context);
         case "ResourceNotFoundException":
         case "com.amazonaws.elasticsearchservice#ResourceNotFoundException":
-            response = {
-                ...(await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1AddTagsCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -1286,51 +1267,25 @@ const deserializeAws_restJson1AddTagsCommandError = async (output, context) => {
     switch (errorCode) {
         case "BaseException":
         case "com.amazonaws.elasticsearchservice#BaseException":
-            response = {
-                ...(await deserializeAws_restJson1BaseExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1BaseExceptionResponse(parsedOutput, context);
         case "InternalException":
         case "com.amazonaws.elasticsearchservice#InternalException":
-            response = {
-                ...(await deserializeAws_restJson1InternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalExceptionResponse(parsedOutput, context);
         case "LimitExceededException":
         case "com.amazonaws.elasticsearchservice#LimitExceededException":
-            response = {
-                ...(await deserializeAws_restJson1LimitExceededExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1LimitExceededExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.elasticsearchservice#ValidationException":
-            response = {
-                ...(await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1AssociatePackageCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -1358,67 +1313,31 @@ const deserializeAws_restJson1AssociatePackageCommandError = async (output, cont
     switch (errorCode) {
         case "AccessDeniedException":
         case "com.amazonaws.elasticsearchservice#AccessDeniedException":
-            response = {
-                ...(await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context);
         case "BaseException":
         case "com.amazonaws.elasticsearchservice#BaseException":
-            response = {
-                ...(await deserializeAws_restJson1BaseExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1BaseExceptionResponse(parsedOutput, context);
         case "ConflictException":
         case "com.amazonaws.elasticsearchservice#ConflictException":
-            response = {
-                ...(await deserializeAws_restJson1ConflictExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ConflictExceptionResponse(parsedOutput, context);
         case "InternalException":
         case "com.amazonaws.elasticsearchservice#InternalException":
-            response = {
-                ...(await deserializeAws_restJson1InternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalExceptionResponse(parsedOutput, context);
         case "ResourceNotFoundException":
         case "com.amazonaws.elasticsearchservice#ResourceNotFoundException":
-            response = {
-                ...(await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.elasticsearchservice#ValidationException":
-            response = {
-                ...(await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1CancelElasticsearchServiceSoftwareUpdateCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -1446,51 +1365,25 @@ const deserializeAws_restJson1CancelElasticsearchServiceSoftwareUpdateCommandErr
     switch (errorCode) {
         case "BaseException":
         case "com.amazonaws.elasticsearchservice#BaseException":
-            response = {
-                ...(await deserializeAws_restJson1BaseExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1BaseExceptionResponse(parsedOutput, context);
         case "InternalException":
         case "com.amazonaws.elasticsearchservice#InternalException":
-            response = {
-                ...(await deserializeAws_restJson1InternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalExceptionResponse(parsedOutput, context);
         case "ResourceNotFoundException":
         case "com.amazonaws.elasticsearchservice#ResourceNotFoundException":
-            response = {
-                ...(await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.elasticsearchservice#ValidationException":
-            response = {
-                ...(await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1CreateElasticsearchDomainCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -1518,75 +1411,34 @@ const deserializeAws_restJson1CreateElasticsearchDomainCommandError = async (out
     switch (errorCode) {
         case "BaseException":
         case "com.amazonaws.elasticsearchservice#BaseException":
-            response = {
-                ...(await deserializeAws_restJson1BaseExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1BaseExceptionResponse(parsedOutput, context);
         case "DisabledOperationException":
         case "com.amazonaws.elasticsearchservice#DisabledOperationException":
-            response = {
-                ...(await deserializeAws_restJson1DisabledOperationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1DisabledOperationExceptionResponse(parsedOutput, context);
         case "InternalException":
         case "com.amazonaws.elasticsearchservice#InternalException":
-            response = {
-                ...(await deserializeAws_restJson1InternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalExceptionResponse(parsedOutput, context);
         case "InvalidTypeException":
         case "com.amazonaws.elasticsearchservice#InvalidTypeException":
-            response = {
-                ...(await deserializeAws_restJson1InvalidTypeExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InvalidTypeExceptionResponse(parsedOutput, context);
         case "LimitExceededException":
         case "com.amazonaws.elasticsearchservice#LimitExceededException":
-            response = {
-                ...(await deserializeAws_restJson1LimitExceededExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1LimitExceededExceptionResponse(parsedOutput, context);
         case "ResourceAlreadyExistsException":
         case "com.amazonaws.elasticsearchservice#ResourceAlreadyExistsException":
-            response = {
-                ...(await deserializeAws_restJson1ResourceAlreadyExistsExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ResourceAlreadyExistsExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.elasticsearchservice#ValidationException":
-            response = {
-                ...(await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1CreateOutboundCrossClusterSearchConnectionCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -1630,51 +1482,25 @@ const deserializeAws_restJson1CreateOutboundCrossClusterSearchConnectionCommandE
     switch (errorCode) {
         case "DisabledOperationException":
         case "com.amazonaws.elasticsearchservice#DisabledOperationException":
-            response = {
-                ...(await deserializeAws_restJson1DisabledOperationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1DisabledOperationExceptionResponse(parsedOutput, context);
         case "InternalException":
         case "com.amazonaws.elasticsearchservice#InternalException":
-            response = {
-                ...(await deserializeAws_restJson1InternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalExceptionResponse(parsedOutput, context);
         case "LimitExceededException":
         case "com.amazonaws.elasticsearchservice#LimitExceededException":
-            response = {
-                ...(await deserializeAws_restJson1LimitExceededExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1LimitExceededExceptionResponse(parsedOutput, context);
         case "ResourceAlreadyExistsException":
         case "com.amazonaws.elasticsearchservice#ResourceAlreadyExistsException":
-            response = {
-                ...(await deserializeAws_restJson1ResourceAlreadyExistsExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ResourceAlreadyExistsExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1CreatePackageCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -1702,75 +1528,34 @@ const deserializeAws_restJson1CreatePackageCommandError = async (output, context
     switch (errorCode) {
         case "AccessDeniedException":
         case "com.amazonaws.elasticsearchservice#AccessDeniedException":
-            response = {
-                ...(await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context);
         case "BaseException":
         case "com.amazonaws.elasticsearchservice#BaseException":
-            response = {
-                ...(await deserializeAws_restJson1BaseExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1BaseExceptionResponse(parsedOutput, context);
         case "InternalException":
         case "com.amazonaws.elasticsearchservice#InternalException":
-            response = {
-                ...(await deserializeAws_restJson1InternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalExceptionResponse(parsedOutput, context);
         case "InvalidTypeException":
         case "com.amazonaws.elasticsearchservice#InvalidTypeException":
-            response = {
-                ...(await deserializeAws_restJson1InvalidTypeExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InvalidTypeExceptionResponse(parsedOutput, context);
         case "LimitExceededException":
         case "com.amazonaws.elasticsearchservice#LimitExceededException":
-            response = {
-                ...(await deserializeAws_restJson1LimitExceededExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1LimitExceededExceptionResponse(parsedOutput, context);
         case "ResourceAlreadyExistsException":
         case "com.amazonaws.elasticsearchservice#ResourceAlreadyExistsException":
-            response = {
-                ...(await deserializeAws_restJson1ResourceAlreadyExistsExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ResourceAlreadyExistsExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.elasticsearchservice#ValidationException":
-            response = {
-                ...(await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1DeleteElasticsearchDomainCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -1798,51 +1583,25 @@ const deserializeAws_restJson1DeleteElasticsearchDomainCommandError = async (out
     switch (errorCode) {
         case "BaseException":
         case "com.amazonaws.elasticsearchservice#BaseException":
-            response = {
-                ...(await deserializeAws_restJson1BaseExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1BaseExceptionResponse(parsedOutput, context);
         case "InternalException":
         case "com.amazonaws.elasticsearchservice#InternalException":
-            response = {
-                ...(await deserializeAws_restJson1InternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalExceptionResponse(parsedOutput, context);
         case "ResourceNotFoundException":
         case "com.amazonaws.elasticsearchservice#ResourceNotFoundException":
-            response = {
-                ...(await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.elasticsearchservice#ValidationException":
-            response = {
-                ...(await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1DeleteElasticsearchServiceRoleCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -1866,43 +1625,22 @@ const deserializeAws_restJson1DeleteElasticsearchServiceRoleCommandError = async
     switch (errorCode) {
         case "BaseException":
         case "com.amazonaws.elasticsearchservice#BaseException":
-            response = {
-                ...(await deserializeAws_restJson1BaseExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1BaseExceptionResponse(parsedOutput, context);
         case "InternalException":
         case "com.amazonaws.elasticsearchservice#InternalException":
-            response = {
-                ...(await deserializeAws_restJson1InternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.elasticsearchservice#ValidationException":
-            response = {
-                ...(await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1DeleteInboundCrossClusterSearchConnectionCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -1930,35 +1668,19 @@ const deserializeAws_restJson1DeleteInboundCrossClusterSearchConnectionCommandEr
     switch (errorCode) {
         case "DisabledOperationException":
         case "com.amazonaws.elasticsearchservice#DisabledOperationException":
-            response = {
-                ...(await deserializeAws_restJson1DisabledOperationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1DisabledOperationExceptionResponse(parsedOutput, context);
         case "ResourceNotFoundException":
         case "com.amazonaws.elasticsearchservice#ResourceNotFoundException":
-            response = {
-                ...(await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1DeleteOutboundCrossClusterSearchConnectionCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -1986,35 +1708,19 @@ const deserializeAws_restJson1DeleteOutboundCrossClusterSearchConnectionCommandE
     switch (errorCode) {
         case "DisabledOperationException":
         case "com.amazonaws.elasticsearchservice#DisabledOperationException":
-            response = {
-                ...(await deserializeAws_restJson1DisabledOperationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1DisabledOperationExceptionResponse(parsedOutput, context);
         case "ResourceNotFoundException":
         case "com.amazonaws.elasticsearchservice#ResourceNotFoundException":
-            response = {
-                ...(await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1DeletePackageCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -2042,67 +1748,31 @@ const deserializeAws_restJson1DeletePackageCommandError = async (output, context
     switch (errorCode) {
         case "AccessDeniedException":
         case "com.amazonaws.elasticsearchservice#AccessDeniedException":
-            response = {
-                ...(await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context);
         case "BaseException":
         case "com.amazonaws.elasticsearchservice#BaseException":
-            response = {
-                ...(await deserializeAws_restJson1BaseExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1BaseExceptionResponse(parsedOutput, context);
         case "ConflictException":
         case "com.amazonaws.elasticsearchservice#ConflictException":
-            response = {
-                ...(await deserializeAws_restJson1ConflictExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ConflictExceptionResponse(parsedOutput, context);
         case "InternalException":
         case "com.amazonaws.elasticsearchservice#InternalException":
-            response = {
-                ...(await deserializeAws_restJson1InternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalExceptionResponse(parsedOutput, context);
         case "ResourceNotFoundException":
         case "com.amazonaws.elasticsearchservice#ResourceNotFoundException":
-            response = {
-                ...(await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.elasticsearchservice#ValidationException":
-            response = {
-                ...(await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1DescribeDomainAutoTunesCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -2134,51 +1804,25 @@ const deserializeAws_restJson1DescribeDomainAutoTunesCommandError = async (outpu
     switch (errorCode) {
         case "BaseException":
         case "com.amazonaws.elasticsearchservice#BaseException":
-            response = {
-                ...(await deserializeAws_restJson1BaseExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1BaseExceptionResponse(parsedOutput, context);
         case "InternalException":
         case "com.amazonaws.elasticsearchservice#InternalException":
-            response = {
-                ...(await deserializeAws_restJson1InternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalExceptionResponse(parsedOutput, context);
         case "ResourceNotFoundException":
         case "com.amazonaws.elasticsearchservice#ResourceNotFoundException":
-            response = {
-                ...(await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.elasticsearchservice#ValidationException":
-            response = {
-                ...(await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1DescribeDomainChangeProgressCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -2206,51 +1850,25 @@ const deserializeAws_restJson1DescribeDomainChangeProgressCommandError = async (
     switch (errorCode) {
         case "BaseException":
         case "com.amazonaws.elasticsearchservice#BaseException":
-            response = {
-                ...(await deserializeAws_restJson1BaseExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1BaseExceptionResponse(parsedOutput, context);
         case "InternalException":
         case "com.amazonaws.elasticsearchservice#InternalException":
-            response = {
-                ...(await deserializeAws_restJson1InternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalExceptionResponse(parsedOutput, context);
         case "ResourceNotFoundException":
         case "com.amazonaws.elasticsearchservice#ResourceNotFoundException":
-            response = {
-                ...(await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.elasticsearchservice#ValidationException":
-            response = {
-                ...(await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1DescribeElasticsearchDomainCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -2278,51 +1896,25 @@ const deserializeAws_restJson1DescribeElasticsearchDomainCommandError = async (o
     switch (errorCode) {
         case "BaseException":
         case "com.amazonaws.elasticsearchservice#BaseException":
-            response = {
-                ...(await deserializeAws_restJson1BaseExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1BaseExceptionResponse(parsedOutput, context);
         case "InternalException":
         case "com.amazonaws.elasticsearchservice#InternalException":
-            response = {
-                ...(await deserializeAws_restJson1InternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalExceptionResponse(parsedOutput, context);
         case "ResourceNotFoundException":
         case "com.amazonaws.elasticsearchservice#ResourceNotFoundException":
-            response = {
-                ...(await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.elasticsearchservice#ValidationException":
-            response = {
-                ...(await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1DescribeElasticsearchDomainConfigCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -2350,51 +1942,25 @@ const deserializeAws_restJson1DescribeElasticsearchDomainConfigCommandError = as
     switch (errorCode) {
         case "BaseException":
         case "com.amazonaws.elasticsearchservice#BaseException":
-            response = {
-                ...(await deserializeAws_restJson1BaseExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1BaseExceptionResponse(parsedOutput, context);
         case "InternalException":
         case "com.amazonaws.elasticsearchservice#InternalException":
-            response = {
-                ...(await deserializeAws_restJson1InternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalExceptionResponse(parsedOutput, context);
         case "ResourceNotFoundException":
         case "com.amazonaws.elasticsearchservice#ResourceNotFoundException":
-            response = {
-                ...(await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.elasticsearchservice#ValidationException":
-            response = {
-                ...(await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1DescribeElasticsearchDomainsCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -2422,43 +1988,22 @@ const deserializeAws_restJson1DescribeElasticsearchDomainsCommandError = async (
     switch (errorCode) {
         case "BaseException":
         case "com.amazonaws.elasticsearchservice#BaseException":
-            response = {
-                ...(await deserializeAws_restJson1BaseExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1BaseExceptionResponse(parsedOutput, context);
         case "InternalException":
         case "com.amazonaws.elasticsearchservice#InternalException":
-            response = {
-                ...(await deserializeAws_restJson1InternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.elasticsearchservice#ValidationException":
-            response = {
-                ...(await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1DescribeElasticsearchInstanceTypeLimitsCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -2486,67 +2031,31 @@ const deserializeAws_restJson1DescribeElasticsearchInstanceTypeLimitsCommandErro
     switch (errorCode) {
         case "BaseException":
         case "com.amazonaws.elasticsearchservice#BaseException":
-            response = {
-                ...(await deserializeAws_restJson1BaseExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1BaseExceptionResponse(parsedOutput, context);
         case "InternalException":
         case "com.amazonaws.elasticsearchservice#InternalException":
-            response = {
-                ...(await deserializeAws_restJson1InternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalExceptionResponse(parsedOutput, context);
         case "InvalidTypeException":
         case "com.amazonaws.elasticsearchservice#InvalidTypeException":
-            response = {
-                ...(await deserializeAws_restJson1InvalidTypeExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InvalidTypeExceptionResponse(parsedOutput, context);
         case "LimitExceededException":
         case "com.amazonaws.elasticsearchservice#LimitExceededException":
-            response = {
-                ...(await deserializeAws_restJson1LimitExceededExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1LimitExceededExceptionResponse(parsedOutput, context);
         case "ResourceNotFoundException":
         case "com.amazonaws.elasticsearchservice#ResourceNotFoundException":
-            response = {
-                ...(await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.elasticsearchservice#ValidationException":
-            response = {
-                ...(await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1DescribeInboundCrossClusterSearchConnectionsCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -2578,35 +2087,19 @@ const deserializeAws_restJson1DescribeInboundCrossClusterSearchConnectionsComman
     switch (errorCode) {
         case "DisabledOperationException":
         case "com.amazonaws.elasticsearchservice#DisabledOperationException":
-            response = {
-                ...(await deserializeAws_restJson1DisabledOperationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1DisabledOperationExceptionResponse(parsedOutput, context);
         case "InvalidPaginationTokenException":
         case "com.amazonaws.elasticsearchservice#InvalidPaginationTokenException":
-            response = {
-                ...(await deserializeAws_restJson1InvalidPaginationTokenExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InvalidPaginationTokenExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1DescribeOutboundCrossClusterSearchConnectionsCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -2638,35 +2131,19 @@ const deserializeAws_restJson1DescribeOutboundCrossClusterSearchConnectionsComma
     switch (errorCode) {
         case "DisabledOperationException":
         case "com.amazonaws.elasticsearchservice#DisabledOperationException":
-            response = {
-                ...(await deserializeAws_restJson1DisabledOperationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1DisabledOperationExceptionResponse(parsedOutput, context);
         case "InvalidPaginationTokenException":
         case "com.amazonaws.elasticsearchservice#InvalidPaginationTokenException":
-            response = {
-                ...(await deserializeAws_restJson1InvalidPaginationTokenExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InvalidPaginationTokenExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1DescribePackagesCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -2698,59 +2175,28 @@ const deserializeAws_restJson1DescribePackagesCommandError = async (output, cont
     switch (errorCode) {
         case "AccessDeniedException":
         case "com.amazonaws.elasticsearchservice#AccessDeniedException":
-            response = {
-                ...(await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context);
         case "BaseException":
         case "com.amazonaws.elasticsearchservice#BaseException":
-            response = {
-                ...(await deserializeAws_restJson1BaseExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1BaseExceptionResponse(parsedOutput, context);
         case "InternalException":
         case "com.amazonaws.elasticsearchservice#InternalException":
-            response = {
-                ...(await deserializeAws_restJson1InternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalExceptionResponse(parsedOutput, context);
         case "ResourceNotFoundException":
         case "com.amazonaws.elasticsearchservice#ResourceNotFoundException":
-            response = {
-                ...(await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.elasticsearchservice#ValidationException":
-            response = {
-                ...(await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1DescribeReservedElasticsearchInstanceOfferingsCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -2783,51 +2229,25 @@ const deserializeAws_restJson1DescribeReservedElasticsearchInstanceOfferingsComm
     switch (errorCode) {
         case "DisabledOperationException":
         case "com.amazonaws.elasticsearchservice#DisabledOperationException":
-            response = {
-                ...(await deserializeAws_restJson1DisabledOperationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1DisabledOperationExceptionResponse(parsedOutput, context);
         case "InternalException":
         case "com.amazonaws.elasticsearchservice#InternalException":
-            response = {
-                ...(await deserializeAws_restJson1InternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalExceptionResponse(parsedOutput, context);
         case "ResourceNotFoundException":
         case "com.amazonaws.elasticsearchservice#ResourceNotFoundException":
-            response = {
-                ...(await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.elasticsearchservice#ValidationException":
-            response = {
-                ...(await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1DescribeReservedElasticsearchInstancesCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -2859,51 +2279,25 @@ const deserializeAws_restJson1DescribeReservedElasticsearchInstancesCommandError
     switch (errorCode) {
         case "DisabledOperationException":
         case "com.amazonaws.elasticsearchservice#DisabledOperationException":
-            response = {
-                ...(await deserializeAws_restJson1DisabledOperationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1DisabledOperationExceptionResponse(parsedOutput, context);
         case "InternalException":
         case "com.amazonaws.elasticsearchservice#InternalException":
-            response = {
-                ...(await deserializeAws_restJson1InternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalExceptionResponse(parsedOutput, context);
         case "ResourceNotFoundException":
         case "com.amazonaws.elasticsearchservice#ResourceNotFoundException":
-            response = {
-                ...(await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.elasticsearchservice#ValidationException":
-            response = {
-                ...(await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1DissociatePackageCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -2931,67 +2325,31 @@ const deserializeAws_restJson1DissociatePackageCommandError = async (output, con
     switch (errorCode) {
         case "AccessDeniedException":
         case "com.amazonaws.elasticsearchservice#AccessDeniedException":
-            response = {
-                ...(await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context);
         case "BaseException":
         case "com.amazonaws.elasticsearchservice#BaseException":
-            response = {
-                ...(await deserializeAws_restJson1BaseExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1BaseExceptionResponse(parsedOutput, context);
         case "ConflictException":
         case "com.amazonaws.elasticsearchservice#ConflictException":
-            response = {
-                ...(await deserializeAws_restJson1ConflictExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ConflictExceptionResponse(parsedOutput, context);
         case "InternalException":
         case "com.amazonaws.elasticsearchservice#InternalException":
-            response = {
-                ...(await deserializeAws_restJson1InternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalExceptionResponse(parsedOutput, context);
         case "ResourceNotFoundException":
         case "com.amazonaws.elasticsearchservice#ResourceNotFoundException":
-            response = {
-                ...(await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.elasticsearchservice#ValidationException":
-            response = {
-                ...(await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1GetCompatibleElasticsearchVersionsCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -3019,59 +2377,28 @@ const deserializeAws_restJson1GetCompatibleElasticsearchVersionsCommandError = a
     switch (errorCode) {
         case "BaseException":
         case "com.amazonaws.elasticsearchservice#BaseException":
-            response = {
-                ...(await deserializeAws_restJson1BaseExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1BaseExceptionResponse(parsedOutput, context);
         case "DisabledOperationException":
         case "com.amazonaws.elasticsearchservice#DisabledOperationException":
-            response = {
-                ...(await deserializeAws_restJson1DisabledOperationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1DisabledOperationExceptionResponse(parsedOutput, context);
         case "InternalException":
         case "com.amazonaws.elasticsearchservice#InternalException":
-            response = {
-                ...(await deserializeAws_restJson1InternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalExceptionResponse(parsedOutput, context);
         case "ResourceNotFoundException":
         case "com.amazonaws.elasticsearchservice#ResourceNotFoundException":
-            response = {
-                ...(await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.elasticsearchservice#ValidationException":
-            response = {
-                ...(await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1GetPackageVersionHistoryCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -3107,59 +2434,28 @@ const deserializeAws_restJson1GetPackageVersionHistoryCommandError = async (outp
     switch (errorCode) {
         case "AccessDeniedException":
         case "com.amazonaws.elasticsearchservice#AccessDeniedException":
-            response = {
-                ...(await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context);
         case "BaseException":
         case "com.amazonaws.elasticsearchservice#BaseException":
-            response = {
-                ...(await deserializeAws_restJson1BaseExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1BaseExceptionResponse(parsedOutput, context);
         case "InternalException":
         case "com.amazonaws.elasticsearchservice#InternalException":
-            response = {
-                ...(await deserializeAws_restJson1InternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalExceptionResponse(parsedOutput, context);
         case "ResourceNotFoundException":
         case "com.amazonaws.elasticsearchservice#ResourceNotFoundException":
-            response = {
-                ...(await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.elasticsearchservice#ValidationException":
-            response = {
-                ...(await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1GetUpgradeHistoryCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -3191,59 +2487,28 @@ const deserializeAws_restJson1GetUpgradeHistoryCommandError = async (output, con
     switch (errorCode) {
         case "BaseException":
         case "com.amazonaws.elasticsearchservice#BaseException":
-            response = {
-                ...(await deserializeAws_restJson1BaseExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1BaseExceptionResponse(parsedOutput, context);
         case "DisabledOperationException":
         case "com.amazonaws.elasticsearchservice#DisabledOperationException":
-            response = {
-                ...(await deserializeAws_restJson1DisabledOperationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1DisabledOperationExceptionResponse(parsedOutput, context);
         case "InternalException":
         case "com.amazonaws.elasticsearchservice#InternalException":
-            response = {
-                ...(await deserializeAws_restJson1InternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalExceptionResponse(parsedOutput, context);
         case "ResourceNotFoundException":
         case "com.amazonaws.elasticsearchservice#ResourceNotFoundException":
-            response = {
-                ...(await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.elasticsearchservice#ValidationException":
-            response = {
-                ...(await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1GetUpgradeStatusCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -3279,59 +2544,28 @@ const deserializeAws_restJson1GetUpgradeStatusCommandError = async (output, cont
     switch (errorCode) {
         case "BaseException":
         case "com.amazonaws.elasticsearchservice#BaseException":
-            response = {
-                ...(await deserializeAws_restJson1BaseExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1BaseExceptionResponse(parsedOutput, context);
         case "DisabledOperationException":
         case "com.amazonaws.elasticsearchservice#DisabledOperationException":
-            response = {
-                ...(await deserializeAws_restJson1DisabledOperationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1DisabledOperationExceptionResponse(parsedOutput, context);
         case "InternalException":
         case "com.amazonaws.elasticsearchservice#InternalException":
-            response = {
-                ...(await deserializeAws_restJson1InternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalExceptionResponse(parsedOutput, context);
         case "ResourceNotFoundException":
         case "com.amazonaws.elasticsearchservice#ResourceNotFoundException":
-            response = {
-                ...(await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.elasticsearchservice#ValidationException":
-            response = {
-                ...(await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1ListDomainNamesCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -3359,35 +2593,19 @@ const deserializeAws_restJson1ListDomainNamesCommandError = async (output, conte
     switch (errorCode) {
         case "BaseException":
         case "com.amazonaws.elasticsearchservice#BaseException":
-            response = {
-                ...(await deserializeAws_restJson1BaseExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1BaseExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.elasticsearchservice#ValidationException":
-            response = {
-                ...(await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1ListDomainsForPackageCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -3419,59 +2637,28 @@ const deserializeAws_restJson1ListDomainsForPackageCommandError = async (output,
     switch (errorCode) {
         case "AccessDeniedException":
         case "com.amazonaws.elasticsearchservice#AccessDeniedException":
-            response = {
-                ...(await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context);
         case "BaseException":
         case "com.amazonaws.elasticsearchservice#BaseException":
-            response = {
-                ...(await deserializeAws_restJson1BaseExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1BaseExceptionResponse(parsedOutput, context);
         case "InternalException":
         case "com.amazonaws.elasticsearchservice#InternalException":
-            response = {
-                ...(await deserializeAws_restJson1InternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalExceptionResponse(parsedOutput, context);
         case "ResourceNotFoundException":
         case "com.amazonaws.elasticsearchservice#ResourceNotFoundException":
-            response = {
-                ...(await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.elasticsearchservice#ValidationException":
-            response = {
-                ...(await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1ListElasticsearchInstanceTypesCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -3503,51 +2690,25 @@ const deserializeAws_restJson1ListElasticsearchInstanceTypesCommandError = async
     switch (errorCode) {
         case "BaseException":
         case "com.amazonaws.elasticsearchservice#BaseException":
-            response = {
-                ...(await deserializeAws_restJson1BaseExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1BaseExceptionResponse(parsedOutput, context);
         case "InternalException":
         case "com.amazonaws.elasticsearchservice#InternalException":
-            response = {
-                ...(await deserializeAws_restJson1InternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalExceptionResponse(parsedOutput, context);
         case "ResourceNotFoundException":
         case "com.amazonaws.elasticsearchservice#ResourceNotFoundException":
-            response = {
-                ...(await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.elasticsearchservice#ValidationException":
-            response = {
-                ...(await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1ListElasticsearchVersionsCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -3579,51 +2740,25 @@ const deserializeAws_restJson1ListElasticsearchVersionsCommandError = async (out
     switch (errorCode) {
         case "BaseException":
         case "com.amazonaws.elasticsearchservice#BaseException":
-            response = {
-                ...(await deserializeAws_restJson1BaseExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1BaseExceptionResponse(parsedOutput, context);
         case "InternalException":
         case "com.amazonaws.elasticsearchservice#InternalException":
-            response = {
-                ...(await deserializeAws_restJson1InternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalExceptionResponse(parsedOutput, context);
         case "ResourceNotFoundException":
         case "com.amazonaws.elasticsearchservice#ResourceNotFoundException":
-            response = {
-                ...(await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.elasticsearchservice#ValidationException":
-            response = {
-                ...(await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1ListPackagesForDomainCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -3655,59 +2790,28 @@ const deserializeAws_restJson1ListPackagesForDomainCommandError = async (output,
     switch (errorCode) {
         case "AccessDeniedException":
         case "com.amazonaws.elasticsearchservice#AccessDeniedException":
-            response = {
-                ...(await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context);
         case "BaseException":
         case "com.amazonaws.elasticsearchservice#BaseException":
-            response = {
-                ...(await deserializeAws_restJson1BaseExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1BaseExceptionResponse(parsedOutput, context);
         case "InternalException":
         case "com.amazonaws.elasticsearchservice#InternalException":
-            response = {
-                ...(await deserializeAws_restJson1InternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalExceptionResponse(parsedOutput, context);
         case "ResourceNotFoundException":
         case "com.amazonaws.elasticsearchservice#ResourceNotFoundException":
-            response = {
-                ...(await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.elasticsearchservice#ValidationException":
-            response = {
-                ...(await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1ListTagsCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -3735,51 +2839,25 @@ const deserializeAws_restJson1ListTagsCommandError = async (output, context) =>
     switch (errorCode) {
         case "BaseException":
         case "com.amazonaws.elasticsearchservice#BaseException":
-            response = {
-                ...(await deserializeAws_restJson1BaseExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1BaseExceptionResponse(parsedOutput, context);
         case "InternalException":
         case "com.amazonaws.elasticsearchservice#InternalException":
-            response = {
-                ...(await deserializeAws_restJson1InternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalExceptionResponse(parsedOutput, context);
         case "ResourceNotFoundException":
         case "com.amazonaws.elasticsearchservice#ResourceNotFoundException":
-            response = {
-                ...(await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.elasticsearchservice#ValidationException":
-            response = {
-                ...(await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1PurchaseReservedElasticsearchInstanceOfferingCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -3811,67 +2889,31 @@ const deserializeAws_restJson1PurchaseReservedElasticsearchInstanceOfferingComma
     switch (errorCode) {
         case "DisabledOperationException":
         case "com.amazonaws.elasticsearchservice#DisabledOperationException":
-            response = {
-                ...(await deserializeAws_restJson1DisabledOperationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1DisabledOperationExceptionResponse(parsedOutput, context);
         case "InternalException":
         case "com.amazonaws.elasticsearchservice#InternalException":
-            response = {
-                ...(await deserializeAws_restJson1InternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalExceptionResponse(parsedOutput, context);
         case "LimitExceededException":
         case "com.amazonaws.elasticsearchservice#LimitExceededException":
-            response = {
-                ...(await deserializeAws_restJson1LimitExceededExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1LimitExceededExceptionResponse(parsedOutput, context);
         case "ResourceAlreadyExistsException":
         case "com.amazonaws.elasticsearchservice#ResourceAlreadyExistsException":
-            response = {
-                ...(await deserializeAws_restJson1ResourceAlreadyExistsExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ResourceAlreadyExistsExceptionResponse(parsedOutput, context);
         case "ResourceNotFoundException":
         case "com.amazonaws.elasticsearchservice#ResourceNotFoundException":
-            response = {
-                ...(await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.elasticsearchservice#ValidationException":
-            response = {
-                ...(await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1RejectInboundCrossClusterSearchConnectionCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -3899,35 +2941,19 @@ const deserializeAws_restJson1RejectInboundCrossClusterSearchConnectionCommandEr
     switch (errorCode) {
         case "DisabledOperationException":
         case "com.amazonaws.elasticsearchservice#DisabledOperationException":
-            response = {
-                ...(await deserializeAws_restJson1DisabledOperationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1DisabledOperationExceptionResponse(parsedOutput, context);
         case "ResourceNotFoundException":
         case "com.amazonaws.elasticsearchservice#ResourceNotFoundException":
-            response = {
-                ...(await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1RemoveTagsCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -3951,43 +2977,22 @@ const deserializeAws_restJson1RemoveTagsCommandError = async (output, context) =
     switch (errorCode) {
         case "BaseException":
         case "com.amazonaws.elasticsearchservice#BaseException":
-            response = {
-                ...(await deserializeAws_restJson1BaseExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1BaseExceptionResponse(parsedOutput, context);
         case "InternalException":
         case "com.amazonaws.elasticsearchservice#InternalException":
-            response = {
-                ...(await deserializeAws_restJson1InternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.elasticsearchservice#ValidationException":
-            response = {
-                ...(await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1StartElasticsearchServiceSoftwareUpdateCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -4015,51 +3020,25 @@ const deserializeAws_restJson1StartElasticsearchServiceSoftwareUpdateCommandErro
     switch (errorCode) {
         case "BaseException":
         case "com.amazonaws.elasticsearchservice#BaseException":
-            response = {
-                ...(await deserializeAws_restJson1BaseExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1BaseExceptionResponse(parsedOutput, context);
         case "InternalException":
         case "com.amazonaws.elasticsearchservice#InternalException":
-            response = {
-                ...(await deserializeAws_restJson1InternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalExceptionResponse(parsedOutput, context);
         case "ResourceNotFoundException":
         case "com.amazonaws.elasticsearchservice#ResourceNotFoundException":
-            response = {
-                ...(await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.elasticsearchservice#ValidationException":
-            response = {
-                ...(await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1UpdateElasticsearchDomainConfigCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -4091,67 +3070,31 @@ const deserializeAws_restJson1UpdateElasticsearchDomainConfigCommandError = asyn
     switch (errorCode) {
         case "BaseException":
         case "com.amazonaws.elasticsearchservice#BaseException":
-            response = {
-                ...(await deserializeAws_restJson1BaseExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1BaseExceptionResponse(parsedOutput, context);
         case "InternalException":
         case "com.amazonaws.elasticsearchservice#InternalException":
-            response = {
-                ...(await deserializeAws_restJson1InternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalExceptionResponse(parsedOutput, context);
         case "InvalidTypeException":
         case "com.amazonaws.elasticsearchservice#InvalidTypeException":
-            response = {
-                ...(await deserializeAws_restJson1InvalidTypeExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InvalidTypeExceptionResponse(parsedOutput, context);
         case "LimitExceededException":
         case "com.amazonaws.elasticsearchservice#LimitExceededException":
-            response = {
-                ...(await deserializeAws_restJson1LimitExceededExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1LimitExceededExceptionResponse(parsedOutput, context);
         case "ResourceNotFoundException":
         case "com.amazonaws.elasticsearchservice#ResourceNotFoundException":
-            response = {
-                ...(await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.elasticsearchservice#ValidationException":
-            response = {
-                ...(await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1UpdatePackageCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -4179,67 +3122,31 @@ const deserializeAws_restJson1UpdatePackageCommandError = async (output, context
     switch (errorCode) {
         case "AccessDeniedException":
         case "com.amazonaws.elasticsearchservice#AccessDeniedException":
-            response = {
-                ...(await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1AccessDeniedExceptionResponse(parsedOutput, context);
         case "BaseException":
         case "com.amazonaws.elasticsearchservice#BaseException":
-            response = {
-                ...(await deserializeAws_restJson1BaseExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1BaseExceptionResponse(parsedOutput, context);
         case "InternalException":
         case "com.amazonaws.elasticsearchservice#InternalException":
-            response = {
-                ...(await deserializeAws_restJson1InternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalExceptionResponse(parsedOutput, context);
         case "LimitExceededException":
         case "com.amazonaws.elasticsearchservice#LimitExceededException":
-            response = {
-                ...(await deserializeAws_restJson1LimitExceededExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1LimitExceededExceptionResponse(parsedOutput, context);
         case "ResourceNotFoundException":
         case "com.amazonaws.elasticsearchservice#ResourceNotFoundException":
-            response = {
-                ...(await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.elasticsearchservice#ValidationException":
-            response = {
-                ...(await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1UpgradeElasticsearchDomainCommand = async (output, context) => {
     if (output.statusCode !== 200 && output.statusCode >= 300) {
@@ -4279,210 +3186,163 @@ const deserializeAws_restJson1UpgradeElasticsearchDomainCommandError = async (ou
     switch (errorCode) {
         case "BaseException":
         case "com.amazonaws.elasticsearchservice#BaseException":
-            response = {
-                ...(await deserializeAws_restJson1BaseExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1BaseExceptionResponse(parsedOutput, context);
         case "DisabledOperationException":
         case "com.amazonaws.elasticsearchservice#DisabledOperationException":
-            response = {
-                ...(await deserializeAws_restJson1DisabledOperationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1DisabledOperationExceptionResponse(parsedOutput, context);
         case "InternalException":
         case "com.amazonaws.elasticsearchservice#InternalException":
-            response = {
-                ...(await deserializeAws_restJson1InternalExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1InternalExceptionResponse(parsedOutput, context);
         case "ResourceAlreadyExistsException":
         case "com.amazonaws.elasticsearchservice#ResourceAlreadyExistsException":
-            response = {
-                ...(await deserializeAws_restJson1ResourceAlreadyExistsExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ResourceAlreadyExistsExceptionResponse(parsedOutput, context);
         case "ResourceNotFoundException":
         case "com.amazonaws.elasticsearchservice#ResourceNotFoundException":
-            response = {
-                ...(await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ResourceNotFoundExceptionResponse(parsedOutput, context);
         case "ValidationException":
         case "com.amazonaws.elasticsearchservice#ValidationException":
-            response = {
-                ...(await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context)),
-                name: errorCode,
-                $metadata: deserializeMetadata(output),
-            };
-            break;
+            throw await deserializeAws_restJson1ValidationExceptionResponse(parsedOutput, context);
         default:
             const parsedBody = parsedOutput.body;
-            errorCode = parsedBody.code || parsedBody.Code || errorCode;
-            response = {
-                ...parsedBody,
-                name: `${errorCode}`,
-                message: parsedBody.message || parsedBody.Message || errorCode,
+            response = new ElasticsearchServiceServiceException_1.ElasticsearchServiceServiceException({
+                name: parsedBody.code || parsedBody.Code || errorCode,
                 $fault: "client",
                 $metadata: deserializeMetadata(output),
-            };
+            });
+            throw smithy_client_1.decorateServiceException(response, parsedBody);
     }
-    const message = response.message || response.Message || errorCode;
-    response.message = message;
-    delete response.Message;
-    return Promise.reject(Object.assign(new Error(message), response));
 };
 const deserializeAws_restJson1AccessDeniedExceptionResponse = async (parsedOutput, context) => {
-    const contents = {
-        name: "AccessDeniedException",
-        $fault: "client",
-        $metadata: deserializeMetadata(parsedOutput),
-        message: undefined,
-    };
+    const contents = {};
     const data = parsedOutput.body;
     if (data.message !== undefined && data.message !== null) {
         contents.message = smithy_client_1.expectString(data.message);
     }
-    return contents;
+    const exception = new models_0_1.AccessDeniedException({
+        $metadata: deserializeMetadata(parsedOutput),
+        ...contents,
+    });
+    return smithy_client_1.decorateServiceException(exception, parsedOutput.body);
 };
 const deserializeAws_restJson1BaseExceptionResponse = async (parsedOutput, context) => {
-    const contents = {
-        name: "BaseException",
-        $fault: "client",
-        $metadata: deserializeMetadata(parsedOutput),
-        message: undefined,
-    };
+    const contents = {};
     const data = parsedOutput.body;
     if (data.message !== undefined && data.message !== null) {
         contents.message = smithy_client_1.expectString(data.message);
     }
-    return contents;
+    const exception = new models_0_1.BaseException({
+        $metadata: deserializeMetadata(parsedOutput),
+        ...contents,
+    });
+    return smithy_client_1.decorateServiceException(exception, parsedOutput.body);
 };
 const deserializeAws_restJson1ConflictExceptionResponse = async (parsedOutput, context) => {
-    const contents = {
-        name: "ConflictException",
-        $fault: "client",
-        $metadata: deserializeMetadata(parsedOutput),
-        message: undefined,
-    };
+    const contents = {};
     const data = parsedOutput.body;
     if (data.message !== undefined && data.message !== null) {
         contents.message = smithy_client_1.expectString(data.message);
     }
-    return contents;
+    const exception = new models_0_1.ConflictException({
+        $metadata: deserializeMetadata(parsedOutput),
+        ...contents,
+    });
+    return smithy_client_1.decorateServiceException(exception, parsedOutput.body);
 };
 const deserializeAws_restJson1DisabledOperationExceptionResponse = async (parsedOutput, context) => {
-    const contents = {
-        name: "DisabledOperationException",
-        $fault: "client",
-        $metadata: deserializeMetadata(parsedOutput),
-        message: undefined,
-    };
+    const contents = {};
     const data = parsedOutput.body;
     if (data.message !== undefined && data.message !== null) {
         contents.message = smithy_client_1.expectString(data.message);
     }
-    return contents;
+    const exception = new models_0_1.DisabledOperationException({
+        $metadata: deserializeMetadata(parsedOutput),
+        ...contents,
+    });
+    return smithy_client_1.decorateServiceException(exception, parsedOutput.body);
 };
 const deserializeAws_restJson1InternalExceptionResponse = async (parsedOutput, context) => {
-    const contents = {
-        name: "InternalException",
-        $fault: "server",
-        $metadata: deserializeMetadata(parsedOutput),
-        message: undefined,
-    };
+    const contents = {};
     const data = parsedOutput.body;
     if (data.message !== undefined && data.message !== null) {
         contents.message = smithy_client_1.expectString(data.message);
     }
-    return contents;
+    const exception = new models_0_1.InternalException({
+        $metadata: deserializeMetadata(parsedOutput),
+        ...contents,
+    });
+    return smithy_client_1.decorateServiceException(exception, parsedOutput.body);
 };
 const deserializeAws_restJson1InvalidPaginationTokenExceptionResponse = async (parsedOutput, context) => {
-    const contents = {
-        name: "InvalidPaginationTokenException",
-        $fault: "client",
-        $metadata: deserializeMetadata(parsedOutput),
-        message: undefined,
-    };
+    const contents = {};
     const data = parsedOutput.body;
     if (data.message !== undefined && data.message !== null) {
         contents.message = smithy_client_1.expectString(data.message);
     }
-    return contents;
+    const exception = new models_0_1.InvalidPaginationTokenException({
+        $metadata: deserializeMetadata(parsedOutput),
+        ...contents,
+    });
+    return smithy_client_1.decorateServiceException(exception, parsedOutput.body);
 };
 const deserializeAws_restJson1InvalidTypeExceptionResponse = async (parsedOutput, context) => {
-    const contents = {
-        name: "InvalidTypeException",
-        $fault: "client",
-        $metadata: deserializeMetadata(parsedOutput),
-        message: undefined,
-    };
+    const contents = {};
     const data = parsedOutput.body;
     if (data.message !== undefined && data.message !== null) {
         contents.message = smithy_client_1.expectString(data.message);
     }
-    return contents;
+    const exception = new models_0_1.InvalidTypeException({
+        $metadata: deserializeMetadata(parsedOutput),
+        ...contents,
+    });
+    return smithy_client_1.decorateServiceException(exception, parsedOutput.body);
 };
 const deserializeAws_restJson1LimitExceededExceptionResponse = async (parsedOutput, context) => {
-    const contents = {
-        name: "LimitExceededException",
-        $fault: "client",
-        $metadata: deserializeMetadata(parsedOutput),
-        message: undefined,
-    };
+    const contents = {};
     const data = parsedOutput.body;
     if (data.message !== undefined && data.message !== null) {
         contents.message = smithy_client_1.expectString(data.message);
     }
-    return contents;
+    const exception = new models_0_1.LimitExceededException({
+        $metadata: deserializeMetadata(parsedOutput),
+        ...contents,
+    });
+    return smithy_client_1.decorateServiceException(exception, parsedOutput.body);
 };
 const deserializeAws_restJson1ResourceAlreadyExistsExceptionResponse = async (parsedOutput, context) => {
-    const contents = {
-        name: "ResourceAlreadyExistsException",
-        $fault: "client",
-        $metadata: deserializeMetadata(parsedOutput),
-        message: undefined,
-    };
+    const contents = {};
     const data = parsedOutput.body;
     if (data.message !== undefined && data.message !== null) {
         contents.message = smithy_client_1.expectString(data.message);
     }
-    return contents;
+    const exception = new models_0_1.ResourceAlreadyExistsException({
+        $metadata: deserializeMetadata(parsedOutput),
+        ...contents,
+    });
+    return smithy_client_1.decorateServiceException(exception, parsedOutput.body);
 };
 const deserializeAws_restJson1ResourceNotFoundExceptionResponse = async (parsedOutput, context) => {
-    const contents = {
-        name: "ResourceNotFoundException",
-        $fault: "client",
-        $metadata: deserializeMetadata(parsedOutput),
-        message: undefined,
-    };
+    const contents = {};
     const data = parsedOutput.body;
     if (data.message !== undefined && data.message !== null) {
         contents.message = smithy_client_1.expectString(data.message);
     }
-    return contents;
+    const exception = new models_0_1.ResourceNotFoundException({
+        $metadata: deserializeMetadata(parsedOutput),
+        ...contents,
+    });
+    return smithy_client_1.decorateServiceException(exception, parsedOutput.body);
 };
 const deserializeAws_restJson1ValidationExceptionResponse = async (parsedOutput, context) => {
-    const contents = {
-        name: "ValidationException",
-        $fault: "client",
-        $metadata: deserializeMetadata(parsedOutput),
-        message: undefined,
-    };
+    const contents = {};
     const data = parsedOutput.body;
     if (data.message !== undefined && data.message !== null) {
         contents.message = smithy_client_1.expectString(data.message);
     }
-    return contents;
+    const exception = new models_0_1.ValidationException({
+        $metadata: deserializeMetadata(parsedOutput),
+        ...contents,
+    });
+    return smithy_client_1.decorateServiceException(exception, parsedOutput.body);
 };
 const serializeAws_restJson1AdvancedOptions = (input, context) => {
     return Object.entries(input).reduce((acc, [key, value]) => {
@@ -4821,7 +3681,7 @@ const deserializeAws_restJson1AdditionalLimit = (output, context) => {
     };
 };
 const deserializeAws_restJson1AdditionalLimitList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -4829,6 +3689,7 @@ const deserializeAws_restJson1AdditionalLimitList = (output, context) => {
         }
         return deserializeAws_restJson1AdditionalLimit(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_restJson1AdvancedOptions = (output, context) => {
     return Object.entries(output).reduce((acc, [key, value]) => {
@@ -4890,7 +3751,7 @@ const deserializeAws_restJson1AutoTuneDetails = (output, context) => {
     };
 };
 const deserializeAws_restJson1AutoTuneList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -4898,6 +3759,7 @@ const deserializeAws_restJson1AutoTuneList = (output, context) => {
         }
         return deserializeAws_restJson1AutoTune(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_restJson1AutoTuneMaintenanceSchedule = (output, context) => {
     return {
@@ -4911,7 +3773,7 @@ const deserializeAws_restJson1AutoTuneMaintenanceSchedule = (output, context) =>
     };
 };
 const deserializeAws_restJson1AutoTuneMaintenanceScheduleList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -4919,6 +3781,7 @@ const deserializeAws_restJson1AutoTuneMaintenanceScheduleList = (output, context
         }
         return deserializeAws_restJson1AutoTuneMaintenanceSchedule(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_restJson1AutoTuneOptions = (output, context) => {
     return {
@@ -4976,7 +3839,7 @@ const deserializeAws_restJson1ChangeProgressStage = (output, context) => {
     };
 };
 const deserializeAws_restJson1ChangeProgressStageList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -4984,6 +3847,7 @@ const deserializeAws_restJson1ChangeProgressStageList = (output, context) => {
         }
         return deserializeAws_restJson1ChangeProgressStage(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_restJson1ChangeProgressStatusDetails = (output, context) => {
     return {
@@ -5028,7 +3892,7 @@ const deserializeAws_restJson1ColdStorageOptions = (output, context) => {
     };
 };
 const deserializeAws_restJson1CompatibleElasticsearchVersionsList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -5036,6 +3900,7 @@ const deserializeAws_restJson1CompatibleElasticsearchVersionsList = (output, con
         }
         return deserializeAws_restJson1CompatibleVersionsMap(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_restJson1CompatibleVersionsMap = (output, context) => {
     return {
@@ -5071,7 +3936,7 @@ const deserializeAws_restJson1DomainInfo = (output, context) => {
     };
 };
 const deserializeAws_restJson1DomainInfoList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -5079,6 +3944,7 @@ const deserializeAws_restJson1DomainInfoList = (output, context) => {
         }
         return deserializeAws_restJson1DomainInfo(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_restJson1DomainInformation = (output, context) => {
     return {
@@ -5105,7 +3971,7 @@ const deserializeAws_restJson1DomainPackageDetails = (output, context) => {
     };
 };
 const deserializeAws_restJson1DomainPackageDetailsList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -5113,6 +3979,7 @@ const deserializeAws_restJson1DomainPackageDetailsList = (output, context) => {
         }
         return deserializeAws_restJson1DomainPackageDetails(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_restJson1DryRunResults = (output, context) => {
     return {
@@ -5282,7 +4149,7 @@ const deserializeAws_restJson1ElasticsearchDomainStatus = (output, context) => {
     };
 };
 const deserializeAws_restJson1ElasticsearchDomainStatusList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -5290,9 +4157,10 @@ const deserializeAws_restJson1ElasticsearchDomainStatusList = (output, context)
         }
         return deserializeAws_restJson1ElasticsearchDomainStatus(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_restJson1ElasticsearchInstanceTypeList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -5300,9 +4168,10 @@ const deserializeAws_restJson1ElasticsearchInstanceTypeList = (output, context)
         }
         return smithy_client_1.expectString(entry);
     });
+    return retVal;
 };
 const deserializeAws_restJson1ElasticsearchVersionList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -5310,6 +4179,7 @@ const deserializeAws_restJson1ElasticsearchVersionList = (output, context) => {
         }
         return smithy_client_1.expectString(entry);
     });
+    return retVal;
 };
 const deserializeAws_restJson1ElasticsearchVersionStatus = (output, context) => {
     return {
@@ -5367,7 +4237,7 @@ const deserializeAws_restJson1InboundCrossClusterSearchConnection = (output, con
     };
 };
 const deserializeAws_restJson1InboundCrossClusterSearchConnections = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -5375,6 +4245,7 @@ const deserializeAws_restJson1InboundCrossClusterSearchConnections = (output, co
         }
         return deserializeAws_restJson1InboundCrossClusterSearchConnection(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_restJson1InboundCrossClusterSearchConnectionStatus = (output, context) => {
     return {
@@ -5396,7 +4267,7 @@ const deserializeAws_restJson1InstanceLimits = (output, context) => {
     };
 };
 const deserializeAws_restJson1Issues = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -5404,6 +4275,7 @@ const deserializeAws_restJson1Issues = (output, context) => {
         }
         return smithy_client_1.expectString(entry);
     });
+    return retVal;
 };
 const deserializeAws_restJson1Limits = (output, context) => {
     return {
@@ -5430,7 +4302,7 @@ const deserializeAws_restJson1LimitsByRole = (output, context) => {
     }, {});
 };
 const deserializeAws_restJson1LimitValueList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -5438,6 +4310,7 @@ const deserializeAws_restJson1LimitValueList = (output, context) => {
         }
         return smithy_client_1.expectString(entry);
     });
+    return retVal;
 };
 const deserializeAws_restJson1LogPublishingOption = (output, context) => {
     return {
@@ -5510,7 +4383,7 @@ const deserializeAws_restJson1OutboundCrossClusterSearchConnection = (output, co
     };
 };
 const deserializeAws_restJson1OutboundCrossClusterSearchConnections = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -5518,6 +4391,7 @@ const deserializeAws_restJson1OutboundCrossClusterSearchConnections = (output, c
         }
         return deserializeAws_restJson1OutboundCrossClusterSearchConnection(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_restJson1OutboundCrossClusterSearchConnectionStatus = (output, context) => {
     return {
@@ -5545,7 +4419,7 @@ const deserializeAws_restJson1PackageDetails = (output, context) => {
     };
 };
 const deserializeAws_restJson1PackageDetailsList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -5553,6 +4427,7 @@ const deserializeAws_restJson1PackageDetailsList = (output, context) => {
         }
         return deserializeAws_restJson1PackageDetails(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_restJson1PackageVersionHistory = (output, context) => {
     return {
@@ -5564,7 +4439,7 @@ const deserializeAws_restJson1PackageVersionHistory = (output, context) => {
     };
 };
 const deserializeAws_restJson1PackageVersionHistoryList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -5572,6 +4447,7 @@ const deserializeAws_restJson1PackageVersionHistoryList = (output, context) => {
         }
         return deserializeAws_restJson1PackageVersionHistory(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_restJson1RecurringCharge = (output, context) => {
     return {
@@ -5580,7 +4456,7 @@ const deserializeAws_restJson1RecurringCharge = (output, context) => {
     };
 };
 const deserializeAws_restJson1RecurringChargeList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -5588,6 +4464,7 @@ const deserializeAws_restJson1RecurringChargeList = (output, context) => {
         }
         return deserializeAws_restJson1RecurringCharge(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_restJson1ReservedElasticsearchInstance = (output, context) => {
     return {
@@ -5611,7 +4488,7 @@ const deserializeAws_restJson1ReservedElasticsearchInstance = (output, context)
     };
 };
 const deserializeAws_restJson1ReservedElasticsearchInstanceList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -5619,6 +4496,7 @@ const deserializeAws_restJson1ReservedElasticsearchInstanceList = (output, conte
         }
         return deserializeAws_restJson1ReservedElasticsearchInstance(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_restJson1ReservedElasticsearchInstanceOffering = (output, context) => {
     return {
@@ -5635,7 +4513,7 @@ const deserializeAws_restJson1ReservedElasticsearchInstanceOffering = (output, c
     };
 };
 const deserializeAws_restJson1ReservedElasticsearchInstanceOfferingList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -5643,6 +4521,7 @@ const deserializeAws_restJson1ReservedElasticsearchInstanceOfferingList = (outpu
         }
         return deserializeAws_restJson1ReservedElasticsearchInstanceOffering(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_restJson1SAMLIdp = (output, context) => {
     return {
@@ -5718,7 +4597,7 @@ const deserializeAws_restJson1StorageTypeLimit = (output, context) => {
     };
 };
 const deserializeAws_restJson1StorageTypeLimitList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -5726,9 +4605,10 @@ const deserializeAws_restJson1StorageTypeLimitList = (output, context) => {
         }
         return deserializeAws_restJson1StorageTypeLimit(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_restJson1StorageTypeList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -5736,9 +4616,10 @@ const deserializeAws_restJson1StorageTypeList = (output, context) => {
         }
         return deserializeAws_restJson1StorageType(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_restJson1StringList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -5746,6 +4627,7 @@ const deserializeAws_restJson1StringList = (output, context) => {
         }
         return smithy_client_1.expectString(entry);
     });
+    return retVal;
 };
 const deserializeAws_restJson1Tag = (output, context) => {
     return {
@@ -5754,7 +4636,7 @@ const deserializeAws_restJson1Tag = (output, context) => {
     };
 };
 const deserializeAws_restJson1TagList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -5762,6 +4644,7 @@ const deserializeAws_restJson1TagList = (output, context) => {
         }
         return deserializeAws_restJson1Tag(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_restJson1UpgradeHistory = (output, context) => {
     return {
@@ -5776,7 +4659,7 @@ const deserializeAws_restJson1UpgradeHistory = (output, context) => {
     };
 };
 const deserializeAws_restJson1UpgradeHistoryList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -5784,6 +4667,7 @@ const deserializeAws_restJson1UpgradeHistoryList = (output, context) => {
         }
         return deserializeAws_restJson1UpgradeHistory(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_restJson1UpgradeStepItem = (output, context) => {
     return {
@@ -5796,7 +4680,7 @@ const deserializeAws_restJson1UpgradeStepItem = (output, context) => {
     };
 };
 const deserializeAws_restJson1UpgradeStepsList = (output, context) => {
-    return (output || [])
+    const retVal = (output || [])
         .filter((e) => e != null)
         .map((entry) => {
         if (entry === null) {
@@ -5804,6 +4688,7 @@ const deserializeAws_restJson1UpgradeStepsList = (output, context) => {
         }
         return deserializeAws_restJson1UpgradeStepItem(entry, context);
     });
+    return retVal;
 };
 const deserializeAws_restJson1VPCDerivedInfo = (output, context) => {
     return {