@aws-sdk/client-redshift 3.179.0 → 3.181.0

package/dist-cjs/protocols/Aws_query.js

@@ -1574,29 +1574,29 @@ exports.deserializeAws_queryAcceptReservedNodeExchangeCommand = deserializeAws_q
 const deserializeAws_queryAcceptReservedNodeExchangeCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "DependentServiceUnavailableFault":
         case "com.amazonaws.redshift#DependentServiceUnavailableFault":
             throw await deserializeAws_queryDependentServiceUnavailableFaultResponse(parsedOutput, context);
-        case "InvalidReservedNodeStateFault":
+        case "InvalidReservedNodeState":
         case "com.amazonaws.redshift#InvalidReservedNodeStateFault":
             throw await deserializeAws_queryInvalidReservedNodeStateFaultResponse(parsedOutput, context);
-        case "ReservedNodeAlreadyExistsFault":
+        case "ReservedNodeAlreadyExists":
         case "com.amazonaws.redshift#ReservedNodeAlreadyExistsFault":
             throw await deserializeAws_queryReservedNodeAlreadyExistsFaultResponse(parsedOutput, context);
-        case "ReservedNodeAlreadyMigratedFault":
+        case "ReservedNodeAlreadyMigrated":
         case "com.amazonaws.redshift#ReservedNodeAlreadyMigratedFault":
             throw await deserializeAws_queryReservedNodeAlreadyMigratedFaultResponse(parsedOutput, context);
-        case "ReservedNodeNotFoundFault":
+        case "ReservedNodeNotFound":
         case "com.amazonaws.redshift#ReservedNodeNotFoundFault":
             throw await deserializeAws_queryReservedNodeNotFoundFaultResponse(parsedOutput, context);
-        case "ReservedNodeOfferingNotFoundFault":
+        case "ReservedNodeOfferingNotFound":
         case "com.amazonaws.redshift#ReservedNodeOfferingNotFoundFault":
             throw await deserializeAws_queryReservedNodeOfferingNotFoundFaultResponse(parsedOutput, context);
-        case "UnsupportedOperationFault":
+        case "UnsupportedOperation":
         case "com.amazonaws.redshift#UnsupportedOperationFault":
             throw await deserializeAws_queryUnsupportedOperationFaultResponse(parsedOutput, context);
         default:
@@ -1626,17 +1626,17 @@ exports.deserializeAws_queryAddPartnerCommand = deserializeAws_queryAddPartnerCo
 const deserializeAws_queryAddPartnerCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "ClusterNotFoundFault":
+        case "ClusterNotFound":
         case "com.amazonaws.redshift#ClusterNotFoundFault":
             throw await deserializeAws_queryClusterNotFoundFaultResponse(parsedOutput, context);
-        case "PartnerNotFoundFault":
+        case "PartnerNotFound":
         case "com.amazonaws.redshift#PartnerNotFoundFault":
             throw await deserializeAws_queryPartnerNotFoundFaultResponse(parsedOutput, context);
-        case "UnauthorizedPartnerIntegrationFault":
+        case "UnauthorizedPartnerIntegration":
         case "com.amazonaws.redshift#UnauthorizedPartnerIntegrationFault":
             throw await deserializeAws_queryUnauthorizedPartnerIntegrationFaultResponse(parsedOutput, context);
         default:
@@ -1666,7 +1666,7 @@ exports.deserializeAws_queryAssociateDataShareConsumerCommand = deserializeAws_q
 const deserializeAws_queryAssociateDataShareConsumerCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
@@ -1703,20 +1703,20 @@ exports.deserializeAws_queryAuthorizeClusterSecurityGroupIngressCommand = deseri
 const deserializeAws_queryAuthorizeClusterSecurityGroupIngressCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "AuthorizationAlreadyExistsFault":
+        case "AuthorizationAlreadyExists":
         case "com.amazonaws.redshift#AuthorizationAlreadyExistsFault":
             throw await deserializeAws_queryAuthorizationAlreadyExistsFaultResponse(parsedOutput, context);
-        case "AuthorizationQuotaExceededFault":
+        case "AuthorizationQuotaExceeded":
         case "com.amazonaws.redshift#AuthorizationQuotaExceededFault":
             throw await deserializeAws_queryAuthorizationQuotaExceededFaultResponse(parsedOutput, context);
-        case "ClusterSecurityGroupNotFoundFault":
+        case "ClusterSecurityGroupNotFound":
         case "com.amazonaws.redshift#ClusterSecurityGroupNotFoundFault":
             throw await deserializeAws_queryClusterSecurityGroupNotFoundFaultResponse(parsedOutput, context);
-        case "InvalidClusterSecurityGroupStateFault":
+        case "InvalidClusterSecurityGroupState":
         case "com.amazonaws.redshift#InvalidClusterSecurityGroupStateFault":
             throw await deserializeAws_queryInvalidClusterSecurityGroupStateFaultResponse(parsedOutput, context);
         default:
@@ -1746,7 +1746,7 @@ exports.deserializeAws_queryAuthorizeDataShareCommand = deserializeAws_queryAuth
 const deserializeAws_queryAuthorizeDataShareCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
@@ -1780,26 +1780,26 @@ exports.deserializeAws_queryAuthorizeEndpointAccessCommand = deserializeAws_quer
 const deserializeAws_queryAuthorizeEndpointAccessCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "ClusterNotFoundFault":
+        case "ClusterNotFound":
         case "com.amazonaws.redshift#ClusterNotFoundFault":
             throw await deserializeAws_queryClusterNotFoundFaultResponse(parsedOutput, context);
-        case "EndpointAuthorizationAlreadyExistsFault":
+        case "EndpointAuthorizationAlreadyExists":
         case "com.amazonaws.redshift#EndpointAuthorizationAlreadyExistsFault":
             throw await deserializeAws_queryEndpointAuthorizationAlreadyExistsFaultResponse(parsedOutput, context);
-        case "EndpointAuthorizationsPerClusterLimitExceededFault":
+        case "EndpointAuthorizationsPerClusterLimitExceeded":
         case "com.amazonaws.redshift#EndpointAuthorizationsPerClusterLimitExceededFault":
             throw await deserializeAws_queryEndpointAuthorizationsPerClusterLimitExceededFaultResponse(parsedOutput, context);
-        case "InvalidAuthorizationStateFault":
+        case "InvalidAuthorizationState":
         case "com.amazonaws.redshift#InvalidAuthorizationStateFault":
             throw await deserializeAws_queryInvalidAuthorizationStateFaultResponse(parsedOutput, context);
-        case "InvalidClusterStateFault":
+        case "InvalidClusterState":
         case "com.amazonaws.redshift#InvalidClusterStateFault":
             throw await deserializeAws_queryInvalidClusterStateFaultResponse(parsedOutput, context);
-        case "UnsupportedOperationFault":
+        case "UnsupportedOperation":
         case "com.amazonaws.redshift#UnsupportedOperationFault":
             throw await deserializeAws_queryUnsupportedOperationFaultResponse(parsedOutput, context);
         default:
@@ -1829,29 +1829,29 @@ exports.deserializeAws_queryAuthorizeSnapshotAccessCommand = deserializeAws_quer
 const deserializeAws_queryAuthorizeSnapshotAccessCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "AuthorizationAlreadyExistsFault":
+        case "AuthorizationAlreadyExists":
         case "com.amazonaws.redshift#AuthorizationAlreadyExistsFault":
             throw await deserializeAws_queryAuthorizationAlreadyExistsFaultResponse(parsedOutput, context);
-        case "AuthorizationQuotaExceededFault":
+        case "AuthorizationQuotaExceeded":
         case "com.amazonaws.redshift#AuthorizationQuotaExceededFault":
             throw await deserializeAws_queryAuthorizationQuotaExceededFaultResponse(parsedOutput, context);
-        case "ClusterSnapshotNotFoundFault":
+        case "ClusterSnapshotNotFound":
         case "com.amazonaws.redshift#ClusterSnapshotNotFoundFault":
             throw await deserializeAws_queryClusterSnapshotNotFoundFaultResponse(parsedOutput, context);
         case "DependentServiceRequestThrottlingFault":
         case "com.amazonaws.redshift#DependentServiceRequestThrottlingFault":
             throw await deserializeAws_queryDependentServiceRequestThrottlingFaultResponse(parsedOutput, context);
-        case "InvalidClusterSnapshotStateFault":
+        case "InvalidClusterSnapshotState":
         case "com.amazonaws.redshift#InvalidClusterSnapshotStateFault":
             throw await deserializeAws_queryInvalidClusterSnapshotStateFaultResponse(parsedOutput, context);
         case "LimitExceededFault":
         case "com.amazonaws.redshift#LimitExceededFault":
             throw await deserializeAws_queryLimitExceededFaultResponse(parsedOutput, context);
-        case "UnsupportedOperationFault":
+        case "UnsupportedOperation":
         case "com.amazonaws.redshift#UnsupportedOperationFault":
             throw await deserializeAws_queryUnsupportedOperationFaultResponse(parsedOutput, context);
         default:
@@ -1881,11 +1881,11 @@ exports.deserializeAws_queryBatchDeleteClusterSnapshotsCommand = deserializeAws_
 const deserializeAws_queryBatchDeleteClusterSnapshotsCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "BatchDeleteRequestSizeExceededFault":
+        case "BatchDeleteRequestSizeExceeded":
         case "com.amazonaws.redshift#BatchDeleteRequestSizeExceededFault":
             throw await deserializeAws_queryBatchDeleteRequestSizeExceededFaultResponse(parsedOutput, context);
         default:
@@ -1915,7 +1915,7 @@ exports.deserializeAws_queryBatchModifyClusterSnapshotsCommand = deserializeAws_
 const deserializeAws_queryBatchModifyClusterSnapshotsCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
@@ -1952,20 +1952,20 @@ exports.deserializeAws_queryCancelResizeCommand = deserializeAws_queryCancelResi
 const deserializeAws_queryCancelResizeCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "ClusterNotFoundFault":
+        case "ClusterNotFound":
         case "com.amazonaws.redshift#ClusterNotFoundFault":
             throw await deserializeAws_queryClusterNotFoundFaultResponse(parsedOutput, context);
-        case "InvalidClusterStateFault":
+        case "InvalidClusterState":
         case "com.amazonaws.redshift#InvalidClusterStateFault":
             throw await deserializeAws_queryInvalidClusterStateFaultResponse(parsedOutput, context);
-        case "ResizeNotFoundFault":
+        case "ResizeNotFound":
         case "com.amazonaws.redshift#ResizeNotFoundFault":
             throw await deserializeAws_queryResizeNotFoundFaultResponse(parsedOutput, context);
-        case "UnsupportedOperationFault":
+        case "UnsupportedOperation":
         case "com.amazonaws.redshift#UnsupportedOperationFault":
             throw await deserializeAws_queryUnsupportedOperationFaultResponse(parsedOutput, context);
         default:
@@ -1995,20 +1995,20 @@ exports.deserializeAws_queryCopyClusterSnapshotCommand = deserializeAws_queryCop
 const deserializeAws_queryCopyClusterSnapshotCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "ClusterSnapshotAlreadyExistsFault":
+        case "ClusterSnapshotAlreadyExists":
         case "com.amazonaws.redshift#ClusterSnapshotAlreadyExistsFault":
             throw await deserializeAws_queryClusterSnapshotAlreadyExistsFaultResponse(parsedOutput, context);
-        case "ClusterSnapshotNotFoundFault":
+        case "ClusterSnapshotNotFound":
         case "com.amazonaws.redshift#ClusterSnapshotNotFoundFault":
             throw await deserializeAws_queryClusterSnapshotNotFoundFaultResponse(parsedOutput, context);
-        case "ClusterSnapshotQuotaExceededFault":
+        case "ClusterSnapshotQuotaExceeded":
         case "com.amazonaws.redshift#ClusterSnapshotQuotaExceededFault":
             throw await deserializeAws_queryClusterSnapshotQuotaExceededFaultResponse(parsedOutput, context);
-        case "InvalidClusterSnapshotStateFault":
+        case "InvalidClusterSnapshotState":
         case "com.amazonaws.redshift#InvalidClusterSnapshotStateFault":
             throw await deserializeAws_queryInvalidClusterSnapshotStateFaultResponse(parsedOutput, context);
         case "InvalidRetentionPeriodFault":
@@ -2041,7 +2041,7 @@ exports.deserializeAws_queryCreateAuthenticationProfileCommand = deserializeAws_
 const deserializeAws_queryCreateAuthenticationProfileCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
@@ -2081,20 +2081,20 @@ exports.deserializeAws_queryCreateClusterCommand = deserializeAws_queryCreateClu
 const deserializeAws_queryCreateClusterCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "ClusterAlreadyExistsFault":
+        case "ClusterAlreadyExists":
         case "com.amazonaws.redshift#ClusterAlreadyExistsFault":
             throw await deserializeAws_queryClusterAlreadyExistsFaultResponse(parsedOutput, context);
-        case "ClusterParameterGroupNotFoundFault":
+        case "ClusterParameterGroupNotFound":
         case "com.amazonaws.redshift#ClusterParameterGroupNotFoundFault":
             throw await deserializeAws_queryClusterParameterGroupNotFoundFaultResponse(parsedOutput, context);
-        case "ClusterQuotaExceededFault":
+        case "ClusterQuotaExceeded":
         case "com.amazonaws.redshift#ClusterQuotaExceededFault":
             throw await deserializeAws_queryClusterQuotaExceededFaultResponse(parsedOutput, context);
-        case "ClusterSecurityGroupNotFoundFault":
+        case "ClusterSecurityGroupNotFound":
         case "com.amazonaws.redshift#ClusterSecurityGroupNotFoundFault":
             throw await deserializeAws_queryClusterSecurityGroupNotFoundFaultResponse(parsedOutput, context);
         case "ClusterSubnetGroupNotFoundFault":
@@ -2109,13 +2109,13 @@ const deserializeAws_queryCreateClusterCommandError = async (output, context) =>
         case "HsmConfigurationNotFoundFault":
         case "com.amazonaws.redshift#HsmConfigurationNotFoundFault":
             throw await deserializeAws_queryHsmConfigurationNotFoundFaultResponse(parsedOutput, context);
-        case "InsufficientClusterCapacityFault":
+        case "InsufficientClusterCapacity":
         case "com.amazonaws.redshift#InsufficientClusterCapacityFault":
             throw await deserializeAws_queryInsufficientClusterCapacityFaultResponse(parsedOutput, context);
         case "InvalidClusterSubnetGroupStateFault":
         case "com.amazonaws.redshift#InvalidClusterSubnetGroupStateFault":
             throw await deserializeAws_queryInvalidClusterSubnetGroupStateFaultResponse(parsedOutput, context);
-        case "InvalidClusterTrackFault":
+        case "InvalidClusterTrack":
         case "com.amazonaws.redshift#InvalidClusterTrackFault":
             throw await deserializeAws_queryInvalidClusterTrackFaultResponse(parsedOutput, context);
         case "InvalidElasticIpFault":
@@ -2136,13 +2136,13 @@ const deserializeAws_queryCreateClusterCommandError = async (output, context) =>
         case "LimitExceededFault":
         case "com.amazonaws.redshift#LimitExceededFault":
             throw await deserializeAws_queryLimitExceededFaultResponse(parsedOutput, context);
-        case "NumberOfNodesPerClusterLimitExceededFault":
+        case "NumberOfNodesPerClusterLimitExceeded":
         case "com.amazonaws.redshift#NumberOfNodesPerClusterLimitExceededFault":
             throw await deserializeAws_queryNumberOfNodesPerClusterLimitExceededFaultResponse(parsedOutput, context);
-        case "NumberOfNodesQuotaExceededFault":
+        case "NumberOfNodesQuotaExceeded":
         case "com.amazonaws.redshift#NumberOfNodesQuotaExceededFault":
             throw await deserializeAws_queryNumberOfNodesQuotaExceededFaultResponse(parsedOutput, context);
-        case "SnapshotScheduleNotFoundFault":
+        case "SnapshotScheduleNotFound":
         case "com.amazonaws.redshift#SnapshotScheduleNotFoundFault":
             throw await deserializeAws_querySnapshotScheduleNotFoundFaultResponse(parsedOutput, context);
         case "TagLimitExceededFault":
@@ -2178,14 +2178,14 @@ exports.deserializeAws_queryCreateClusterParameterGroupCommand = deserializeAws_
 const deserializeAws_queryCreateClusterParameterGroupCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "ClusterParameterGroupAlreadyExistsFault":
+        case "ClusterParameterGroupAlreadyExists":
         case "com.amazonaws.redshift#ClusterParameterGroupAlreadyExistsFault":
             throw await deserializeAws_queryClusterParameterGroupAlreadyExistsFaultResponse(parsedOutput, context);
-        case "ClusterParameterGroupQuotaExceededFault":
+        case "ClusterParameterGroupQuotaExceeded":
         case "com.amazonaws.redshift#ClusterParameterGroupQuotaExceededFault":
             throw await deserializeAws_queryClusterParameterGroupQuotaExceededFaultResponse(parsedOutput, context);
         case "InvalidTagFault":
@@ -2221,19 +2221,19 @@ exports.deserializeAws_queryCreateClusterSecurityGroupCommand = deserializeAws_q
 const deserializeAws_queryCreateClusterSecurityGroupCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "ClusterSecurityGroupAlreadyExistsFault":
+        case "ClusterSecurityGroupAlreadyExists":
         case "com.amazonaws.redshift#ClusterSecurityGroupAlreadyExistsFault":
             throw await deserializeAws_queryClusterSecurityGroupAlreadyExistsFaultResponse(parsedOutput, context);
-        case "ClusterSecurityGroupQuotaExceededFault":
-        case "com.amazonaws.redshift#ClusterSecurityGroupQuotaExceededFault":
-            throw await deserializeAws_queryClusterSecurityGroupQuotaExceededFaultResponse(parsedOutput, context);
         case "InvalidTagFault":
         case "com.amazonaws.redshift#InvalidTagFault":
             throw await deserializeAws_queryInvalidTagFaultResponse(parsedOutput, context);
+        case "QuotaExceeded.ClusterSecurityGroup":
+        case "com.amazonaws.redshift#ClusterSecurityGroupQuotaExceededFault":
+            throw await deserializeAws_queryClusterSecurityGroupQuotaExceededFaultResponse(parsedOutput, context);
         case "TagLimitExceededFault":
         case "com.amazonaws.redshift#TagLimitExceededFault":
             throw await deserializeAws_queryTagLimitExceededFaultResponse(parsedOutput, context);
@@ -2264,20 +2264,20 @@ exports.deserializeAws_queryCreateClusterSnapshotCommand = deserializeAws_queryC
 const deserializeAws_queryCreateClusterSnapshotCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "ClusterNotFoundFault":
+        case "ClusterNotFound":
         case "com.amazonaws.redshift#ClusterNotFoundFault":
             throw await deserializeAws_queryClusterNotFoundFaultResponse(parsedOutput, context);
-        case "ClusterSnapshotAlreadyExistsFault":
+        case "ClusterSnapshotAlreadyExists":
         case "com.amazonaws.redshift#ClusterSnapshotAlreadyExistsFault":
             throw await deserializeAws_queryClusterSnapshotAlreadyExistsFaultResponse(parsedOutput, context);
-        case "ClusterSnapshotQuotaExceededFault":
+        case "ClusterSnapshotQuotaExceeded":
         case "com.amazonaws.redshift#ClusterSnapshotQuotaExceededFault":
             throw await deserializeAws_queryClusterSnapshotQuotaExceededFaultResponse(parsedOutput, context);
-        case "InvalidClusterStateFault":
+        case "InvalidClusterState":
         case "com.amazonaws.redshift#InvalidClusterStateFault":
             throw await deserializeAws_queryInvalidClusterStateFaultResponse(parsedOutput, context);
         case "InvalidRetentionPeriodFault":
@@ -2316,14 +2316,14 @@ exports.deserializeAws_queryCreateClusterSubnetGroupCommand = deserializeAws_que
 const deserializeAws_queryCreateClusterSubnetGroupCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "ClusterSubnetGroupAlreadyExistsFault":
+        case "ClusterSubnetGroupAlreadyExists":
         case "com.amazonaws.redshift#ClusterSubnetGroupAlreadyExistsFault":
             throw await deserializeAws_queryClusterSubnetGroupAlreadyExistsFaultResponse(parsedOutput, context);
-        case "ClusterSubnetGroupQuotaExceededFault":
+        case "ClusterSubnetGroupQuotaExceeded":
         case "com.amazonaws.redshift#ClusterSubnetGroupQuotaExceededFault":
             throw await deserializeAws_queryClusterSubnetGroupQuotaExceededFaultResponse(parsedOutput, context);
         case "ClusterSubnetQuotaExceededFault":
@@ -2371,38 +2371,38 @@ exports.deserializeAws_queryCreateEndpointAccessCommand = deserializeAws_queryCr
 const deserializeAws_queryCreateEndpointAccessCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "AccessToClusterDeniedFault":
+        case "AccessToClusterDenied":
         case "com.amazonaws.redshift#AccessToClusterDeniedFault":
             throw await deserializeAws_queryAccessToClusterDeniedFaultResponse(parsedOutput, context);
-        case "ClusterNotFoundFault":
+        case "ClusterNotFound":
         case "com.amazonaws.redshift#ClusterNotFoundFault":
             throw await deserializeAws_queryClusterNotFoundFaultResponse(parsedOutput, context);
         case "ClusterSubnetGroupNotFoundFault":
         case "com.amazonaws.redshift#ClusterSubnetGroupNotFoundFault":
             throw await deserializeAws_queryClusterSubnetGroupNotFoundFaultResponse(parsedOutput, context);
-        case "EndpointAlreadyExistsFault":
+        case "EndpointAlreadyExists":
         case "com.amazonaws.redshift#EndpointAlreadyExistsFault":
             throw await deserializeAws_queryEndpointAlreadyExistsFaultResponse(parsedOutput, context);
-        case "EndpointsPerAuthorizationLimitExceededFault":
+        case "EndpointsPerAuthorizationLimitExceeded":
         case "com.amazonaws.redshift#EndpointsPerAuthorizationLimitExceededFault":
             throw await deserializeAws_queryEndpointsPerAuthorizationLimitExceededFaultResponse(parsedOutput, context);
-        case "EndpointsPerClusterLimitExceededFault":
+        case "EndpointsPerClusterLimitExceeded":
         case "com.amazonaws.redshift#EndpointsPerClusterLimitExceededFault":
             throw await deserializeAws_queryEndpointsPerClusterLimitExceededFaultResponse(parsedOutput, context);
-        case "InvalidClusterSecurityGroupStateFault":
+        case "InvalidClusterSecurityGroupState":
         case "com.amazonaws.redshift#InvalidClusterSecurityGroupStateFault":
             throw await deserializeAws_queryInvalidClusterSecurityGroupStateFaultResponse(parsedOutput, context);
-        case "InvalidClusterStateFault":
+        case "InvalidClusterState":
         case "com.amazonaws.redshift#InvalidClusterStateFault":
             throw await deserializeAws_queryInvalidClusterStateFaultResponse(parsedOutput, context);
         case "UnauthorizedOperation":
         case "com.amazonaws.redshift#UnauthorizedOperation":
             throw await deserializeAws_queryUnauthorizedOperationResponse(parsedOutput, context);
-        case "UnsupportedOperationFault":
+        case "UnsupportedOperation":
         case "com.amazonaws.redshift#UnsupportedOperationFault":
             throw await deserializeAws_queryUnsupportedOperationFaultResponse(parsedOutput, context);
         default:
@@ -2432,38 +2432,38 @@ exports.deserializeAws_queryCreateEventSubscriptionCommand = deserializeAws_quer
 const deserializeAws_queryCreateEventSubscriptionCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "EventSubscriptionQuotaExceededFault":
+        case "EventSubscriptionQuotaExceeded":
         case "com.amazonaws.redshift#EventSubscriptionQuotaExceededFault":
             throw await deserializeAws_queryEventSubscriptionQuotaExceededFaultResponse(parsedOutput, context);
         case "InvalidTagFault":
         case "com.amazonaws.redshift#InvalidTagFault":
             throw await deserializeAws_queryInvalidTagFaultResponse(parsedOutput, context);
-        case "SNSInvalidTopicFault":
+        case "SNSInvalidTopic":
         case "com.amazonaws.redshift#SNSInvalidTopicFault":
             throw await deserializeAws_querySNSInvalidTopicFaultResponse(parsedOutput, context);
-        case "SNSNoAuthorizationFault":
+        case "SNSNoAuthorization":
         case "com.amazonaws.redshift#SNSNoAuthorizationFault":
             throw await deserializeAws_querySNSNoAuthorizationFaultResponse(parsedOutput, context);
-        case "SNSTopicArnNotFoundFault":
+        case "SNSTopicArnNotFound":
         case "com.amazonaws.redshift#SNSTopicArnNotFoundFault":
             throw await deserializeAws_querySNSTopicArnNotFoundFaultResponse(parsedOutput, context);
-        case "SourceNotFoundFault":
+        case "SourceNotFound":
         case "com.amazonaws.redshift#SourceNotFoundFault":
             throw await deserializeAws_querySourceNotFoundFaultResponse(parsedOutput, context);
-        case "SubscriptionAlreadyExistFault":
+        case "SubscriptionAlreadyExist":
         case "com.amazonaws.redshift#SubscriptionAlreadyExistFault":
             throw await deserializeAws_querySubscriptionAlreadyExistFaultResponse(parsedOutput, context);
-        case "SubscriptionCategoryNotFoundFault":
+        case "SubscriptionCategoryNotFound":
         case "com.amazonaws.redshift#SubscriptionCategoryNotFoundFault":
             throw await deserializeAws_querySubscriptionCategoryNotFoundFaultResponse(parsedOutput, context);
-        case "SubscriptionEventIdNotFoundFault":
+        case "SubscriptionEventIdNotFound":
         case "com.amazonaws.redshift#SubscriptionEventIdNotFoundFault":
             throw await deserializeAws_querySubscriptionEventIdNotFoundFaultResponse(parsedOutput, context);
-        case "SubscriptionSeverityNotFoundFault":
+        case "SubscriptionSeverityNotFound":
         case "com.amazonaws.redshift#SubscriptionSeverityNotFoundFault":
             throw await deserializeAws_querySubscriptionSeverityNotFoundFaultResponse(parsedOutput, context);
         case "TagLimitExceededFault":
@@ -2496,7 +2496,7 @@ exports.deserializeAws_queryCreateHsmClientCertificateCommand = deserializeAws_q
 const deserializeAws_queryCreateHsmClientCertificateCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
@@ -2539,7 +2539,7 @@ exports.deserializeAws_queryCreateHsmConfigurationCommand = deserializeAws_query
 const deserializeAws_queryCreateHsmConfigurationCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
@@ -2582,23 +2582,23 @@ exports.deserializeAws_queryCreateScheduledActionCommand = deserializeAws_queryC
 const deserializeAws_queryCreateScheduledActionCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "InvalidScheduledActionFault":
-        case "com.amazonaws.redshift#InvalidScheduledActionFault":
-            throw await deserializeAws_queryInvalidScheduledActionFaultResponse(parsedOutput, context);
-        case "InvalidScheduleFault":
+        case "InvalidSchedule":
         case "com.amazonaws.redshift#InvalidScheduleFault":
             throw await deserializeAws_queryInvalidScheduleFaultResponse(parsedOutput, context);
-        case "ScheduledActionAlreadyExistsFault":
+        case "InvalidScheduledAction":
+        case "com.amazonaws.redshift#InvalidScheduledActionFault":
+            throw await deserializeAws_queryInvalidScheduledActionFaultResponse(parsedOutput, context);
+        case "ScheduledActionAlreadyExists":
         case "com.amazonaws.redshift#ScheduledActionAlreadyExistsFault":
             throw await deserializeAws_queryScheduledActionAlreadyExistsFaultResponse(parsedOutput, context);
-        case "ScheduledActionQuotaExceededFault":
+        case "ScheduledActionQuotaExceeded":
         case "com.amazonaws.redshift#ScheduledActionQuotaExceededFault":
             throw await deserializeAws_queryScheduledActionQuotaExceededFaultResponse(parsedOutput, context);
-        case "ScheduledActionTypeUnsupportedFault":
+        case "ScheduledActionTypeUnsupported":
         case "com.amazonaws.redshift#ScheduledActionTypeUnsupportedFault":
             throw await deserializeAws_queryScheduledActionTypeUnsupportedFaultResponse(parsedOutput, context);
         case "UnauthorizedOperation":
@@ -2631,7 +2631,7 @@ exports.deserializeAws_queryCreateSnapshotCopyGrantCommand = deserializeAws_quer
 const deserializeAws_queryCreateSnapshotCopyGrantCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
@@ -2680,23 +2680,23 @@ exports.deserializeAws_queryCreateSnapshotScheduleCommand = deserializeAws_query
 const deserializeAws_queryCreateSnapshotScheduleCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "InvalidScheduleFault":
+        case "InvalidSchedule":
         case "com.amazonaws.redshift#InvalidScheduleFault":
             throw await deserializeAws_queryInvalidScheduleFaultResponse(parsedOutput, context);
         case "InvalidTagFault":
         case "com.amazonaws.redshift#InvalidTagFault":
             throw await deserializeAws_queryInvalidTagFaultResponse(parsedOutput, context);
-        case "ScheduleDefinitionTypeUnsupportedFault":
+        case "ScheduleDefinitionTypeUnsupported":
         case "com.amazonaws.redshift#ScheduleDefinitionTypeUnsupportedFault":
             throw await deserializeAws_queryScheduleDefinitionTypeUnsupportedFaultResponse(parsedOutput, context);
-        case "SnapshotScheduleAlreadyExistsFault":
+        case "SnapshotScheduleAlreadyExists":
         case "com.amazonaws.redshift#SnapshotScheduleAlreadyExistsFault":
             throw await deserializeAws_querySnapshotScheduleAlreadyExistsFaultResponse(parsedOutput, context);
-        case "SnapshotScheduleQuotaExceededFault":
+        case "SnapshotScheduleQuotaExceeded":
         case "com.amazonaws.redshift#SnapshotScheduleQuotaExceededFault":
             throw await deserializeAws_querySnapshotScheduleQuotaExceededFaultResponse(parsedOutput, context);
         case "TagLimitExceededFault":
@@ -2726,11 +2726,11 @@ exports.deserializeAws_queryCreateTagsCommand = deserializeAws_queryCreateTagsCo
 const deserializeAws_queryCreateTagsCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "InvalidClusterStateFault":
+        case "InvalidClusterState":
         case "com.amazonaws.redshift#InvalidClusterStateFault":
             throw await deserializeAws_queryInvalidClusterStateFaultResponse(parsedOutput, context);
         case "InvalidTagFault":
@@ -2769,17 +2769,17 @@ exports.deserializeAws_queryCreateUsageLimitCommand = deserializeAws_queryCreate
 const deserializeAws_queryCreateUsageLimitCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "ClusterNotFoundFault":
+        case "ClusterNotFound":
         case "com.amazonaws.redshift#ClusterNotFoundFault":
             throw await deserializeAws_queryClusterNotFoundFaultResponse(parsedOutput, context);
-        case "InvalidClusterStateFault":
+        case "InvalidClusterState":
         case "com.amazonaws.redshift#InvalidClusterStateFault":
             throw await deserializeAws_queryInvalidClusterStateFaultResponse(parsedOutput, context);
-        case "InvalidUsageLimitFault":
+        case "InvalidUsageLimit":
         case "com.amazonaws.redshift#InvalidUsageLimitFault":
             throw await deserializeAws_queryInvalidUsageLimitFaultResponse(parsedOutput, context);
         case "LimitExceededFault":
@@ -2788,10 +2788,10 @@ const deserializeAws_queryCreateUsageLimitCommandError = async (output, context)
         case "TagLimitExceededFault":
         case "com.amazonaws.redshift#TagLimitExceededFault":
             throw await deserializeAws_queryTagLimitExceededFaultResponse(parsedOutput, context);
-        case "UnsupportedOperationFault":
+        case "UnsupportedOperation":
         case "com.amazonaws.redshift#UnsupportedOperationFault":
             throw await deserializeAws_queryUnsupportedOperationFaultResponse(parsedOutput, context);
-        case "UsageLimitAlreadyExistsFault":
+        case "UsageLimitAlreadyExists":
         case "com.amazonaws.redshift#UsageLimitAlreadyExistsFault":
             throw await deserializeAws_queryUsageLimitAlreadyExistsFaultResponse(parsedOutput, context);
         default:
@@ -2821,7 +2821,7 @@ exports.deserializeAws_queryDeauthorizeDataShareCommand = deserializeAws_queryDe
 const deserializeAws_queryDeauthorizeDataShareCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
@@ -2855,7 +2855,7 @@ exports.deserializeAws_queryDeleteAuthenticationProfileCommand = deserializeAws_
 const deserializeAws_queryDeleteAuthenticationProfileCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
@@ -2892,20 +2892,20 @@ exports.deserializeAws_queryDeleteClusterCommand = deserializeAws_queryDeleteClu
 const deserializeAws_queryDeleteClusterCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "ClusterNotFoundFault":
+        case "ClusterNotFound":
         case "com.amazonaws.redshift#ClusterNotFoundFault":
             throw await deserializeAws_queryClusterNotFoundFaultResponse(parsedOutput, context);
-        case "ClusterSnapshotAlreadyExistsFault":
+        case "ClusterSnapshotAlreadyExists":
         case "com.amazonaws.redshift#ClusterSnapshotAlreadyExistsFault":
             throw await deserializeAws_queryClusterSnapshotAlreadyExistsFaultResponse(parsedOutput, context);
-        case "ClusterSnapshotQuotaExceededFault":
+        case "ClusterSnapshotQuotaExceeded":
         case "com.amazonaws.redshift#ClusterSnapshotQuotaExceededFault":
             throw await deserializeAws_queryClusterSnapshotQuotaExceededFaultResponse(parsedOutput, context);
-        case "InvalidClusterStateFault":
+        case "InvalidClusterState":
         case "com.amazonaws.redshift#InvalidClusterStateFault":
             throw await deserializeAws_queryInvalidClusterStateFaultResponse(parsedOutput, context);
         case "InvalidRetentionPeriodFault":
@@ -2935,14 +2935,14 @@ exports.deserializeAws_queryDeleteClusterParameterGroupCommand = deserializeAws_
 const deserializeAws_queryDeleteClusterParameterGroupCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "ClusterParameterGroupNotFoundFault":
+        case "ClusterParameterGroupNotFound":
         case "com.amazonaws.redshift#ClusterParameterGroupNotFoundFault":
             throw await deserializeAws_queryClusterParameterGroupNotFoundFaultResponse(parsedOutput, context);
-        case "InvalidClusterParameterGroupStateFault":
+        case "InvalidClusterParameterGroupState":
         case "com.amazonaws.redshift#InvalidClusterParameterGroupStateFault":
             throw await deserializeAws_queryInvalidClusterParameterGroupStateFaultResponse(parsedOutput, context);
         default:
@@ -2969,14 +2969,14 @@ exports.deserializeAws_queryDeleteClusterSecurityGroupCommand = deserializeAws_q
 const deserializeAws_queryDeleteClusterSecurityGroupCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "ClusterSecurityGroupNotFoundFault":
+        case "ClusterSecurityGroupNotFound":
         case "com.amazonaws.redshift#ClusterSecurityGroupNotFoundFault":
             throw await deserializeAws_queryClusterSecurityGroupNotFoundFaultResponse(parsedOutput, context);
-        case "InvalidClusterSecurityGroupStateFault":
+        case "InvalidClusterSecurityGroupState":
         case "com.amazonaws.redshift#InvalidClusterSecurityGroupStateFault":
             throw await deserializeAws_queryInvalidClusterSecurityGroupStateFaultResponse(parsedOutput, context);
         default:
@@ -3006,14 +3006,14 @@ exports.deserializeAws_queryDeleteClusterSnapshotCommand = deserializeAws_queryD
 const deserializeAws_queryDeleteClusterSnapshotCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "ClusterSnapshotNotFoundFault":
+        case "ClusterSnapshotNotFound":
         case "com.amazonaws.redshift#ClusterSnapshotNotFoundFault":
             throw await deserializeAws_queryClusterSnapshotNotFoundFaultResponse(parsedOutput, context);
-        case "InvalidClusterSnapshotStateFault":
+        case "InvalidClusterSnapshotState":
         case "com.amazonaws.redshift#InvalidClusterSnapshotStateFault":
             throw await deserializeAws_queryInvalidClusterSnapshotStateFaultResponse(parsedOutput, context);
         default:
@@ -3040,7 +3040,7 @@ exports.deserializeAws_queryDeleteClusterSubnetGroupCommand = deserializeAws_que
 const deserializeAws_queryDeleteClusterSubnetGroupCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
@@ -3080,23 +3080,23 @@ exports.deserializeAws_queryDeleteEndpointAccessCommand = deserializeAws_queryDe
 const deserializeAws_queryDeleteEndpointAccessCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "ClusterNotFoundFault":
+        case "ClusterNotFound":
         case "com.amazonaws.redshift#ClusterNotFoundFault":
             throw await deserializeAws_queryClusterNotFoundFaultResponse(parsedOutput, context);
-        case "EndpointNotFoundFault":
+        case "EndpointNotFound":
         case "com.amazonaws.redshift#EndpointNotFoundFault":
             throw await deserializeAws_queryEndpointNotFoundFaultResponse(parsedOutput, context);
-        case "InvalidClusterSecurityGroupStateFault":
+        case "InvalidClusterSecurityGroupState":
         case "com.amazonaws.redshift#InvalidClusterSecurityGroupStateFault":
             throw await deserializeAws_queryInvalidClusterSecurityGroupStateFaultResponse(parsedOutput, context);
-        case "InvalidClusterStateFault":
+        case "InvalidClusterState":
         case "com.amazonaws.redshift#InvalidClusterStateFault":
             throw await deserializeAws_queryInvalidClusterStateFaultResponse(parsedOutput, context);
-        case "InvalidEndpointStateFault":
+        case "InvalidEndpointState":
         case "com.amazonaws.redshift#InvalidEndpointStateFault":
             throw await deserializeAws_queryInvalidEndpointStateFaultResponse(parsedOutput, context);
         default:
@@ -3123,14 +3123,14 @@ exports.deserializeAws_queryDeleteEventSubscriptionCommand = deserializeAws_quer
 const deserializeAws_queryDeleteEventSubscriptionCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "InvalidSubscriptionStateFault":
         case "com.amazonaws.redshift#InvalidSubscriptionStateFault":
             throw await deserializeAws_queryInvalidSubscriptionStateFaultResponse(parsedOutput, context);
-        case "SubscriptionNotFoundFault":
+        case "SubscriptionNotFound":
         case "com.amazonaws.redshift#SubscriptionNotFoundFault":
             throw await deserializeAws_querySubscriptionNotFoundFaultResponse(parsedOutput, context);
         default:
@@ -3157,7 +3157,7 @@ exports.deserializeAws_queryDeleteHsmClientCertificateCommand = deserializeAws_q
 const deserializeAws_queryDeleteHsmClientCertificateCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
@@ -3191,7 +3191,7 @@ exports.deserializeAws_queryDeleteHsmConfigurationCommand = deserializeAws_query
 const deserializeAws_queryDeleteHsmConfigurationCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
@@ -3228,17 +3228,17 @@ exports.deserializeAws_queryDeletePartnerCommand = deserializeAws_queryDeletePar
 const deserializeAws_queryDeletePartnerCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "ClusterNotFoundFault":
+        case "ClusterNotFound":
         case "com.amazonaws.redshift#ClusterNotFoundFault":
             throw await deserializeAws_queryClusterNotFoundFaultResponse(parsedOutput, context);
-        case "PartnerNotFoundFault":
+        case "PartnerNotFound":
         case "com.amazonaws.redshift#PartnerNotFoundFault":
             throw await deserializeAws_queryPartnerNotFoundFaultResponse(parsedOutput, context);
-        case "UnauthorizedPartnerIntegrationFault":
+        case "UnauthorizedPartnerIntegration":
         case "com.amazonaws.redshift#UnauthorizedPartnerIntegrationFault":
             throw await deserializeAws_queryUnauthorizedPartnerIntegrationFaultResponse(parsedOutput, context);
         default:
@@ -3265,11 +3265,11 @@ exports.deserializeAws_queryDeleteScheduledActionCommand = deserializeAws_queryD
 const deserializeAws_queryDeleteScheduledActionCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "ScheduledActionNotFoundFault":
+        case "ScheduledActionNotFound":
         case "com.amazonaws.redshift#ScheduledActionNotFoundFault":
             throw await deserializeAws_queryScheduledActionNotFoundFaultResponse(parsedOutput, context);
         case "UnauthorizedOperation":
@@ -3299,7 +3299,7 @@ exports.deserializeAws_queryDeleteSnapshotCopyGrantCommand = deserializeAws_quer
 const deserializeAws_queryDeleteSnapshotCopyGrantCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
@@ -3333,14 +3333,14 @@ exports.deserializeAws_queryDeleteSnapshotScheduleCommand = deserializeAws_query
 const deserializeAws_queryDeleteSnapshotScheduleCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "InvalidClusterSnapshotScheduleStateFault":
+        case "InvalidClusterSnapshotScheduleState":
         case "com.amazonaws.redshift#InvalidClusterSnapshotScheduleStateFault":
             throw await deserializeAws_queryInvalidClusterSnapshotScheduleStateFaultResponse(parsedOutput, context);
-        case "SnapshotScheduleNotFoundFault":
+        case "SnapshotScheduleNotFound":
         case "com.amazonaws.redshift#SnapshotScheduleNotFoundFault":
             throw await deserializeAws_querySnapshotScheduleNotFoundFaultResponse(parsedOutput, context);
         default:
@@ -3367,7 +3367,7 @@ exports.deserializeAws_queryDeleteTagsCommand = deserializeAws_queryDeleteTagsCo
 const deserializeAws_queryDeleteTagsCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
@@ -3401,14 +3401,14 @@ exports.deserializeAws_queryDeleteUsageLimitCommand = deserializeAws_queryDelete
 const deserializeAws_queryDeleteUsageLimitCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "UnsupportedOperationFault":
+        case "UnsupportedOperation":
         case "com.amazonaws.redshift#UnsupportedOperationFault":
             throw await deserializeAws_queryUnsupportedOperationFaultResponse(parsedOutput, context);
-        case "UsageLimitNotFoundFault":
+        case "UsageLimitNotFound":
         case "com.amazonaws.redshift#UsageLimitNotFoundFault":
             throw await deserializeAws_queryUsageLimitNotFoundFaultResponse(parsedOutput, context);
         default:
@@ -3438,7 +3438,7 @@ exports.deserializeAws_queryDescribeAccountAttributesCommand = deserializeAws_qu
 const deserializeAws_queryDescribeAccountAttributesCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     const parsedBody = parsedOutput.body;
@@ -3466,7 +3466,7 @@ exports.deserializeAws_queryDescribeAuthenticationProfilesCommand = deserializeA
 const deserializeAws_queryDescribeAuthenticationProfilesCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
@@ -3503,14 +3503,14 @@ exports.deserializeAws_queryDescribeClusterDbRevisionsCommand = deserializeAws_q
 const deserializeAws_queryDescribeClusterDbRevisionsCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "ClusterNotFoundFault":
+        case "ClusterNotFound":
         case "com.amazonaws.redshift#ClusterNotFoundFault":
             throw await deserializeAws_queryClusterNotFoundFaultResponse(parsedOutput, context);
-        case "InvalidClusterStateFault":
+        case "InvalidClusterState":
         case "com.amazonaws.redshift#InvalidClusterStateFault":
             throw await deserializeAws_queryInvalidClusterStateFaultResponse(parsedOutput, context);
         default:
@@ -3540,11 +3540,11 @@ exports.deserializeAws_queryDescribeClusterParameterGroupsCommand = deserializeA
 const deserializeAws_queryDescribeClusterParameterGroupsCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "ClusterParameterGroupNotFoundFault":
+        case "ClusterParameterGroupNotFound":
         case "com.amazonaws.redshift#ClusterParameterGroupNotFoundFault":
             throw await deserializeAws_queryClusterParameterGroupNotFoundFaultResponse(parsedOutput, context);
         case "InvalidTagFault":
@@ -3577,11 +3577,11 @@ exports.deserializeAws_queryDescribeClusterParametersCommand = deserializeAws_qu
 const deserializeAws_queryDescribeClusterParametersCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "ClusterParameterGroupNotFoundFault":
+        case "ClusterParameterGroupNotFound":
         case "com.amazonaws.redshift#ClusterParameterGroupNotFoundFault":
             throw await deserializeAws_queryClusterParameterGroupNotFoundFaultResponse(parsedOutput, context);
         default:
@@ -3611,11 +3611,11 @@ exports.deserializeAws_queryDescribeClustersCommand = deserializeAws_queryDescri
 const deserializeAws_queryDescribeClustersCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "ClusterNotFoundFault":
+        case "ClusterNotFound":
         case "com.amazonaws.redshift#ClusterNotFoundFault":
             throw await deserializeAws_queryClusterNotFoundFaultResponse(parsedOutput, context);
         case "InvalidTagFault":
@@ -3648,11 +3648,11 @@ exports.deserializeAws_queryDescribeClusterSecurityGroupsCommand = deserializeAw
 const deserializeAws_queryDescribeClusterSecurityGroupsCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "ClusterSecurityGroupNotFoundFault":
+        case "ClusterSecurityGroupNotFound":
         case "com.amazonaws.redshift#ClusterSecurityGroupNotFoundFault":
             throw await deserializeAws_queryClusterSecurityGroupNotFoundFaultResponse(parsedOutput, context);
         case "InvalidTagFault":
@@ -3685,20 +3685,20 @@ exports.deserializeAws_queryDescribeClusterSnapshotsCommand = deserializeAws_que
 const deserializeAws_queryDescribeClusterSnapshotsCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "ClusterNotFoundFault":
+        case "ClusterNotFound":
         case "com.amazonaws.redshift#ClusterNotFoundFault":
             throw await deserializeAws_queryClusterNotFoundFaultResponse(parsedOutput, context);
-        case "ClusterSnapshotNotFoundFault":
+        case "ClusterSnapshotNotFound":
         case "com.amazonaws.redshift#ClusterSnapshotNotFoundFault":
             throw await deserializeAws_queryClusterSnapshotNotFoundFaultResponse(parsedOutput, context);
         case "InvalidTagFault":
         case "com.amazonaws.redshift#InvalidTagFault":
             throw await deserializeAws_queryInvalidTagFaultResponse(parsedOutput, context);
-        case "UnsupportedOperationFault":
+        case "UnsupportedOperation":
         case "com.amazonaws.redshift#UnsupportedOperationFault":
             throw await deserializeAws_queryUnsupportedOperationFaultResponse(parsedOutput, context);
         default:
@@ -3728,7 +3728,7 @@ exports.deserializeAws_queryDescribeClusterSubnetGroupsCommand = deserializeAws_
 const deserializeAws_queryDescribeClusterSubnetGroupsCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
@@ -3765,11 +3765,11 @@ exports.deserializeAws_queryDescribeClusterTracksCommand = deserializeAws_queryD
 const deserializeAws_queryDescribeClusterTracksCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "InvalidClusterTrackFault":
+        case "InvalidClusterTrack":
         case "com.amazonaws.redshift#InvalidClusterTrackFault":
             throw await deserializeAws_queryInvalidClusterTrackFaultResponse(parsedOutput, context);
         case "UnauthorizedOperation":
@@ -3802,7 +3802,7 @@ exports.deserializeAws_queryDescribeClusterVersionsCommand = deserializeAws_quer
 const deserializeAws_queryDescribeClusterVersionsCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     const parsedBody = parsedOutput.body;
@@ -3830,7 +3830,7 @@ exports.deserializeAws_queryDescribeDataSharesCommand = deserializeAws_queryDesc
 const deserializeAws_queryDescribeDataSharesCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
@@ -3864,7 +3864,7 @@ exports.deserializeAws_queryDescribeDataSharesForConsumerCommand = deserializeAw
 const deserializeAws_queryDescribeDataSharesForConsumerCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
@@ -3898,7 +3898,7 @@ exports.deserializeAws_queryDescribeDataSharesForProducerCommand = deserializeAw
 const deserializeAws_queryDescribeDataSharesForProducerCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
@@ -3932,7 +3932,7 @@ exports.deserializeAws_queryDescribeDefaultClusterParametersCommand = deserializ
 const deserializeAws_queryDescribeDefaultClusterParametersCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     const parsedBody = parsedOutput.body;
@@ -3960,17 +3960,17 @@ exports.deserializeAws_queryDescribeEndpointAccessCommand = deserializeAws_query
 const deserializeAws_queryDescribeEndpointAccessCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "ClusterNotFoundFault":
+        case "ClusterNotFound":
         case "com.amazonaws.redshift#ClusterNotFoundFault":
             throw await deserializeAws_queryClusterNotFoundFaultResponse(parsedOutput, context);
-        case "EndpointNotFoundFault":
+        case "EndpointNotFound":
         case "com.amazonaws.redshift#EndpointNotFoundFault":
             throw await deserializeAws_queryEndpointNotFoundFaultResponse(parsedOutput, context);
-        case "InvalidClusterStateFault":
+        case "InvalidClusterState":
         case "com.amazonaws.redshift#InvalidClusterStateFault":
             throw await deserializeAws_queryInvalidClusterStateFaultResponse(parsedOutput, context);
         default:
@@ -4000,14 +4000,14 @@ exports.deserializeAws_queryDescribeEndpointAuthorizationCommand = deserializeAw
 const deserializeAws_queryDescribeEndpointAuthorizationCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "ClusterNotFoundFault":
+        case "ClusterNotFound":
         case "com.amazonaws.redshift#ClusterNotFoundFault":
             throw await deserializeAws_queryClusterNotFoundFaultResponse(parsedOutput, context);
-        case "UnsupportedOperationFault":
+        case "UnsupportedOperation":
         case "com.amazonaws.redshift#UnsupportedOperationFault":
             throw await deserializeAws_queryUnsupportedOperationFaultResponse(parsedOutput, context);
         default:
@@ -4037,7 +4037,7 @@ exports.deserializeAws_queryDescribeEventCategoriesCommand = deserializeAws_quer
 const deserializeAws_queryDescribeEventCategoriesCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     const parsedBody = parsedOutput.body;
@@ -4065,7 +4065,7 @@ exports.deserializeAws_queryDescribeEventsCommand = deserializeAws_queryDescribe
 const deserializeAws_queryDescribeEventsCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     const parsedBody = parsedOutput.body;
@@ -4093,14 +4093,14 @@ exports.deserializeAws_queryDescribeEventSubscriptionsCommand = deserializeAws_q
 const deserializeAws_queryDescribeEventSubscriptionsCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "InvalidTagFault":
         case "com.amazonaws.redshift#InvalidTagFault":
             throw await deserializeAws_queryInvalidTagFaultResponse(parsedOutput, context);
-        case "SubscriptionNotFoundFault":
+        case "SubscriptionNotFound":
         case "com.amazonaws.redshift#SubscriptionNotFoundFault":
             throw await deserializeAws_querySubscriptionNotFoundFaultResponse(parsedOutput, context);
         default:
@@ -4130,7 +4130,7 @@ exports.deserializeAws_queryDescribeHsmClientCertificatesCommand = deserializeAw
 const deserializeAws_queryDescribeHsmClientCertificatesCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
@@ -4167,7 +4167,7 @@ exports.deserializeAws_queryDescribeHsmConfigurationsCommand = deserializeAws_qu
 const deserializeAws_queryDescribeHsmConfigurationsCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
@@ -4204,11 +4204,11 @@ exports.deserializeAws_queryDescribeLoggingStatusCommand = deserializeAws_queryD
 const deserializeAws_queryDescribeLoggingStatusCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "ClusterNotFoundFault":
+        case "ClusterNotFound":
         case "com.amazonaws.redshift#ClusterNotFoundFault":
             throw await deserializeAws_queryClusterNotFoundFaultResponse(parsedOutput, context);
         default:
@@ -4238,23 +4238,23 @@ exports.deserializeAws_queryDescribeNodeConfigurationOptionsCommand = deserializ
 const deserializeAws_queryDescribeNodeConfigurationOptionsCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "AccessToSnapshotDeniedFault":
+        case "AccessToSnapshotDenied":
         case "com.amazonaws.redshift#AccessToSnapshotDeniedFault":
             throw await deserializeAws_queryAccessToSnapshotDeniedFaultResponse(parsedOutput, context);
-        case "ClusterNotFoundFault":
+        case "ClusterNotFound":
         case "com.amazonaws.redshift#ClusterNotFoundFault":
             throw await deserializeAws_queryClusterNotFoundFaultResponse(parsedOutput, context);
-        case "ClusterSnapshotNotFoundFault":
+        case "ClusterSnapshotNotFound":
         case "com.amazonaws.redshift#ClusterSnapshotNotFoundFault":
             throw await deserializeAws_queryClusterSnapshotNotFoundFaultResponse(parsedOutput, context);
-        case "InvalidClusterSnapshotStateFault":
+        case "InvalidClusterSnapshotState":
         case "com.amazonaws.redshift#InvalidClusterSnapshotStateFault":
             throw await deserializeAws_queryInvalidClusterSnapshotStateFaultResponse(parsedOutput, context);
-        case "UnsupportedOperationFault":
+        case "UnsupportedOperation":
         case "com.amazonaws.redshift#UnsupportedOperationFault":
             throw await deserializeAws_queryUnsupportedOperationFaultResponse(parsedOutput, context);
         default:
@@ -4284,7 +4284,7 @@ exports.deserializeAws_queryDescribeOrderableClusterOptionsCommand = deserialize
 const deserializeAws_queryDescribeOrderableClusterOptionsCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     const parsedBody = parsedOutput.body;
@@ -4312,14 +4312,14 @@ exports.deserializeAws_queryDescribePartnersCommand = deserializeAws_queryDescri
 const deserializeAws_queryDescribePartnersCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "ClusterNotFoundFault":
+        case "ClusterNotFound":
         case "com.amazonaws.redshift#ClusterNotFoundFault":
             throw await deserializeAws_queryClusterNotFoundFaultResponse(parsedOutput, context);
-        case "UnauthorizedPartnerIntegrationFault":
+        case "UnauthorizedPartnerIntegration":
         case "com.amazonaws.redshift#UnauthorizedPartnerIntegrationFault":
             throw await deserializeAws_queryUnauthorizedPartnerIntegrationFaultResponse(parsedOutput, context);
         default:
@@ -4349,17 +4349,17 @@ exports.deserializeAws_queryDescribeReservedNodeExchangeStatusCommand = deserial
 const deserializeAws_queryDescribeReservedNodeExchangeStatusCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "ReservedNodeExchangeNotFoundFault":
+        case "ReservedNodeExchangeNotFond":
         case "com.amazonaws.redshift#ReservedNodeExchangeNotFoundFault":
             throw await deserializeAws_queryReservedNodeExchangeNotFoundFaultResponse(parsedOutput, context);
-        case "ReservedNodeNotFoundFault":
+        case "ReservedNodeNotFound":
         case "com.amazonaws.redshift#ReservedNodeNotFoundFault":
             throw await deserializeAws_queryReservedNodeNotFoundFaultResponse(parsedOutput, context);
-        case "UnsupportedOperationFault":
+        case "UnsupportedOperation":
         case "com.amazonaws.redshift#UnsupportedOperationFault":
             throw await deserializeAws_queryUnsupportedOperationFaultResponse(parsedOutput, context);
         default:
@@ -4389,17 +4389,17 @@ exports.deserializeAws_queryDescribeReservedNodeOfferingsCommand = deserializeAw
 const deserializeAws_queryDescribeReservedNodeOfferingsCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "DependentServiceUnavailableFault":
         case "com.amazonaws.redshift#DependentServiceUnavailableFault":
             throw await deserializeAws_queryDependentServiceUnavailableFaultResponse(parsedOutput, context);
-        case "ReservedNodeOfferingNotFoundFault":
+        case "ReservedNodeOfferingNotFound":
         case "com.amazonaws.redshift#ReservedNodeOfferingNotFoundFault":
             throw await deserializeAws_queryReservedNodeOfferingNotFoundFaultResponse(parsedOutput, context);
-        case "UnsupportedOperationFault":
+        case "UnsupportedOperation":
         case "com.amazonaws.redshift#UnsupportedOperationFault":
             throw await deserializeAws_queryUnsupportedOperationFaultResponse(parsedOutput, context);
         default:
@@ -4429,14 +4429,14 @@ exports.deserializeAws_queryDescribeReservedNodesCommand = deserializeAws_queryD
 const deserializeAws_queryDescribeReservedNodesCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "DependentServiceUnavailableFault":
         case "com.amazonaws.redshift#DependentServiceUnavailableFault":
             throw await deserializeAws_queryDependentServiceUnavailableFaultResponse(parsedOutput, context);
-        case "ReservedNodeNotFoundFault":
+        case "ReservedNodeNotFound":
         case "com.amazonaws.redshift#ReservedNodeNotFoundFault":
             throw await deserializeAws_queryReservedNodeNotFoundFaultResponse(parsedOutput, context);
         default:
@@ -4466,14 +4466,14 @@ exports.deserializeAws_queryDescribeResizeCommand = deserializeAws_queryDescribe
 const deserializeAws_queryDescribeResizeCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "ClusterNotFoundFault":
+        case "ClusterNotFound":
         case "com.amazonaws.redshift#ClusterNotFoundFault":
             throw await deserializeAws_queryClusterNotFoundFaultResponse(parsedOutput, context);
-        case "ResizeNotFoundFault":
+        case "ResizeNotFound":
         case "com.amazonaws.redshift#ResizeNotFoundFault":
             throw await deserializeAws_queryResizeNotFoundFaultResponse(parsedOutput, context);
         default:
@@ -4503,11 +4503,11 @@ exports.deserializeAws_queryDescribeScheduledActionsCommand = deserializeAws_que
 const deserializeAws_queryDescribeScheduledActionsCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "ScheduledActionNotFoundFault":
+        case "ScheduledActionNotFound":
         case "com.amazonaws.redshift#ScheduledActionNotFoundFault":
             throw await deserializeAws_queryScheduledActionNotFoundFaultResponse(parsedOutput, context);
         case "UnauthorizedOperation":
@@ -4540,7 +4540,7 @@ exports.deserializeAws_queryDescribeSnapshotCopyGrantsCommand = deserializeAws_q
 const deserializeAws_queryDescribeSnapshotCopyGrantsCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
@@ -4577,7 +4577,7 @@ exports.deserializeAws_queryDescribeSnapshotSchedulesCommand = deserializeAws_qu
 const deserializeAws_queryDescribeSnapshotSchedulesCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     const parsedBody = parsedOutput.body;
@@ -4605,7 +4605,7 @@ exports.deserializeAws_queryDescribeStorageCommand = deserializeAws_queryDescrib
 const deserializeAws_queryDescribeStorageCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     const parsedBody = parsedOutput.body;
@@ -4633,11 +4633,11 @@ exports.deserializeAws_queryDescribeTableRestoreStatusCommand = deserializeAws_q
 const deserializeAws_queryDescribeTableRestoreStatusCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "ClusterNotFoundFault":
+        case "ClusterNotFound":
         case "com.amazonaws.redshift#ClusterNotFoundFault":
             throw await deserializeAws_queryClusterNotFoundFaultResponse(parsedOutput, context);
         case "TableRestoreNotFoundFault":
@@ -4670,7 +4670,7 @@ exports.deserializeAws_queryDescribeTagsCommand = deserializeAws_queryDescribeTa
 const deserializeAws_queryDescribeTagsCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
@@ -4707,14 +4707,14 @@ exports.deserializeAws_queryDescribeUsageLimitsCommand = deserializeAws_queryDes
 const deserializeAws_queryDescribeUsageLimitsCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "ClusterNotFoundFault":
+        case "ClusterNotFound":
         case "com.amazonaws.redshift#ClusterNotFoundFault":
             throw await deserializeAws_queryClusterNotFoundFaultResponse(parsedOutput, context);
-        case "UnsupportedOperationFault":
+        case "UnsupportedOperation":
         case "com.amazonaws.redshift#UnsupportedOperationFault":
             throw await deserializeAws_queryUnsupportedOperationFaultResponse(parsedOutput, context);
         default:
@@ -4744,14 +4744,14 @@ exports.deserializeAws_queryDisableLoggingCommand = deserializeAws_queryDisableL
 const deserializeAws_queryDisableLoggingCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "ClusterNotFoundFault":
+        case "ClusterNotFound":
         case "com.amazonaws.redshift#ClusterNotFoundFault":
             throw await deserializeAws_queryClusterNotFoundFaultResponse(parsedOutput, context);
-        case "InvalidClusterStateFault":
+        case "InvalidClusterState":
         case "com.amazonaws.redshift#InvalidClusterStateFault":
             throw await deserializeAws_queryInvalidClusterStateFaultResponse(parsedOutput, context);
         default:
@@ -4781,14 +4781,14 @@ exports.deserializeAws_queryDisableSnapshotCopyCommand = deserializeAws_queryDis
 const deserializeAws_queryDisableSnapshotCopyCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "ClusterNotFoundFault":
+        case "ClusterNotFound":
         case "com.amazonaws.redshift#ClusterNotFoundFault":
             throw await deserializeAws_queryClusterNotFoundFaultResponse(parsedOutput, context);
-        case "InvalidClusterStateFault":
+        case "InvalidClusterState":
         case "com.amazonaws.redshift#InvalidClusterStateFault":
             throw await deserializeAws_queryInvalidClusterStateFaultResponse(parsedOutput, context);
         case "SnapshotCopyAlreadyDisabledFault":
@@ -4824,7 +4824,7 @@ exports.deserializeAws_queryDisassociateDataShareConsumerCommand = deserializeAw
 const deserializeAws_queryDisassociateDataShareConsumerCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
@@ -4861,20 +4861,20 @@ exports.deserializeAws_queryEnableLoggingCommand = deserializeAws_queryEnableLog
 const deserializeAws_queryEnableLoggingCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "BucketNotFoundFault":
         case "com.amazonaws.redshift#BucketNotFoundFault":
             throw await deserializeAws_queryBucketNotFoundFaultResponse(parsedOutput, context);
-        case "ClusterNotFoundFault":
+        case "ClusterNotFound":
         case "com.amazonaws.redshift#ClusterNotFoundFault":
             throw await deserializeAws_queryClusterNotFoundFaultResponse(parsedOutput, context);
         case "InsufficientS3BucketPolicyFault":
         case "com.amazonaws.redshift#InsufficientS3BucketPolicyFault":
             throw await deserializeAws_queryInsufficientS3BucketPolicyFaultResponse(parsedOutput, context);
-        case "InvalidClusterStateFault":
+        case "InvalidClusterState":
         case "com.amazonaws.redshift#InvalidClusterStateFault":
             throw await deserializeAws_queryInvalidClusterStateFaultResponse(parsedOutput, context);
         case "InvalidS3BucketNameFault":
@@ -4910,11 +4910,11 @@ exports.deserializeAws_queryEnableSnapshotCopyCommand = deserializeAws_queryEnab
 const deserializeAws_queryEnableSnapshotCopyCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "ClusterNotFoundFault":
+        case "ClusterNotFound":
         case "com.amazonaws.redshift#ClusterNotFoundFault":
             throw await deserializeAws_queryClusterNotFoundFaultResponse(parsedOutput, context);
         case "CopyToRegionDisabledFault":
@@ -4926,7 +4926,7 @@ const deserializeAws_queryEnableSnapshotCopyCommandError = async (output, contex
         case "IncompatibleOrderableOptions":
         case "com.amazonaws.redshift#IncompatibleOrderableOptions":
             throw await deserializeAws_queryIncompatibleOrderableOptionsResponse(parsedOutput, context);
-        case "InvalidClusterStateFault":
+        case "InvalidClusterState":
         case "com.amazonaws.redshift#InvalidClusterStateFault":
             throw await deserializeAws_queryInvalidClusterStateFaultResponse(parsedOutput, context);
         case "InvalidRetentionPeriodFault":
@@ -4974,14 +4974,14 @@ exports.deserializeAws_queryGetClusterCredentialsCommand = deserializeAws_queryG
 const deserializeAws_queryGetClusterCredentialsCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "ClusterNotFoundFault":
+        case "ClusterNotFound":
         case "com.amazonaws.redshift#ClusterNotFoundFault":
             throw await deserializeAws_queryClusterNotFoundFaultResponse(parsedOutput, context);
-        case "UnsupportedOperationFault":
+        case "UnsupportedOperation":
         case "com.amazonaws.redshift#UnsupportedOperationFault":
             throw await deserializeAws_queryUnsupportedOperationFaultResponse(parsedOutput, context);
         default:
@@ -5011,14 +5011,14 @@ exports.deserializeAws_queryGetClusterCredentialsWithIAMCommand = deserializeAws
 const deserializeAws_queryGetClusterCredentialsWithIAMCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "ClusterNotFoundFault":
+        case "ClusterNotFound":
         case "com.amazonaws.redshift#ClusterNotFoundFault":
             throw await deserializeAws_queryClusterNotFoundFaultResponse(parsedOutput, context);
-        case "UnsupportedOperationFault":
+        case "UnsupportedOperation":
         case "com.amazonaws.redshift#UnsupportedOperationFault":
             throw await deserializeAws_queryUnsupportedOperationFaultResponse(parsedOutput, context);
         default:
@@ -5048,32 +5048,32 @@ exports.deserializeAws_queryGetReservedNodeExchangeConfigurationOptionsCommand =
 const deserializeAws_queryGetReservedNodeExchangeConfigurationOptionsCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "ClusterNotFoundFault":
+        case "ClusterNotFound":
         case "com.amazonaws.redshift#ClusterNotFoundFault":
             throw await deserializeAws_queryClusterNotFoundFaultResponse(parsedOutput, context);
-        case "ClusterSnapshotNotFoundFault":
+        case "ClusterSnapshotNotFound":
         case "com.amazonaws.redshift#ClusterSnapshotNotFoundFault":
             throw await deserializeAws_queryClusterSnapshotNotFoundFaultResponse(parsedOutput, context);
         case "DependentServiceUnavailableFault":
         case "com.amazonaws.redshift#DependentServiceUnavailableFault":
             throw await deserializeAws_queryDependentServiceUnavailableFaultResponse(parsedOutput, context);
-        case "InvalidReservedNodeStateFault":
+        case "InvalidReservedNodeState":
         case "com.amazonaws.redshift#InvalidReservedNodeStateFault":
             throw await deserializeAws_queryInvalidReservedNodeStateFaultResponse(parsedOutput, context);
-        case "ReservedNodeAlreadyMigratedFault":
+        case "ReservedNodeAlreadyMigrated":
         case "com.amazonaws.redshift#ReservedNodeAlreadyMigratedFault":
             throw await deserializeAws_queryReservedNodeAlreadyMigratedFaultResponse(parsedOutput, context);
-        case "ReservedNodeNotFoundFault":
+        case "ReservedNodeNotFound":
         case "com.amazonaws.redshift#ReservedNodeNotFoundFault":
             throw await deserializeAws_queryReservedNodeNotFoundFaultResponse(parsedOutput, context);
-        case "ReservedNodeOfferingNotFoundFault":
+        case "ReservedNodeOfferingNotFound":
         case "com.amazonaws.redshift#ReservedNodeOfferingNotFoundFault":
             throw await deserializeAws_queryReservedNodeOfferingNotFoundFaultResponse(parsedOutput, context);
-        case "UnsupportedOperationFault":
+        case "UnsupportedOperation":
         case "com.amazonaws.redshift#UnsupportedOperationFault":
             throw await deserializeAws_queryUnsupportedOperationFaultResponse(parsedOutput, context);
         default:
@@ -5103,26 +5103,26 @@ exports.deserializeAws_queryGetReservedNodeExchangeOfferingsCommand = deserializ
 const deserializeAws_queryGetReservedNodeExchangeOfferingsCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "DependentServiceUnavailableFault":
         case "com.amazonaws.redshift#DependentServiceUnavailableFault":
             throw await deserializeAws_queryDependentServiceUnavailableFaultResponse(parsedOutput, context);
-        case "InvalidReservedNodeStateFault":
+        case "InvalidReservedNodeState":
         case "com.amazonaws.redshift#InvalidReservedNodeStateFault":
             throw await deserializeAws_queryInvalidReservedNodeStateFaultResponse(parsedOutput, context);
-        case "ReservedNodeAlreadyMigratedFault":
+        case "ReservedNodeAlreadyMigrated":
         case "com.amazonaws.redshift#ReservedNodeAlreadyMigratedFault":
             throw await deserializeAws_queryReservedNodeAlreadyMigratedFaultResponse(parsedOutput, context);
-        case "ReservedNodeNotFoundFault":
+        case "ReservedNodeNotFound":
         case "com.amazonaws.redshift#ReservedNodeNotFoundFault":
             throw await deserializeAws_queryReservedNodeNotFoundFaultResponse(parsedOutput, context);
-        case "ReservedNodeOfferingNotFoundFault":
+        case "ReservedNodeOfferingNotFound":
         case "com.amazonaws.redshift#ReservedNodeOfferingNotFoundFault":
             throw await deserializeAws_queryReservedNodeOfferingNotFoundFaultResponse(parsedOutput, context);
-        case "UnsupportedOperationFault":
+        case "UnsupportedOperation":
         case "com.amazonaws.redshift#UnsupportedOperationFault":
             throw await deserializeAws_queryUnsupportedOperationFaultResponse(parsedOutput, context);
         default:
@@ -5152,17 +5152,17 @@ exports.deserializeAws_queryModifyAquaConfigurationCommand = deserializeAws_quer
 const deserializeAws_queryModifyAquaConfigurationCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "ClusterNotFoundFault":
+        case "ClusterNotFound":
         case "com.amazonaws.redshift#ClusterNotFoundFault":
             throw await deserializeAws_queryClusterNotFoundFaultResponse(parsedOutput, context);
-        case "InvalidClusterStateFault":
+        case "InvalidClusterState":
         case "com.amazonaws.redshift#InvalidClusterStateFault":
             throw await deserializeAws_queryInvalidClusterStateFaultResponse(parsedOutput, context);
-        case "UnsupportedOperationFault":
+        case "UnsupportedOperation":
         case "com.amazonaws.redshift#UnsupportedOperationFault":
             throw await deserializeAws_queryUnsupportedOperationFaultResponse(parsedOutput, context);
         default:
@@ -5192,7 +5192,7 @@ exports.deserializeAws_queryModifyAuthenticationProfileCommand = deserializeAws_
 const deserializeAws_queryModifyAuthenticationProfileCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
@@ -5232,20 +5232,20 @@ exports.deserializeAws_queryModifyClusterCommand = deserializeAws_queryModifyClu
 const deserializeAws_queryModifyClusterCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "ClusterAlreadyExistsFault":
+        case "ClusterAlreadyExists":
         case "com.amazonaws.redshift#ClusterAlreadyExistsFault":
             throw await deserializeAws_queryClusterAlreadyExistsFaultResponse(parsedOutput, context);
-        case "ClusterNotFoundFault":
+        case "ClusterNotFound":
         case "com.amazonaws.redshift#ClusterNotFoundFault":
             throw await deserializeAws_queryClusterNotFoundFaultResponse(parsedOutput, context);
-        case "ClusterParameterGroupNotFoundFault":
+        case "ClusterParameterGroupNotFound":
         case "com.amazonaws.redshift#ClusterParameterGroupNotFoundFault":
             throw await deserializeAws_queryClusterParameterGroupNotFoundFaultResponse(parsedOutput, context);
-        case "ClusterSecurityGroupNotFoundFault":
+        case "ClusterSecurityGroupNotFound":
         case "com.amazonaws.redshift#ClusterSecurityGroupNotFoundFault":
             throw await deserializeAws_queryClusterSecurityGroupNotFoundFaultResponse(parsedOutput, context);
         case "DependentServiceRequestThrottlingFault":
@@ -5257,16 +5257,16 @@ const deserializeAws_queryModifyClusterCommandError = async (output, context) =>
         case "HsmConfigurationNotFoundFault":
         case "com.amazonaws.redshift#HsmConfigurationNotFoundFault":
             throw await deserializeAws_queryHsmConfigurationNotFoundFaultResponse(parsedOutput, context);
-        case "InsufficientClusterCapacityFault":
+        case "InsufficientClusterCapacity":
         case "com.amazonaws.redshift#InsufficientClusterCapacityFault":
             throw await deserializeAws_queryInsufficientClusterCapacityFaultResponse(parsedOutput, context);
-        case "InvalidClusterSecurityGroupStateFault":
+        case "InvalidClusterSecurityGroupState":
         case "com.amazonaws.redshift#InvalidClusterSecurityGroupStateFault":
             throw await deserializeAws_queryInvalidClusterSecurityGroupStateFaultResponse(parsedOutput, context);
-        case "InvalidClusterStateFault":
+        case "InvalidClusterState":
         case "com.amazonaws.redshift#InvalidClusterStateFault":
             throw await deserializeAws_queryInvalidClusterStateFaultResponse(parsedOutput, context);
-        case "InvalidClusterTrackFault":
+        case "InvalidClusterTrack":
         case "com.amazonaws.redshift#InvalidClusterTrackFault":
             throw await deserializeAws_queryInvalidClusterTrackFaultResponse(parsedOutput, context);
         case "InvalidElasticIpFault":
@@ -5278,13 +5278,13 @@ const deserializeAws_queryModifyClusterCommandError = async (output, context) =>
         case "LimitExceededFault":
         case "com.amazonaws.redshift#LimitExceededFault":
             throw await deserializeAws_queryLimitExceededFaultResponse(parsedOutput, context);
-        case "NumberOfNodesPerClusterLimitExceededFault":
+        case "NumberOfNodesPerClusterLimitExceeded":
         case "com.amazonaws.redshift#NumberOfNodesPerClusterLimitExceededFault":
             throw await deserializeAws_queryNumberOfNodesPerClusterLimitExceededFaultResponse(parsedOutput, context);
-        case "NumberOfNodesQuotaExceededFault":
+        case "NumberOfNodesQuotaExceeded":
         case "com.amazonaws.redshift#NumberOfNodesQuotaExceededFault":
             throw await deserializeAws_queryNumberOfNodesQuotaExceededFaultResponse(parsedOutput, context);
-        case "TableLimitExceededFault":
+        case "TableLimitExceeded":
         case "com.amazonaws.redshift#TableLimitExceededFault":
             throw await deserializeAws_queryTableLimitExceededFaultResponse(parsedOutput, context);
         case "UnauthorizedOperation":
@@ -5320,17 +5320,17 @@ exports.deserializeAws_queryModifyClusterDbRevisionCommand = deserializeAws_quer
 const deserializeAws_queryModifyClusterDbRevisionCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "ClusterNotFoundFault":
+        case "ClusterNotFound":
         case "com.amazonaws.redshift#ClusterNotFoundFault":
             throw await deserializeAws_queryClusterNotFoundFaultResponse(parsedOutput, context);
-        case "ClusterOnLatestRevisionFault":
+        case "ClusterOnLatestRevision":
         case "com.amazonaws.redshift#ClusterOnLatestRevisionFault":
             throw await deserializeAws_queryClusterOnLatestRevisionFaultResponse(parsedOutput, context);
-        case "InvalidClusterStateFault":
+        case "InvalidClusterState":
         case "com.amazonaws.redshift#InvalidClusterStateFault":
             throw await deserializeAws_queryInvalidClusterStateFaultResponse(parsedOutput, context);
         default:
@@ -5360,14 +5360,14 @@ exports.deserializeAws_queryModifyClusterIamRolesCommand = deserializeAws_queryM
 const deserializeAws_queryModifyClusterIamRolesCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "ClusterNotFoundFault":
+        case "ClusterNotFound":
         case "com.amazonaws.redshift#ClusterNotFoundFault":
             throw await deserializeAws_queryClusterNotFoundFaultResponse(parsedOutput, context);
-        case "InvalidClusterStateFault":
+        case "InvalidClusterState":
         case "com.amazonaws.redshift#InvalidClusterStateFault":
             throw await deserializeAws_queryInvalidClusterStateFaultResponse(parsedOutput, context);
         default:
@@ -5397,14 +5397,14 @@ exports.deserializeAws_queryModifyClusterMaintenanceCommand = deserializeAws_que
 const deserializeAws_queryModifyClusterMaintenanceCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "ClusterNotFoundFault":
+        case "ClusterNotFound":
         case "com.amazonaws.redshift#ClusterNotFoundFault":
             throw await deserializeAws_queryClusterNotFoundFaultResponse(parsedOutput, context);
-        case "InvalidClusterStateFault":
+        case "InvalidClusterState":
         case "com.amazonaws.redshift#InvalidClusterStateFault":
             throw await deserializeAws_queryInvalidClusterStateFaultResponse(parsedOutput, context);
         default:
@@ -5434,14 +5434,14 @@ exports.deserializeAws_queryModifyClusterParameterGroupCommand = deserializeAws_
 const deserializeAws_queryModifyClusterParameterGroupCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "ClusterParameterGroupNotFoundFault":
+        case "ClusterParameterGroupNotFound":
         case "com.amazonaws.redshift#ClusterParameterGroupNotFoundFault":
             throw await deserializeAws_queryClusterParameterGroupNotFoundFaultResponse(parsedOutput, context);
-        case "InvalidClusterParameterGroupStateFault":
+        case "InvalidClusterParameterGroupState":
         case "com.amazonaws.redshift#InvalidClusterParameterGroupStateFault":
             throw await deserializeAws_queryInvalidClusterParameterGroupStateFaultResponse(parsedOutput, context);
         default:
@@ -5471,14 +5471,14 @@ exports.deserializeAws_queryModifyClusterSnapshotCommand = deserializeAws_queryM
 const deserializeAws_queryModifyClusterSnapshotCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "ClusterSnapshotNotFoundFault":
+        case "ClusterSnapshotNotFound":
         case "com.amazonaws.redshift#ClusterSnapshotNotFoundFault":
             throw await deserializeAws_queryClusterSnapshotNotFoundFaultResponse(parsedOutput, context);
-        case "InvalidClusterSnapshotStateFault":
+        case "InvalidClusterSnapshotState":
         case "com.amazonaws.redshift#InvalidClusterSnapshotStateFault":
             throw await deserializeAws_queryInvalidClusterSnapshotStateFaultResponse(parsedOutput, context);
         case "InvalidRetentionPeriodFault":
@@ -5508,17 +5508,17 @@ exports.deserializeAws_queryModifyClusterSnapshotScheduleCommand = deserializeAw
 const deserializeAws_queryModifyClusterSnapshotScheduleCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "ClusterNotFoundFault":
+        case "ClusterNotFound":
         case "com.amazonaws.redshift#ClusterNotFoundFault":
             throw await deserializeAws_queryClusterNotFoundFaultResponse(parsedOutput, context);
-        case "InvalidClusterSnapshotScheduleStateFault":
+        case "InvalidClusterSnapshotScheduleState":
         case "com.amazonaws.redshift#InvalidClusterSnapshotScheduleStateFault":
             throw await deserializeAws_queryInvalidClusterSnapshotScheduleStateFaultResponse(parsedOutput, context);
-        case "SnapshotScheduleNotFoundFault":
+        case "SnapshotScheduleNotFound":
         case "com.amazonaws.redshift#SnapshotScheduleNotFoundFault":
             throw await deserializeAws_querySnapshotScheduleNotFoundFaultResponse(parsedOutput, context);
         default:
@@ -5548,7 +5548,7 @@ exports.deserializeAws_queryModifyClusterSubnetGroupCommand = deserializeAws_que
 const deserializeAws_queryModifyClusterSubnetGroupCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
@@ -5597,23 +5597,23 @@ exports.deserializeAws_queryModifyEndpointAccessCommand = deserializeAws_queryMo
 const deserializeAws_queryModifyEndpointAccessCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "ClusterNotFoundFault":
+        case "ClusterNotFound":
         case "com.amazonaws.redshift#ClusterNotFoundFault":
             throw await deserializeAws_queryClusterNotFoundFaultResponse(parsedOutput, context);
-        case "EndpointNotFoundFault":
+        case "EndpointNotFound":
         case "com.amazonaws.redshift#EndpointNotFoundFault":
             throw await deserializeAws_queryEndpointNotFoundFaultResponse(parsedOutput, context);
-        case "InvalidClusterSecurityGroupStateFault":
+        case "InvalidClusterSecurityGroupState":
         case "com.amazonaws.redshift#InvalidClusterSecurityGroupStateFault":
             throw await deserializeAws_queryInvalidClusterSecurityGroupStateFaultResponse(parsedOutput, context);
-        case "InvalidClusterStateFault":
+        case "InvalidClusterState":
         case "com.amazonaws.redshift#InvalidClusterStateFault":
             throw await deserializeAws_queryInvalidClusterStateFaultResponse(parsedOutput, context);
-        case "InvalidEndpointStateFault":
+        case "InvalidEndpointState":
         case "com.amazonaws.redshift#InvalidEndpointStateFault":
             throw await deserializeAws_queryInvalidEndpointStateFaultResponse(parsedOutput, context);
         case "UnauthorizedOperation":
@@ -5646,35 +5646,35 @@ exports.deserializeAws_queryModifyEventSubscriptionCommand = deserializeAws_quer
 const deserializeAws_queryModifyEventSubscriptionCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
         case "InvalidSubscriptionStateFault":
         case "com.amazonaws.redshift#InvalidSubscriptionStateFault":
             throw await deserializeAws_queryInvalidSubscriptionStateFaultResponse(parsedOutput, context);
-        case "SNSInvalidTopicFault":
+        case "SNSInvalidTopic":
         case "com.amazonaws.redshift#SNSInvalidTopicFault":
             throw await deserializeAws_querySNSInvalidTopicFaultResponse(parsedOutput, context);
-        case "SNSNoAuthorizationFault":
+        case "SNSNoAuthorization":
         case "com.amazonaws.redshift#SNSNoAuthorizationFault":
             throw await deserializeAws_querySNSNoAuthorizationFaultResponse(parsedOutput, context);
-        case "SNSTopicArnNotFoundFault":
+        case "SNSTopicArnNotFound":
         case "com.amazonaws.redshift#SNSTopicArnNotFoundFault":
             throw await deserializeAws_querySNSTopicArnNotFoundFaultResponse(parsedOutput, context);
-        case "SourceNotFoundFault":
+        case "SourceNotFound":
         case "com.amazonaws.redshift#SourceNotFoundFault":
             throw await deserializeAws_querySourceNotFoundFaultResponse(parsedOutput, context);
-        case "SubscriptionCategoryNotFoundFault":
+        case "SubscriptionCategoryNotFound":
         case "com.amazonaws.redshift#SubscriptionCategoryNotFoundFault":
             throw await deserializeAws_querySubscriptionCategoryNotFoundFaultResponse(parsedOutput, context);
-        case "SubscriptionEventIdNotFoundFault":
+        case "SubscriptionEventIdNotFound":
         case "com.amazonaws.redshift#SubscriptionEventIdNotFoundFault":
             throw await deserializeAws_querySubscriptionEventIdNotFoundFaultResponse(parsedOutput, context);
-        case "SubscriptionNotFoundFault":
+        case "SubscriptionNotFound":
         case "com.amazonaws.redshift#SubscriptionNotFoundFault":
             throw await deserializeAws_querySubscriptionNotFoundFaultResponse(parsedOutput, context);
-        case "SubscriptionSeverityNotFoundFault":
+        case "SubscriptionSeverityNotFound":
         case "com.amazonaws.redshift#SubscriptionSeverityNotFoundFault":
             throw await deserializeAws_querySubscriptionSeverityNotFoundFaultResponse(parsedOutput, context);
         default:
@@ -5704,20 +5704,20 @@ exports.deserializeAws_queryModifyScheduledActionCommand = deserializeAws_queryM
 const deserializeAws_queryModifyScheduledActionCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "InvalidScheduledActionFault":
-        case "com.amazonaws.redshift#InvalidScheduledActionFault":
-            throw await deserializeAws_queryInvalidScheduledActionFaultResponse(parsedOutput, context);
-        case "InvalidScheduleFault":
+        case "InvalidSchedule":
         case "com.amazonaws.redshift#InvalidScheduleFault":
             throw await deserializeAws_queryInvalidScheduleFaultResponse(parsedOutput, context);
-        case "ScheduledActionNotFoundFault":
+        case "InvalidScheduledAction":
+        case "com.amazonaws.redshift#InvalidScheduledActionFault":
+            throw await deserializeAws_queryInvalidScheduledActionFaultResponse(parsedOutput, context);
+        case "ScheduledActionNotFound":
         case "com.amazonaws.redshift#ScheduledActionNotFoundFault":
             throw await deserializeAws_queryScheduledActionNotFoundFaultResponse(parsedOutput, context);
-        case "ScheduledActionTypeUnsupportedFault":
+        case "ScheduledActionTypeUnsupported":
         case "com.amazonaws.redshift#ScheduledActionTypeUnsupportedFault":
             throw await deserializeAws_queryScheduledActionTypeUnsupportedFaultResponse(parsedOutput, context);
         case "UnauthorizedOperation":
@@ -5750,14 +5750,14 @@ exports.deserializeAws_queryModifySnapshotCopyRetentionPeriodCommand = deseriali
 const deserializeAws_queryModifySnapshotCopyRetentionPeriodCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "ClusterNotFoundFault":
+        case "ClusterNotFound":
         case "com.amazonaws.redshift#ClusterNotFoundFault":
             throw await deserializeAws_queryClusterNotFoundFaultResponse(parsedOutput, context);
-        case "InvalidClusterStateFault":
+        case "InvalidClusterState":
         case "com.amazonaws.redshift#InvalidClusterStateFault":
             throw await deserializeAws_queryInvalidClusterStateFaultResponse(parsedOutput, context);
         case "InvalidRetentionPeriodFault":
@@ -5796,17 +5796,17 @@ exports.deserializeAws_queryModifySnapshotScheduleCommand = deserializeAws_query
 const deserializeAws_queryModifySnapshotScheduleCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "InvalidScheduleFault":
+        case "InvalidSchedule":
         case "com.amazonaws.redshift#InvalidScheduleFault":
             throw await deserializeAws_queryInvalidScheduleFaultResponse(parsedOutput, context);
-        case "SnapshotScheduleNotFoundFault":
+        case "SnapshotScheduleNotFound":
         case "com.amazonaws.redshift#SnapshotScheduleNotFoundFault":
             throw await deserializeAws_querySnapshotScheduleNotFoundFaultResponse(parsedOutput, context);
-        case "SnapshotScheduleUpdateInProgressFault":
+        case "SnapshotScheduleUpdateInProgress":
         case "com.amazonaws.redshift#SnapshotScheduleUpdateInProgressFault":
             throw await deserializeAws_querySnapshotScheduleUpdateInProgressFaultResponse(parsedOutput, context);
         default:
@@ -5836,17 +5836,17 @@ exports.deserializeAws_queryModifyUsageLimitCommand = deserializeAws_queryModify
 const deserializeAws_queryModifyUsageLimitCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "InvalidUsageLimitFault":
+        case "InvalidUsageLimit":
         case "com.amazonaws.redshift#InvalidUsageLimitFault":
             throw await deserializeAws_queryInvalidUsageLimitFaultResponse(parsedOutput, context);
-        case "UnsupportedOperationFault":
+        case "UnsupportedOperation":
         case "com.amazonaws.redshift#UnsupportedOperationFault":
             throw await deserializeAws_queryUnsupportedOperationFaultResponse(parsedOutput, context);
-        case "UsageLimitNotFoundFault":
+        case "UsageLimitNotFound":
         case "com.amazonaws.redshift#UsageLimitNotFoundFault":
             throw await deserializeAws_queryUsageLimitNotFoundFaultResponse(parsedOutput, context);
         default:
@@ -5876,14 +5876,14 @@ exports.deserializeAws_queryPauseClusterCommand = deserializeAws_queryPauseClust
 const deserializeAws_queryPauseClusterCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "ClusterNotFoundFault":
+        case "ClusterNotFound":
         case "com.amazonaws.redshift#ClusterNotFoundFault":
             throw await deserializeAws_queryClusterNotFoundFaultResponse(parsedOutput, context);
-        case "InvalidClusterStateFault":
+        case "InvalidClusterState":
         case "com.amazonaws.redshift#InvalidClusterStateFault":
             throw await deserializeAws_queryInvalidClusterStateFaultResponse(parsedOutput, context);
         default:
@@ -5913,20 +5913,20 @@ exports.deserializeAws_queryPurchaseReservedNodeOfferingCommand = deserializeAws
 const deserializeAws_queryPurchaseReservedNodeOfferingCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "ReservedNodeAlreadyExistsFault":
+        case "ReservedNodeAlreadyExists":
         case "com.amazonaws.redshift#ReservedNodeAlreadyExistsFault":
             throw await deserializeAws_queryReservedNodeAlreadyExistsFaultResponse(parsedOutput, context);
-        case "ReservedNodeOfferingNotFoundFault":
+        case "ReservedNodeOfferingNotFound":
         case "com.amazonaws.redshift#ReservedNodeOfferingNotFoundFault":
             throw await deserializeAws_queryReservedNodeOfferingNotFoundFaultResponse(parsedOutput, context);
-        case "ReservedNodeQuotaExceededFault":
+        case "ReservedNodeQuotaExceeded":
         case "com.amazonaws.redshift#ReservedNodeQuotaExceededFault":
             throw await deserializeAws_queryReservedNodeQuotaExceededFaultResponse(parsedOutput, context);
-        case "UnsupportedOperationFault":
+        case "UnsupportedOperation":
         case "com.amazonaws.redshift#UnsupportedOperationFault":
             throw await deserializeAws_queryUnsupportedOperationFaultResponse(parsedOutput, context);
         default:
@@ -5956,14 +5956,14 @@ exports.deserializeAws_queryRebootClusterCommand = deserializeAws_queryRebootClu
 const deserializeAws_queryRebootClusterCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "ClusterNotFoundFault":
+        case "ClusterNotFound":
         case "com.amazonaws.redshift#ClusterNotFoundFault":
             throw await deserializeAws_queryClusterNotFoundFaultResponse(parsedOutput, context);
-        case "InvalidClusterStateFault":
+        case "InvalidClusterState":
         case "com.amazonaws.redshift#InvalidClusterStateFault":
             throw await deserializeAws_queryInvalidClusterStateFaultResponse(parsedOutput, context);
         default:
@@ -5993,7 +5993,7 @@ exports.deserializeAws_queryRejectDataShareCommand = deserializeAws_queryRejectD
 const deserializeAws_queryRejectDataShareCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
@@ -6027,14 +6027,14 @@ exports.deserializeAws_queryResetClusterParameterGroupCommand = deserializeAws_q
 const deserializeAws_queryResetClusterParameterGroupCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "ClusterParameterGroupNotFoundFault":
+        case "ClusterParameterGroupNotFound":
         case "com.amazonaws.redshift#ClusterParameterGroupNotFoundFault":
             throw await deserializeAws_queryClusterParameterGroupNotFoundFaultResponse(parsedOutput, context);
-        case "InvalidClusterParameterGroupStateFault":
+        case "InvalidClusterParameterGroupState":
         case "com.amazonaws.redshift#InvalidClusterParameterGroupStateFault":
             throw await deserializeAws_queryInvalidClusterParameterGroupStateFaultResponse(parsedOutput, context);
         default:
@@ -6064,50 +6064,50 @@ exports.deserializeAws_queryResizeClusterCommand = deserializeAws_queryResizeClu
 const deserializeAws_queryResizeClusterCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "ClusterNotFoundFault":
+        case "ClusterNotFound":
         case "com.amazonaws.redshift#ClusterNotFoundFault":
             throw await deserializeAws_queryClusterNotFoundFaultResponse(parsedOutput, context);
         case "DependentServiceUnavailableFault":
         case "com.amazonaws.redshift#DependentServiceUnavailableFault":
             throw await deserializeAws_queryDependentServiceUnavailableFaultResponse(parsedOutput, context);
-        case "InsufficientClusterCapacityFault":
+        case "InsufficientClusterCapacity":
         case "com.amazonaws.redshift#InsufficientClusterCapacityFault":
             throw await deserializeAws_queryInsufficientClusterCapacityFaultResponse(parsedOutput, context);
-        case "InvalidClusterStateFault":
+        case "InvalidClusterState":
         case "com.amazonaws.redshift#InvalidClusterStateFault":
             throw await deserializeAws_queryInvalidClusterStateFaultResponse(parsedOutput, context);
-        case "InvalidReservedNodeStateFault":
+        case "InvalidReservedNodeState":
         case "com.amazonaws.redshift#InvalidReservedNodeStateFault":
             throw await deserializeAws_queryInvalidReservedNodeStateFaultResponse(parsedOutput, context);
         case "LimitExceededFault":
         case "com.amazonaws.redshift#LimitExceededFault":
             throw await deserializeAws_queryLimitExceededFaultResponse(parsedOutput, context);
-        case "NumberOfNodesPerClusterLimitExceededFault":
+        case "NumberOfNodesPerClusterLimitExceeded":
         case "com.amazonaws.redshift#NumberOfNodesPerClusterLimitExceededFault":
             throw await deserializeAws_queryNumberOfNodesPerClusterLimitExceededFaultResponse(parsedOutput, context);
-        case "NumberOfNodesQuotaExceededFault":
+        case "NumberOfNodesQuotaExceeded":
         case "com.amazonaws.redshift#NumberOfNodesQuotaExceededFault":
             throw await deserializeAws_queryNumberOfNodesQuotaExceededFaultResponse(parsedOutput, context);
-        case "ReservedNodeAlreadyExistsFault":
+        case "ReservedNodeAlreadyExists":
         case "com.amazonaws.redshift#ReservedNodeAlreadyExistsFault":
             throw await deserializeAws_queryReservedNodeAlreadyExistsFaultResponse(parsedOutput, context);
-        case "ReservedNodeAlreadyMigratedFault":
+        case "ReservedNodeAlreadyMigrated":
         case "com.amazonaws.redshift#ReservedNodeAlreadyMigratedFault":
             throw await deserializeAws_queryReservedNodeAlreadyMigratedFaultResponse(parsedOutput, context);
-        case "ReservedNodeNotFoundFault":
+        case "ReservedNodeNotFound":
         case "com.amazonaws.redshift#ReservedNodeNotFoundFault":
             throw await deserializeAws_queryReservedNodeNotFoundFaultResponse(parsedOutput, context);
-        case "ReservedNodeOfferingNotFoundFault":
+        case "ReservedNodeOfferingNotFound":
         case "com.amazonaws.redshift#ReservedNodeOfferingNotFoundFault":
             throw await deserializeAws_queryReservedNodeOfferingNotFoundFaultResponse(parsedOutput, context);
         case "UnauthorizedOperation":
         case "com.amazonaws.redshift#UnauthorizedOperation":
             throw await deserializeAws_queryUnauthorizedOperationResponse(parsedOutput, context);
-        case "UnsupportedOperationFault":
+        case "UnsupportedOperation":
         case "com.amazonaws.redshift#UnsupportedOperationFault":
             throw await deserializeAws_queryUnsupportedOperationFaultResponse(parsedOutput, context);
         case "UnsupportedOptionFault":
@@ -6140,26 +6140,26 @@ exports.deserializeAws_queryRestoreFromClusterSnapshotCommand = deserializeAws_q
 const deserializeAws_queryRestoreFromClusterSnapshotCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "AccessToSnapshotDeniedFault":
+        case "AccessToSnapshotDenied":
         case "com.amazonaws.redshift#AccessToSnapshotDeniedFault":
             throw await deserializeAws_queryAccessToSnapshotDeniedFaultResponse(parsedOutput, context);
-        case "ClusterAlreadyExistsFault":
+        case "ClusterAlreadyExists":
         case "com.amazonaws.redshift#ClusterAlreadyExistsFault":
             throw await deserializeAws_queryClusterAlreadyExistsFaultResponse(parsedOutput, context);
-        case "ClusterParameterGroupNotFoundFault":
+        case "ClusterParameterGroupNotFound":
         case "com.amazonaws.redshift#ClusterParameterGroupNotFoundFault":
             throw await deserializeAws_queryClusterParameterGroupNotFoundFaultResponse(parsedOutput, context);
-        case "ClusterQuotaExceededFault":
+        case "ClusterQuotaExceeded":
         case "com.amazonaws.redshift#ClusterQuotaExceededFault":
             throw await deserializeAws_queryClusterQuotaExceededFaultResponse(parsedOutput, context);
-        case "ClusterSecurityGroupNotFoundFault":
+        case "ClusterSecurityGroupNotFound":
         case "com.amazonaws.redshift#ClusterSecurityGroupNotFoundFault":
             throw await deserializeAws_queryClusterSecurityGroupNotFoundFaultResponse(parsedOutput, context);
-        case "ClusterSnapshotNotFoundFault":
+        case "ClusterSnapshotNotFound":
         case "com.amazonaws.redshift#ClusterSnapshotNotFoundFault":
             throw await deserializeAws_queryClusterSnapshotNotFoundFaultResponse(parsedOutput, context);
         case "ClusterSubnetGroupNotFoundFault":
@@ -6177,25 +6177,25 @@ const deserializeAws_queryRestoreFromClusterSnapshotCommandError = async (output
         case "HsmConfigurationNotFoundFault":
         case "com.amazonaws.redshift#HsmConfigurationNotFoundFault":
             throw await deserializeAws_queryHsmConfigurationNotFoundFaultResponse(parsedOutput, context);
-        case "InsufficientClusterCapacityFault":
+        case "InsufficientClusterCapacity":
         case "com.amazonaws.redshift#InsufficientClusterCapacityFault":
             throw await deserializeAws_queryInsufficientClusterCapacityFaultResponse(parsedOutput, context);
-        case "InvalidClusterSnapshotStateFault":
+        case "InvalidClusterSnapshotState":
         case "com.amazonaws.redshift#InvalidClusterSnapshotStateFault":
             throw await deserializeAws_queryInvalidClusterSnapshotStateFaultResponse(parsedOutput, context);
         case "InvalidClusterSubnetGroupStateFault":
         case "com.amazonaws.redshift#InvalidClusterSubnetGroupStateFault":
             throw await deserializeAws_queryInvalidClusterSubnetGroupStateFaultResponse(parsedOutput, context);
-        case "InvalidClusterTrackFault":
+        case "InvalidClusterTrack":
         case "com.amazonaws.redshift#InvalidClusterTrackFault":
             throw await deserializeAws_queryInvalidClusterTrackFaultResponse(parsedOutput, context);
         case "InvalidElasticIpFault":
         case "com.amazonaws.redshift#InvalidElasticIpFault":
             throw await deserializeAws_queryInvalidElasticIpFaultResponse(parsedOutput, context);
-        case "InvalidReservedNodeStateFault":
+        case "InvalidReservedNodeState":
         case "com.amazonaws.redshift#InvalidReservedNodeStateFault":
             throw await deserializeAws_queryInvalidReservedNodeStateFaultResponse(parsedOutput, context);
-        case "InvalidRestoreFault":
+        case "InvalidRestore":
         case "com.amazonaws.redshift#InvalidRestoreFault":
             throw await deserializeAws_queryInvalidRestoreFaultResponse(parsedOutput, context);
         case "InvalidSubnet":
@@ -6210,25 +6210,25 @@ const deserializeAws_queryRestoreFromClusterSnapshotCommandError = async (output
         case "LimitExceededFault":
         case "com.amazonaws.redshift#LimitExceededFault":
             throw await deserializeAws_queryLimitExceededFaultResponse(parsedOutput, context);
-        case "NumberOfNodesPerClusterLimitExceededFault":
+        case "NumberOfNodesPerClusterLimitExceeded":
         case "com.amazonaws.redshift#NumberOfNodesPerClusterLimitExceededFault":
             throw await deserializeAws_queryNumberOfNodesPerClusterLimitExceededFaultResponse(parsedOutput, context);
-        case "NumberOfNodesQuotaExceededFault":
+        case "NumberOfNodesQuotaExceeded":
         case "com.amazonaws.redshift#NumberOfNodesQuotaExceededFault":
             throw await deserializeAws_queryNumberOfNodesQuotaExceededFaultResponse(parsedOutput, context);
-        case "ReservedNodeAlreadyExistsFault":
+        case "ReservedNodeAlreadyExists":
         case "com.amazonaws.redshift#ReservedNodeAlreadyExistsFault":
             throw await deserializeAws_queryReservedNodeAlreadyExistsFaultResponse(parsedOutput, context);
-        case "ReservedNodeAlreadyMigratedFault":
+        case "ReservedNodeAlreadyMigrated":
         case "com.amazonaws.redshift#ReservedNodeAlreadyMigratedFault":
             throw await deserializeAws_queryReservedNodeAlreadyMigratedFaultResponse(parsedOutput, context);
-        case "ReservedNodeNotFoundFault":
+        case "ReservedNodeNotFound":
         case "com.amazonaws.redshift#ReservedNodeNotFoundFault":
             throw await deserializeAws_queryReservedNodeNotFoundFaultResponse(parsedOutput, context);
-        case "ReservedNodeOfferingNotFoundFault":
+        case "ReservedNodeOfferingNotFound":
         case "com.amazonaws.redshift#ReservedNodeOfferingNotFoundFault":
             throw await deserializeAws_queryReservedNodeOfferingNotFoundFaultResponse(parsedOutput, context);
-        case "SnapshotScheduleNotFoundFault":
+        case "SnapshotScheduleNotFound":
         case "com.amazonaws.redshift#SnapshotScheduleNotFoundFault":
             throw await deserializeAws_querySnapshotScheduleNotFoundFaultResponse(parsedOutput, context);
         case "TagLimitExceededFault":
@@ -6237,7 +6237,7 @@ const deserializeAws_queryRestoreFromClusterSnapshotCommandError = async (output
         case "UnauthorizedOperation":
         case "com.amazonaws.redshift#UnauthorizedOperation":
             throw await deserializeAws_queryUnauthorizedOperationResponse(parsedOutput, context);
-        case "UnsupportedOperationFault":
+        case "UnsupportedOperation":
         case "com.amazonaws.redshift#UnsupportedOperationFault":
             throw await deserializeAws_queryUnsupportedOperationFaultResponse(parsedOutput, context);
         default:
@@ -6267,29 +6267,29 @@ exports.deserializeAws_queryRestoreTableFromClusterSnapshotCommand = deserialize
 const deserializeAws_queryRestoreTableFromClusterSnapshotCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "ClusterNotFoundFault":
+        case "ClusterNotFound":
         case "com.amazonaws.redshift#ClusterNotFoundFault":
             throw await deserializeAws_queryClusterNotFoundFaultResponse(parsedOutput, context);
-        case "ClusterSnapshotNotFoundFault":
+        case "ClusterSnapshotNotFound":
         case "com.amazonaws.redshift#ClusterSnapshotNotFoundFault":
             throw await deserializeAws_queryClusterSnapshotNotFoundFaultResponse(parsedOutput, context);
         case "InProgressTableRestoreQuotaExceededFault":
         case "com.amazonaws.redshift#InProgressTableRestoreQuotaExceededFault":
             throw await deserializeAws_queryInProgressTableRestoreQuotaExceededFaultResponse(parsedOutput, context);
-        case "InvalidClusterSnapshotStateFault":
+        case "InvalidClusterSnapshotState":
         case "com.amazonaws.redshift#InvalidClusterSnapshotStateFault":
             throw await deserializeAws_queryInvalidClusterSnapshotStateFaultResponse(parsedOutput, context);
-        case "InvalidClusterStateFault":
+        case "InvalidClusterState":
         case "com.amazonaws.redshift#InvalidClusterStateFault":
             throw await deserializeAws_queryInvalidClusterStateFaultResponse(parsedOutput, context);
-        case "InvalidTableRestoreArgumentFault":
+        case "InvalidTableRestoreArgument":
         case "com.amazonaws.redshift#InvalidTableRestoreArgumentFault":
             throw await deserializeAws_queryInvalidTableRestoreArgumentFaultResponse(parsedOutput, context);
-        case "UnsupportedOperationFault":
+        case "UnsupportedOperation":
         case "com.amazonaws.redshift#UnsupportedOperationFault":
             throw await deserializeAws_queryUnsupportedOperationFaultResponse(parsedOutput, context);
         default:
@@ -6319,17 +6319,17 @@ exports.deserializeAws_queryResumeClusterCommand = deserializeAws_queryResumeClu
 const deserializeAws_queryResumeClusterCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "ClusterNotFoundFault":
+        case "ClusterNotFound":
         case "com.amazonaws.redshift#ClusterNotFoundFault":
             throw await deserializeAws_queryClusterNotFoundFaultResponse(parsedOutput, context);
-        case "InsufficientClusterCapacityFault":
+        case "InsufficientClusterCapacity":
         case "com.amazonaws.redshift#InsufficientClusterCapacityFault":
             throw await deserializeAws_queryInsufficientClusterCapacityFaultResponse(parsedOutput, context);
-        case "InvalidClusterStateFault":
+        case "InvalidClusterState":
         case "com.amazonaws.redshift#InvalidClusterStateFault":
             throw await deserializeAws_queryInvalidClusterStateFaultResponse(parsedOutput, context);
         default:
@@ -6359,17 +6359,17 @@ exports.deserializeAws_queryRevokeClusterSecurityGroupIngressCommand = deseriali
 const deserializeAws_queryRevokeClusterSecurityGroupIngressCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "AuthorizationNotFoundFault":
+        case "AuthorizationNotFound":
         case "com.amazonaws.redshift#AuthorizationNotFoundFault":
             throw await deserializeAws_queryAuthorizationNotFoundFaultResponse(parsedOutput, context);
-        case "ClusterSecurityGroupNotFoundFault":
+        case "ClusterSecurityGroupNotFound":
         case "com.amazonaws.redshift#ClusterSecurityGroupNotFoundFault":
             throw await deserializeAws_queryClusterSecurityGroupNotFoundFaultResponse(parsedOutput, context);
-        case "InvalidClusterSecurityGroupStateFault":
+        case "InvalidClusterSecurityGroupState":
         case "com.amazonaws.redshift#InvalidClusterSecurityGroupStateFault":
             throw await deserializeAws_queryInvalidClusterSecurityGroupStateFaultResponse(parsedOutput, context);
         default:
@@ -6399,29 +6399,29 @@ exports.deserializeAws_queryRevokeEndpointAccessCommand = deserializeAws_queryRe
 const deserializeAws_queryRevokeEndpointAccessCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "ClusterNotFoundFault":
+        case "ClusterNotFound":
         case "com.amazonaws.redshift#ClusterNotFoundFault":
             throw await deserializeAws_queryClusterNotFoundFaultResponse(parsedOutput, context);
-        case "EndpointAuthorizationNotFoundFault":
+        case "EndpointAuthorizationNotFound":
         case "com.amazonaws.redshift#EndpointAuthorizationNotFoundFault":
             throw await deserializeAws_queryEndpointAuthorizationNotFoundFaultResponse(parsedOutput, context);
-        case "EndpointNotFoundFault":
+        case "EndpointNotFound":
         case "com.amazonaws.redshift#EndpointNotFoundFault":
             throw await deserializeAws_queryEndpointNotFoundFaultResponse(parsedOutput, context);
-        case "InvalidAuthorizationStateFault":
+        case "InvalidAuthorizationState":
         case "com.amazonaws.redshift#InvalidAuthorizationStateFault":
             throw await deserializeAws_queryInvalidAuthorizationStateFaultResponse(parsedOutput, context);
-        case "InvalidClusterSecurityGroupStateFault":
+        case "InvalidClusterSecurityGroupState":
         case "com.amazonaws.redshift#InvalidClusterSecurityGroupStateFault":
             throw await deserializeAws_queryInvalidClusterSecurityGroupStateFaultResponse(parsedOutput, context);
-        case "InvalidClusterStateFault":
+        case "InvalidClusterState":
         case "com.amazonaws.redshift#InvalidClusterStateFault":
             throw await deserializeAws_queryInvalidClusterStateFaultResponse(parsedOutput, context);
-        case "InvalidEndpointStateFault":
+        case "InvalidEndpointState":
         case "com.amazonaws.redshift#InvalidEndpointStateFault":
             throw await deserializeAws_queryInvalidEndpointStateFaultResponse(parsedOutput, context);
         default:
@@ -6451,20 +6451,20 @@ exports.deserializeAws_queryRevokeSnapshotAccessCommand = deserializeAws_queryRe
 const deserializeAws_queryRevokeSnapshotAccessCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "AccessToSnapshotDeniedFault":
+        case "AccessToSnapshotDenied":
         case "com.amazonaws.redshift#AccessToSnapshotDeniedFault":
             throw await deserializeAws_queryAccessToSnapshotDeniedFaultResponse(parsedOutput, context);
-        case "AuthorizationNotFoundFault":
+        case "AuthorizationNotFound":
         case "com.amazonaws.redshift#AuthorizationNotFoundFault":
             throw await deserializeAws_queryAuthorizationNotFoundFaultResponse(parsedOutput, context);
-        case "ClusterSnapshotNotFoundFault":
+        case "ClusterSnapshotNotFound":
         case "com.amazonaws.redshift#ClusterSnapshotNotFoundFault":
             throw await deserializeAws_queryClusterSnapshotNotFoundFaultResponse(parsedOutput, context);
-        case "UnsupportedOperationFault":
+        case "UnsupportedOperation":
         case "com.amazonaws.redshift#UnsupportedOperationFault":
             throw await deserializeAws_queryUnsupportedOperationFaultResponse(parsedOutput, context);
         default:
@@ -6494,17 +6494,17 @@ exports.deserializeAws_queryRotateEncryptionKeyCommand = deserializeAws_queryRot
 const deserializeAws_queryRotateEncryptionKeyCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "ClusterNotFoundFault":
+        case "ClusterNotFound":
         case "com.amazonaws.redshift#ClusterNotFoundFault":
             throw await deserializeAws_queryClusterNotFoundFaultResponse(parsedOutput, context);
         case "DependentServiceRequestThrottlingFault":
         case "com.amazonaws.redshift#DependentServiceRequestThrottlingFault":
             throw await deserializeAws_queryDependentServiceRequestThrottlingFaultResponse(parsedOutput, context);
-        case "InvalidClusterStateFault":
+        case "InvalidClusterState":
         case "com.amazonaws.redshift#InvalidClusterStateFault":
             throw await deserializeAws_queryInvalidClusterStateFaultResponse(parsedOutput, context);
         default:
@@ -6534,17 +6534,17 @@ exports.deserializeAws_queryUpdatePartnerStatusCommand = deserializeAws_queryUpd
 const deserializeAws_queryUpdatePartnerStatusCommandError = async (output, context) => {
     const parsedOutput = {
         ...output,
-        body: await parseBody(output.body, context),
+        body: await parseErrorBody(output.body, context),
     };
     const errorCode = loadQueryErrorCode(output, parsedOutput.body);
     switch (errorCode) {
-        case "ClusterNotFoundFault":
+        case "ClusterNotFound":
         case "com.amazonaws.redshift#ClusterNotFoundFault":
             throw await deserializeAws_queryClusterNotFoundFaultResponse(parsedOutput, context);
-        case "PartnerNotFoundFault":
+        case "PartnerNotFound":
         case "com.amazonaws.redshift#PartnerNotFoundFault":
             throw await deserializeAws_queryPartnerNotFoundFaultResponse(parsedOutput, context);
-        case "UnauthorizedPartnerIntegrationFault":
+        case "UnauthorizedPartnerIntegration":
         case "com.amazonaws.redshift#UnauthorizedPartnerIntegrationFault":
             throw await deserializeAws_queryUnauthorizedPartnerIntegrationFaultResponse(parsedOutput, context);
         default:
@@ -15252,6 +15252,14 @@ const parseBody = (streamBody, context) => collectBodyString(streamBody, context
     }
     return {};
 });
+const parseErrorBody = async (errorBody, context) => {
+    var _a;
+    const value = await parseBody(errorBody, context);
+    if (value.Error) {
+        value.Error.message = (_a = value.Error.message) !== null && _a !== void 0 ? _a : value.Error.Message;
+    }
+    return value;
+};
 const buildFormUrlencodedString = (formEntries) => Object.entries(formEntries)
     .map(([key, value]) => (0, smithy_client_1.extendedEncodeURIComponent)(key) + "=" + (0, smithy_client_1.extendedEncodeURIComponent)(value))
     .join("&");