@aws-sdk/client-redshift 3.179.0 → 3.181.0

package/dist-es/protocols/Aws_query.js

@@ -1225,7 +1225,7 @@ var deserializeAws_queryAcceptReservedNodeExchangeCommandError = function (outpu
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
@@ -1233,17 +1233,17 @@ var deserializeAws_queryAcceptReservedNodeExchangeCommandError = function (outpu
                 switch (_b) {
                     case "DependentServiceUnavailableFault": return [3, 2];
                     case "com.amazonaws.redshift#DependentServiceUnavailableFault": return [3, 2];
-                    case "InvalidReservedNodeStateFault": return [3, 4];
+                    case "InvalidReservedNodeState": return [3, 4];
                     case "com.amazonaws.redshift#InvalidReservedNodeStateFault": return [3, 4];
-                    case "ReservedNodeAlreadyExistsFault": return [3, 6];
+                    case "ReservedNodeAlreadyExists": return [3, 6];
                     case "com.amazonaws.redshift#ReservedNodeAlreadyExistsFault": return [3, 6];
-                    case "ReservedNodeAlreadyMigratedFault": return [3, 8];
+                    case "ReservedNodeAlreadyMigrated": return [3, 8];
                     case "com.amazonaws.redshift#ReservedNodeAlreadyMigratedFault": return [3, 8];
-                    case "ReservedNodeNotFoundFault": return [3, 10];
+                    case "ReservedNodeNotFound": return [3, 10];
                     case "com.amazonaws.redshift#ReservedNodeNotFoundFault": return [3, 10];
-                    case "ReservedNodeOfferingNotFoundFault": return [3, 12];
+                    case "ReservedNodeOfferingNotFound": return [3, 12];
                     case "com.amazonaws.redshift#ReservedNodeOfferingNotFoundFault": return [3, 12];
-                    case "UnsupportedOperationFault": return [3, 14];
+                    case "UnsupportedOperation": return [3, 14];
                     case "com.amazonaws.redshift#UnsupportedOperationFault": return [3, 14];
                 }
                 return [3, 16];
@@ -1300,17 +1300,17 @@ var deserializeAws_queryAddPartnerCommandError = function (output, context) { re
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
                 switch (_b) {
-                    case "ClusterNotFoundFault": return [3, 2];
+                    case "ClusterNotFound": return [3, 2];
                     case "com.amazonaws.redshift#ClusterNotFoundFault": return [3, 2];
-                    case "PartnerNotFoundFault": return [3, 4];
+                    case "PartnerNotFound": return [3, 4];
                     case "com.amazonaws.redshift#PartnerNotFoundFault": return [3, 4];
-                    case "UnauthorizedPartnerIntegrationFault": return [3, 6];
+                    case "UnauthorizedPartnerIntegration": return [3, 6];
                     case "com.amazonaws.redshift#UnauthorizedPartnerIntegrationFault": return [3, 6];
                 }
                 return [3, 8];
@@ -1359,7 +1359,7 @@ var deserializeAws_queryAssociateDataShareConsumerCommandError = function (outpu
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
@@ -1414,19 +1414,19 @@ var deserializeAws_queryAuthorizeClusterSecurityGroupIngressCommandError = funct
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
                 switch (_b) {
-                    case "AuthorizationAlreadyExistsFault": return [3, 2];
+                    case "AuthorizationAlreadyExists": return [3, 2];
                     case "com.amazonaws.redshift#AuthorizationAlreadyExistsFault": return [3, 2];
-                    case "AuthorizationQuotaExceededFault": return [3, 4];
+                    case "AuthorizationQuotaExceeded": return [3, 4];
                     case "com.amazonaws.redshift#AuthorizationQuotaExceededFault": return [3, 4];
-                    case "ClusterSecurityGroupNotFoundFault": return [3, 6];
+                    case "ClusterSecurityGroupNotFound": return [3, 6];
                     case "com.amazonaws.redshift#ClusterSecurityGroupNotFoundFault": return [3, 6];
-                    case "InvalidClusterSecurityGroupStateFault": return [3, 8];
+                    case "InvalidClusterSecurityGroupState": return [3, 8];
                     case "com.amazonaws.redshift#InvalidClusterSecurityGroupStateFault": return [3, 8];
                 }
                 return [3, 10];
@@ -1477,7 +1477,7 @@ var deserializeAws_queryAuthorizeDataShareCommandError = function (output, conte
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
@@ -1528,23 +1528,23 @@ var deserializeAws_queryAuthorizeEndpointAccessCommandError = function (output,
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
                 switch (_b) {
-                    case "ClusterNotFoundFault": return [3, 2];
+                    case "ClusterNotFound": return [3, 2];
                     case "com.amazonaws.redshift#ClusterNotFoundFault": return [3, 2];
-                    case "EndpointAuthorizationAlreadyExistsFault": return [3, 4];
+                    case "EndpointAuthorizationAlreadyExists": return [3, 4];
                     case "com.amazonaws.redshift#EndpointAuthorizationAlreadyExistsFault": return [3, 4];
-                    case "EndpointAuthorizationsPerClusterLimitExceededFault": return [3, 6];
+                    case "EndpointAuthorizationsPerClusterLimitExceeded": return [3, 6];
                     case "com.amazonaws.redshift#EndpointAuthorizationsPerClusterLimitExceededFault": return [3, 6];
-                    case "InvalidAuthorizationStateFault": return [3, 8];
+                    case "InvalidAuthorizationState": return [3, 8];
                     case "com.amazonaws.redshift#InvalidAuthorizationStateFault": return [3, 8];
-                    case "InvalidClusterStateFault": return [3, 10];
+                    case "InvalidClusterState": return [3, 10];
                     case "com.amazonaws.redshift#InvalidClusterStateFault": return [3, 10];
-                    case "UnsupportedOperationFault": return [3, 12];
+                    case "UnsupportedOperation": return [3, 12];
                     case "com.amazonaws.redshift#UnsupportedOperationFault": return [3, 12];
                 }
                 return [3, 14];
@@ -1599,25 +1599,25 @@ var deserializeAws_queryAuthorizeSnapshotAccessCommandError = function (output,
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
                 switch (_b) {
-                    case "AuthorizationAlreadyExistsFault": return [3, 2];
+                    case "AuthorizationAlreadyExists": return [3, 2];
                     case "com.amazonaws.redshift#AuthorizationAlreadyExistsFault": return [3, 2];
-                    case "AuthorizationQuotaExceededFault": return [3, 4];
+                    case "AuthorizationQuotaExceeded": return [3, 4];
                     case "com.amazonaws.redshift#AuthorizationQuotaExceededFault": return [3, 4];
-                    case "ClusterSnapshotNotFoundFault": return [3, 6];
+                    case "ClusterSnapshotNotFound": return [3, 6];
                     case "com.amazonaws.redshift#ClusterSnapshotNotFoundFault": return [3, 6];
                     case "DependentServiceRequestThrottlingFault": return [3, 8];
                     case "com.amazonaws.redshift#DependentServiceRequestThrottlingFault": return [3, 8];
-                    case "InvalidClusterSnapshotStateFault": return [3, 10];
+                    case "InvalidClusterSnapshotState": return [3, 10];
                     case "com.amazonaws.redshift#InvalidClusterSnapshotStateFault": return [3, 10];
                     case "LimitExceededFault": return [3, 12];
                     case "com.amazonaws.redshift#LimitExceededFault": return [3, 12];
-                    case "UnsupportedOperationFault": return [3, 14];
+                    case "UnsupportedOperation": return [3, 14];
                     case "com.amazonaws.redshift#UnsupportedOperationFault": return [3, 14];
                 }
                 return [3, 16];
@@ -1674,13 +1674,13 @@ var deserializeAws_queryBatchDeleteClusterSnapshotsCommandError = function (outp
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
                 switch (_b) {
-                    case "BatchDeleteRequestSizeExceededFault": return [3, 2];
+                    case "BatchDeleteRequestSizeExceeded": return [3, 2];
                     case "com.amazonaws.redshift#BatchDeleteRequestSizeExceededFault": return [3, 2];
                 }
                 return [3, 4];
@@ -1725,7 +1725,7 @@ var deserializeAws_queryBatchModifyClusterSnapshotsCommandError = function (outp
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
@@ -1780,19 +1780,19 @@ var deserializeAws_queryCancelResizeCommandError = function (output, context) {
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
                 switch (_b) {
-                    case "ClusterNotFoundFault": return [3, 2];
+                    case "ClusterNotFound": return [3, 2];
                     case "com.amazonaws.redshift#ClusterNotFoundFault": return [3, 2];
-                    case "InvalidClusterStateFault": return [3, 4];
+                    case "InvalidClusterState": return [3, 4];
                     case "com.amazonaws.redshift#InvalidClusterStateFault": return [3, 4];
-                    case "ResizeNotFoundFault": return [3, 6];
+                    case "ResizeNotFound": return [3, 6];
                     case "com.amazonaws.redshift#ResizeNotFoundFault": return [3, 6];
-                    case "UnsupportedOperationFault": return [3, 8];
+                    case "UnsupportedOperation": return [3, 8];
                     case "com.amazonaws.redshift#UnsupportedOperationFault": return [3, 8];
                 }
                 return [3, 10];
@@ -1843,19 +1843,19 @@ var deserializeAws_queryCopyClusterSnapshotCommandError = function (output, cont
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
                 switch (_b) {
-                    case "ClusterSnapshotAlreadyExistsFault": return [3, 2];
+                    case "ClusterSnapshotAlreadyExists": return [3, 2];
                     case "com.amazonaws.redshift#ClusterSnapshotAlreadyExistsFault": return [3, 2];
-                    case "ClusterSnapshotNotFoundFault": return [3, 4];
+                    case "ClusterSnapshotNotFound": return [3, 4];
                     case "com.amazonaws.redshift#ClusterSnapshotNotFoundFault": return [3, 4];
-                    case "ClusterSnapshotQuotaExceededFault": return [3, 6];
+                    case "ClusterSnapshotQuotaExceeded": return [3, 6];
                     case "com.amazonaws.redshift#ClusterSnapshotQuotaExceededFault": return [3, 6];
-                    case "InvalidClusterSnapshotStateFault": return [3, 8];
+                    case "InvalidClusterSnapshotState": return [3, 8];
                     case "com.amazonaws.redshift#InvalidClusterSnapshotStateFault": return [3, 8];
                     case "InvalidRetentionPeriodFault": return [3, 10];
                     case "com.amazonaws.redshift#InvalidRetentionPeriodFault": return [3, 10];
@@ -1910,7 +1910,7 @@ var deserializeAws_queryCreateAuthenticationProfileCommandError = function (outp
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
@@ -1969,19 +1969,19 @@ var deserializeAws_queryCreateClusterCommandError = function (output, context) {
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
                 switch (_b) {
-                    case "ClusterAlreadyExistsFault": return [3, 2];
+                    case "ClusterAlreadyExists": return [3, 2];
                     case "com.amazonaws.redshift#ClusterAlreadyExistsFault": return [3, 2];
-                    case "ClusterParameterGroupNotFoundFault": return [3, 4];
+                    case "ClusterParameterGroupNotFound": return [3, 4];
                     case "com.amazonaws.redshift#ClusterParameterGroupNotFoundFault": return [3, 4];
-                    case "ClusterQuotaExceededFault": return [3, 6];
+                    case "ClusterQuotaExceeded": return [3, 6];
                     case "com.amazonaws.redshift#ClusterQuotaExceededFault": return [3, 6];
-                    case "ClusterSecurityGroupNotFoundFault": return [3, 8];
+                    case "ClusterSecurityGroupNotFound": return [3, 8];
                     case "com.amazonaws.redshift#ClusterSecurityGroupNotFoundFault": return [3, 8];
                     case "ClusterSubnetGroupNotFoundFault": return [3, 10];
                     case "com.amazonaws.redshift#ClusterSubnetGroupNotFoundFault": return [3, 10];
@@ -1991,11 +1991,11 @@ var deserializeAws_queryCreateClusterCommandError = function (output, context) {
                     case "com.amazonaws.redshift#HsmClientCertificateNotFoundFault": return [3, 14];
                     case "HsmConfigurationNotFoundFault": return [3, 16];
                     case "com.amazonaws.redshift#HsmConfigurationNotFoundFault": return [3, 16];
-                    case "InsufficientClusterCapacityFault": return [3, 18];
+                    case "InsufficientClusterCapacity": return [3, 18];
                     case "com.amazonaws.redshift#InsufficientClusterCapacityFault": return [3, 18];
                     case "InvalidClusterSubnetGroupStateFault": return [3, 20];
                     case "com.amazonaws.redshift#InvalidClusterSubnetGroupStateFault": return [3, 20];
-                    case "InvalidClusterTrackFault": return [3, 22];
+                    case "InvalidClusterTrack": return [3, 22];
                     case "com.amazonaws.redshift#InvalidClusterTrackFault": return [3, 22];
                     case "InvalidElasticIpFault": return [3, 24];
                     case "com.amazonaws.redshift#InvalidElasticIpFault": return [3, 24];
@@ -2009,11 +2009,11 @@ var deserializeAws_queryCreateClusterCommandError = function (output, context) {
                     case "com.amazonaws.redshift#InvalidVPCNetworkStateFault": return [3, 32];
                     case "LimitExceededFault": return [3, 34];
                     case "com.amazonaws.redshift#LimitExceededFault": return [3, 34];
-                    case "NumberOfNodesPerClusterLimitExceededFault": return [3, 36];
+                    case "NumberOfNodesPerClusterLimitExceeded": return [3, 36];
                     case "com.amazonaws.redshift#NumberOfNodesPerClusterLimitExceededFault": return [3, 36];
-                    case "NumberOfNodesQuotaExceededFault": return [3, 38];
+                    case "NumberOfNodesQuotaExceeded": return [3, 38];
                     case "com.amazonaws.redshift#NumberOfNodesQuotaExceededFault": return [3, 38];
-                    case "SnapshotScheduleNotFoundFault": return [3, 40];
+                    case "SnapshotScheduleNotFound": return [3, 40];
                     case "com.amazonaws.redshift#SnapshotScheduleNotFoundFault": return [3, 40];
                     case "TagLimitExceededFault": return [3, 42];
                     case "com.amazonaws.redshift#TagLimitExceededFault": return [3, 42];
@@ -2104,15 +2104,15 @@ var deserializeAws_queryCreateClusterParameterGroupCommandError = function (outp
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
                 switch (_b) {
-                    case "ClusterParameterGroupAlreadyExistsFault": return [3, 2];
+                    case "ClusterParameterGroupAlreadyExists": return [3, 2];
                     case "com.amazonaws.redshift#ClusterParameterGroupAlreadyExistsFault": return [3, 2];
-                    case "ClusterParameterGroupQuotaExceededFault": return [3, 4];
+                    case "ClusterParameterGroupQuotaExceeded": return [3, 4];
                     case "com.amazonaws.redshift#ClusterParameterGroupQuotaExceededFault": return [3, 4];
                     case "InvalidTagFault": return [3, 6];
                     case "com.amazonaws.redshift#InvalidTagFault": return [3, 6];
@@ -2167,27 +2167,27 @@ var deserializeAws_queryCreateClusterSecurityGroupCommandError = function (outpu
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
                 switch (_b) {
-                    case "ClusterSecurityGroupAlreadyExistsFault": return [3, 2];
+                    case "ClusterSecurityGroupAlreadyExists": return [3, 2];
                     case "com.amazonaws.redshift#ClusterSecurityGroupAlreadyExistsFault": return [3, 2];
-                    case "ClusterSecurityGroupQuotaExceededFault": return [3, 4];
-                    case "com.amazonaws.redshift#ClusterSecurityGroupQuotaExceededFault": return [3, 4];
-                    case "InvalidTagFault": return [3, 6];
-                    case "com.amazonaws.redshift#InvalidTagFault": return [3, 6];
+                    case "InvalidTagFault": return [3, 4];
+                    case "com.amazonaws.redshift#InvalidTagFault": return [3, 4];
+                    case "QuotaExceeded.ClusterSecurityGroup": return [3, 6];
+                    case "com.amazonaws.redshift#ClusterSecurityGroupQuotaExceededFault": return [3, 6];
                     case "TagLimitExceededFault": return [3, 8];
                     case "com.amazonaws.redshift#TagLimitExceededFault": return [3, 8];
                 }
                 return [3, 10];
             case 2: return [4, deserializeAws_queryClusterSecurityGroupAlreadyExistsFaultResponse(parsedOutput, context)];
             case 3: throw _d.sent();
-            case 4: return [4, deserializeAws_queryClusterSecurityGroupQuotaExceededFaultResponse(parsedOutput, context)];
+            case 4: return [4, deserializeAws_queryInvalidTagFaultResponse(parsedOutput, context)];
             case 5: throw _d.sent();
-            case 6: return [4, deserializeAws_queryInvalidTagFaultResponse(parsedOutput, context)];
+            case 6: return [4, deserializeAws_queryClusterSecurityGroupQuotaExceededFaultResponse(parsedOutput, context)];
             case 7: throw _d.sent();
             case 8: return [4, deserializeAws_queryTagLimitExceededFaultResponse(parsedOutput, context)];
             case 9: throw _d.sent();
@@ -2230,19 +2230,19 @@ var deserializeAws_queryCreateClusterSnapshotCommandError = function (output, co
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
                 switch (_b) {
-                    case "ClusterNotFoundFault": return [3, 2];
+                    case "ClusterNotFound": return [3, 2];
                     case "com.amazonaws.redshift#ClusterNotFoundFault": return [3, 2];
-                    case "ClusterSnapshotAlreadyExistsFault": return [3, 4];
+                    case "ClusterSnapshotAlreadyExists": return [3, 4];
                     case "com.amazonaws.redshift#ClusterSnapshotAlreadyExistsFault": return [3, 4];
-                    case "ClusterSnapshotQuotaExceededFault": return [3, 6];
+                    case "ClusterSnapshotQuotaExceeded": return [3, 6];
                     case "com.amazonaws.redshift#ClusterSnapshotQuotaExceededFault": return [3, 6];
-                    case "InvalidClusterStateFault": return [3, 8];
+                    case "InvalidClusterState": return [3, 8];
                     case "com.amazonaws.redshift#InvalidClusterStateFault": return [3, 8];
                     case "InvalidRetentionPeriodFault": return [3, 10];
                     case "com.amazonaws.redshift#InvalidRetentionPeriodFault": return [3, 10];
@@ -2305,15 +2305,15 @@ var deserializeAws_queryCreateClusterSubnetGroupCommandError = function (output,
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
                 switch (_b) {
-                    case "ClusterSubnetGroupAlreadyExistsFault": return [3, 2];
+                    case "ClusterSubnetGroupAlreadyExists": return [3, 2];
                     case "com.amazonaws.redshift#ClusterSubnetGroupAlreadyExistsFault": return [3, 2];
-                    case "ClusterSubnetGroupQuotaExceededFault": return [3, 4];
+                    case "ClusterSubnetGroupQuotaExceeded": return [3, 4];
                     case "com.amazonaws.redshift#ClusterSubnetGroupQuotaExceededFault": return [3, 4];
                     case "ClusterSubnetQuotaExceededFault": return [3, 6];
                     case "com.amazonaws.redshift#ClusterSubnetQuotaExceededFault": return [3, 6];
@@ -2384,31 +2384,31 @@ var deserializeAws_queryCreateEndpointAccessCommandError = function (output, con
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
                 switch (_b) {
-                    case "AccessToClusterDeniedFault": return [3, 2];
+                    case "AccessToClusterDenied": return [3, 2];
                     case "com.amazonaws.redshift#AccessToClusterDeniedFault": return [3, 2];
-                    case "ClusterNotFoundFault": return [3, 4];
+                    case "ClusterNotFound": return [3, 4];
                     case "com.amazonaws.redshift#ClusterNotFoundFault": return [3, 4];
                     case "ClusterSubnetGroupNotFoundFault": return [3, 6];
                     case "com.amazonaws.redshift#ClusterSubnetGroupNotFoundFault": return [3, 6];
-                    case "EndpointAlreadyExistsFault": return [3, 8];
+                    case "EndpointAlreadyExists": return [3, 8];
                     case "com.amazonaws.redshift#EndpointAlreadyExistsFault": return [3, 8];
-                    case "EndpointsPerAuthorizationLimitExceededFault": return [3, 10];
+                    case "EndpointsPerAuthorizationLimitExceeded": return [3, 10];
                     case "com.amazonaws.redshift#EndpointsPerAuthorizationLimitExceededFault": return [3, 10];
-                    case "EndpointsPerClusterLimitExceededFault": return [3, 12];
+                    case "EndpointsPerClusterLimitExceeded": return [3, 12];
                     case "com.amazonaws.redshift#EndpointsPerClusterLimitExceededFault": return [3, 12];
-                    case "InvalidClusterSecurityGroupStateFault": return [3, 14];
+                    case "InvalidClusterSecurityGroupState": return [3, 14];
                     case "com.amazonaws.redshift#InvalidClusterSecurityGroupStateFault": return [3, 14];
-                    case "InvalidClusterStateFault": return [3, 16];
+                    case "InvalidClusterState": return [3, 16];
                     case "com.amazonaws.redshift#InvalidClusterStateFault": return [3, 16];
                     case "UnauthorizedOperation": return [3, 18];
                     case "com.amazonaws.redshift#UnauthorizedOperation": return [3, 18];
-                    case "UnsupportedOperationFault": return [3, 20];
+                    case "UnsupportedOperation": return [3, 20];
                     case "com.amazonaws.redshift#UnsupportedOperationFault": return [3, 20];
                 }
                 return [3, 22];
@@ -2471,31 +2471,31 @@ var deserializeAws_queryCreateEventSubscriptionCommandError = function (output,
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
                 switch (_b) {
-                    case "EventSubscriptionQuotaExceededFault": return [3, 2];
+                    case "EventSubscriptionQuotaExceeded": return [3, 2];
                     case "com.amazonaws.redshift#EventSubscriptionQuotaExceededFault": return [3, 2];
                     case "InvalidTagFault": return [3, 4];
                     case "com.amazonaws.redshift#InvalidTagFault": return [3, 4];
-                    case "SNSInvalidTopicFault": return [3, 6];
+                    case "SNSInvalidTopic": return [3, 6];
                     case "com.amazonaws.redshift#SNSInvalidTopicFault": return [3, 6];
-                    case "SNSNoAuthorizationFault": return [3, 8];
+                    case "SNSNoAuthorization": return [3, 8];
                     case "com.amazonaws.redshift#SNSNoAuthorizationFault": return [3, 8];
-                    case "SNSTopicArnNotFoundFault": return [3, 10];
+                    case "SNSTopicArnNotFound": return [3, 10];
                     case "com.amazonaws.redshift#SNSTopicArnNotFoundFault": return [3, 10];
-                    case "SourceNotFoundFault": return [3, 12];
+                    case "SourceNotFound": return [3, 12];
                     case "com.amazonaws.redshift#SourceNotFoundFault": return [3, 12];
-                    case "SubscriptionAlreadyExistFault": return [3, 14];
+                    case "SubscriptionAlreadyExist": return [3, 14];
                     case "com.amazonaws.redshift#SubscriptionAlreadyExistFault": return [3, 14];
-                    case "SubscriptionCategoryNotFoundFault": return [3, 16];
+                    case "SubscriptionCategoryNotFound": return [3, 16];
                     case "com.amazonaws.redshift#SubscriptionCategoryNotFoundFault": return [3, 16];
-                    case "SubscriptionEventIdNotFoundFault": return [3, 18];
+                    case "SubscriptionEventIdNotFound": return [3, 18];
                     case "com.amazonaws.redshift#SubscriptionEventIdNotFoundFault": return [3, 18];
-                    case "SubscriptionSeverityNotFoundFault": return [3, 20];
+                    case "SubscriptionSeverityNotFound": return [3, 20];
                     case "com.amazonaws.redshift#SubscriptionSeverityNotFoundFault": return [3, 20];
                     case "TagLimitExceededFault": return [3, 22];
                     case "com.amazonaws.redshift#TagLimitExceededFault": return [3, 22];
@@ -2562,7 +2562,7 @@ var deserializeAws_queryCreateHsmClientCertificateCommandError = function (outpu
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
@@ -2625,7 +2625,7 @@ var deserializeAws_queryCreateHsmConfigurationCommandError = function (output, c
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
@@ -2688,29 +2688,29 @@ var deserializeAws_queryCreateScheduledActionCommandError = function (output, co
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
                 switch (_b) {
-                    case "InvalidScheduledActionFault": return [3, 2];
-                    case "com.amazonaws.redshift#InvalidScheduledActionFault": return [3, 2];
-                    case "InvalidScheduleFault": return [3, 4];
-                    case "com.amazonaws.redshift#InvalidScheduleFault": return [3, 4];
-                    case "ScheduledActionAlreadyExistsFault": return [3, 6];
+                    case "InvalidSchedule": return [3, 2];
+                    case "com.amazonaws.redshift#InvalidScheduleFault": return [3, 2];
+                    case "InvalidScheduledAction": return [3, 4];
+                    case "com.amazonaws.redshift#InvalidScheduledActionFault": return [3, 4];
+                    case "ScheduledActionAlreadyExists": return [3, 6];
                     case "com.amazonaws.redshift#ScheduledActionAlreadyExistsFault": return [3, 6];
-                    case "ScheduledActionQuotaExceededFault": return [3, 8];
+                    case "ScheduledActionQuotaExceeded": return [3, 8];
                     case "com.amazonaws.redshift#ScheduledActionQuotaExceededFault": return [3, 8];
-                    case "ScheduledActionTypeUnsupportedFault": return [3, 10];
+                    case "ScheduledActionTypeUnsupported": return [3, 10];
                     case "com.amazonaws.redshift#ScheduledActionTypeUnsupportedFault": return [3, 10];
                     case "UnauthorizedOperation": return [3, 12];
                     case "com.amazonaws.redshift#UnauthorizedOperation": return [3, 12];
                 }
                 return [3, 14];
-            case 2: return [4, deserializeAws_queryInvalidScheduledActionFaultResponse(parsedOutput, context)];
+            case 2: return [4, deserializeAws_queryInvalidScheduleFaultResponse(parsedOutput, context)];
             case 3: throw _d.sent();
-            case 4: return [4, deserializeAws_queryInvalidScheduleFaultResponse(parsedOutput, context)];
+            case 4: return [4, deserializeAws_queryInvalidScheduledActionFaultResponse(parsedOutput, context)];
             case 5: throw _d.sent();
             case 6: return [4, deserializeAws_queryScheduledActionAlreadyExistsFaultResponse(parsedOutput, context)];
             case 7: throw _d.sent();
@@ -2759,7 +2759,7 @@ var deserializeAws_queryCreateSnapshotCopyGrantCommandError = function (output,
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
@@ -2830,21 +2830,21 @@ var deserializeAws_queryCreateSnapshotScheduleCommandError = function (output, c
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
                 switch (_b) {
-                    case "InvalidScheduleFault": return [3, 2];
+                    case "InvalidSchedule": return [3, 2];
                     case "com.amazonaws.redshift#InvalidScheduleFault": return [3, 2];
                     case "InvalidTagFault": return [3, 4];
                     case "com.amazonaws.redshift#InvalidTagFault": return [3, 4];
-                    case "ScheduleDefinitionTypeUnsupportedFault": return [3, 6];
+                    case "ScheduleDefinitionTypeUnsupported": return [3, 6];
                     case "com.amazonaws.redshift#ScheduleDefinitionTypeUnsupportedFault": return [3, 6];
-                    case "SnapshotScheduleAlreadyExistsFault": return [3, 8];
+                    case "SnapshotScheduleAlreadyExists": return [3, 8];
                     case "com.amazonaws.redshift#SnapshotScheduleAlreadyExistsFault": return [3, 8];
-                    case "SnapshotScheduleQuotaExceededFault": return [3, 10];
+                    case "SnapshotScheduleQuotaExceeded": return [3, 10];
                     case "com.amazonaws.redshift#SnapshotScheduleQuotaExceededFault": return [3, 10];
                     case "TagLimitExceededFault": return [3, 12];
                     case "com.amazonaws.redshift#TagLimitExceededFault": return [3, 12];
@@ -2901,13 +2901,13 @@ var deserializeAws_queryCreateTagsCommandError = function (output, context) { re
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
                 switch (_b) {
-                    case "InvalidClusterStateFault": return [3, 2];
+                    case "InvalidClusterState": return [3, 2];
                     case "com.amazonaws.redshift#InvalidClusterStateFault": return [3, 2];
                     case "InvalidTagFault": return [3, 4];
                     case "com.amazonaws.redshift#InvalidTagFault": return [3, 4];
@@ -2964,25 +2964,25 @@ var deserializeAws_queryCreateUsageLimitCommandError = function (output, context
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
                 switch (_b) {
-                    case "ClusterNotFoundFault": return [3, 2];
+                    case "ClusterNotFound": return [3, 2];
                     case "com.amazonaws.redshift#ClusterNotFoundFault": return [3, 2];
-                    case "InvalidClusterStateFault": return [3, 4];
+                    case "InvalidClusterState": return [3, 4];
                     case "com.amazonaws.redshift#InvalidClusterStateFault": return [3, 4];
-                    case "InvalidUsageLimitFault": return [3, 6];
+                    case "InvalidUsageLimit": return [3, 6];
                     case "com.amazonaws.redshift#InvalidUsageLimitFault": return [3, 6];
                     case "LimitExceededFault": return [3, 8];
                     case "com.amazonaws.redshift#LimitExceededFault": return [3, 8];
                     case "TagLimitExceededFault": return [3, 10];
                     case "com.amazonaws.redshift#TagLimitExceededFault": return [3, 10];
-                    case "UnsupportedOperationFault": return [3, 12];
+                    case "UnsupportedOperation": return [3, 12];
                     case "com.amazonaws.redshift#UnsupportedOperationFault": return [3, 12];
-                    case "UsageLimitAlreadyExistsFault": return [3, 14];
+                    case "UsageLimitAlreadyExists": return [3, 14];
                     case "com.amazonaws.redshift#UsageLimitAlreadyExistsFault": return [3, 14];
                 }
                 return [3, 16];
@@ -3039,7 +3039,7 @@ var deserializeAws_queryDeauthorizeDataShareCommandError = function (output, con
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
@@ -3090,7 +3090,7 @@ var deserializeAws_queryDeleteAuthenticationProfileCommandError = function (outp
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
@@ -3145,19 +3145,19 @@ var deserializeAws_queryDeleteClusterCommandError = function (output, context) {
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
                 switch (_b) {
-                    case "ClusterNotFoundFault": return [3, 2];
+                    case "ClusterNotFound": return [3, 2];
                     case "com.amazonaws.redshift#ClusterNotFoundFault": return [3, 2];
-                    case "ClusterSnapshotAlreadyExistsFault": return [3, 4];
+                    case "ClusterSnapshotAlreadyExists": return [3, 4];
                     case "com.amazonaws.redshift#ClusterSnapshotAlreadyExistsFault": return [3, 4];
-                    case "ClusterSnapshotQuotaExceededFault": return [3, 6];
+                    case "ClusterSnapshotQuotaExceeded": return [3, 6];
                     case "com.amazonaws.redshift#ClusterSnapshotQuotaExceededFault": return [3, 6];
-                    case "InvalidClusterStateFault": return [3, 8];
+                    case "InvalidClusterState": return [3, 8];
                     case "com.amazonaws.redshift#InvalidClusterStateFault": return [3, 8];
                     case "InvalidRetentionPeriodFault": return [3, 10];
                     case "com.amazonaws.redshift#InvalidRetentionPeriodFault": return [3, 10];
@@ -3212,15 +3212,15 @@ var deserializeAws_queryDeleteClusterParameterGroupCommandError = function (outp
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
                 switch (_b) {
-                    case "ClusterParameterGroupNotFoundFault": return [3, 2];
+                    case "ClusterParameterGroupNotFound": return [3, 2];
                     case "com.amazonaws.redshift#ClusterParameterGroupNotFoundFault": return [3, 2];
-                    case "InvalidClusterParameterGroupStateFault": return [3, 4];
+                    case "InvalidClusterParameterGroupState": return [3, 4];
                     case "com.amazonaws.redshift#InvalidClusterParameterGroupStateFault": return [3, 4];
                 }
                 return [3, 6];
@@ -3267,15 +3267,15 @@ var deserializeAws_queryDeleteClusterSecurityGroupCommandError = function (outpu
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
                 switch (_b) {
-                    case "ClusterSecurityGroupNotFoundFault": return [3, 2];
+                    case "ClusterSecurityGroupNotFound": return [3, 2];
                     case "com.amazonaws.redshift#ClusterSecurityGroupNotFoundFault": return [3, 2];
-                    case "InvalidClusterSecurityGroupStateFault": return [3, 4];
+                    case "InvalidClusterSecurityGroupState": return [3, 4];
                     case "com.amazonaws.redshift#InvalidClusterSecurityGroupStateFault": return [3, 4];
                 }
                 return [3, 6];
@@ -3322,15 +3322,15 @@ var deserializeAws_queryDeleteClusterSnapshotCommandError = function (output, co
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
                 switch (_b) {
-                    case "ClusterSnapshotNotFoundFault": return [3, 2];
+                    case "ClusterSnapshotNotFound": return [3, 2];
                     case "com.amazonaws.redshift#ClusterSnapshotNotFoundFault": return [3, 2];
-                    case "InvalidClusterSnapshotStateFault": return [3, 4];
+                    case "InvalidClusterSnapshotState": return [3, 4];
                     case "com.amazonaws.redshift#InvalidClusterSnapshotStateFault": return [3, 4];
                 }
                 return [3, 6];
@@ -3377,7 +3377,7 @@ var deserializeAws_queryDeleteClusterSubnetGroupCommandError = function (output,
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
@@ -3436,21 +3436,21 @@ var deserializeAws_queryDeleteEndpointAccessCommandError = function (output, con
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
                 switch (_b) {
-                    case "ClusterNotFoundFault": return [3, 2];
+                    case "ClusterNotFound": return [3, 2];
                     case "com.amazonaws.redshift#ClusterNotFoundFault": return [3, 2];
-                    case "EndpointNotFoundFault": return [3, 4];
+                    case "EndpointNotFound": return [3, 4];
                     case "com.amazonaws.redshift#EndpointNotFoundFault": return [3, 4];
-                    case "InvalidClusterSecurityGroupStateFault": return [3, 6];
+                    case "InvalidClusterSecurityGroupState": return [3, 6];
                     case "com.amazonaws.redshift#InvalidClusterSecurityGroupStateFault": return [3, 6];
-                    case "InvalidClusterStateFault": return [3, 8];
+                    case "InvalidClusterState": return [3, 8];
                     case "com.amazonaws.redshift#InvalidClusterStateFault": return [3, 8];
-                    case "InvalidEndpointStateFault": return [3, 10];
+                    case "InvalidEndpointState": return [3, 10];
                     case "com.amazonaws.redshift#InvalidEndpointStateFault": return [3, 10];
                 }
                 return [3, 12];
@@ -3503,7 +3503,7 @@ var deserializeAws_queryDeleteEventSubscriptionCommandError = function (output,
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
@@ -3511,7 +3511,7 @@ var deserializeAws_queryDeleteEventSubscriptionCommandError = function (output,
                 switch (_b) {
                     case "InvalidSubscriptionStateFault": return [3, 2];
                     case "com.amazonaws.redshift#InvalidSubscriptionStateFault": return [3, 2];
-                    case "SubscriptionNotFoundFault": return [3, 4];
+                    case "SubscriptionNotFound": return [3, 4];
                     case "com.amazonaws.redshift#SubscriptionNotFoundFault": return [3, 4];
                 }
                 return [3, 6];
@@ -3558,7 +3558,7 @@ var deserializeAws_queryDeleteHsmClientCertificateCommandError = function (outpu
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
@@ -3613,7 +3613,7 @@ var deserializeAws_queryDeleteHsmConfigurationCommandError = function (output, c
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
@@ -3668,17 +3668,17 @@ var deserializeAws_queryDeletePartnerCommandError = function (output, context) {
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
                 switch (_b) {
-                    case "ClusterNotFoundFault": return [3, 2];
+                    case "ClusterNotFound": return [3, 2];
                     case "com.amazonaws.redshift#ClusterNotFoundFault": return [3, 2];
-                    case "PartnerNotFoundFault": return [3, 4];
+                    case "PartnerNotFound": return [3, 4];
                     case "com.amazonaws.redshift#PartnerNotFoundFault": return [3, 4];
-                    case "UnauthorizedPartnerIntegrationFault": return [3, 6];
+                    case "UnauthorizedPartnerIntegration": return [3, 6];
                     case "com.amazonaws.redshift#UnauthorizedPartnerIntegrationFault": return [3, 6];
                 }
                 return [3, 8];
@@ -3727,13 +3727,13 @@ var deserializeAws_queryDeleteScheduledActionCommandError = function (output, co
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
                 switch (_b) {
-                    case "ScheduledActionNotFoundFault": return [3, 2];
+                    case "ScheduledActionNotFound": return [3, 2];
                     case "com.amazonaws.redshift#ScheduledActionNotFoundFault": return [3, 2];
                     case "UnauthorizedOperation": return [3, 4];
                     case "com.amazonaws.redshift#UnauthorizedOperation": return [3, 4];
@@ -3782,7 +3782,7 @@ var deserializeAws_queryDeleteSnapshotCopyGrantCommandError = function (output,
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
@@ -3837,15 +3837,15 @@ var deserializeAws_queryDeleteSnapshotScheduleCommandError = function (output, c
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
                 switch (_b) {
-                    case "InvalidClusterSnapshotScheduleStateFault": return [3, 2];
+                    case "InvalidClusterSnapshotScheduleState": return [3, 2];
                     case "com.amazonaws.redshift#InvalidClusterSnapshotScheduleStateFault": return [3, 2];
-                    case "SnapshotScheduleNotFoundFault": return [3, 4];
+                    case "SnapshotScheduleNotFound": return [3, 4];
                     case "com.amazonaws.redshift#SnapshotScheduleNotFoundFault": return [3, 4];
                 }
                 return [3, 6];
@@ -3892,7 +3892,7 @@ var deserializeAws_queryDeleteTagsCommandError = function (output, context) { re
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
@@ -3947,15 +3947,15 @@ var deserializeAws_queryDeleteUsageLimitCommandError = function (output, context
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
                 switch (_b) {
-                    case "UnsupportedOperationFault": return [3, 2];
+                    case "UnsupportedOperation": return [3, 2];
                     case "com.amazonaws.redshift#UnsupportedOperationFault": return [3, 2];
-                    case "UsageLimitNotFoundFault": return [3, 4];
+                    case "UsageLimitNotFound": return [3, 4];
                     case "com.amazonaws.redshift#UsageLimitNotFoundFault": return [3, 4];
                 }
                 return [3, 6];
@@ -4002,7 +4002,7 @@ var deserializeAws_queryDescribeAccountAttributesCommandError = function (output
             case 0:
                 _a = [__assign({}, output)];
                 _b = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_b.body = _c.sent(), _b)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
@@ -4043,7 +4043,7 @@ var deserializeAws_queryDescribeAuthenticationProfilesCommandError = function (o
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
@@ -4098,15 +4098,15 @@ var deserializeAws_queryDescribeClusterDbRevisionsCommandError = function (outpu
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
                 switch (_b) {
-                    case "ClusterNotFoundFault": return [3, 2];
+                    case "ClusterNotFound": return [3, 2];
                     case "com.amazonaws.redshift#ClusterNotFoundFault": return [3, 2];
-                    case "InvalidClusterStateFault": return [3, 4];
+                    case "InvalidClusterState": return [3, 4];
                     case "com.amazonaws.redshift#InvalidClusterStateFault": return [3, 4];
                 }
                 return [3, 6];
@@ -4153,13 +4153,13 @@ var deserializeAws_queryDescribeClusterParameterGroupsCommandError = function (o
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
                 switch (_b) {
-                    case "ClusterParameterGroupNotFoundFault": return [3, 2];
+                    case "ClusterParameterGroupNotFound": return [3, 2];
                     case "com.amazonaws.redshift#ClusterParameterGroupNotFoundFault": return [3, 2];
                     case "InvalidTagFault": return [3, 4];
                     case "com.amazonaws.redshift#InvalidTagFault": return [3, 4];
@@ -4208,13 +4208,13 @@ var deserializeAws_queryDescribeClusterParametersCommandError = function (output
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
                 switch (_b) {
-                    case "ClusterParameterGroupNotFoundFault": return [3, 2];
+                    case "ClusterParameterGroupNotFound": return [3, 2];
                     case "com.amazonaws.redshift#ClusterParameterGroupNotFoundFault": return [3, 2];
                 }
                 return [3, 4];
@@ -4259,13 +4259,13 @@ var deserializeAws_queryDescribeClustersCommandError = function (output, context
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
                 switch (_b) {
-                    case "ClusterNotFoundFault": return [3, 2];
+                    case "ClusterNotFound": return [3, 2];
                     case "com.amazonaws.redshift#ClusterNotFoundFault": return [3, 2];
                     case "InvalidTagFault": return [3, 4];
                     case "com.amazonaws.redshift#InvalidTagFault": return [3, 4];
@@ -4314,13 +4314,13 @@ var deserializeAws_queryDescribeClusterSecurityGroupsCommandError = function (ou
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
                 switch (_b) {
-                    case "ClusterSecurityGroupNotFoundFault": return [3, 2];
+                    case "ClusterSecurityGroupNotFound": return [3, 2];
                     case "com.amazonaws.redshift#ClusterSecurityGroupNotFoundFault": return [3, 2];
                     case "InvalidTagFault": return [3, 4];
                     case "com.amazonaws.redshift#InvalidTagFault": return [3, 4];
@@ -4369,19 +4369,19 @@ var deserializeAws_queryDescribeClusterSnapshotsCommandError = function (output,
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
                 switch (_b) {
-                    case "ClusterNotFoundFault": return [3, 2];
+                    case "ClusterNotFound": return [3, 2];
                     case "com.amazonaws.redshift#ClusterNotFoundFault": return [3, 2];
-                    case "ClusterSnapshotNotFoundFault": return [3, 4];
+                    case "ClusterSnapshotNotFound": return [3, 4];
                     case "com.amazonaws.redshift#ClusterSnapshotNotFoundFault": return [3, 4];
                     case "InvalidTagFault": return [3, 6];
                     case "com.amazonaws.redshift#InvalidTagFault": return [3, 6];
-                    case "UnsupportedOperationFault": return [3, 8];
+                    case "UnsupportedOperation": return [3, 8];
                     case "com.amazonaws.redshift#UnsupportedOperationFault": return [3, 8];
                 }
                 return [3, 10];
@@ -4432,7 +4432,7 @@ var deserializeAws_queryDescribeClusterSubnetGroupsCommandError = function (outp
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
@@ -4487,13 +4487,13 @@ var deserializeAws_queryDescribeClusterTracksCommandError = function (output, co
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
                 switch (_b) {
-                    case "InvalidClusterTrackFault": return [3, 2];
+                    case "InvalidClusterTrack": return [3, 2];
                     case "com.amazonaws.redshift#InvalidClusterTrackFault": return [3, 2];
                     case "UnauthorizedOperation": return [3, 4];
                     case "com.amazonaws.redshift#UnauthorizedOperation": return [3, 4];
@@ -4542,7 +4542,7 @@ var deserializeAws_queryDescribeClusterVersionsCommandError = function (output,
             case 0:
                 _a = [__assign({}, output)];
                 _b = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_b.body = _c.sent(), _b)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
@@ -4583,7 +4583,7 @@ var deserializeAws_queryDescribeDataSharesCommandError = function (output, conte
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
@@ -4634,7 +4634,7 @@ var deserializeAws_queryDescribeDataSharesForConsumerCommandError = function (ou
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
@@ -4685,7 +4685,7 @@ var deserializeAws_queryDescribeDataSharesForProducerCommandError = function (ou
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
@@ -4736,7 +4736,7 @@ var deserializeAws_queryDescribeDefaultClusterParametersCommandError = function
             case 0:
                 _a = [__assign({}, output)];
                 _b = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_b.body = _c.sent(), _b)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
@@ -4777,17 +4777,17 @@ var deserializeAws_queryDescribeEndpointAccessCommandError = function (output, c
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
                 switch (_b) {
-                    case "ClusterNotFoundFault": return [3, 2];
+                    case "ClusterNotFound": return [3, 2];
                     case "com.amazonaws.redshift#ClusterNotFoundFault": return [3, 2];
-                    case "EndpointNotFoundFault": return [3, 4];
+                    case "EndpointNotFound": return [3, 4];
                     case "com.amazonaws.redshift#EndpointNotFoundFault": return [3, 4];
-                    case "InvalidClusterStateFault": return [3, 6];
+                    case "InvalidClusterState": return [3, 6];
                     case "com.amazonaws.redshift#InvalidClusterStateFault": return [3, 6];
                 }
                 return [3, 8];
@@ -4836,15 +4836,15 @@ var deserializeAws_queryDescribeEndpointAuthorizationCommandError = function (ou
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
                 switch (_b) {
-                    case "ClusterNotFoundFault": return [3, 2];
+                    case "ClusterNotFound": return [3, 2];
                     case "com.amazonaws.redshift#ClusterNotFoundFault": return [3, 2];
-                    case "UnsupportedOperationFault": return [3, 4];
+                    case "UnsupportedOperation": return [3, 4];
                     case "com.amazonaws.redshift#UnsupportedOperationFault": return [3, 4];
                 }
                 return [3, 6];
@@ -4891,7 +4891,7 @@ var deserializeAws_queryDescribeEventCategoriesCommandError = function (output,
             case 0:
                 _a = [__assign({}, output)];
                 _b = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_b.body = _c.sent(), _b)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
@@ -4932,7 +4932,7 @@ var deserializeAws_queryDescribeEventsCommandError = function (output, context)
             case 0:
                 _a = [__assign({}, output)];
                 _b = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_b.body = _c.sent(), _b)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
@@ -4973,7 +4973,7 @@ var deserializeAws_queryDescribeEventSubscriptionsCommandError = function (outpu
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
@@ -4981,7 +4981,7 @@ var deserializeAws_queryDescribeEventSubscriptionsCommandError = function (outpu
                 switch (_b) {
                     case "InvalidTagFault": return [3, 2];
                     case "com.amazonaws.redshift#InvalidTagFault": return [3, 2];
-                    case "SubscriptionNotFoundFault": return [3, 4];
+                    case "SubscriptionNotFound": return [3, 4];
                     case "com.amazonaws.redshift#SubscriptionNotFoundFault": return [3, 4];
                 }
                 return [3, 6];
@@ -5028,7 +5028,7 @@ var deserializeAws_queryDescribeHsmClientCertificatesCommandError = function (ou
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
@@ -5083,7 +5083,7 @@ var deserializeAws_queryDescribeHsmConfigurationsCommandError = function (output
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
@@ -5138,13 +5138,13 @@ var deserializeAws_queryDescribeLoggingStatusCommandError = function (output, co
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
                 switch (_b) {
-                    case "ClusterNotFoundFault": return [3, 2];
+                    case "ClusterNotFound": return [3, 2];
                     case "com.amazonaws.redshift#ClusterNotFoundFault": return [3, 2];
                 }
                 return [3, 4];
@@ -5189,21 +5189,21 @@ var deserializeAws_queryDescribeNodeConfigurationOptionsCommandError = function
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
                 switch (_b) {
-                    case "AccessToSnapshotDeniedFault": return [3, 2];
+                    case "AccessToSnapshotDenied": return [3, 2];
                     case "com.amazonaws.redshift#AccessToSnapshotDeniedFault": return [3, 2];
-                    case "ClusterNotFoundFault": return [3, 4];
+                    case "ClusterNotFound": return [3, 4];
                     case "com.amazonaws.redshift#ClusterNotFoundFault": return [3, 4];
-                    case "ClusterSnapshotNotFoundFault": return [3, 6];
+                    case "ClusterSnapshotNotFound": return [3, 6];
                     case "com.amazonaws.redshift#ClusterSnapshotNotFoundFault": return [3, 6];
-                    case "InvalidClusterSnapshotStateFault": return [3, 8];
+                    case "InvalidClusterSnapshotState": return [3, 8];
                     case "com.amazonaws.redshift#InvalidClusterSnapshotStateFault": return [3, 8];
-                    case "UnsupportedOperationFault": return [3, 10];
+                    case "UnsupportedOperation": return [3, 10];
                     case "com.amazonaws.redshift#UnsupportedOperationFault": return [3, 10];
                 }
                 return [3, 12];
@@ -5256,7 +5256,7 @@ var deserializeAws_queryDescribeOrderableClusterOptionsCommandError = function (
             case 0:
                 _a = [__assign({}, output)];
                 _b = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_b.body = _c.sent(), _b)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
@@ -5297,15 +5297,15 @@ var deserializeAws_queryDescribePartnersCommandError = function (output, context
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
                 switch (_b) {
-                    case "ClusterNotFoundFault": return [3, 2];
+                    case "ClusterNotFound": return [3, 2];
                     case "com.amazonaws.redshift#ClusterNotFoundFault": return [3, 2];
-                    case "UnauthorizedPartnerIntegrationFault": return [3, 4];
+                    case "UnauthorizedPartnerIntegration": return [3, 4];
                     case "com.amazonaws.redshift#UnauthorizedPartnerIntegrationFault": return [3, 4];
                 }
                 return [3, 6];
@@ -5352,17 +5352,17 @@ var deserializeAws_queryDescribeReservedNodeExchangeStatusCommandError = functio
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
                 switch (_b) {
-                    case "ReservedNodeExchangeNotFoundFault": return [3, 2];
+                    case "ReservedNodeExchangeNotFond": return [3, 2];
                     case "com.amazonaws.redshift#ReservedNodeExchangeNotFoundFault": return [3, 2];
-                    case "ReservedNodeNotFoundFault": return [3, 4];
+                    case "ReservedNodeNotFound": return [3, 4];
                     case "com.amazonaws.redshift#ReservedNodeNotFoundFault": return [3, 4];
-                    case "UnsupportedOperationFault": return [3, 6];
+                    case "UnsupportedOperation": return [3, 6];
                     case "com.amazonaws.redshift#UnsupportedOperationFault": return [3, 6];
                 }
                 return [3, 8];
@@ -5411,7 +5411,7 @@ var deserializeAws_queryDescribeReservedNodeOfferingsCommandError = function (ou
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
@@ -5419,9 +5419,9 @@ var deserializeAws_queryDescribeReservedNodeOfferingsCommandError = function (ou
                 switch (_b) {
                     case "DependentServiceUnavailableFault": return [3, 2];
                     case "com.amazonaws.redshift#DependentServiceUnavailableFault": return [3, 2];
-                    case "ReservedNodeOfferingNotFoundFault": return [3, 4];
+                    case "ReservedNodeOfferingNotFound": return [3, 4];
                     case "com.amazonaws.redshift#ReservedNodeOfferingNotFoundFault": return [3, 4];
-                    case "UnsupportedOperationFault": return [3, 6];
+                    case "UnsupportedOperation": return [3, 6];
                     case "com.amazonaws.redshift#UnsupportedOperationFault": return [3, 6];
                 }
                 return [3, 8];
@@ -5470,7 +5470,7 @@ var deserializeAws_queryDescribeReservedNodesCommandError = function (output, co
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
@@ -5478,7 +5478,7 @@ var deserializeAws_queryDescribeReservedNodesCommandError = function (output, co
                 switch (_b) {
                     case "DependentServiceUnavailableFault": return [3, 2];
                     case "com.amazonaws.redshift#DependentServiceUnavailableFault": return [3, 2];
-                    case "ReservedNodeNotFoundFault": return [3, 4];
+                    case "ReservedNodeNotFound": return [3, 4];
                     case "com.amazonaws.redshift#ReservedNodeNotFoundFault": return [3, 4];
                 }
                 return [3, 6];
@@ -5525,15 +5525,15 @@ var deserializeAws_queryDescribeResizeCommandError = function (output, context)
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
                 switch (_b) {
-                    case "ClusterNotFoundFault": return [3, 2];
+                    case "ClusterNotFound": return [3, 2];
                     case "com.amazonaws.redshift#ClusterNotFoundFault": return [3, 2];
-                    case "ResizeNotFoundFault": return [3, 4];
+                    case "ResizeNotFound": return [3, 4];
                     case "com.amazonaws.redshift#ResizeNotFoundFault": return [3, 4];
                 }
                 return [3, 6];
@@ -5580,13 +5580,13 @@ var deserializeAws_queryDescribeScheduledActionsCommandError = function (output,
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
                 switch (_b) {
-                    case "ScheduledActionNotFoundFault": return [3, 2];
+                    case "ScheduledActionNotFound": return [3, 2];
                     case "com.amazonaws.redshift#ScheduledActionNotFoundFault": return [3, 2];
                     case "UnauthorizedOperation": return [3, 4];
                     case "com.amazonaws.redshift#UnauthorizedOperation": return [3, 4];
@@ -5635,7 +5635,7 @@ var deserializeAws_queryDescribeSnapshotCopyGrantsCommandError = function (outpu
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
@@ -5690,7 +5690,7 @@ var deserializeAws_queryDescribeSnapshotSchedulesCommandError = function (output
             case 0:
                 _a = [__assign({}, output)];
                 _b = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_b.body = _c.sent(), _b)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
@@ -5731,7 +5731,7 @@ var deserializeAws_queryDescribeStorageCommandError = function (output, context)
             case 0:
                 _a = [__assign({}, output)];
                 _b = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_b.body = _c.sent(), _b)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
@@ -5772,13 +5772,13 @@ var deserializeAws_queryDescribeTableRestoreStatusCommandError = function (outpu
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
                 switch (_b) {
-                    case "ClusterNotFoundFault": return [3, 2];
+                    case "ClusterNotFound": return [3, 2];
                     case "com.amazonaws.redshift#ClusterNotFoundFault": return [3, 2];
                     case "TableRestoreNotFoundFault": return [3, 4];
                     case "com.amazonaws.redshift#TableRestoreNotFoundFault": return [3, 4];
@@ -5827,7 +5827,7 @@ var deserializeAws_queryDescribeTagsCommandError = function (output, context) {
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
@@ -5882,15 +5882,15 @@ var deserializeAws_queryDescribeUsageLimitsCommandError = function (output, cont
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
                 switch (_b) {
-                    case "ClusterNotFoundFault": return [3, 2];
+                    case "ClusterNotFound": return [3, 2];
                     case "com.amazonaws.redshift#ClusterNotFoundFault": return [3, 2];
-                    case "UnsupportedOperationFault": return [3, 4];
+                    case "UnsupportedOperation": return [3, 4];
                     case "com.amazonaws.redshift#UnsupportedOperationFault": return [3, 4];
                 }
                 return [3, 6];
@@ -5937,15 +5937,15 @@ var deserializeAws_queryDisableLoggingCommandError = function (output, context)
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
                 switch (_b) {
-                    case "ClusterNotFoundFault": return [3, 2];
+                    case "ClusterNotFound": return [3, 2];
                     case "com.amazonaws.redshift#ClusterNotFoundFault": return [3, 2];
-                    case "InvalidClusterStateFault": return [3, 4];
+                    case "InvalidClusterState": return [3, 4];
                     case "com.amazonaws.redshift#InvalidClusterStateFault": return [3, 4];
                 }
                 return [3, 6];
@@ -5992,15 +5992,15 @@ var deserializeAws_queryDisableSnapshotCopyCommandError = function (output, cont
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
                 switch (_b) {
-                    case "ClusterNotFoundFault": return [3, 2];
+                    case "ClusterNotFound": return [3, 2];
                     case "com.amazonaws.redshift#ClusterNotFoundFault": return [3, 2];
-                    case "InvalidClusterStateFault": return [3, 4];
+                    case "InvalidClusterState": return [3, 4];
                     case "com.amazonaws.redshift#InvalidClusterStateFault": return [3, 4];
                     case "SnapshotCopyAlreadyDisabledFault": return [3, 6];
                     case "com.amazonaws.redshift#SnapshotCopyAlreadyDisabledFault": return [3, 6];
@@ -6055,7 +6055,7 @@ var deserializeAws_queryDisassociateDataShareConsumerCommandError = function (ou
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
@@ -6110,7 +6110,7 @@ var deserializeAws_queryEnableLoggingCommandError = function (output, context) {
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
@@ -6118,11 +6118,11 @@ var deserializeAws_queryEnableLoggingCommandError = function (output, context) {
                 switch (_b) {
                     case "BucketNotFoundFault": return [3, 2];
                     case "com.amazonaws.redshift#BucketNotFoundFault": return [3, 2];
-                    case "ClusterNotFoundFault": return [3, 4];
+                    case "ClusterNotFound": return [3, 4];
                     case "com.amazonaws.redshift#ClusterNotFoundFault": return [3, 4];
                     case "InsufficientS3BucketPolicyFault": return [3, 6];
                     case "com.amazonaws.redshift#InsufficientS3BucketPolicyFault": return [3, 6];
-                    case "InvalidClusterStateFault": return [3, 8];
+                    case "InvalidClusterState": return [3, 8];
                     case "com.amazonaws.redshift#InvalidClusterStateFault": return [3, 8];
                     case "InvalidS3BucketNameFault": return [3, 10];
                     case "com.amazonaws.redshift#InvalidS3BucketNameFault": return [3, 10];
@@ -6181,13 +6181,13 @@ var deserializeAws_queryEnableSnapshotCopyCommandError = function (output, conte
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
                 switch (_b) {
-                    case "ClusterNotFoundFault": return [3, 2];
+                    case "ClusterNotFound": return [3, 2];
                     case "com.amazonaws.redshift#ClusterNotFoundFault": return [3, 2];
                     case "CopyToRegionDisabledFault": return [3, 4];
                     case "com.amazonaws.redshift#CopyToRegionDisabledFault": return [3, 4];
@@ -6195,7 +6195,7 @@ var deserializeAws_queryEnableSnapshotCopyCommandError = function (output, conte
                     case "com.amazonaws.redshift#DependentServiceRequestThrottlingFault": return [3, 6];
                     case "IncompatibleOrderableOptions": return [3, 8];
                     case "com.amazonaws.redshift#IncompatibleOrderableOptions": return [3, 8];
-                    case "InvalidClusterStateFault": return [3, 10];
+                    case "InvalidClusterState": return [3, 10];
                     case "com.amazonaws.redshift#InvalidClusterStateFault": return [3, 10];
                     case "InvalidRetentionPeriodFault": return [3, 12];
                     case "com.amazonaws.redshift#InvalidRetentionPeriodFault": return [3, 12];
@@ -6272,15 +6272,15 @@ var deserializeAws_queryGetClusterCredentialsCommandError = function (output, co
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
                 switch (_b) {
-                    case "ClusterNotFoundFault": return [3, 2];
+                    case "ClusterNotFound": return [3, 2];
                     case "com.amazonaws.redshift#ClusterNotFoundFault": return [3, 2];
-                    case "UnsupportedOperationFault": return [3, 4];
+                    case "UnsupportedOperation": return [3, 4];
                     case "com.amazonaws.redshift#UnsupportedOperationFault": return [3, 4];
                 }
                 return [3, 6];
@@ -6327,15 +6327,15 @@ var deserializeAws_queryGetClusterCredentialsWithIAMCommandError = function (out
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
                 switch (_b) {
-                    case "ClusterNotFoundFault": return [3, 2];
+                    case "ClusterNotFound": return [3, 2];
                     case "com.amazonaws.redshift#ClusterNotFoundFault": return [3, 2];
-                    case "UnsupportedOperationFault": return [3, 4];
+                    case "UnsupportedOperation": return [3, 4];
                     case "com.amazonaws.redshift#UnsupportedOperationFault": return [3, 4];
                 }
                 return [3, 6];
@@ -6382,27 +6382,27 @@ var deserializeAws_queryGetReservedNodeExchangeConfigurationOptionsCommandError
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
                 switch (_b) {
-                    case "ClusterNotFoundFault": return [3, 2];
+                    case "ClusterNotFound": return [3, 2];
                     case "com.amazonaws.redshift#ClusterNotFoundFault": return [3, 2];
-                    case "ClusterSnapshotNotFoundFault": return [3, 4];
+                    case "ClusterSnapshotNotFound": return [3, 4];
                     case "com.amazonaws.redshift#ClusterSnapshotNotFoundFault": return [3, 4];
                     case "DependentServiceUnavailableFault": return [3, 6];
                     case "com.amazonaws.redshift#DependentServiceUnavailableFault": return [3, 6];
-                    case "InvalidReservedNodeStateFault": return [3, 8];
+                    case "InvalidReservedNodeState": return [3, 8];
                     case "com.amazonaws.redshift#InvalidReservedNodeStateFault": return [3, 8];
-                    case "ReservedNodeAlreadyMigratedFault": return [3, 10];
+                    case "ReservedNodeAlreadyMigrated": return [3, 10];
                     case "com.amazonaws.redshift#ReservedNodeAlreadyMigratedFault": return [3, 10];
-                    case "ReservedNodeNotFoundFault": return [3, 12];
+                    case "ReservedNodeNotFound": return [3, 12];
                     case "com.amazonaws.redshift#ReservedNodeNotFoundFault": return [3, 12];
-                    case "ReservedNodeOfferingNotFoundFault": return [3, 14];
+                    case "ReservedNodeOfferingNotFound": return [3, 14];
                     case "com.amazonaws.redshift#ReservedNodeOfferingNotFoundFault": return [3, 14];
-                    case "UnsupportedOperationFault": return [3, 16];
+                    case "UnsupportedOperation": return [3, 16];
                     case "com.amazonaws.redshift#UnsupportedOperationFault": return [3, 16];
                 }
                 return [3, 18];
@@ -6461,7 +6461,7 @@ var deserializeAws_queryGetReservedNodeExchangeOfferingsCommandError = function
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
@@ -6469,15 +6469,15 @@ var deserializeAws_queryGetReservedNodeExchangeOfferingsCommandError = function
                 switch (_b) {
                     case "DependentServiceUnavailableFault": return [3, 2];
                     case "com.amazonaws.redshift#DependentServiceUnavailableFault": return [3, 2];
-                    case "InvalidReservedNodeStateFault": return [3, 4];
+                    case "InvalidReservedNodeState": return [3, 4];
                     case "com.amazonaws.redshift#InvalidReservedNodeStateFault": return [3, 4];
-                    case "ReservedNodeAlreadyMigratedFault": return [3, 6];
+                    case "ReservedNodeAlreadyMigrated": return [3, 6];
                     case "com.amazonaws.redshift#ReservedNodeAlreadyMigratedFault": return [3, 6];
-                    case "ReservedNodeNotFoundFault": return [3, 8];
+                    case "ReservedNodeNotFound": return [3, 8];
                     case "com.amazonaws.redshift#ReservedNodeNotFoundFault": return [3, 8];
-                    case "ReservedNodeOfferingNotFoundFault": return [3, 10];
+                    case "ReservedNodeOfferingNotFound": return [3, 10];
                     case "com.amazonaws.redshift#ReservedNodeOfferingNotFoundFault": return [3, 10];
-                    case "UnsupportedOperationFault": return [3, 12];
+                    case "UnsupportedOperation": return [3, 12];
                     case "com.amazonaws.redshift#UnsupportedOperationFault": return [3, 12];
                 }
                 return [3, 14];
@@ -6532,17 +6532,17 @@ var deserializeAws_queryModifyAquaConfigurationCommandError = function (output,
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
                 switch (_b) {
-                    case "ClusterNotFoundFault": return [3, 2];
+                    case "ClusterNotFound": return [3, 2];
                     case "com.amazonaws.redshift#ClusterNotFoundFault": return [3, 2];
-                    case "InvalidClusterStateFault": return [3, 4];
+                    case "InvalidClusterState": return [3, 4];
                     case "com.amazonaws.redshift#InvalidClusterStateFault": return [3, 4];
-                    case "UnsupportedOperationFault": return [3, 6];
+                    case "UnsupportedOperation": return [3, 6];
                     case "com.amazonaws.redshift#UnsupportedOperationFault": return [3, 6];
                 }
                 return [3, 8];
@@ -6591,7 +6591,7 @@ var deserializeAws_queryModifyAuthenticationProfileCommandError = function (outp
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
@@ -6650,19 +6650,19 @@ var deserializeAws_queryModifyClusterCommandError = function (output, context) {
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
                 switch (_b) {
-                    case "ClusterAlreadyExistsFault": return [3, 2];
+                    case "ClusterAlreadyExists": return [3, 2];
                     case "com.amazonaws.redshift#ClusterAlreadyExistsFault": return [3, 2];
-                    case "ClusterNotFoundFault": return [3, 4];
+                    case "ClusterNotFound": return [3, 4];
                     case "com.amazonaws.redshift#ClusterNotFoundFault": return [3, 4];
-                    case "ClusterParameterGroupNotFoundFault": return [3, 6];
+                    case "ClusterParameterGroupNotFound": return [3, 6];
                     case "com.amazonaws.redshift#ClusterParameterGroupNotFoundFault": return [3, 6];
-                    case "ClusterSecurityGroupNotFoundFault": return [3, 8];
+                    case "ClusterSecurityGroupNotFound": return [3, 8];
                     case "com.amazonaws.redshift#ClusterSecurityGroupNotFoundFault": return [3, 8];
                     case "DependentServiceRequestThrottlingFault": return [3, 10];
                     case "com.amazonaws.redshift#DependentServiceRequestThrottlingFault": return [3, 10];
@@ -6670,13 +6670,13 @@ var deserializeAws_queryModifyClusterCommandError = function (output, context) {
                     case "com.amazonaws.redshift#HsmClientCertificateNotFoundFault": return [3, 12];
                     case "HsmConfigurationNotFoundFault": return [3, 14];
                     case "com.amazonaws.redshift#HsmConfigurationNotFoundFault": return [3, 14];
-                    case "InsufficientClusterCapacityFault": return [3, 16];
+                    case "InsufficientClusterCapacity": return [3, 16];
                     case "com.amazonaws.redshift#InsufficientClusterCapacityFault": return [3, 16];
-                    case "InvalidClusterSecurityGroupStateFault": return [3, 18];
+                    case "InvalidClusterSecurityGroupState": return [3, 18];
                     case "com.amazonaws.redshift#InvalidClusterSecurityGroupStateFault": return [3, 18];
-                    case "InvalidClusterStateFault": return [3, 20];
+                    case "InvalidClusterState": return [3, 20];
                     case "com.amazonaws.redshift#InvalidClusterStateFault": return [3, 20];
-                    case "InvalidClusterTrackFault": return [3, 22];
+                    case "InvalidClusterTrack": return [3, 22];
                     case "com.amazonaws.redshift#InvalidClusterTrackFault": return [3, 22];
                     case "InvalidElasticIpFault": return [3, 24];
                     case "com.amazonaws.redshift#InvalidElasticIpFault": return [3, 24];
@@ -6684,11 +6684,11 @@ var deserializeAws_queryModifyClusterCommandError = function (output, context) {
                     case "com.amazonaws.redshift#InvalidRetentionPeriodFault": return [3, 26];
                     case "LimitExceededFault": return [3, 28];
                     case "com.amazonaws.redshift#LimitExceededFault": return [3, 28];
-                    case "NumberOfNodesPerClusterLimitExceededFault": return [3, 30];
+                    case "NumberOfNodesPerClusterLimitExceeded": return [3, 30];
                     case "com.amazonaws.redshift#NumberOfNodesPerClusterLimitExceededFault": return [3, 30];
-                    case "NumberOfNodesQuotaExceededFault": return [3, 32];
+                    case "NumberOfNodesQuotaExceeded": return [3, 32];
                     case "com.amazonaws.redshift#NumberOfNodesQuotaExceededFault": return [3, 32];
-                    case "TableLimitExceededFault": return [3, 34];
+                    case "TableLimitExceeded": return [3, 34];
                     case "com.amazonaws.redshift#TableLimitExceededFault": return [3, 34];
                     case "UnauthorizedOperation": return [3, 36];
                     case "com.amazonaws.redshift#UnauthorizedOperation": return [3, 36];
@@ -6773,17 +6773,17 @@ var deserializeAws_queryModifyClusterDbRevisionCommandError = function (output,
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
                 switch (_b) {
-                    case "ClusterNotFoundFault": return [3, 2];
+                    case "ClusterNotFound": return [3, 2];
                     case "com.amazonaws.redshift#ClusterNotFoundFault": return [3, 2];
-                    case "ClusterOnLatestRevisionFault": return [3, 4];
+                    case "ClusterOnLatestRevision": return [3, 4];
                     case "com.amazonaws.redshift#ClusterOnLatestRevisionFault": return [3, 4];
-                    case "InvalidClusterStateFault": return [3, 6];
+                    case "InvalidClusterState": return [3, 6];
                     case "com.amazonaws.redshift#InvalidClusterStateFault": return [3, 6];
                 }
                 return [3, 8];
@@ -6832,15 +6832,15 @@ var deserializeAws_queryModifyClusterIamRolesCommandError = function (output, co
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
                 switch (_b) {
-                    case "ClusterNotFoundFault": return [3, 2];
+                    case "ClusterNotFound": return [3, 2];
                     case "com.amazonaws.redshift#ClusterNotFoundFault": return [3, 2];
-                    case "InvalidClusterStateFault": return [3, 4];
+                    case "InvalidClusterState": return [3, 4];
                     case "com.amazonaws.redshift#InvalidClusterStateFault": return [3, 4];
                 }
                 return [3, 6];
@@ -6887,15 +6887,15 @@ var deserializeAws_queryModifyClusterMaintenanceCommandError = function (output,
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
                 switch (_b) {
-                    case "ClusterNotFoundFault": return [3, 2];
+                    case "ClusterNotFound": return [3, 2];
                     case "com.amazonaws.redshift#ClusterNotFoundFault": return [3, 2];
-                    case "InvalidClusterStateFault": return [3, 4];
+                    case "InvalidClusterState": return [3, 4];
                     case "com.amazonaws.redshift#InvalidClusterStateFault": return [3, 4];
                 }
                 return [3, 6];
@@ -6942,15 +6942,15 @@ var deserializeAws_queryModifyClusterParameterGroupCommandError = function (outp
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
                 switch (_b) {
-                    case "ClusterParameterGroupNotFoundFault": return [3, 2];
+                    case "ClusterParameterGroupNotFound": return [3, 2];
                     case "com.amazonaws.redshift#ClusterParameterGroupNotFoundFault": return [3, 2];
-                    case "InvalidClusterParameterGroupStateFault": return [3, 4];
+                    case "InvalidClusterParameterGroupState": return [3, 4];
                     case "com.amazonaws.redshift#InvalidClusterParameterGroupStateFault": return [3, 4];
                 }
                 return [3, 6];
@@ -6997,15 +6997,15 @@ var deserializeAws_queryModifyClusterSnapshotCommandError = function (output, co
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
                 switch (_b) {
-                    case "ClusterSnapshotNotFoundFault": return [3, 2];
+                    case "ClusterSnapshotNotFound": return [3, 2];
                     case "com.amazonaws.redshift#ClusterSnapshotNotFoundFault": return [3, 2];
-                    case "InvalidClusterSnapshotStateFault": return [3, 4];
+                    case "InvalidClusterSnapshotState": return [3, 4];
                     case "com.amazonaws.redshift#InvalidClusterSnapshotStateFault": return [3, 4];
                     case "InvalidRetentionPeriodFault": return [3, 6];
                     case "com.amazonaws.redshift#InvalidRetentionPeriodFault": return [3, 6];
@@ -7056,17 +7056,17 @@ var deserializeAws_queryModifyClusterSnapshotScheduleCommandError = function (ou
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
                 switch (_b) {
-                    case "ClusterNotFoundFault": return [3, 2];
+                    case "ClusterNotFound": return [3, 2];
                     case "com.amazonaws.redshift#ClusterNotFoundFault": return [3, 2];
-                    case "InvalidClusterSnapshotScheduleStateFault": return [3, 4];
+                    case "InvalidClusterSnapshotScheduleState": return [3, 4];
                     case "com.amazonaws.redshift#InvalidClusterSnapshotScheduleStateFault": return [3, 4];
-                    case "SnapshotScheduleNotFoundFault": return [3, 6];
+                    case "SnapshotScheduleNotFound": return [3, 6];
                     case "com.amazonaws.redshift#SnapshotScheduleNotFoundFault": return [3, 6];
                 }
                 return [3, 8];
@@ -7115,7 +7115,7 @@ var deserializeAws_queryModifyClusterSubnetGroupCommandError = function (output,
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
@@ -7186,21 +7186,21 @@ var deserializeAws_queryModifyEndpointAccessCommandError = function (output, con
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
                 switch (_b) {
-                    case "ClusterNotFoundFault": return [3, 2];
+                    case "ClusterNotFound": return [3, 2];
                     case "com.amazonaws.redshift#ClusterNotFoundFault": return [3, 2];
-                    case "EndpointNotFoundFault": return [3, 4];
+                    case "EndpointNotFound": return [3, 4];
                     case "com.amazonaws.redshift#EndpointNotFoundFault": return [3, 4];
-                    case "InvalidClusterSecurityGroupStateFault": return [3, 6];
+                    case "InvalidClusterSecurityGroupState": return [3, 6];
                     case "com.amazonaws.redshift#InvalidClusterSecurityGroupStateFault": return [3, 6];
-                    case "InvalidClusterStateFault": return [3, 8];
+                    case "InvalidClusterState": return [3, 8];
                     case "com.amazonaws.redshift#InvalidClusterStateFault": return [3, 8];
-                    case "InvalidEndpointStateFault": return [3, 10];
+                    case "InvalidEndpointState": return [3, 10];
                     case "com.amazonaws.redshift#InvalidEndpointStateFault": return [3, 10];
                     case "UnauthorizedOperation": return [3, 12];
                     case "com.amazonaws.redshift#UnauthorizedOperation": return [3, 12];
@@ -7257,7 +7257,7 @@ var deserializeAws_queryModifyEventSubscriptionCommandError = function (output,
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
@@ -7265,21 +7265,21 @@ var deserializeAws_queryModifyEventSubscriptionCommandError = function (output,
                 switch (_b) {
                     case "InvalidSubscriptionStateFault": return [3, 2];
                     case "com.amazonaws.redshift#InvalidSubscriptionStateFault": return [3, 2];
-                    case "SNSInvalidTopicFault": return [3, 4];
+                    case "SNSInvalidTopic": return [3, 4];
                     case "com.amazonaws.redshift#SNSInvalidTopicFault": return [3, 4];
-                    case "SNSNoAuthorizationFault": return [3, 6];
+                    case "SNSNoAuthorization": return [3, 6];
                     case "com.amazonaws.redshift#SNSNoAuthorizationFault": return [3, 6];
-                    case "SNSTopicArnNotFoundFault": return [3, 8];
+                    case "SNSTopicArnNotFound": return [3, 8];
                     case "com.amazonaws.redshift#SNSTopicArnNotFoundFault": return [3, 8];
-                    case "SourceNotFoundFault": return [3, 10];
+                    case "SourceNotFound": return [3, 10];
                     case "com.amazonaws.redshift#SourceNotFoundFault": return [3, 10];
-                    case "SubscriptionCategoryNotFoundFault": return [3, 12];
+                    case "SubscriptionCategoryNotFound": return [3, 12];
                     case "com.amazonaws.redshift#SubscriptionCategoryNotFoundFault": return [3, 12];
-                    case "SubscriptionEventIdNotFoundFault": return [3, 14];
+                    case "SubscriptionEventIdNotFound": return [3, 14];
                     case "com.amazonaws.redshift#SubscriptionEventIdNotFoundFault": return [3, 14];
-                    case "SubscriptionNotFoundFault": return [3, 16];
+                    case "SubscriptionNotFound": return [3, 16];
                     case "com.amazonaws.redshift#SubscriptionNotFoundFault": return [3, 16];
-                    case "SubscriptionSeverityNotFoundFault": return [3, 18];
+                    case "SubscriptionSeverityNotFound": return [3, 18];
                     case "com.amazonaws.redshift#SubscriptionSeverityNotFoundFault": return [3, 18];
                 }
                 return [3, 20];
@@ -7340,27 +7340,27 @@ var deserializeAws_queryModifyScheduledActionCommandError = function (output, co
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
                 switch (_b) {
-                    case "InvalidScheduledActionFault": return [3, 2];
-                    case "com.amazonaws.redshift#InvalidScheduledActionFault": return [3, 2];
-                    case "InvalidScheduleFault": return [3, 4];
-                    case "com.amazonaws.redshift#InvalidScheduleFault": return [3, 4];
-                    case "ScheduledActionNotFoundFault": return [3, 6];
+                    case "InvalidSchedule": return [3, 2];
+                    case "com.amazonaws.redshift#InvalidScheduleFault": return [3, 2];
+                    case "InvalidScheduledAction": return [3, 4];
+                    case "com.amazonaws.redshift#InvalidScheduledActionFault": return [3, 4];
+                    case "ScheduledActionNotFound": return [3, 6];
                     case "com.amazonaws.redshift#ScheduledActionNotFoundFault": return [3, 6];
-                    case "ScheduledActionTypeUnsupportedFault": return [3, 8];
+                    case "ScheduledActionTypeUnsupported": return [3, 8];
                     case "com.amazonaws.redshift#ScheduledActionTypeUnsupportedFault": return [3, 8];
                     case "UnauthorizedOperation": return [3, 10];
                     case "com.amazonaws.redshift#UnauthorizedOperation": return [3, 10];
                 }
                 return [3, 12];
-            case 2: return [4, deserializeAws_queryInvalidScheduledActionFaultResponse(parsedOutput, context)];
+            case 2: return [4, deserializeAws_queryInvalidScheduleFaultResponse(parsedOutput, context)];
             case 3: throw _d.sent();
-            case 4: return [4, deserializeAws_queryInvalidScheduleFaultResponse(parsedOutput, context)];
+            case 4: return [4, deserializeAws_queryInvalidScheduledActionFaultResponse(parsedOutput, context)];
             case 5: throw _d.sent();
             case 6: return [4, deserializeAws_queryScheduledActionNotFoundFaultResponse(parsedOutput, context)];
             case 7: throw _d.sent();
@@ -7407,15 +7407,15 @@ var deserializeAws_queryModifySnapshotCopyRetentionPeriodCommandError = function
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
                 switch (_b) {
-                    case "ClusterNotFoundFault": return [3, 2];
+                    case "ClusterNotFound": return [3, 2];
                     case "com.amazonaws.redshift#ClusterNotFoundFault": return [3, 2];
-                    case "InvalidClusterStateFault": return [3, 4];
+                    case "InvalidClusterState": return [3, 4];
                     case "com.amazonaws.redshift#InvalidClusterStateFault": return [3, 4];
                     case "InvalidRetentionPeriodFault": return [3, 6];
                     case "com.amazonaws.redshift#InvalidRetentionPeriodFault": return [3, 6];
@@ -7474,17 +7474,17 @@ var deserializeAws_queryModifySnapshotScheduleCommandError = function (output, c
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
                 switch (_b) {
-                    case "InvalidScheduleFault": return [3, 2];
+                    case "InvalidSchedule": return [3, 2];
                     case "com.amazonaws.redshift#InvalidScheduleFault": return [3, 2];
-                    case "SnapshotScheduleNotFoundFault": return [3, 4];
+                    case "SnapshotScheduleNotFound": return [3, 4];
                     case "com.amazonaws.redshift#SnapshotScheduleNotFoundFault": return [3, 4];
-                    case "SnapshotScheduleUpdateInProgressFault": return [3, 6];
+                    case "SnapshotScheduleUpdateInProgress": return [3, 6];
                     case "com.amazonaws.redshift#SnapshotScheduleUpdateInProgressFault": return [3, 6];
                 }
                 return [3, 8];
@@ -7533,17 +7533,17 @@ var deserializeAws_queryModifyUsageLimitCommandError = function (output, context
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
                 switch (_b) {
-                    case "InvalidUsageLimitFault": return [3, 2];
+                    case "InvalidUsageLimit": return [3, 2];
                     case "com.amazonaws.redshift#InvalidUsageLimitFault": return [3, 2];
-                    case "UnsupportedOperationFault": return [3, 4];
+                    case "UnsupportedOperation": return [3, 4];
                     case "com.amazonaws.redshift#UnsupportedOperationFault": return [3, 4];
-                    case "UsageLimitNotFoundFault": return [3, 6];
+                    case "UsageLimitNotFound": return [3, 6];
                     case "com.amazonaws.redshift#UsageLimitNotFoundFault": return [3, 6];
                 }
                 return [3, 8];
@@ -7592,15 +7592,15 @@ var deserializeAws_queryPauseClusterCommandError = function (output, context) {
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
                 switch (_b) {
-                    case "ClusterNotFoundFault": return [3, 2];
+                    case "ClusterNotFound": return [3, 2];
                     case "com.amazonaws.redshift#ClusterNotFoundFault": return [3, 2];
-                    case "InvalidClusterStateFault": return [3, 4];
+                    case "InvalidClusterState": return [3, 4];
                     case "com.amazonaws.redshift#InvalidClusterStateFault": return [3, 4];
                 }
                 return [3, 6];
@@ -7647,19 +7647,19 @@ var deserializeAws_queryPurchaseReservedNodeOfferingCommandError = function (out
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
                 switch (_b) {
-                    case "ReservedNodeAlreadyExistsFault": return [3, 2];
+                    case "ReservedNodeAlreadyExists": return [3, 2];
                     case "com.amazonaws.redshift#ReservedNodeAlreadyExistsFault": return [3, 2];
-                    case "ReservedNodeOfferingNotFoundFault": return [3, 4];
+                    case "ReservedNodeOfferingNotFound": return [3, 4];
                     case "com.amazonaws.redshift#ReservedNodeOfferingNotFoundFault": return [3, 4];
-                    case "ReservedNodeQuotaExceededFault": return [3, 6];
+                    case "ReservedNodeQuotaExceeded": return [3, 6];
                     case "com.amazonaws.redshift#ReservedNodeQuotaExceededFault": return [3, 6];
-                    case "UnsupportedOperationFault": return [3, 8];
+                    case "UnsupportedOperation": return [3, 8];
                     case "com.amazonaws.redshift#UnsupportedOperationFault": return [3, 8];
                 }
                 return [3, 10];
@@ -7710,15 +7710,15 @@ var deserializeAws_queryRebootClusterCommandError = function (output, context) {
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
                 switch (_b) {
-                    case "ClusterNotFoundFault": return [3, 2];
+                    case "ClusterNotFound": return [3, 2];
                     case "com.amazonaws.redshift#ClusterNotFoundFault": return [3, 2];
-                    case "InvalidClusterStateFault": return [3, 4];
+                    case "InvalidClusterState": return [3, 4];
                     case "com.amazonaws.redshift#InvalidClusterStateFault": return [3, 4];
                 }
                 return [3, 6];
@@ -7765,7 +7765,7 @@ var deserializeAws_queryRejectDataShareCommandError = function (output, context)
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
@@ -7816,15 +7816,15 @@ var deserializeAws_queryResetClusterParameterGroupCommandError = function (outpu
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
                 switch (_b) {
-                    case "ClusterParameterGroupNotFoundFault": return [3, 2];
+                    case "ClusterParameterGroupNotFound": return [3, 2];
                     case "com.amazonaws.redshift#ClusterParameterGroupNotFoundFault": return [3, 2];
-                    case "InvalidClusterParameterGroupStateFault": return [3, 4];
+                    case "InvalidClusterParameterGroupState": return [3, 4];
                     case "com.amazonaws.redshift#InvalidClusterParameterGroupStateFault": return [3, 4];
                 }
                 return [3, 6];
@@ -7871,39 +7871,39 @@ var deserializeAws_queryResizeClusterCommandError = function (output, context) {
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
                 switch (_b) {
-                    case "ClusterNotFoundFault": return [3, 2];
+                    case "ClusterNotFound": return [3, 2];
                     case "com.amazonaws.redshift#ClusterNotFoundFault": return [3, 2];
                     case "DependentServiceUnavailableFault": return [3, 4];
                     case "com.amazonaws.redshift#DependentServiceUnavailableFault": return [3, 4];
-                    case "InsufficientClusterCapacityFault": return [3, 6];
+                    case "InsufficientClusterCapacity": return [3, 6];
                     case "com.amazonaws.redshift#InsufficientClusterCapacityFault": return [3, 6];
-                    case "InvalidClusterStateFault": return [3, 8];
+                    case "InvalidClusterState": return [3, 8];
                     case "com.amazonaws.redshift#InvalidClusterStateFault": return [3, 8];
-                    case "InvalidReservedNodeStateFault": return [3, 10];
+                    case "InvalidReservedNodeState": return [3, 10];
                     case "com.amazonaws.redshift#InvalidReservedNodeStateFault": return [3, 10];
                     case "LimitExceededFault": return [3, 12];
                     case "com.amazonaws.redshift#LimitExceededFault": return [3, 12];
-                    case "NumberOfNodesPerClusterLimitExceededFault": return [3, 14];
+                    case "NumberOfNodesPerClusterLimitExceeded": return [3, 14];
                     case "com.amazonaws.redshift#NumberOfNodesPerClusterLimitExceededFault": return [3, 14];
-                    case "NumberOfNodesQuotaExceededFault": return [3, 16];
+                    case "NumberOfNodesQuotaExceeded": return [3, 16];
                     case "com.amazonaws.redshift#NumberOfNodesQuotaExceededFault": return [3, 16];
-                    case "ReservedNodeAlreadyExistsFault": return [3, 18];
+                    case "ReservedNodeAlreadyExists": return [3, 18];
                     case "com.amazonaws.redshift#ReservedNodeAlreadyExistsFault": return [3, 18];
-                    case "ReservedNodeAlreadyMigratedFault": return [3, 20];
+                    case "ReservedNodeAlreadyMigrated": return [3, 20];
                     case "com.amazonaws.redshift#ReservedNodeAlreadyMigratedFault": return [3, 20];
-                    case "ReservedNodeNotFoundFault": return [3, 22];
+                    case "ReservedNodeNotFound": return [3, 22];
                     case "com.amazonaws.redshift#ReservedNodeNotFoundFault": return [3, 22];
-                    case "ReservedNodeOfferingNotFoundFault": return [3, 24];
+                    case "ReservedNodeOfferingNotFound": return [3, 24];
                     case "com.amazonaws.redshift#ReservedNodeOfferingNotFoundFault": return [3, 24];
                     case "UnauthorizedOperation": return [3, 26];
                     case "com.amazonaws.redshift#UnauthorizedOperation": return [3, 26];
-                    case "UnsupportedOperationFault": return [3, 28];
+                    case "UnsupportedOperation": return [3, 28];
                     case "com.amazonaws.redshift#UnsupportedOperationFault": return [3, 28];
                     case "UnsupportedOptionFault": return [3, 30];
                     case "com.amazonaws.redshift#UnsupportedOptionFault": return [3, 30];
@@ -7978,23 +7978,23 @@ var deserializeAws_queryRestoreFromClusterSnapshotCommandError = function (outpu
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
                 switch (_b) {
-                    case "AccessToSnapshotDeniedFault": return [3, 2];
+                    case "AccessToSnapshotDenied": return [3, 2];
                     case "com.amazonaws.redshift#AccessToSnapshotDeniedFault": return [3, 2];
-                    case "ClusterAlreadyExistsFault": return [3, 4];
+                    case "ClusterAlreadyExists": return [3, 4];
                     case "com.amazonaws.redshift#ClusterAlreadyExistsFault": return [3, 4];
-                    case "ClusterParameterGroupNotFoundFault": return [3, 6];
+                    case "ClusterParameterGroupNotFound": return [3, 6];
                     case "com.amazonaws.redshift#ClusterParameterGroupNotFoundFault": return [3, 6];
-                    case "ClusterQuotaExceededFault": return [3, 8];
+                    case "ClusterQuotaExceeded": return [3, 8];
                     case "com.amazonaws.redshift#ClusterQuotaExceededFault": return [3, 8];
-                    case "ClusterSecurityGroupNotFoundFault": return [3, 10];
+                    case "ClusterSecurityGroupNotFound": return [3, 10];
                     case "com.amazonaws.redshift#ClusterSecurityGroupNotFoundFault": return [3, 10];
-                    case "ClusterSnapshotNotFoundFault": return [3, 12];
+                    case "ClusterSnapshotNotFound": return [3, 12];
                     case "com.amazonaws.redshift#ClusterSnapshotNotFoundFault": return [3, 12];
                     case "ClusterSubnetGroupNotFoundFault": return [3, 14];
                     case "com.amazonaws.redshift#ClusterSubnetGroupNotFoundFault": return [3, 14];
@@ -8006,19 +8006,19 @@ var deserializeAws_queryRestoreFromClusterSnapshotCommandError = function (outpu
                     case "com.amazonaws.redshift#HsmClientCertificateNotFoundFault": return [3, 20];
                     case "HsmConfigurationNotFoundFault": return [3, 22];
                     case "com.amazonaws.redshift#HsmConfigurationNotFoundFault": return [3, 22];
-                    case "InsufficientClusterCapacityFault": return [3, 24];
+                    case "InsufficientClusterCapacity": return [3, 24];
                     case "com.amazonaws.redshift#InsufficientClusterCapacityFault": return [3, 24];
-                    case "InvalidClusterSnapshotStateFault": return [3, 26];
+                    case "InvalidClusterSnapshotState": return [3, 26];
                     case "com.amazonaws.redshift#InvalidClusterSnapshotStateFault": return [3, 26];
                     case "InvalidClusterSubnetGroupStateFault": return [3, 28];
                     case "com.amazonaws.redshift#InvalidClusterSubnetGroupStateFault": return [3, 28];
-                    case "InvalidClusterTrackFault": return [3, 30];
+                    case "InvalidClusterTrack": return [3, 30];
                     case "com.amazonaws.redshift#InvalidClusterTrackFault": return [3, 30];
                     case "InvalidElasticIpFault": return [3, 32];
                     case "com.amazonaws.redshift#InvalidElasticIpFault": return [3, 32];
-                    case "InvalidReservedNodeStateFault": return [3, 34];
+                    case "InvalidReservedNodeState": return [3, 34];
                     case "com.amazonaws.redshift#InvalidReservedNodeStateFault": return [3, 34];
-                    case "InvalidRestoreFault": return [3, 36];
+                    case "InvalidRestore": return [3, 36];
                     case "com.amazonaws.redshift#InvalidRestoreFault": return [3, 36];
                     case "InvalidSubnet": return [3, 38];
                     case "com.amazonaws.redshift#InvalidSubnet": return [3, 38];
@@ -8028,25 +8028,25 @@ var deserializeAws_queryRestoreFromClusterSnapshotCommandError = function (outpu
                     case "com.amazonaws.redshift#InvalidVPCNetworkStateFault": return [3, 42];
                     case "LimitExceededFault": return [3, 44];
                     case "com.amazonaws.redshift#LimitExceededFault": return [3, 44];
-                    case "NumberOfNodesPerClusterLimitExceededFault": return [3, 46];
+                    case "NumberOfNodesPerClusterLimitExceeded": return [3, 46];
                     case "com.amazonaws.redshift#NumberOfNodesPerClusterLimitExceededFault": return [3, 46];
-                    case "NumberOfNodesQuotaExceededFault": return [3, 48];
+                    case "NumberOfNodesQuotaExceeded": return [3, 48];
                     case "com.amazonaws.redshift#NumberOfNodesQuotaExceededFault": return [3, 48];
-                    case "ReservedNodeAlreadyExistsFault": return [3, 50];
+                    case "ReservedNodeAlreadyExists": return [3, 50];
                     case "com.amazonaws.redshift#ReservedNodeAlreadyExistsFault": return [3, 50];
-                    case "ReservedNodeAlreadyMigratedFault": return [3, 52];
+                    case "ReservedNodeAlreadyMigrated": return [3, 52];
                     case "com.amazonaws.redshift#ReservedNodeAlreadyMigratedFault": return [3, 52];
-                    case "ReservedNodeNotFoundFault": return [3, 54];
+                    case "ReservedNodeNotFound": return [3, 54];
                     case "com.amazonaws.redshift#ReservedNodeNotFoundFault": return [3, 54];
-                    case "ReservedNodeOfferingNotFoundFault": return [3, 56];
+                    case "ReservedNodeOfferingNotFound": return [3, 56];
                     case "com.amazonaws.redshift#ReservedNodeOfferingNotFoundFault": return [3, 56];
-                    case "SnapshotScheduleNotFoundFault": return [3, 58];
+                    case "SnapshotScheduleNotFound": return [3, 58];
                     case "com.amazonaws.redshift#SnapshotScheduleNotFoundFault": return [3, 58];
                     case "TagLimitExceededFault": return [3, 60];
                     case "com.amazonaws.redshift#TagLimitExceededFault": return [3, 60];
                     case "UnauthorizedOperation": return [3, 62];
                     case "com.amazonaws.redshift#UnauthorizedOperation": return [3, 62];
-                    case "UnsupportedOperationFault": return [3, 64];
+                    case "UnsupportedOperation": return [3, 64];
                     case "com.amazonaws.redshift#UnsupportedOperationFault": return [3, 64];
                 }
                 return [3, 66];
@@ -8153,25 +8153,25 @@ var deserializeAws_queryRestoreTableFromClusterSnapshotCommandError = function (
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
                 switch (_b) {
-                    case "ClusterNotFoundFault": return [3, 2];
+                    case "ClusterNotFound": return [3, 2];
                     case "com.amazonaws.redshift#ClusterNotFoundFault": return [3, 2];
-                    case "ClusterSnapshotNotFoundFault": return [3, 4];
+                    case "ClusterSnapshotNotFound": return [3, 4];
                     case "com.amazonaws.redshift#ClusterSnapshotNotFoundFault": return [3, 4];
                     case "InProgressTableRestoreQuotaExceededFault": return [3, 6];
                     case "com.amazonaws.redshift#InProgressTableRestoreQuotaExceededFault": return [3, 6];
-                    case "InvalidClusterSnapshotStateFault": return [3, 8];
+                    case "InvalidClusterSnapshotState": return [3, 8];
                     case "com.amazonaws.redshift#InvalidClusterSnapshotStateFault": return [3, 8];
-                    case "InvalidClusterStateFault": return [3, 10];
+                    case "InvalidClusterState": return [3, 10];
                     case "com.amazonaws.redshift#InvalidClusterStateFault": return [3, 10];
-                    case "InvalidTableRestoreArgumentFault": return [3, 12];
+                    case "InvalidTableRestoreArgument": return [3, 12];
                     case "com.amazonaws.redshift#InvalidTableRestoreArgumentFault": return [3, 12];
-                    case "UnsupportedOperationFault": return [3, 14];
+                    case "UnsupportedOperation": return [3, 14];
                     case "com.amazonaws.redshift#UnsupportedOperationFault": return [3, 14];
                 }
                 return [3, 16];
@@ -8228,17 +8228,17 @@ var deserializeAws_queryResumeClusterCommandError = function (output, context) {
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
                 switch (_b) {
-                    case "ClusterNotFoundFault": return [3, 2];
+                    case "ClusterNotFound": return [3, 2];
                     case "com.amazonaws.redshift#ClusterNotFoundFault": return [3, 2];
-                    case "InsufficientClusterCapacityFault": return [3, 4];
+                    case "InsufficientClusterCapacity": return [3, 4];
                     case "com.amazonaws.redshift#InsufficientClusterCapacityFault": return [3, 4];
-                    case "InvalidClusterStateFault": return [3, 6];
+                    case "InvalidClusterState": return [3, 6];
                     case "com.amazonaws.redshift#InvalidClusterStateFault": return [3, 6];
                 }
                 return [3, 8];
@@ -8287,17 +8287,17 @@ var deserializeAws_queryRevokeClusterSecurityGroupIngressCommandError = function
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
                 switch (_b) {
-                    case "AuthorizationNotFoundFault": return [3, 2];
+                    case "AuthorizationNotFound": return [3, 2];
                     case "com.amazonaws.redshift#AuthorizationNotFoundFault": return [3, 2];
-                    case "ClusterSecurityGroupNotFoundFault": return [3, 4];
+                    case "ClusterSecurityGroupNotFound": return [3, 4];
                     case "com.amazonaws.redshift#ClusterSecurityGroupNotFoundFault": return [3, 4];
-                    case "InvalidClusterSecurityGroupStateFault": return [3, 6];
+                    case "InvalidClusterSecurityGroupState": return [3, 6];
                     case "com.amazonaws.redshift#InvalidClusterSecurityGroupStateFault": return [3, 6];
                 }
                 return [3, 8];
@@ -8346,25 +8346,25 @@ var deserializeAws_queryRevokeEndpointAccessCommandError = function (output, con
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
                 switch (_b) {
-                    case "ClusterNotFoundFault": return [3, 2];
+                    case "ClusterNotFound": return [3, 2];
                     case "com.amazonaws.redshift#ClusterNotFoundFault": return [3, 2];
-                    case "EndpointAuthorizationNotFoundFault": return [3, 4];
+                    case "EndpointAuthorizationNotFound": return [3, 4];
                     case "com.amazonaws.redshift#EndpointAuthorizationNotFoundFault": return [3, 4];
-                    case "EndpointNotFoundFault": return [3, 6];
+                    case "EndpointNotFound": return [3, 6];
                     case "com.amazonaws.redshift#EndpointNotFoundFault": return [3, 6];
-                    case "InvalidAuthorizationStateFault": return [3, 8];
+                    case "InvalidAuthorizationState": return [3, 8];
                     case "com.amazonaws.redshift#InvalidAuthorizationStateFault": return [3, 8];
-                    case "InvalidClusterSecurityGroupStateFault": return [3, 10];
+                    case "InvalidClusterSecurityGroupState": return [3, 10];
                     case "com.amazonaws.redshift#InvalidClusterSecurityGroupStateFault": return [3, 10];
-                    case "InvalidClusterStateFault": return [3, 12];
+                    case "InvalidClusterState": return [3, 12];
                     case "com.amazonaws.redshift#InvalidClusterStateFault": return [3, 12];
-                    case "InvalidEndpointStateFault": return [3, 14];
+                    case "InvalidEndpointState": return [3, 14];
                     case "com.amazonaws.redshift#InvalidEndpointStateFault": return [3, 14];
                 }
                 return [3, 16];
@@ -8421,19 +8421,19 @@ var deserializeAws_queryRevokeSnapshotAccessCommandError = function (output, con
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
                 switch (_b) {
-                    case "AccessToSnapshotDeniedFault": return [3, 2];
+                    case "AccessToSnapshotDenied": return [3, 2];
                     case "com.amazonaws.redshift#AccessToSnapshotDeniedFault": return [3, 2];
-                    case "AuthorizationNotFoundFault": return [3, 4];
+                    case "AuthorizationNotFound": return [3, 4];
                     case "com.amazonaws.redshift#AuthorizationNotFoundFault": return [3, 4];
-                    case "ClusterSnapshotNotFoundFault": return [3, 6];
+                    case "ClusterSnapshotNotFound": return [3, 6];
                     case "com.amazonaws.redshift#ClusterSnapshotNotFoundFault": return [3, 6];
-                    case "UnsupportedOperationFault": return [3, 8];
+                    case "UnsupportedOperation": return [3, 8];
                     case "com.amazonaws.redshift#UnsupportedOperationFault": return [3, 8];
                 }
                 return [3, 10];
@@ -8484,17 +8484,17 @@ var deserializeAws_queryRotateEncryptionKeyCommandError = function (output, cont
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
                 switch (_b) {
-                    case "ClusterNotFoundFault": return [3, 2];
+                    case "ClusterNotFound": return [3, 2];
                     case "com.amazonaws.redshift#ClusterNotFoundFault": return [3, 2];
                     case "DependentServiceRequestThrottlingFault": return [3, 4];
                     case "com.amazonaws.redshift#DependentServiceRequestThrottlingFault": return [3, 4];
-                    case "InvalidClusterStateFault": return [3, 6];
+                    case "InvalidClusterState": return [3, 6];
                     case "com.amazonaws.redshift#InvalidClusterStateFault": return [3, 6];
                 }
                 return [3, 8];
@@ -8543,17 +8543,17 @@ var deserializeAws_queryUpdatePartnerStatusCommandError = function (output, cont
             case 0:
                 _a = [__assign({}, output)];
                 _c = {};
-                return [4, parseBody(output.body, context)];
+                return [4, parseErrorBody(output.body, context)];
             case 1:
                 parsedOutput = __assign.apply(void 0, _a.concat([(_c.body = _d.sent(), _c)]));
                 errorCode = loadQueryErrorCode(output, parsedOutput.body);
                 _b = errorCode;
                 switch (_b) {
-                    case "ClusterNotFoundFault": return [3, 2];
+                    case "ClusterNotFound": return [3, 2];
                     case "com.amazonaws.redshift#ClusterNotFoundFault": return [3, 2];
-                    case "PartnerNotFoundFault": return [3, 4];
+                    case "PartnerNotFound": return [3, 4];
                     case "com.amazonaws.redshift#PartnerNotFoundFault": return [3, 4];
-                    case "UnauthorizedPartnerIntegrationFault": return [3, 6];
+                    case "UnauthorizedPartnerIntegration": return [3, 6];
                     case "com.amazonaws.redshift#UnauthorizedPartnerIntegrationFault": return [3, 6];
                 }
                 return [3, 8];
@@ -17596,6 +17596,21 @@ var parseBody = function (streamBody, context) {
         return {};
     });
 };
+var parseErrorBody = function (errorBody, context) { return __awaiter(void 0, void 0, void 0, function () {
+    var value;
+    var _a;
+    return __generator(this, function (_b) {
+        switch (_b.label) {
+            case 0: return [4, parseBody(errorBody, context)];
+            case 1:
+                value = _b.sent();
+                if (value.Error) {
+                    value.Error.message = (_a = value.Error.message) !== null && _a !== void 0 ? _a : value.Error.Message;
+                }
+                return [2, value];
+        }
+    });
+}); };
 var buildFormUrlencodedString = function (formEntries) {
     return Object.entries(formEntries)
         .map(function (_a) {