npm - @aws-sdk/client-redshift - Versions diffs - 3.30.0 → 3.34.0 - Mend

@aws-sdk/client-redshift 3.30.0 → 3.34.0

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

Files changed (584) hide show

package/dist/cjs/protocols/Aws_query.js CHANGED Viewed

@@ -13327,7 +13327,7 @@ const deserializeAws_queryAccessToClusterDeniedFault = (output, context) => {
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -13336,7 +13336,7 @@ const deserializeAws_queryAccessToSnapshotDeniedFault = (output, context) => {
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -13346,13 +13346,13 @@ const deserializeAws_queryAccountAttribute = (output, context) => {
         AttributeValues: undefined,
     };
     if (output["AttributeName"] !== undefined) {
-        contents.AttributeName = (0, smithy_client_1.expectString)(output["AttributeName"]);
+        contents.AttributeName = smithy_client_1.expectString(output["AttributeName"]);
     }
     if (output.AttributeValues === "") {
         contents.AttributeValues = [];
     }
     if (output["AttributeValues"] !== undefined && output["AttributeValues"]["AttributeValueTarget"] !== undefined) {
-        contents.AttributeValues = deserializeAws_queryAttributeValueList((0, smithy_client_1.getArrayIfSingleItem)(output["AttributeValues"]["AttributeValueTarget"]), context);
+        contents.AttributeValues = deserializeAws_queryAttributeValueList(smithy_client_1.getArrayIfSingleItem(output["AttributeValues"]["AttributeValueTarget"]), context);
     }
     return contents;
 };
@@ -13364,7 +13364,7 @@ const deserializeAws_queryAccountAttributeList = (output, context) => {
         contents.AccountAttributes = [];
     }
     if (output["AccountAttributes"] !== undefined && output["AccountAttributes"]["AccountAttribute"] !== undefined) {
-        contents.AccountAttributes = deserializeAws_queryAttributeList((0, smithy_client_1.getArrayIfSingleItem)(output["AccountAttributes"]["AccountAttribute"]), context);
+        contents.AccountAttributes = deserializeAws_queryAttributeList(smithy_client_1.getArrayIfSingleItem(output["AccountAttributes"]["AccountAttribute"]), context);
     }
     return contents;
 };
@@ -13384,10 +13384,10 @@ const deserializeAws_queryAccountWithRestoreAccess = (output, context) => {
         AccountAlias: undefined,
     };
     if (output["AccountId"] !== undefined) {
-        contents.AccountId = (0, smithy_client_1.expectString)(output["AccountId"]);
+        contents.AccountId = smithy_client_1.expectString(output["AccountId"]);
     }
     if (output["AccountAlias"] !== undefined) {
-        contents.AccountAlias = (0, smithy_client_1.expectString)(output["AccountAlias"]);
+        contents.AccountAlias = smithy_client_1.expectString(output["AccountAlias"]);
     }
     return contents;
 };
@@ -13397,10 +13397,10 @@ const deserializeAws_queryAquaConfiguration = (output, context) => {
         AquaConfigurationStatus: undefined,
     };
     if (output["AquaStatus"] !== undefined) {
-        contents.AquaStatus = (0, smithy_client_1.expectString)(output["AquaStatus"]);
+        contents.AquaStatus = smithy_client_1.expectString(output["AquaStatus"]);
     }
     if (output["AquaConfigurationStatus"] !== undefined) {
-        contents.AquaConfigurationStatus = (0, smithy_client_1.expectString)(output["AquaConfigurationStatus"]);
+        contents.AquaConfigurationStatus = smithy_client_1.expectString(output["AquaConfigurationStatus"]);
     }
     return contents;
 };
@@ -13439,7 +13439,7 @@ const deserializeAws_queryAttributeValueTarget = (output, context) => {
         AttributeValue: undefined,
     };
     if (output["AttributeValue"] !== undefined) {
-        contents.AttributeValue = (0, smithy_client_1.expectString)(output["AttributeValue"]);
+        contents.AttributeValue = smithy_client_1.expectString(output["AttributeValue"]);
     }
     return contents;
 };
@@ -13449,10 +13449,10 @@ const deserializeAws_queryAuthenticationProfile = (output, context) => {
         AuthenticationProfileContent: undefined,
     };
     if (output["AuthenticationProfileName"] !== undefined) {
-        contents.AuthenticationProfileName = (0, smithy_client_1.expectString)(output["AuthenticationProfileName"]);
+        contents.AuthenticationProfileName = smithy_client_1.expectString(output["AuthenticationProfileName"]);
     }
     if (output["AuthenticationProfileContent"] !== undefined) {
-        contents.AuthenticationProfileContent = (0, smithy_client_1.expectString)(output["AuthenticationProfileContent"]);
+        contents.AuthenticationProfileContent = smithy_client_1.expectString(output["AuthenticationProfileContent"]);
     }
     return contents;
 };
@@ -13461,7 +13461,7 @@ const deserializeAws_queryAuthenticationProfileAlreadyExistsFault = (output, con
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -13480,7 +13480,7 @@ const deserializeAws_queryAuthenticationProfileNotFoundFault = (output, context)
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -13489,7 +13489,7 @@ const deserializeAws_queryAuthenticationProfileQuotaExceededFault = (output, con
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -13498,7 +13498,7 @@ const deserializeAws_queryAuthorizationAlreadyExistsFault = (output, context) =>
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -13507,7 +13507,7 @@ const deserializeAws_queryAuthorizationNotFoundFault = (output, context) => {
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -13516,7 +13516,7 @@ const deserializeAws_queryAuthorizationQuotaExceededFault = (output, context) =>
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -13544,13 +13544,13 @@ const deserializeAws_queryAvailabilityZone = (output, context) => {
         SupportedPlatforms: undefined,
     };
     if (output["Name"] !== undefined) {
-        contents.Name = (0, smithy_client_1.expectString)(output["Name"]);
+        contents.Name = smithy_client_1.expectString(output["Name"]);
     }
     if (output.SupportedPlatforms === "") {
         contents.SupportedPlatforms = [];
     }
     if (output["SupportedPlatforms"] !== undefined && output["SupportedPlatforms"]["SupportedPlatform"] !== undefined) {
-        contents.SupportedPlatforms = deserializeAws_querySupportedPlatformsList((0, smithy_client_1.getArrayIfSingleItem)(output["SupportedPlatforms"]["SupportedPlatform"]), context);
+        contents.SupportedPlatforms = deserializeAws_querySupportedPlatformsList(smithy_client_1.getArrayIfSingleItem(output["SupportedPlatforms"]["SupportedPlatform"]), context);
     }
     return contents;
 };
@@ -13573,13 +13573,13 @@ const deserializeAws_queryBatchDeleteClusterSnapshotsResult = (output, context)
         contents.Resources = [];
     }
     if (output["Resources"] !== undefined && output["Resources"]["String"] !== undefined) {
-        contents.Resources = deserializeAws_querySnapshotIdentifierList((0, smithy_client_1.getArrayIfSingleItem)(output["Resources"]["String"]), context);
+        contents.Resources = deserializeAws_querySnapshotIdentifierList(smithy_client_1.getArrayIfSingleItem(output["Resources"]["String"]), context);
     }
     if (output.Errors === "") {
         contents.Errors = [];
     }
     if (output["Errors"] !== undefined && output["Errors"]["SnapshotErrorMessage"] !== undefined) {
-        contents.Errors = deserializeAws_queryBatchSnapshotOperationErrorList((0, smithy_client_1.getArrayIfSingleItem)(output["Errors"]["SnapshotErrorMessage"]), context);
+        contents.Errors = deserializeAws_queryBatchSnapshotOperationErrorList(smithy_client_1.getArrayIfSingleItem(output["Errors"]["SnapshotErrorMessage"]), context);
     }
     return contents;
 };
@@ -13588,7 +13588,7 @@ const deserializeAws_queryBatchDeleteRequestSizeExceededFault = (output, context
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -13597,7 +13597,7 @@ const deserializeAws_queryBatchModifyClusterSnapshotsLimitExceededFault = (outpu
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -13610,13 +13610,13 @@ const deserializeAws_queryBatchModifyClusterSnapshotsOutputMessage = (output, co
         contents.Resources = [];
     }
     if (output["Resources"] !== undefined && output["Resources"]["String"] !== undefined) {
-        contents.Resources = deserializeAws_querySnapshotIdentifierList((0, smithy_client_1.getArrayIfSingleItem)(output["Resources"]["String"]), context);
+        contents.Resources = deserializeAws_querySnapshotIdentifierList(smithy_client_1.getArrayIfSingleItem(output["Resources"]["String"]), context);
     }
     if (output.Errors === "") {
         contents.Errors = [];
     }
     if (output["Errors"] !== undefined && output["Errors"]["SnapshotErrorMessage"] !== undefined) {
-        contents.Errors = deserializeAws_queryBatchSnapshotOperationErrors((0, smithy_client_1.getArrayIfSingleItem)(output["Errors"]["SnapshotErrorMessage"]), context);
+        contents.Errors = deserializeAws_queryBatchSnapshotOperationErrors(smithy_client_1.getArrayIfSingleItem(output["Errors"]["SnapshotErrorMessage"]), context);
     }
     return contents;
 };
@@ -13645,7 +13645,7 @@ const deserializeAws_queryBucketNotFoundFault = (output, context) => {
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -13703,87 +13703,87 @@ const deserializeAws_queryCluster = (output, context) => {
         AquaConfiguration: undefined,
     };
     if (output["ClusterIdentifier"] !== undefined) {
-        contents.ClusterIdentifier = (0, smithy_client_1.expectString)(output["ClusterIdentifier"]);
+        contents.ClusterIdentifier = smithy_client_1.expectString(output["ClusterIdentifier"]);
     }
     if (output["NodeType"] !== undefined) {
-        contents.NodeType = (0, smithy_client_1.expectString)(output["NodeType"]);
+        contents.NodeType = smithy_client_1.expectString(output["NodeType"]);
     }
     if (output["ClusterStatus"] !== undefined) {
-        contents.ClusterStatus = (0, smithy_client_1.expectString)(output["ClusterStatus"]);
+        contents.ClusterStatus = smithy_client_1.expectString(output["ClusterStatus"]);
     }
     if (output["ClusterAvailabilityStatus"] !== undefined) {
-        contents.ClusterAvailabilityStatus = (0, smithy_client_1.expectString)(output["ClusterAvailabilityStatus"]);
+        contents.ClusterAvailabilityStatus = smithy_client_1.expectString(output["ClusterAvailabilityStatus"]);
     }
     if (output["ModifyStatus"] !== undefined) {
-        contents.ModifyStatus = (0, smithy_client_1.expectString)(output["ModifyStatus"]);
+        contents.ModifyStatus = smithy_client_1.expectString(output["ModifyStatus"]);
     }
     if (output["MasterUsername"] !== undefined) {
-        contents.MasterUsername = (0, smithy_client_1.expectString)(output["MasterUsername"]);
+        contents.MasterUsername = smithy_client_1.expectString(output["MasterUsername"]);
     }
     if (output["DBName"] !== undefined) {
-        contents.DBName = (0, smithy_client_1.expectString)(output["DBName"]);
+        contents.DBName = smithy_client_1.expectString(output["DBName"]);
     }
     if (output["Endpoint"] !== undefined) {
         contents.Endpoint = deserializeAws_queryEndpoint(output["Endpoint"], context);
     }
     if (output["ClusterCreateTime"] !== undefined) {
-        contents.ClusterCreateTime = new Date(output["ClusterCreateTime"]);
+        contents.ClusterCreateTime = smithy_client_1.expectNonNull(smithy_client_1.parseRfc3339DateTime(output["ClusterCreateTime"]));
     }
     if (output["AutomatedSnapshotRetentionPeriod"] !== undefined) {
-        contents.AutomatedSnapshotRetentionPeriod = (0, smithy_client_1.strictParseInt32)(output["AutomatedSnapshotRetentionPeriod"]);
+        contents.AutomatedSnapshotRetentionPeriod = smithy_client_1.strictParseInt32(output["AutomatedSnapshotRetentionPeriod"]);
     }
     if (output["ManualSnapshotRetentionPeriod"] !== undefined) {
-        contents.ManualSnapshotRetentionPeriod = (0, smithy_client_1.strictParseInt32)(output["ManualSnapshotRetentionPeriod"]);
+        contents.ManualSnapshotRetentionPeriod = smithy_client_1.strictParseInt32(output["ManualSnapshotRetentionPeriod"]);
     }
     if (output.ClusterSecurityGroups === "") {
         contents.ClusterSecurityGroups = [];
     }
     if (output["ClusterSecurityGroups"] !== undefined &&
         output["ClusterSecurityGroups"]["ClusterSecurityGroup"] !== undefined) {
-        contents.ClusterSecurityGroups = deserializeAws_queryClusterSecurityGroupMembershipList((0, smithy_client_1.getArrayIfSingleItem)(output["ClusterSecurityGroups"]["ClusterSecurityGroup"]), context);
+        contents.ClusterSecurityGroups = deserializeAws_queryClusterSecurityGroupMembershipList(smithy_client_1.getArrayIfSingleItem(output["ClusterSecurityGroups"]["ClusterSecurityGroup"]), context);
     }
     if (output.VpcSecurityGroups === "") {
         contents.VpcSecurityGroups = [];
     }
     if (output["VpcSecurityGroups"] !== undefined && output["VpcSecurityGroups"]["VpcSecurityGroup"] !== undefined) {
-        contents.VpcSecurityGroups = deserializeAws_queryVpcSecurityGroupMembershipList((0, smithy_client_1.getArrayIfSingleItem)(output["VpcSecurityGroups"]["VpcSecurityGroup"]), context);
+        contents.VpcSecurityGroups = deserializeAws_queryVpcSecurityGroupMembershipList(smithy_client_1.getArrayIfSingleItem(output["VpcSecurityGroups"]["VpcSecurityGroup"]), context);
     }
     if (output.ClusterParameterGroups === "") {
         contents.ClusterParameterGroups = [];
     }
     if (output["ClusterParameterGroups"] !== undefined &&
         output["ClusterParameterGroups"]["ClusterParameterGroup"] !== undefined) {
-        contents.ClusterParameterGroups = deserializeAws_queryClusterParameterGroupStatusList((0, smithy_client_1.getArrayIfSingleItem)(output["ClusterParameterGroups"]["ClusterParameterGroup"]), context);
+        contents.ClusterParameterGroups = deserializeAws_queryClusterParameterGroupStatusList(smithy_client_1.getArrayIfSingleItem(output["ClusterParameterGroups"]["ClusterParameterGroup"]), context);
     }
     if (output["ClusterSubnetGroupName"] !== undefined) {
-        contents.ClusterSubnetGroupName = (0, smithy_client_1.expectString)(output["ClusterSubnetGroupName"]);
+        contents.ClusterSubnetGroupName = smithy_client_1.expectString(output["ClusterSubnetGroupName"]);
     }
     if (output["VpcId"] !== undefined) {
-        contents.VpcId = (0, smithy_client_1.expectString)(output["VpcId"]);
+        contents.VpcId = smithy_client_1.expectString(output["VpcId"]);
     }
     if (output["AvailabilityZone"] !== undefined) {
-        contents.AvailabilityZone = (0, smithy_client_1.expectString)(output["AvailabilityZone"]);
+        contents.AvailabilityZone = smithy_client_1.expectString(output["AvailabilityZone"]);
     }
     if (output["PreferredMaintenanceWindow"] !== undefined) {
-        contents.PreferredMaintenanceWindow = (0, smithy_client_1.expectString)(output["PreferredMaintenanceWindow"]);
+        contents.PreferredMaintenanceWindow = smithy_client_1.expectString(output["PreferredMaintenanceWindow"]);
     }
     if (output["PendingModifiedValues"] !== undefined) {
         contents.PendingModifiedValues = deserializeAws_queryPendingModifiedValues(output["PendingModifiedValues"], context);
     }
     if (output["ClusterVersion"] !== undefined) {
-        contents.ClusterVersion = (0, smithy_client_1.expectString)(output["ClusterVersion"]);
+        contents.ClusterVersion = smithy_client_1.expectString(output["ClusterVersion"]);
     }
     if (output["AllowVersionUpgrade"] !== undefined) {
-        contents.AllowVersionUpgrade = (0, smithy_client_1.parseBoolean)(output["AllowVersionUpgrade"]);
+        contents.AllowVersionUpgrade = smithy_client_1.parseBoolean(output["AllowVersionUpgrade"]);
     }
     if (output["NumberOfNodes"] !== undefined) {
-        contents.NumberOfNodes = (0, smithy_client_1.strictParseInt32)(output["NumberOfNodes"]);
+        contents.NumberOfNodes = smithy_client_1.strictParseInt32(output["NumberOfNodes"]);
     }
     if (output["PubliclyAccessible"] !== undefined) {
-        contents.PubliclyAccessible = (0, smithy_client_1.parseBoolean)(output["PubliclyAccessible"]);
+        contents.PubliclyAccessible = smithy_client_1.parseBoolean(output["PubliclyAccessible"]);
     }
     if (output["Encrypted"] !== undefined) {
-        contents.Encrypted = (0, smithy_client_1.parseBoolean)(output["Encrypted"]);
+        contents.Encrypted = smithy_client_1.parseBoolean(output["Encrypted"]);
     }
     if (output["RestoreStatus"] !== undefined) {
         contents.RestoreStatus = deserializeAws_queryRestoreStatus(output["RestoreStatus"], context);
@@ -13798,83 +13798,83 @@ const deserializeAws_queryCluster = (output, context) => {
         contents.ClusterSnapshotCopyStatus = deserializeAws_queryClusterSnapshotCopyStatus(output["ClusterSnapshotCopyStatus"], context);
     }
     if (output["ClusterPublicKey"] !== undefined) {
-        contents.ClusterPublicKey = (0, smithy_client_1.expectString)(output["ClusterPublicKey"]);
+        contents.ClusterPublicKey = smithy_client_1.expectString(output["ClusterPublicKey"]);
     }
     if (output.ClusterNodes === "") {
         contents.ClusterNodes = [];
     }
     if (output["ClusterNodes"] !== undefined && output["ClusterNodes"]["member"] !== undefined) {
-        contents.ClusterNodes = deserializeAws_queryClusterNodesList((0, smithy_client_1.getArrayIfSingleItem)(output["ClusterNodes"]["member"]), context);
+        contents.ClusterNodes = deserializeAws_queryClusterNodesList(smithy_client_1.getArrayIfSingleItem(output["ClusterNodes"]["member"]), context);
     }
     if (output["ElasticIpStatus"] !== undefined) {
         contents.ElasticIpStatus = deserializeAws_queryElasticIpStatus(output["ElasticIpStatus"], context);
     }
     if (output["ClusterRevisionNumber"] !== undefined) {
-        contents.ClusterRevisionNumber = (0, smithy_client_1.expectString)(output["ClusterRevisionNumber"]);
+        contents.ClusterRevisionNumber = smithy_client_1.expectString(output["ClusterRevisionNumber"]);
     }
     if (output.Tags === "") {
         contents.Tags = [];
     }
     if (output["Tags"] !== undefined && output["Tags"]["Tag"] !== undefined) {
-        contents.Tags = deserializeAws_queryTagList((0, smithy_client_1.getArrayIfSingleItem)(output["Tags"]["Tag"]), context);
+        contents.Tags = deserializeAws_queryTagList(smithy_client_1.getArrayIfSingleItem(output["Tags"]["Tag"]), context);
     }
     if (output["KmsKeyId"] !== undefined) {
-        contents.KmsKeyId = (0, smithy_client_1.expectString)(output["KmsKeyId"]);
+        contents.KmsKeyId = smithy_client_1.expectString(output["KmsKeyId"]);
     }
     if (output["EnhancedVpcRouting"] !== undefined) {
-        contents.EnhancedVpcRouting = (0, smithy_client_1.parseBoolean)(output["EnhancedVpcRouting"]);
+        contents.EnhancedVpcRouting = smithy_client_1.parseBoolean(output["EnhancedVpcRouting"]);
     }
     if (output.IamRoles === "") {
         contents.IamRoles = [];
     }
     if (output["IamRoles"] !== undefined && output["IamRoles"]["ClusterIamRole"] !== undefined) {
-        contents.IamRoles = deserializeAws_queryClusterIamRoleList((0, smithy_client_1.getArrayIfSingleItem)(output["IamRoles"]["ClusterIamRole"]), context);
+        contents.IamRoles = deserializeAws_queryClusterIamRoleList(smithy_client_1.getArrayIfSingleItem(output["IamRoles"]["ClusterIamRole"]), context);
     }
     if (output.PendingActions === "") {
         contents.PendingActions = [];
     }
     if (output["PendingActions"] !== undefined && output["PendingActions"]["member"] !== undefined) {
-        contents.PendingActions = deserializeAws_queryPendingActionsList((0, smithy_client_1.getArrayIfSingleItem)(output["PendingActions"]["member"]), context);
+        contents.PendingActions = deserializeAws_queryPendingActionsList(smithy_client_1.getArrayIfSingleItem(output["PendingActions"]["member"]), context);
     }
     if (output["MaintenanceTrackName"] !== undefined) {
-        contents.MaintenanceTrackName = (0, smithy_client_1.expectString)(output["MaintenanceTrackName"]);
+        contents.MaintenanceTrackName = smithy_client_1.expectString(output["MaintenanceTrackName"]);
     }
     if (output["ElasticResizeNumberOfNodeOptions"] !== undefined) {
-        contents.ElasticResizeNumberOfNodeOptions = (0, smithy_client_1.expectString)(output["ElasticResizeNumberOfNodeOptions"]);
+        contents.ElasticResizeNumberOfNodeOptions = smithy_client_1.expectString(output["ElasticResizeNumberOfNodeOptions"]);
     }
     if (output.DeferredMaintenanceWindows === "") {
         contents.DeferredMaintenanceWindows = [];
     }
     if (output["DeferredMaintenanceWindows"] !== undefined &&
         output["DeferredMaintenanceWindows"]["DeferredMaintenanceWindow"] !== undefined) {
-        contents.DeferredMaintenanceWindows = deserializeAws_queryDeferredMaintenanceWindowsList((0, smithy_client_1.getArrayIfSingleItem)(output["DeferredMaintenanceWindows"]["DeferredMaintenanceWindow"]), context);
+        contents.DeferredMaintenanceWindows = deserializeAws_queryDeferredMaintenanceWindowsList(smithy_client_1.getArrayIfSingleItem(output["DeferredMaintenanceWindows"]["DeferredMaintenanceWindow"]), context);
     }
     if (output["SnapshotScheduleIdentifier"] !== undefined) {
-        contents.SnapshotScheduleIdentifier = (0, smithy_client_1.expectString)(output["SnapshotScheduleIdentifier"]);
+        contents.SnapshotScheduleIdentifier = smithy_client_1.expectString(output["SnapshotScheduleIdentifier"]);
     }
     if (output["SnapshotScheduleState"] !== undefined) {
-        contents.SnapshotScheduleState = (0, smithy_client_1.expectString)(output["SnapshotScheduleState"]);
+        contents.SnapshotScheduleState = smithy_client_1.expectString(output["SnapshotScheduleState"]);
     }
     if (output["ExpectedNextSnapshotScheduleTime"] !== undefined) {
-        contents.ExpectedNextSnapshotScheduleTime = new Date(output["ExpectedNextSnapshotScheduleTime"]);
+        contents.ExpectedNextSnapshotScheduleTime = smithy_client_1.expectNonNull(smithy_client_1.parseRfc3339DateTime(output["ExpectedNextSnapshotScheduleTime"]));
     }
     if (output["ExpectedNextSnapshotScheduleTimeStatus"] !== undefined) {
-        contents.ExpectedNextSnapshotScheduleTimeStatus = (0, smithy_client_1.expectString)(output["ExpectedNextSnapshotScheduleTimeStatus"]);
+        contents.ExpectedNextSnapshotScheduleTimeStatus = smithy_client_1.expectString(output["ExpectedNextSnapshotScheduleTimeStatus"]);
     }
     if (output["NextMaintenanceWindowStartTime"] !== undefined) {
-        contents.NextMaintenanceWindowStartTime = new Date(output["NextMaintenanceWindowStartTime"]);
+        contents.NextMaintenanceWindowStartTime = smithy_client_1.expectNonNull(smithy_client_1.parseRfc3339DateTime(output["NextMaintenanceWindowStartTime"]));
     }
     if (output["ResizeInfo"] !== undefined) {
         contents.ResizeInfo = deserializeAws_queryResizeInfo(output["ResizeInfo"], context);
     }
     if (output["AvailabilityZoneRelocationStatus"] !== undefined) {
-        contents.AvailabilityZoneRelocationStatus = (0, smithy_client_1.expectString)(output["AvailabilityZoneRelocationStatus"]);
+        contents.AvailabilityZoneRelocationStatus = smithy_client_1.expectString(output["AvailabilityZoneRelocationStatus"]);
     }
     if (output["ClusterNamespaceArn"] !== undefined) {
-        contents.ClusterNamespaceArn = (0, smithy_client_1.expectString)(output["ClusterNamespaceArn"]);
+        contents.ClusterNamespaceArn = smithy_client_1.expectString(output["ClusterNamespaceArn"]);
     }
     if (output["TotalStorageCapacityInMegaBytes"] !== undefined) {
-        contents.TotalStorageCapacityInMegaBytes = (0, smithy_client_1.strictParseLong)(output["TotalStorageCapacityInMegaBytes"]);
+        contents.TotalStorageCapacityInMegaBytes = smithy_client_1.strictParseLong(output["TotalStorageCapacityInMegaBytes"]);
     }
     if (output["AquaConfiguration"] !== undefined) {
         contents.AquaConfiguration = deserializeAws_queryAquaConfiguration(output["AquaConfiguration"], context);
@@ -13886,7 +13886,7 @@ const deserializeAws_queryClusterAlreadyExistsFault = (output, context) => {
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -13896,10 +13896,10 @@ const deserializeAws_queryClusterAssociatedToSchedule = (output, context) => {
         ScheduleAssociationState: undefined,
     };
     if (output["ClusterIdentifier"] !== undefined) {
-        contents.ClusterIdentifier = (0, smithy_client_1.expectString)(output["ClusterIdentifier"]);
+        contents.ClusterIdentifier = smithy_client_1.expectString(output["ClusterIdentifier"]);
     }
     if (output["ScheduleAssociationState"] !== undefined) {
-        contents.ScheduleAssociationState = (0, smithy_client_1.expectString)(output["ScheduleAssociationState"]);
+        contents.ScheduleAssociationState = smithy_client_1.expectString(output["ScheduleAssociationState"]);
     }
     return contents;
 };
@@ -13910,13 +13910,13 @@ const deserializeAws_queryClusterCredentials = (output, context) => {
         Expiration: undefined,
     };
     if (output["DbUser"] !== undefined) {
-        contents.DbUser = (0, smithy_client_1.expectString)(output["DbUser"]);
+        contents.DbUser = smithy_client_1.expectString(output["DbUser"]);
     }
     if (output["DbPassword"] !== undefined) {
-        contents.DbPassword = (0, smithy_client_1.expectString)(output["DbPassword"]);
+        contents.DbPassword = smithy_client_1.expectString(output["DbPassword"]);
     }
     if (output["Expiration"] !== undefined) {
-        contents.Expiration = new Date(output["Expiration"]);
+        contents.Expiration = smithy_client_1.expectNonNull(smithy_client_1.parseRfc3339DateTime(output["Expiration"]));
     }
     return contents;
 };
@@ -13928,19 +13928,19 @@ const deserializeAws_queryClusterDbRevision = (output, context) => {
         RevisionTargets: undefined,
     };
     if (output["ClusterIdentifier"] !== undefined) {
-        contents.ClusterIdentifier = (0, smithy_client_1.expectString)(output["ClusterIdentifier"]);
+        contents.ClusterIdentifier = smithy_client_1.expectString(output["ClusterIdentifier"]);
     }
     if (output["CurrentDatabaseRevision"] !== undefined) {
-        contents.CurrentDatabaseRevision = (0, smithy_client_1.expectString)(output["CurrentDatabaseRevision"]);
+        contents.CurrentDatabaseRevision = smithy_client_1.expectString(output["CurrentDatabaseRevision"]);
     }
     if (output["DatabaseRevisionReleaseDate"] !== undefined) {
-        contents.DatabaseRevisionReleaseDate = new Date(output["DatabaseRevisionReleaseDate"]);
+        contents.DatabaseRevisionReleaseDate = smithy_client_1.expectNonNull(smithy_client_1.parseRfc3339DateTime(output["DatabaseRevisionReleaseDate"]));
     }
     if (output.RevisionTargets === "") {
         contents.RevisionTargets = [];
     }
     if (output["RevisionTargets"] !== undefined && output["RevisionTargets"]["RevisionTarget"] !== undefined) {
-        contents.RevisionTargets = deserializeAws_queryRevisionTargetsList((0, smithy_client_1.getArrayIfSingleItem)(output["RevisionTargets"]["RevisionTarget"]), context);
+        contents.RevisionTargets = deserializeAws_queryRevisionTargetsList(smithy_client_1.getArrayIfSingleItem(output["RevisionTargets"]["RevisionTarget"]), context);
     }
     return contents;
 };
@@ -13960,13 +13960,13 @@ const deserializeAws_queryClusterDbRevisionsMessage = (output, context) => {
         ClusterDbRevisions: undefined,
     };
     if (output["Marker"] !== undefined) {
-        contents.Marker = (0, smithy_client_1.expectString)(output["Marker"]);
+        contents.Marker = smithy_client_1.expectString(output["Marker"]);
     }
     if (output.ClusterDbRevisions === "") {
         contents.ClusterDbRevisions = [];
     }
     if (output["ClusterDbRevisions"] !== undefined && output["ClusterDbRevisions"]["ClusterDbRevision"] !== undefined) {
-        contents.ClusterDbRevisions = deserializeAws_queryClusterDbRevisionsList((0, smithy_client_1.getArrayIfSingleItem)(output["ClusterDbRevisions"]["ClusterDbRevision"]), context);
+        contents.ClusterDbRevisions = deserializeAws_queryClusterDbRevisionsList(smithy_client_1.getArrayIfSingleItem(output["ClusterDbRevisions"]["ClusterDbRevision"]), context);
     }
     return contents;
 };
@@ -13976,10 +13976,10 @@ const deserializeAws_queryClusterIamRole = (output, context) => {
         ApplyStatus: undefined,
     };
     if (output["IamRoleArn"] !== undefined) {
-        contents.IamRoleArn = (0, smithy_client_1.expectString)(output["IamRoleArn"]);
+        contents.IamRoleArn = smithy_client_1.expectString(output["IamRoleArn"]);
     }
     if (output["ApplyStatus"] !== undefined) {
-        contents.ApplyStatus = (0, smithy_client_1.expectString)(output["ApplyStatus"]);
+        contents.ApplyStatus = smithy_client_1.expectString(output["ApplyStatus"]);
     }
     return contents;
 };
@@ -14010,13 +14010,13 @@ const deserializeAws_queryClusterNode = (output, context) => {
         PublicIPAddress: undefined,
     };
     if (output["NodeRole"] !== undefined) {
-        contents.NodeRole = (0, smithy_client_1.expectString)(output["NodeRole"]);
+        contents.NodeRole = smithy_client_1.expectString(output["NodeRole"]);
     }
     if (output["PrivateIPAddress"] !== undefined) {
-        contents.PrivateIPAddress = (0, smithy_client_1.expectString)(output["PrivateIPAddress"]);
+        contents.PrivateIPAddress = smithy_client_1.expectString(output["PrivateIPAddress"]);
     }
     if (output["PublicIPAddress"] !== undefined) {
-        contents.PublicIPAddress = (0, smithy_client_1.expectString)(output["PublicIPAddress"]);
+        contents.PublicIPAddress = smithy_client_1.expectString(output["PublicIPAddress"]);
     }
     return contents;
 };
@@ -14035,7 +14035,7 @@ const deserializeAws_queryClusterNotFoundFault = (output, context) => {
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -14044,7 +14044,7 @@ const deserializeAws_queryClusterOnLatestRevisionFault = (output, context) => {
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -14056,19 +14056,19 @@ const deserializeAws_queryClusterParameterGroup = (output, context) => {
         Tags: undefined,
     };
     if (output["ParameterGroupName"] !== undefined) {
-        contents.ParameterGroupName = (0, smithy_client_1.expectString)(output["ParameterGroupName"]);
+        contents.ParameterGroupName = smithy_client_1.expectString(output["ParameterGroupName"]);
     }
     if (output["ParameterGroupFamily"] !== undefined) {
-        contents.ParameterGroupFamily = (0, smithy_client_1.expectString)(output["ParameterGroupFamily"]);
+        contents.ParameterGroupFamily = smithy_client_1.expectString(output["ParameterGroupFamily"]);
     }
     if (output["Description"] !== undefined) {
-        contents.Description = (0, smithy_client_1.expectString)(output["Description"]);
+        contents.Description = smithy_client_1.expectString(output["Description"]);
     }
     if (output.Tags === "") {
         contents.Tags = [];
     }
     if (output["Tags"] !== undefined && output["Tags"]["Tag"] !== undefined) {
-        contents.Tags = deserializeAws_queryTagList((0, smithy_client_1.getArrayIfSingleItem)(output["Tags"]["Tag"]), context);
+        contents.Tags = deserializeAws_queryTagList(smithy_client_1.getArrayIfSingleItem(output["Tags"]["Tag"]), context);
     }
     return contents;
 };
@@ -14077,7 +14077,7 @@ const deserializeAws_queryClusterParameterGroupAlreadyExistsFault = (output, con
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -14090,10 +14090,10 @@ const deserializeAws_queryClusterParameterGroupDetails = (output, context) => {
         contents.Parameters = [];
     }
     if (output["Parameters"] !== undefined && output["Parameters"]["Parameter"] !== undefined) {
-        contents.Parameters = deserializeAws_queryParametersList((0, smithy_client_1.getArrayIfSingleItem)(output["Parameters"]["Parameter"]), context);
+        contents.Parameters = deserializeAws_queryParametersList(smithy_client_1.getArrayIfSingleItem(output["Parameters"]["Parameter"]), context);
     }
     if (output["Marker"] !== undefined) {
-        contents.Marker = (0, smithy_client_1.expectString)(output["Marker"]);
+        contents.Marker = smithy_client_1.expectString(output["Marker"]);
     }
     return contents;
 };
@@ -14103,10 +14103,10 @@ const deserializeAws_queryClusterParameterGroupNameMessage = (output, context) =
         ParameterGroupStatus: undefined,
     };
     if (output["ParameterGroupName"] !== undefined) {
-        contents.ParameterGroupName = (0, smithy_client_1.expectString)(output["ParameterGroupName"]);
+        contents.ParameterGroupName = smithy_client_1.expectString(output["ParameterGroupName"]);
     }
     if (output["ParameterGroupStatus"] !== undefined) {
-        contents.ParameterGroupStatus = (0, smithy_client_1.expectString)(output["ParameterGroupStatus"]);
+        contents.ParameterGroupStatus = smithy_client_1.expectString(output["ParameterGroupStatus"]);
     }
     return contents;
 };
@@ -14115,7 +14115,7 @@ const deserializeAws_queryClusterParameterGroupNotFoundFault = (output, context)
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -14124,7 +14124,7 @@ const deserializeAws_queryClusterParameterGroupQuotaExceededFault = (output, con
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -14134,13 +14134,13 @@ const deserializeAws_queryClusterParameterGroupsMessage = (output, context) => {
         ParameterGroups: undefined,
     };
     if (output["Marker"] !== undefined) {
-        contents.Marker = (0, smithy_client_1.expectString)(output["Marker"]);
+        contents.Marker = smithy_client_1.expectString(output["Marker"]);
     }
     if (output.ParameterGroups === "") {
         contents.ParameterGroups = [];
     }
     if (output["ParameterGroups"] !== undefined && output["ParameterGroups"]["ClusterParameterGroup"] !== undefined) {
-        contents.ParameterGroups = deserializeAws_queryParameterGroupList((0, smithy_client_1.getArrayIfSingleItem)(output["ParameterGroups"]["ClusterParameterGroup"]), context);
+        contents.ParameterGroups = deserializeAws_queryParameterGroupList(smithy_client_1.getArrayIfSingleItem(output["ParameterGroups"]["ClusterParameterGroup"]), context);
     }
     return contents;
 };
@@ -14151,17 +14151,17 @@ const deserializeAws_queryClusterParameterGroupStatus = (output, context) => {
         ClusterParameterStatusList: undefined,
     };
     if (output["ParameterGroupName"] !== undefined) {
-        contents.ParameterGroupName = (0, smithy_client_1.expectString)(output["ParameterGroupName"]);
+        contents.ParameterGroupName = smithy_client_1.expectString(output["ParameterGroupName"]);
     }
     if (output["ParameterApplyStatus"] !== undefined) {
-        contents.ParameterApplyStatus = (0, smithy_client_1.expectString)(output["ParameterApplyStatus"]);
+        contents.ParameterApplyStatus = smithy_client_1.expectString(output["ParameterApplyStatus"]);
     }
     if (output.ClusterParameterStatusList === "") {
         contents.ClusterParameterStatusList = [];
     }
     if (output["ClusterParameterStatusList"] !== undefined &&
         output["ClusterParameterStatusList"]["member"] !== undefined) {
-        contents.ClusterParameterStatusList = deserializeAws_queryClusterParameterStatusList((0, smithy_client_1.getArrayIfSingleItem)(output["ClusterParameterStatusList"]["member"]), context);
+        contents.ClusterParameterStatusList = deserializeAws_queryClusterParameterStatusList(smithy_client_1.getArrayIfSingleItem(output["ClusterParameterStatusList"]["member"]), context);
     }
     return contents;
 };
@@ -14182,13 +14182,13 @@ const deserializeAws_queryClusterParameterStatus = (output, context) => {
         ParameterApplyErrorDescription: undefined,
     };
     if (output["ParameterName"] !== undefined) {
-        contents.ParameterName = (0, smithy_client_1.expectString)(output["ParameterName"]);
+        contents.ParameterName = smithy_client_1.expectString(output["ParameterName"]);
     }
     if (output["ParameterApplyStatus"] !== undefined) {
-        contents.ParameterApplyStatus = (0, smithy_client_1.expectString)(output["ParameterApplyStatus"]);
+        contents.ParameterApplyStatus = smithy_client_1.expectString(output["ParameterApplyStatus"]);
     }
     if (output["ParameterApplyErrorDescription"] !== undefined) {
-        contents.ParameterApplyErrorDescription = (0, smithy_client_1.expectString)(output["ParameterApplyErrorDescription"]);
+        contents.ParameterApplyErrorDescription = smithy_client_1.expectString(output["ParameterApplyErrorDescription"]);
     }
     return contents;
 };
@@ -14207,7 +14207,7 @@ const deserializeAws_queryClusterQuotaExceededFault = (output, context) => {
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -14220,28 +14220,28 @@ const deserializeAws_queryClusterSecurityGroup = (output, context) => {
         Tags: undefined,
     };
     if (output["ClusterSecurityGroupName"] !== undefined) {
-        contents.ClusterSecurityGroupName = (0, smithy_client_1.expectString)(output["ClusterSecurityGroupName"]);
+        contents.ClusterSecurityGroupName = smithy_client_1.expectString(output["ClusterSecurityGroupName"]);
     }
     if (output["Description"] !== undefined) {
-        contents.Description = (0, smithy_client_1.expectString)(output["Description"]);
+        contents.Description = smithy_client_1.expectString(output["Description"]);
     }
     if (output.EC2SecurityGroups === "") {
         contents.EC2SecurityGroups = [];
     }
     if (output["EC2SecurityGroups"] !== undefined && output["EC2SecurityGroups"]["EC2SecurityGroup"] !== undefined) {
-        contents.EC2SecurityGroups = deserializeAws_queryEC2SecurityGroupList((0, smithy_client_1.getArrayIfSingleItem)(output["EC2SecurityGroups"]["EC2SecurityGroup"]), context);
+        contents.EC2SecurityGroups = deserializeAws_queryEC2SecurityGroupList(smithy_client_1.getArrayIfSingleItem(output["EC2SecurityGroups"]["EC2SecurityGroup"]), context);
     }
     if (output.IPRanges === "") {
         contents.IPRanges = [];
     }
     if (output["IPRanges"] !== undefined && output["IPRanges"]["IPRange"] !== undefined) {
-        contents.IPRanges = deserializeAws_queryIPRangeList((0, smithy_client_1.getArrayIfSingleItem)(output["IPRanges"]["IPRange"]), context);
+        contents.IPRanges = deserializeAws_queryIPRangeList(smithy_client_1.getArrayIfSingleItem(output["IPRanges"]["IPRange"]), context);
     }
     if (output.Tags === "") {
         contents.Tags = [];
     }
     if (output["Tags"] !== undefined && output["Tags"]["Tag"] !== undefined) {
-        contents.Tags = deserializeAws_queryTagList((0, smithy_client_1.getArrayIfSingleItem)(output["Tags"]["Tag"]), context);
+        contents.Tags = deserializeAws_queryTagList(smithy_client_1.getArrayIfSingleItem(output["Tags"]["Tag"]), context);
     }
     return contents;
 };
@@ -14250,7 +14250,7 @@ const deserializeAws_queryClusterSecurityGroupAlreadyExistsFault = (output, cont
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -14260,10 +14260,10 @@ const deserializeAws_queryClusterSecurityGroupMembership = (output, context) =>
         Status: undefined,
     };
     if (output["ClusterSecurityGroupName"] !== undefined) {
-        contents.ClusterSecurityGroupName = (0, smithy_client_1.expectString)(output["ClusterSecurityGroupName"]);
+        contents.ClusterSecurityGroupName = smithy_client_1.expectString(output["ClusterSecurityGroupName"]);
     }
     if (output["Status"] !== undefined) {
-        contents.Status = (0, smithy_client_1.expectString)(output["Status"]);
+        contents.Status = smithy_client_1.expectString(output["Status"]);
     }
     return contents;
 };
@@ -14283,14 +14283,14 @@ const deserializeAws_queryClusterSecurityGroupMessage = (output, context) => {
         ClusterSecurityGroups: undefined,
     };
     if (output["Marker"] !== undefined) {
-        contents.Marker = (0, smithy_client_1.expectString)(output["Marker"]);
+        contents.Marker = smithy_client_1.expectString(output["Marker"]);
     }
     if (output.ClusterSecurityGroups === "") {
         contents.ClusterSecurityGroups = [];
     }
     if (output["ClusterSecurityGroups"] !== undefined &&
         output["ClusterSecurityGroups"]["ClusterSecurityGroup"] !== undefined) {
-        contents.ClusterSecurityGroups = deserializeAws_queryClusterSecurityGroups((0, smithy_client_1.getArrayIfSingleItem)(output["ClusterSecurityGroups"]["ClusterSecurityGroup"]), context);
+        contents.ClusterSecurityGroups = deserializeAws_queryClusterSecurityGroups(smithy_client_1.getArrayIfSingleItem(output["ClusterSecurityGroups"]["ClusterSecurityGroup"]), context);
     }
     return contents;
 };
@@ -14299,7 +14299,7 @@ const deserializeAws_queryClusterSecurityGroupNotFoundFault = (output, context)
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -14308,7 +14308,7 @@ const deserializeAws_queryClusterSecurityGroupQuotaExceededFault = (output, cont
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -14328,13 +14328,13 @@ const deserializeAws_queryClustersMessage = (output, context) => {
         Clusters: undefined,
     };
     if (output["Marker"] !== undefined) {
-        contents.Marker = (0, smithy_client_1.expectString)(output["Marker"]);
+        contents.Marker = smithy_client_1.expectString(output["Marker"]);
     }
     if (output.Clusters === "") {
         contents.Clusters = [];
     }
     if (output["Clusters"] !== undefined && output["Clusters"]["Cluster"] !== undefined) {
-        contents.Clusters = deserializeAws_queryClusterList((0, smithy_client_1.getArrayIfSingleItem)(output["Clusters"]["Cluster"]), context);
+        contents.Clusters = deserializeAws_queryClusterList(smithy_client_1.getArrayIfSingleItem(output["Clusters"]["Cluster"]), context);
     }
     return contents;
 };
@@ -14343,7 +14343,7 @@ const deserializeAws_queryClusterSnapshotAlreadyExistsFault = (output, context)
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -14355,16 +14355,16 @@ const deserializeAws_queryClusterSnapshotCopyStatus = (output, context) => {
         SnapshotCopyGrantName: undefined,
     };
     if (output["DestinationRegion"] !== undefined) {
-        contents.DestinationRegion = (0, smithy_client_1.expectString)(output["DestinationRegion"]);
+        contents.DestinationRegion = smithy_client_1.expectString(output["DestinationRegion"]);
     }
     if (output["RetentionPeriod"] !== undefined) {
-        contents.RetentionPeriod = (0, smithy_client_1.strictParseLong)(output["RetentionPeriod"]);
+        contents.RetentionPeriod = smithy_client_1.strictParseLong(output["RetentionPeriod"]);
     }
     if (output["ManualSnapshotRetentionPeriod"] !== undefined) {
-        contents.ManualSnapshotRetentionPeriod = (0, smithy_client_1.strictParseInt32)(output["ManualSnapshotRetentionPeriod"]);
+        contents.ManualSnapshotRetentionPeriod = smithy_client_1.strictParseInt32(output["ManualSnapshotRetentionPeriod"]);
     }
     if (output["SnapshotCopyGrantName"] !== undefined) {
-        contents.SnapshotCopyGrantName = (0, smithy_client_1.expectString)(output["SnapshotCopyGrantName"]);
+        contents.SnapshotCopyGrantName = smithy_client_1.expectString(output["SnapshotCopyGrantName"]);
     }
     return contents;
 };
@@ -14373,7 +14373,7 @@ const deserializeAws_queryClusterSnapshotNotFoundFault = (output, context) => {
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -14382,7 +14382,7 @@ const deserializeAws_queryClusterSnapshotQuotaExceededFault = (output, context)
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -14396,28 +14396,28 @@ const deserializeAws_queryClusterSubnetGroup = (output, context) => {
         Tags: undefined,
     };
     if (output["ClusterSubnetGroupName"] !== undefined) {
-        contents.ClusterSubnetGroupName = (0, smithy_client_1.expectString)(output["ClusterSubnetGroupName"]);
+        contents.ClusterSubnetGroupName = smithy_client_1.expectString(output["ClusterSubnetGroupName"]);
     }
     if (output["Description"] !== undefined) {
-        contents.Description = (0, smithy_client_1.expectString)(output["Description"]);
+        contents.Description = smithy_client_1.expectString(output["Description"]);
     }
     if (output["VpcId"] !== undefined) {
-        contents.VpcId = (0, smithy_client_1.expectString)(output["VpcId"]);
+        contents.VpcId = smithy_client_1.expectString(output["VpcId"]);
     }
     if (output["SubnetGroupStatus"] !== undefined) {
-        contents.SubnetGroupStatus = (0, smithy_client_1.expectString)(output["SubnetGroupStatus"]);
+        contents.SubnetGroupStatus = smithy_client_1.expectString(output["SubnetGroupStatus"]);
     }
     if (output.Subnets === "") {
         contents.Subnets = [];
     }
     if (output["Subnets"] !== undefined && output["Subnets"]["Subnet"] !== undefined) {
-        contents.Subnets = deserializeAws_querySubnetList((0, smithy_client_1.getArrayIfSingleItem)(output["Subnets"]["Subnet"]), context);
+        contents.Subnets = deserializeAws_querySubnetList(smithy_client_1.getArrayIfSingleItem(output["Subnets"]["Subnet"]), context);
     }
     if (output.Tags === "") {
         contents.Tags = [];
     }
     if (output["Tags"] !== undefined && output["Tags"]["Tag"] !== undefined) {
-        contents.Tags = deserializeAws_queryTagList((0, smithy_client_1.getArrayIfSingleItem)(output["Tags"]["Tag"]), context);
+        contents.Tags = deserializeAws_queryTagList(smithy_client_1.getArrayIfSingleItem(output["Tags"]["Tag"]), context);
     }
     return contents;
 };
@@ -14426,7 +14426,7 @@ const deserializeAws_queryClusterSubnetGroupAlreadyExistsFault = (output, contex
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -14436,14 +14436,14 @@ const deserializeAws_queryClusterSubnetGroupMessage = (output, context) => {
         ClusterSubnetGroups: undefined,
     };
     if (output["Marker"] !== undefined) {
-        contents.Marker = (0, smithy_client_1.expectString)(output["Marker"]);
+        contents.Marker = smithy_client_1.expectString(output["Marker"]);
     }
     if (output.ClusterSubnetGroups === "") {
         contents.ClusterSubnetGroups = [];
     }
     if (output["ClusterSubnetGroups"] !== undefined &&
         output["ClusterSubnetGroups"]["ClusterSubnetGroup"] !== undefined) {
-        contents.ClusterSubnetGroups = deserializeAws_queryClusterSubnetGroups((0, smithy_client_1.getArrayIfSingleItem)(output["ClusterSubnetGroups"]["ClusterSubnetGroup"]), context);
+        contents.ClusterSubnetGroups = deserializeAws_queryClusterSubnetGroups(smithy_client_1.getArrayIfSingleItem(output["ClusterSubnetGroups"]["ClusterSubnetGroup"]), context);
     }
     return contents;
 };
@@ -14452,7 +14452,7 @@ const deserializeAws_queryClusterSubnetGroupNotFoundFault = (output, context) =>
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -14461,7 +14461,7 @@ const deserializeAws_queryClusterSubnetGroupQuotaExceededFault = (output, contex
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -14480,7 +14480,7 @@ const deserializeAws_queryClusterSubnetQuotaExceededFault = (output, context) =>
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -14491,13 +14491,13 @@ const deserializeAws_queryClusterVersion = (output, context) => {
         Description: undefined,
     };
     if (output["ClusterVersion"] !== undefined) {
-        contents.ClusterVersion = (0, smithy_client_1.expectString)(output["ClusterVersion"]);
+        contents.ClusterVersion = smithy_client_1.expectString(output["ClusterVersion"]);
     }
     if (output["ClusterParameterGroupFamily"] !== undefined) {
-        contents.ClusterParameterGroupFamily = (0, smithy_client_1.expectString)(output["ClusterParameterGroupFamily"]);
+        contents.ClusterParameterGroupFamily = smithy_client_1.expectString(output["ClusterParameterGroupFamily"]);
     }
     if (output["Description"] !== undefined) {
-        contents.Description = (0, smithy_client_1.expectString)(output["Description"]);
+        contents.Description = smithy_client_1.expectString(output["Description"]);
     }
     return contents;
 };
@@ -14517,13 +14517,13 @@ const deserializeAws_queryClusterVersionsMessage = (output, context) => {
         ClusterVersions: undefined,
     };
     if (output["Marker"] !== undefined) {
-        contents.Marker = (0, smithy_client_1.expectString)(output["Marker"]);
+        contents.Marker = smithy_client_1.expectString(output["Marker"]);
     }
     if (output.ClusterVersions === "") {
         contents.ClusterVersions = [];
     }
     if (output["ClusterVersions"] !== undefined && output["ClusterVersions"]["ClusterVersion"] !== undefined) {
-        contents.ClusterVersions = deserializeAws_queryClusterVersionList((0, smithy_client_1.getArrayIfSingleItem)(output["ClusterVersions"]["ClusterVersion"]), context);
+        contents.ClusterVersions = deserializeAws_queryClusterVersionList(smithy_client_1.getArrayIfSingleItem(output["ClusterVersions"]["ClusterVersion"]), context);
     }
     return contents;
 };
@@ -14541,7 +14541,7 @@ const deserializeAws_queryCopyToRegionDisabledFault = (output, context) => {
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -14551,10 +14551,10 @@ const deserializeAws_queryCreateAuthenticationProfileResult = (output, context)
         AuthenticationProfileContent: undefined,
     };
     if (output["AuthenticationProfileName"] !== undefined) {
-        contents.AuthenticationProfileName = (0, smithy_client_1.expectString)(output["AuthenticationProfileName"]);
+        contents.AuthenticationProfileName = smithy_client_1.expectString(output["AuthenticationProfileName"]);
     }
     if (output["AuthenticationProfileContent"] !== undefined) {
-        contents.AuthenticationProfileContent = (0, smithy_client_1.expectString)(output["AuthenticationProfileContent"]);
+        contents.AuthenticationProfileContent = smithy_client_1.expectString(output["AuthenticationProfileContent"]);
     }
     return contents;
 };
@@ -14645,10 +14645,10 @@ const deserializeAws_queryCustomerStorageMessage = (output, context) => {
         TotalProvisionedStorageInMegaBytes: undefined,
     };
     if (output["TotalBackupSizeInMegaBytes"] !== undefined) {
-        contents.TotalBackupSizeInMegaBytes = (0, smithy_client_1.strictParseFloat)(output["TotalBackupSizeInMegaBytes"]);
+        contents.TotalBackupSizeInMegaBytes = smithy_client_1.strictParseFloat(output["TotalBackupSizeInMegaBytes"]);
     }
     if (output["TotalProvisionedStorageInMegaBytes"] !== undefined) {
-        contents.TotalProvisionedStorageInMegaBytes = (0, smithy_client_1.strictParseFloat)(output["TotalProvisionedStorageInMegaBytes"]);
+        contents.TotalProvisionedStorageInMegaBytes = smithy_client_1.strictParseFloat(output["TotalProvisionedStorageInMegaBytes"]);
     }
     return contents;
 };
@@ -14660,19 +14660,19 @@ const deserializeAws_queryDataShare = (output, context) => {
         DataShareAssociations: undefined,
     };
     if (output["DataShareArn"] !== undefined) {
-        contents.DataShareArn = (0, smithy_client_1.expectString)(output["DataShareArn"]);
+        contents.DataShareArn = smithy_client_1.expectString(output["DataShareArn"]);
     }
     if (output["ProducerArn"] !== undefined) {
-        contents.ProducerArn = (0, smithy_client_1.expectString)(output["ProducerArn"]);
+        contents.ProducerArn = smithy_client_1.expectString(output["ProducerArn"]);
     }
     if (output["AllowPubliclyAccessibleConsumers"] !== undefined) {
-        contents.AllowPubliclyAccessibleConsumers = (0, smithy_client_1.parseBoolean)(output["AllowPubliclyAccessibleConsumers"]);
+        contents.AllowPubliclyAccessibleConsumers = smithy_client_1.parseBoolean(output["AllowPubliclyAccessibleConsumers"]);
     }
     if (output.DataShareAssociations === "") {
         contents.DataShareAssociations = [];
     }
     if (output["DataShareAssociations"] !== undefined && output["DataShareAssociations"]["member"] !== undefined) {
-        contents.DataShareAssociations = deserializeAws_queryDataShareAssociationList((0, smithy_client_1.getArrayIfSingleItem)(output["DataShareAssociations"]["member"]), context);
+        contents.DataShareAssociations = deserializeAws_queryDataShareAssociationList(smithy_client_1.getArrayIfSingleItem(output["DataShareAssociations"]["member"]), context);
     }
     return contents;
 };
@@ -14684,16 +14684,16 @@ const deserializeAws_queryDataShareAssociation = (output, context) => {
         StatusChangeDate: undefined,
     };
     if (output["ConsumerIdentifier"] !== undefined) {
-        contents.ConsumerIdentifier = (0, smithy_client_1.expectString)(output["ConsumerIdentifier"]);
+        contents.ConsumerIdentifier = smithy_client_1.expectString(output["ConsumerIdentifier"]);
     }
     if (output["Status"] !== undefined) {
-        contents.Status = (0, smithy_client_1.expectString)(output["Status"]);
+        contents.Status = smithy_client_1.expectString(output["Status"]);
     }
     if (output["CreatedDate"] !== undefined) {
-        contents.CreatedDate = new Date(output["CreatedDate"]);
+        contents.CreatedDate = smithy_client_1.expectNonNull(smithy_client_1.parseRfc3339DateTime(output["CreatedDate"]));
     }
     if (output["StatusChangeDate"] !== undefined) {
-        contents.StatusChangeDate = new Date(output["StatusChangeDate"]);
+        contents.StatusChangeDate = smithy_client_1.expectNonNull(smithy_client_1.parseRfc3339DateTime(output["StatusChangeDate"]));
     }
     return contents;
 };
@@ -14727,22 +14727,22 @@ const deserializeAws_queryDataTransferProgress = (output, context) => {
         ElapsedTimeInSeconds: undefined,
     };
     if (output["Status"] !== undefined) {
-        contents.Status = (0, smithy_client_1.expectString)(output["Status"]);
+        contents.Status = smithy_client_1.expectString(output["Status"]);
     }
     if (output["CurrentRateInMegaBytesPerSecond"] !== undefined) {
-        contents.CurrentRateInMegaBytesPerSecond = (0, smithy_client_1.strictParseFloat)(output["CurrentRateInMegaBytesPerSecond"]);
+        contents.CurrentRateInMegaBytesPerSecond = smithy_client_1.strictParseFloat(output["CurrentRateInMegaBytesPerSecond"]);
     }
     if (output["TotalDataInMegaBytes"] !== undefined) {
-        contents.TotalDataInMegaBytes = (0, smithy_client_1.strictParseLong)(output["TotalDataInMegaBytes"]);
+        contents.TotalDataInMegaBytes = smithy_client_1.strictParseLong(output["TotalDataInMegaBytes"]);
     }
     if (output["DataTransferredInMegaBytes"] !== undefined) {
-        contents.DataTransferredInMegaBytes = (0, smithy_client_1.strictParseLong)(output["DataTransferredInMegaBytes"]);
+        contents.DataTransferredInMegaBytes = smithy_client_1.strictParseLong(output["DataTransferredInMegaBytes"]);
     }
     if (output["EstimatedTimeToCompletionInSeconds"] !== undefined) {
-        contents.EstimatedTimeToCompletionInSeconds = (0, smithy_client_1.strictParseLong)(output["EstimatedTimeToCompletionInSeconds"]);
+        contents.EstimatedTimeToCompletionInSeconds = smithy_client_1.strictParseLong(output["EstimatedTimeToCompletionInSeconds"]);
     }
     if (output["ElapsedTimeInSeconds"] !== undefined) {
-        contents.ElapsedTimeInSeconds = (0, smithy_client_1.strictParseLong)(output["ElapsedTimeInSeconds"]);
+        contents.ElapsedTimeInSeconds = smithy_client_1.strictParseLong(output["ElapsedTimeInSeconds"]);
     }
     return contents;
 };
@@ -14753,16 +14753,16 @@ const deserializeAws_queryDefaultClusterParameters = (output, context) => {
         Parameters: undefined,
     };
     if (output["ParameterGroupFamily"] !== undefined) {
-        contents.ParameterGroupFamily = (0, smithy_client_1.expectString)(output["ParameterGroupFamily"]);
+        contents.ParameterGroupFamily = smithy_client_1.expectString(output["ParameterGroupFamily"]);
     }
     if (output["Marker"] !== undefined) {
-        contents.Marker = (0, smithy_client_1.expectString)(output["Marker"]);
+        contents.Marker = smithy_client_1.expectString(output["Marker"]);
     }
     if (output.Parameters === "") {
         contents.Parameters = [];
     }
     if (output["Parameters"] !== undefined && output["Parameters"]["Parameter"] !== undefined) {
-        contents.Parameters = deserializeAws_queryParametersList((0, smithy_client_1.getArrayIfSingleItem)(output["Parameters"]["Parameter"]), context);
+        contents.Parameters = deserializeAws_queryParametersList(smithy_client_1.getArrayIfSingleItem(output["Parameters"]["Parameter"]), context);
     }
     return contents;
 };
@@ -14773,13 +14773,13 @@ const deserializeAws_queryDeferredMaintenanceWindow = (output, context) => {
         DeferMaintenanceEndTime: undefined,
     };
     if (output["DeferMaintenanceIdentifier"] !== undefined) {
-        contents.DeferMaintenanceIdentifier = (0, smithy_client_1.expectString)(output["DeferMaintenanceIdentifier"]);
+        contents.DeferMaintenanceIdentifier = smithy_client_1.expectString(output["DeferMaintenanceIdentifier"]);
     }
     if (output["DeferMaintenanceStartTime"] !== undefined) {
-        contents.DeferMaintenanceStartTime = new Date(output["DeferMaintenanceStartTime"]);
+        contents.DeferMaintenanceStartTime = smithy_client_1.expectNonNull(smithy_client_1.parseRfc3339DateTime(output["DeferMaintenanceStartTime"]));
     }
     if (output["DeferMaintenanceEndTime"] !== undefined) {
-        contents.DeferMaintenanceEndTime = new Date(output["DeferMaintenanceEndTime"]);
+        contents.DeferMaintenanceEndTime = smithy_client_1.expectNonNull(smithy_client_1.parseRfc3339DateTime(output["DeferMaintenanceEndTime"]));
     }
     return contents;
 };
@@ -14798,7 +14798,7 @@ const deserializeAws_queryDeleteAuthenticationProfileResult = (output, context)
         AuthenticationProfileName: undefined,
     };
     if (output["AuthenticationProfileName"] !== undefined) {
-        contents.AuthenticationProfileName = (0, smithy_client_1.expectString)(output["AuthenticationProfileName"]);
+        contents.AuthenticationProfileName = smithy_client_1.expectString(output["AuthenticationProfileName"]);
     }
     return contents;
 };
@@ -14825,7 +14825,7 @@ const deserializeAws_queryDependentServiceRequestThrottlingFault = (output, cont
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -14834,7 +14834,7 @@ const deserializeAws_queryDependentServiceUnavailableFault = (output, context) =
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -14846,7 +14846,7 @@ const deserializeAws_queryDescribeAuthenticationProfilesResult = (output, contex
         contents.AuthenticationProfiles = [];
     }
     if (output["AuthenticationProfiles"] !== undefined && output["AuthenticationProfiles"]["member"] !== undefined) {
-        contents.AuthenticationProfiles = deserializeAws_queryAuthenticationProfileList((0, smithy_client_1.getArrayIfSingleItem)(output["AuthenticationProfiles"]["member"]), context);
+        contents.AuthenticationProfiles = deserializeAws_queryAuthenticationProfileList(smithy_client_1.getArrayIfSingleItem(output["AuthenticationProfiles"]["member"]), context);
     }
     return contents;
 };
@@ -14859,10 +14859,10 @@ const deserializeAws_queryDescribeDataSharesForConsumerResult = (output, context
         contents.DataShares = [];
     }
     if (output["DataShares"] !== undefined && output["DataShares"]["member"] !== undefined) {
-        contents.DataShares = deserializeAws_queryDataShareList((0, smithy_client_1.getArrayIfSingleItem)(output["DataShares"]["member"]), context);
+        contents.DataShares = deserializeAws_queryDataShareList(smithy_client_1.getArrayIfSingleItem(output["DataShares"]["member"]), context);
     }
     if (output["Marker"] !== undefined) {
-        contents.Marker = (0, smithy_client_1.expectString)(output["Marker"]);
+        contents.Marker = smithy_client_1.expectString(output["Marker"]);
     }
     return contents;
 };
@@ -14875,10 +14875,10 @@ const deserializeAws_queryDescribeDataSharesForProducerResult = (output, context
         contents.DataShares = [];
     }
     if (output["DataShares"] !== undefined && output["DataShares"]["member"] !== undefined) {
-        contents.DataShares = deserializeAws_queryDataShareList((0, smithy_client_1.getArrayIfSingleItem)(output["DataShares"]["member"]), context);
+        contents.DataShares = deserializeAws_queryDataShareList(smithy_client_1.getArrayIfSingleItem(output["DataShares"]["member"]), context);
     }
     if (output["Marker"] !== undefined) {
-        contents.Marker = (0, smithy_client_1.expectString)(output["Marker"]);
+        contents.Marker = smithy_client_1.expectString(output["Marker"]);
     }
     return contents;
 };
@@ -14891,10 +14891,10 @@ const deserializeAws_queryDescribeDataSharesResult = (output, context) => {
         contents.DataShares = [];
     }
     if (output["DataShares"] !== undefined && output["DataShares"]["member"] !== undefined) {
-        contents.DataShares = deserializeAws_queryDataShareList((0, smithy_client_1.getArrayIfSingleItem)(output["DataShares"]["member"]), context);
+        contents.DataShares = deserializeAws_queryDataShareList(smithy_client_1.getArrayIfSingleItem(output["DataShares"]["member"]), context);
     }
     if (output["Marker"] !== undefined) {
-        contents.Marker = (0, smithy_client_1.expectString)(output["Marker"]);
+        contents.Marker = smithy_client_1.expectString(output["Marker"]);
     }
     return contents;
 };
@@ -14916,7 +14916,7 @@ const deserializeAws_queryDescribePartnersOutputMessage = (output, context) => {
     }
     if (output["PartnerIntegrationInfoList"] !== undefined &&
         output["PartnerIntegrationInfoList"]["PartnerIntegrationInfo"] !== undefined) {
-        contents.PartnerIntegrationInfoList = deserializeAws_queryPartnerIntegrationInfoList((0, smithy_client_1.getArrayIfSingleItem)(output["PartnerIntegrationInfoList"]["PartnerIntegrationInfo"]), context);
+        contents.PartnerIntegrationInfoList = deserializeAws_queryPartnerIntegrationInfoList(smithy_client_1.getArrayIfSingleItem(output["PartnerIntegrationInfoList"]["PartnerIntegrationInfo"]), context);
     }
     return contents;
 };
@@ -14929,10 +14929,10 @@ const deserializeAws_queryDescribeSnapshotSchedulesOutputMessage = (output, cont
         contents.SnapshotSchedules = [];
     }
     if (output["SnapshotSchedules"] !== undefined && output["SnapshotSchedules"]["SnapshotSchedule"] !== undefined) {
-        contents.SnapshotSchedules = deserializeAws_querySnapshotScheduleList((0, smithy_client_1.getArrayIfSingleItem)(output["SnapshotSchedules"]["SnapshotSchedule"]), context);
+        contents.SnapshotSchedules = deserializeAws_querySnapshotScheduleList(smithy_client_1.getArrayIfSingleItem(output["SnapshotSchedules"]["SnapshotSchedule"]), context);
     }
     if (output["Marker"] !== undefined) {
-        contents.Marker = (0, smithy_client_1.expectString)(output["Marker"]);
+        contents.Marker = smithy_client_1.expectString(output["Marker"]);
     }
     return contents;
 };
@@ -14953,19 +14953,19 @@ const deserializeAws_queryEC2SecurityGroup = (output, context) => {
         Tags: undefined,
     };
     if (output["Status"] !== undefined) {
-        contents.Status = (0, smithy_client_1.expectString)(output["Status"]);
+        contents.Status = smithy_client_1.expectString(output["Status"]);
     }
     if (output["EC2SecurityGroupName"] !== undefined) {
-        contents.EC2SecurityGroupName = (0, smithy_client_1.expectString)(output["EC2SecurityGroupName"]);
+        contents.EC2SecurityGroupName = smithy_client_1.expectString(output["EC2SecurityGroupName"]);
     }
     if (output["EC2SecurityGroupOwnerId"] !== undefined) {
-        contents.EC2SecurityGroupOwnerId = (0, smithy_client_1.expectString)(output["EC2SecurityGroupOwnerId"]);
+        contents.EC2SecurityGroupOwnerId = smithy_client_1.expectString(output["EC2SecurityGroupOwnerId"]);
     }
     if (output.Tags === "") {
         contents.Tags = [];
     }
     if (output["Tags"] !== undefined && output["Tags"]["Tag"] !== undefined) {
-        contents.Tags = deserializeAws_queryTagList((0, smithy_client_1.getArrayIfSingleItem)(output["Tags"]["Tag"]), context);
+        contents.Tags = deserializeAws_queryTagList(smithy_client_1.getArrayIfSingleItem(output["Tags"]["Tag"]), context);
     }
     return contents;
 };
@@ -14985,10 +14985,10 @@ const deserializeAws_queryElasticIpStatus = (output, context) => {
         Status: undefined,
     };
     if (output["ElasticIp"] !== undefined) {
-        contents.ElasticIp = (0, smithy_client_1.expectString)(output["ElasticIp"]);
+        contents.ElasticIp = smithy_client_1.expectString(output["ElasticIp"]);
     }
     if (output["Status"] !== undefined) {
-        contents.Status = (0, smithy_client_1.expectString)(output["Status"]);
+        contents.Status = smithy_client_1.expectString(output["Status"]);
     }
     return contents;
 };
@@ -15018,16 +15018,16 @@ const deserializeAws_queryEndpoint = (output, context) => {
         VpcEndpoints: undefined,
     };
     if (output["Address"] !== undefined) {
-        contents.Address = (0, smithy_client_1.expectString)(output["Address"]);
+        contents.Address = smithy_client_1.expectString(output["Address"]);
     }
     if (output["Port"] !== undefined) {
-        contents.Port = (0, smithy_client_1.strictParseInt32)(output["Port"]);
+        contents.Port = smithy_client_1.strictParseInt32(output["Port"]);
     }
     if (output.VpcEndpoints === "") {
         contents.VpcEndpoints = [];
     }
     if (output["VpcEndpoints"] !== undefined && output["VpcEndpoints"]["VpcEndpoint"] !== undefined) {
-        contents.VpcEndpoints = deserializeAws_queryVpcEndpointsList((0, smithy_client_1.getArrayIfSingleItem)(output["VpcEndpoints"]["VpcEndpoint"]), context);
+        contents.VpcEndpoints = deserializeAws_queryVpcEndpointsList(smithy_client_1.getArrayIfSingleItem(output["VpcEndpoints"]["VpcEndpoint"]), context);
     }
     return contents;
 };
@@ -15045,34 +15045,34 @@ const deserializeAws_queryEndpointAccess = (output, context) => {
         VpcEndpoint: undefined,
     };
     if (output["ClusterIdentifier"] !== undefined) {
-        contents.ClusterIdentifier = (0, smithy_client_1.expectString)(output["ClusterIdentifier"]);
+        contents.ClusterIdentifier = smithy_client_1.expectString(output["ClusterIdentifier"]);
     }
     if (output["ResourceOwner"] !== undefined) {
-        contents.ResourceOwner = (0, smithy_client_1.expectString)(output["ResourceOwner"]);
+        contents.ResourceOwner = smithy_client_1.expectString(output["ResourceOwner"]);
     }
     if (output["SubnetGroupName"] !== undefined) {
-        contents.SubnetGroupName = (0, smithy_client_1.expectString)(output["SubnetGroupName"]);
+        contents.SubnetGroupName = smithy_client_1.expectString(output["SubnetGroupName"]);
     }
     if (output["EndpointStatus"] !== undefined) {
-        contents.EndpointStatus = (0, smithy_client_1.expectString)(output["EndpointStatus"]);
+        contents.EndpointStatus = smithy_client_1.expectString(output["EndpointStatus"]);
     }
     if (output["EndpointName"] !== undefined) {
-        contents.EndpointName = (0, smithy_client_1.expectString)(output["EndpointName"]);
+        contents.EndpointName = smithy_client_1.expectString(output["EndpointName"]);
     }
     if (output["EndpointCreateTime"] !== undefined) {
-        contents.EndpointCreateTime = new Date(output["EndpointCreateTime"]);
+        contents.EndpointCreateTime = smithy_client_1.expectNonNull(smithy_client_1.parseRfc3339DateTime(output["EndpointCreateTime"]));
     }
     if (output["Port"] !== undefined) {
-        contents.Port = (0, smithy_client_1.strictParseInt32)(output["Port"]);
+        contents.Port = smithy_client_1.strictParseInt32(output["Port"]);
     }
     if (output["Address"] !== undefined) {
-        contents.Address = (0, smithy_client_1.expectString)(output["Address"]);
+        contents.Address = smithy_client_1.expectString(output["Address"]);
     }
     if (output.VpcSecurityGroups === "") {
         contents.VpcSecurityGroups = [];
     }
     if (output["VpcSecurityGroups"] !== undefined && output["VpcSecurityGroups"]["VpcSecurityGroup"] !== undefined) {
-        contents.VpcSecurityGroups = deserializeAws_queryVpcSecurityGroupMembershipList((0, smithy_client_1.getArrayIfSingleItem)(output["VpcSecurityGroups"]["VpcSecurityGroup"]), context);
+        contents.VpcSecurityGroups = deserializeAws_queryVpcSecurityGroupMembershipList(smithy_client_1.getArrayIfSingleItem(output["VpcSecurityGroups"]["VpcSecurityGroup"]), context);
     }
     if (output["VpcEndpoint"] !== undefined) {
         contents.VpcEndpoint = deserializeAws_queryVpcEndpoint(output["VpcEndpoint"], context);
@@ -15098,10 +15098,10 @@ const deserializeAws_queryEndpointAccessList = (output, context) => {
         contents.EndpointAccessList = [];
     }
     if (output["EndpointAccessList"] !== undefined && output["EndpointAccessList"]["member"] !== undefined) {
-        contents.EndpointAccessList = deserializeAws_queryEndpointAccesses((0, smithy_client_1.getArrayIfSingleItem)(output["EndpointAccessList"]["member"]), context);
+        contents.EndpointAccessList = deserializeAws_queryEndpointAccesses(smithy_client_1.getArrayIfSingleItem(output["EndpointAccessList"]["member"]), context);
     }
     if (output["Marker"] !== undefined) {
-        contents.Marker = (0, smithy_client_1.expectString)(output["Marker"]);
+        contents.Marker = smithy_client_1.expectString(output["Marker"]);
     }
     return contents;
 };
@@ -15110,7 +15110,7 @@ const deserializeAws_queryEndpointAlreadyExistsFault = (output, context) => {
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -15127,34 +15127,34 @@ const deserializeAws_queryEndpointAuthorization = (output, context) => {
         EndpointCount: undefined,
     };
     if (output["Grantor"] !== undefined) {
-        contents.Grantor = (0, smithy_client_1.expectString)(output["Grantor"]);
+        contents.Grantor = smithy_client_1.expectString(output["Grantor"]);
     }
     if (output["Grantee"] !== undefined) {
-        contents.Grantee = (0, smithy_client_1.expectString)(output["Grantee"]);
+        contents.Grantee = smithy_client_1.expectString(output["Grantee"]);
     }
     if (output["ClusterIdentifier"] !== undefined) {
-        contents.ClusterIdentifier = (0, smithy_client_1.expectString)(output["ClusterIdentifier"]);
+        contents.ClusterIdentifier = smithy_client_1.expectString(output["ClusterIdentifier"]);
     }
     if (output["AuthorizeTime"] !== undefined) {
-        contents.AuthorizeTime = new Date(output["AuthorizeTime"]);
+        contents.AuthorizeTime = smithy_client_1.expectNonNull(smithy_client_1.parseRfc3339DateTime(output["AuthorizeTime"]));
     }
     if (output["ClusterStatus"] !== undefined) {
-        contents.ClusterStatus = (0, smithy_client_1.expectString)(output["ClusterStatus"]);
+        contents.ClusterStatus = smithy_client_1.expectString(output["ClusterStatus"]);
     }
     if (output["Status"] !== undefined) {
-        contents.Status = (0, smithy_client_1.expectString)(output["Status"]);
+        contents.Status = smithy_client_1.expectString(output["Status"]);
     }
     if (output["AllowedAllVPCs"] !== undefined) {
-        contents.AllowedAllVPCs = (0, smithy_client_1.parseBoolean)(output["AllowedAllVPCs"]);
+        contents.AllowedAllVPCs = smithy_client_1.parseBoolean(output["AllowedAllVPCs"]);
     }
     if (output.AllowedVPCs === "") {
         contents.AllowedVPCs = [];
     }
     if (output["AllowedVPCs"] !== undefined && output["AllowedVPCs"]["VpcIdentifier"] !== undefined) {
-        contents.AllowedVPCs = deserializeAws_queryVpcIdentifierList((0, smithy_client_1.getArrayIfSingleItem)(output["AllowedVPCs"]["VpcIdentifier"]), context);
+        contents.AllowedVPCs = deserializeAws_queryVpcIdentifierList(smithy_client_1.getArrayIfSingleItem(output["AllowedVPCs"]["VpcIdentifier"]), context);
     }
     if (output["EndpointCount"] !== undefined) {
-        contents.EndpointCount = (0, smithy_client_1.strictParseInt32)(output["EndpointCount"]);
+        contents.EndpointCount = smithy_client_1.strictParseInt32(output["EndpointCount"]);
     }
     return contents;
 };
@@ -15163,7 +15163,7 @@ const deserializeAws_queryEndpointAuthorizationAlreadyExistsFault = (output, con
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -15177,10 +15177,10 @@ const deserializeAws_queryEndpointAuthorizationList = (output, context) => {
     }
     if (output["EndpointAuthorizationList"] !== undefined &&
         output["EndpointAuthorizationList"]["member"] !== undefined) {
-        contents.EndpointAuthorizationList = deserializeAws_queryEndpointAuthorizations((0, smithy_client_1.getArrayIfSingleItem)(output["EndpointAuthorizationList"]["member"]), context);
+        contents.EndpointAuthorizationList = deserializeAws_queryEndpointAuthorizations(smithy_client_1.getArrayIfSingleItem(output["EndpointAuthorizationList"]["member"]), context);
     }
     if (output["Marker"] !== undefined) {
-        contents.Marker = (0, smithy_client_1.expectString)(output["Marker"]);
+        contents.Marker = smithy_client_1.expectString(output["Marker"]);
     }
     return contents;
 };
@@ -15189,7 +15189,7 @@ const deserializeAws_queryEndpointAuthorizationNotFoundFault = (output, context)
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -15208,7 +15208,7 @@ const deserializeAws_queryEndpointAuthorizationsPerClusterLimitExceededFault = (
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -15217,7 +15217,7 @@ const deserializeAws_queryEndpointNotFoundFault = (output, context) => {
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -15226,7 +15226,7 @@ const deserializeAws_queryEndpointsPerAuthorizationLimitExceededFault = (output,
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -15235,7 +15235,7 @@ const deserializeAws_queryEndpointsPerClusterLimitExceededFault = (output, conte
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -15250,28 +15250,28 @@ const deserializeAws_queryEvent = (output, context) => {
         EventId: undefined,
     };
     if (output["SourceIdentifier"] !== undefined) {
-        contents.SourceIdentifier = (0, smithy_client_1.expectString)(output["SourceIdentifier"]);
+        contents.SourceIdentifier = smithy_client_1.expectString(output["SourceIdentifier"]);
     }
     if (output["SourceType"] !== undefined) {
-        contents.SourceType = (0, smithy_client_1.expectString)(output["SourceType"]);
+        contents.SourceType = smithy_client_1.expectString(output["SourceType"]);
     }
     if (output["Message"] !== undefined) {
-        contents.Message = (0, smithy_client_1.expectString)(output["Message"]);
+        contents.Message = smithy_client_1.expectString(output["Message"]);
     }
     if (output.EventCategories === "") {
         contents.EventCategories = [];
     }
     if (output["EventCategories"] !== undefined && output["EventCategories"]["EventCategory"] !== undefined) {
-        contents.EventCategories = deserializeAws_queryEventCategoriesList((0, smithy_client_1.getArrayIfSingleItem)(output["EventCategories"]["EventCategory"]), context);
+        contents.EventCategories = deserializeAws_queryEventCategoriesList(smithy_client_1.getArrayIfSingleItem(output["EventCategories"]["EventCategory"]), context);
     }
     if (output["Severity"] !== undefined) {
-        contents.Severity = (0, smithy_client_1.expectString)(output["Severity"]);
+        contents.Severity = smithy_client_1.expectString(output["Severity"]);
     }
     if (output["Date"] !== undefined) {
-        contents.Date = new Date(output["Date"]);
+        contents.Date = smithy_client_1.expectNonNull(smithy_client_1.parseRfc3339DateTime(output["Date"]));
     }
     if (output["EventId"] !== undefined) {
-        contents.EventId = (0, smithy_client_1.expectString)(output["EventId"]);
+        contents.EventId = smithy_client_1.expectString(output["EventId"]);
     }
     return contents;
 };
@@ -15282,7 +15282,7 @@ const deserializeAws_queryEventCategoriesList = (output, context) => {
         if (entry === null) {
             return null;
         }
-        return (0, smithy_client_1.expectString)(entry);
+        return smithy_client_1.expectString(entry);
     });
 };
 const deserializeAws_queryEventCategoriesMap = (output, context) => {
@@ -15291,13 +15291,13 @@ const deserializeAws_queryEventCategoriesMap = (output, context) => {
         Events: undefined,
     };
     if (output["SourceType"] !== undefined) {
-        contents.SourceType = (0, smithy_client_1.expectString)(output["SourceType"]);
+        contents.SourceType = smithy_client_1.expectString(output["SourceType"]);
     }
     if (output.Events === "") {
         contents.Events = [];
     }
     if (output["Events"] !== undefined && output["Events"]["EventInfoMap"] !== undefined) {
-        contents.Events = deserializeAws_queryEventInfoMapList((0, smithy_client_1.getArrayIfSingleItem)(output["Events"]["EventInfoMap"]), context);
+        contents.Events = deserializeAws_queryEventInfoMapList(smithy_client_1.getArrayIfSingleItem(output["Events"]["EventInfoMap"]), context);
     }
     return contents;
 };
@@ -15320,7 +15320,7 @@ const deserializeAws_queryEventCategoriesMessage = (output, context) => {
     }
     if (output["EventCategoriesMapList"] !== undefined &&
         output["EventCategoriesMapList"]["EventCategoriesMap"] !== undefined) {
-        contents.EventCategoriesMapList = deserializeAws_queryEventCategoriesMapList((0, smithy_client_1.getArrayIfSingleItem)(output["EventCategoriesMapList"]["EventCategoriesMap"]), context);
+        contents.EventCategoriesMapList = deserializeAws_queryEventCategoriesMapList(smithy_client_1.getArrayIfSingleItem(output["EventCategoriesMapList"]["EventCategoriesMap"]), context);
     }
     return contents;
 };
@@ -15332,19 +15332,19 @@ const deserializeAws_queryEventInfoMap = (output, context) => {
         Severity: undefined,
     };
     if (output["EventId"] !== undefined) {
-        contents.EventId = (0, smithy_client_1.expectString)(output["EventId"]);
+        contents.EventId = smithy_client_1.expectString(output["EventId"]);
     }
     if (output.EventCategories === "") {
         contents.EventCategories = [];
     }
     if (output["EventCategories"] !== undefined && output["EventCategories"]["EventCategory"] !== undefined) {
-        contents.EventCategories = deserializeAws_queryEventCategoriesList((0, smithy_client_1.getArrayIfSingleItem)(output["EventCategories"]["EventCategory"]), context);
+        contents.EventCategories = deserializeAws_queryEventCategoriesList(smithy_client_1.getArrayIfSingleItem(output["EventCategories"]["EventCategory"]), context);
     }
     if (output["EventDescription"] !== undefined) {
-        contents.EventDescription = (0, smithy_client_1.expectString)(output["EventDescription"]);
+        contents.EventDescription = smithy_client_1.expectString(output["EventDescription"]);
     }
     if (output["Severity"] !== undefined) {
-        contents.Severity = (0, smithy_client_1.expectString)(output["Severity"]);
+        contents.Severity = smithy_client_1.expectString(output["Severity"]);
     }
     return contents;
 };
@@ -15374,13 +15374,13 @@ const deserializeAws_queryEventsMessage = (output, context) => {
         Events: undefined,
     };
     if (output["Marker"] !== undefined) {
-        contents.Marker = (0, smithy_client_1.expectString)(output["Marker"]);
+        contents.Marker = smithy_client_1.expectString(output["Marker"]);
     }
     if (output.Events === "") {
         contents.Events = [];
     }
     if (output["Events"] !== undefined && output["Events"]["Event"] !== undefined) {
-        contents.Events = deserializeAws_queryEventList((0, smithy_client_1.getArrayIfSingleItem)(output["Events"]["Event"]), context);
+        contents.Events = deserializeAws_queryEventList(smithy_client_1.getArrayIfSingleItem(output["Events"]["Event"]), context);
     }
     return contents;
 };
@@ -15399,46 +15399,46 @@ const deserializeAws_queryEventSubscription = (output, context) => {
         Tags: undefined,
     };
     if (output["CustomerAwsId"] !== undefined) {
-        contents.CustomerAwsId = (0, smithy_client_1.expectString)(output["CustomerAwsId"]);
+        contents.CustomerAwsId = smithy_client_1.expectString(output["CustomerAwsId"]);
     }
     if (output["CustSubscriptionId"] !== undefined) {
-        contents.CustSubscriptionId = (0, smithy_client_1.expectString)(output["CustSubscriptionId"]);
+        contents.CustSubscriptionId = smithy_client_1.expectString(output["CustSubscriptionId"]);
     }
     if (output["SnsTopicArn"] !== undefined) {
-        contents.SnsTopicArn = (0, smithy_client_1.expectString)(output["SnsTopicArn"]);
+        contents.SnsTopicArn = smithy_client_1.expectString(output["SnsTopicArn"]);
     }
     if (output["Status"] !== undefined) {
-        contents.Status = (0, smithy_client_1.expectString)(output["Status"]);
+        contents.Status = smithy_client_1.expectString(output["Status"]);
     }
     if (output["SubscriptionCreationTime"] !== undefined) {
-        contents.SubscriptionCreationTime = new Date(output["SubscriptionCreationTime"]);
+        contents.SubscriptionCreationTime = smithy_client_1.expectNonNull(smithy_client_1.parseRfc3339DateTime(output["SubscriptionCreationTime"]));
     }
     if (output["SourceType"] !== undefined) {
-        contents.SourceType = (0, smithy_client_1.expectString)(output["SourceType"]);
+        contents.SourceType = smithy_client_1.expectString(output["SourceType"]);
     }
     if (output.SourceIdsList === "") {
         contents.SourceIdsList = [];
     }
     if (output["SourceIdsList"] !== undefined && output["SourceIdsList"]["SourceId"] !== undefined) {
-        contents.SourceIdsList = deserializeAws_querySourceIdsList((0, smithy_client_1.getArrayIfSingleItem)(output["SourceIdsList"]["SourceId"]), context);
+        contents.SourceIdsList = deserializeAws_querySourceIdsList(smithy_client_1.getArrayIfSingleItem(output["SourceIdsList"]["SourceId"]), context);
     }
     if (output.EventCategoriesList === "") {
         contents.EventCategoriesList = [];
     }
     if (output["EventCategoriesList"] !== undefined && output["EventCategoriesList"]["EventCategory"] !== undefined) {
-        contents.EventCategoriesList = deserializeAws_queryEventCategoriesList((0, smithy_client_1.getArrayIfSingleItem)(output["EventCategoriesList"]["EventCategory"]), context);
+        contents.EventCategoriesList = deserializeAws_queryEventCategoriesList(smithy_client_1.getArrayIfSingleItem(output["EventCategoriesList"]["EventCategory"]), context);
     }
     if (output["Severity"] !== undefined) {
-        contents.Severity = (0, smithy_client_1.expectString)(output["Severity"]);
+        contents.Severity = smithy_client_1.expectString(output["Severity"]);
     }
     if (output["Enabled"] !== undefined) {
-        contents.Enabled = (0, smithy_client_1.parseBoolean)(output["Enabled"]);
+        contents.Enabled = smithy_client_1.parseBoolean(output["Enabled"]);
     }
     if (output.Tags === "") {
         contents.Tags = [];
     }
     if (output["Tags"] !== undefined && output["Tags"]["Tag"] !== undefined) {
-        contents.Tags = deserializeAws_queryTagList((0, smithy_client_1.getArrayIfSingleItem)(output["Tags"]["Tag"]), context);
+        contents.Tags = deserializeAws_queryTagList(smithy_client_1.getArrayIfSingleItem(output["Tags"]["Tag"]), context);
     }
     return contents;
 };
@@ -15447,7 +15447,7 @@ const deserializeAws_queryEventSubscriptionQuotaExceededFault = (output, context
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -15467,14 +15467,14 @@ const deserializeAws_queryEventSubscriptionsMessage = (output, context) => {
         EventSubscriptionsList: undefined,
     };
     if (output["Marker"] !== undefined) {
-        contents.Marker = (0, smithy_client_1.expectString)(output["Marker"]);
+        contents.Marker = smithy_client_1.expectString(output["Marker"]);
     }
     if (output.EventSubscriptionsList === "") {
         contents.EventSubscriptionsList = [];
     }
     if (output["EventSubscriptionsList"] !== undefined &&
         output["EventSubscriptionsList"]["EventSubscription"] !== undefined) {
-        contents.EventSubscriptionsList = deserializeAws_queryEventSubscriptionsList((0, smithy_client_1.getArrayIfSingleItem)(output["EventSubscriptionsList"]["EventSubscription"]), context);
+        contents.EventSubscriptionsList = deserializeAws_queryEventSubscriptionsList(smithy_client_1.getArrayIfSingleItem(output["EventSubscriptionsList"]["EventSubscription"]), context);
     }
     return contents;
 };
@@ -15484,14 +15484,14 @@ const deserializeAws_queryGetReservedNodeExchangeOfferingsOutputMessage = (outpu
         ReservedNodeOfferings: undefined,
     };
     if (output["Marker"] !== undefined) {
-        contents.Marker = (0, smithy_client_1.expectString)(output["Marker"]);
+        contents.Marker = smithy_client_1.expectString(output["Marker"]);
     }
     if (output.ReservedNodeOfferings === "") {
         contents.ReservedNodeOfferings = [];
     }
     if (output["ReservedNodeOfferings"] !== undefined &&
         output["ReservedNodeOfferings"]["ReservedNodeOffering"] !== undefined) {
-        contents.ReservedNodeOfferings = deserializeAws_queryReservedNodeOfferingList((0, smithy_client_1.getArrayIfSingleItem)(output["ReservedNodeOfferings"]["ReservedNodeOffering"]), context);
+        contents.ReservedNodeOfferings = deserializeAws_queryReservedNodeOfferingList(smithy_client_1.getArrayIfSingleItem(output["ReservedNodeOfferings"]["ReservedNodeOffering"]), context);
     }
     return contents;
 };
@@ -15502,16 +15502,16 @@ const deserializeAws_queryHsmClientCertificate = (output, context) => {
         Tags: undefined,
     };
     if (output["HsmClientCertificateIdentifier"] !== undefined) {
-        contents.HsmClientCertificateIdentifier = (0, smithy_client_1.expectString)(output["HsmClientCertificateIdentifier"]);
+        contents.HsmClientCertificateIdentifier = smithy_client_1.expectString(output["HsmClientCertificateIdentifier"]);
     }
     if (output["HsmClientCertificatePublicKey"] !== undefined) {
-        contents.HsmClientCertificatePublicKey = (0, smithy_client_1.expectString)(output["HsmClientCertificatePublicKey"]);
+        contents.HsmClientCertificatePublicKey = smithy_client_1.expectString(output["HsmClientCertificatePublicKey"]);
     }
     if (output.Tags === "") {
         contents.Tags = [];
     }
     if (output["Tags"] !== undefined && output["Tags"]["Tag"] !== undefined) {
-        contents.Tags = deserializeAws_queryTagList((0, smithy_client_1.getArrayIfSingleItem)(output["Tags"]["Tag"]), context);
+        contents.Tags = deserializeAws_queryTagList(smithy_client_1.getArrayIfSingleItem(output["Tags"]["Tag"]), context);
     }
     return contents;
 };
@@ -15520,7 +15520,7 @@ const deserializeAws_queryHsmClientCertificateAlreadyExistsFault = (output, cont
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -15540,14 +15540,14 @@ const deserializeAws_queryHsmClientCertificateMessage = (output, context) => {
         HsmClientCertificates: undefined,
     };
     if (output["Marker"] !== undefined) {
-        contents.Marker = (0, smithy_client_1.expectString)(output["Marker"]);
+        contents.Marker = smithy_client_1.expectString(output["Marker"]);
     }
     if (output.HsmClientCertificates === "") {
         contents.HsmClientCertificates = [];
     }
     if (output["HsmClientCertificates"] !== undefined &&
         output["HsmClientCertificates"]["HsmClientCertificate"] !== undefined) {
-        contents.HsmClientCertificates = deserializeAws_queryHsmClientCertificateList((0, smithy_client_1.getArrayIfSingleItem)(output["HsmClientCertificates"]["HsmClientCertificate"]), context);
+        contents.HsmClientCertificates = deserializeAws_queryHsmClientCertificateList(smithy_client_1.getArrayIfSingleItem(output["HsmClientCertificates"]["HsmClientCertificate"]), context);
     }
     return contents;
 };
@@ -15556,7 +15556,7 @@ const deserializeAws_queryHsmClientCertificateNotFoundFault = (output, context)
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -15565,7 +15565,7 @@ const deserializeAws_queryHsmClientCertificateQuotaExceededFault = (output, cont
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -15578,22 +15578,22 @@ const deserializeAws_queryHsmConfiguration = (output, context) => {
         Tags: undefined,
     };
     if (output["HsmConfigurationIdentifier"] !== undefined) {
-        contents.HsmConfigurationIdentifier = (0, smithy_client_1.expectString)(output["HsmConfigurationIdentifier"]);
+        contents.HsmConfigurationIdentifier = smithy_client_1.expectString(output["HsmConfigurationIdentifier"]);
     }
     if (output["Description"] !== undefined) {
-        contents.Description = (0, smithy_client_1.expectString)(output["Description"]);
+        contents.Description = smithy_client_1.expectString(output["Description"]);
     }
     if (output["HsmIpAddress"] !== undefined) {
-        contents.HsmIpAddress = (0, smithy_client_1.expectString)(output["HsmIpAddress"]);
+        contents.HsmIpAddress = smithy_client_1.expectString(output["HsmIpAddress"]);
     }
     if (output["HsmPartitionName"] !== undefined) {
-        contents.HsmPartitionName = (0, smithy_client_1.expectString)(output["HsmPartitionName"]);
+        contents.HsmPartitionName = smithy_client_1.expectString(output["HsmPartitionName"]);
     }
     if (output.Tags === "") {
         contents.Tags = [];
     }
     if (output["Tags"] !== undefined && output["Tags"]["Tag"] !== undefined) {
-        contents.Tags = deserializeAws_queryTagList((0, smithy_client_1.getArrayIfSingleItem)(output["Tags"]["Tag"]), context);
+        contents.Tags = deserializeAws_queryTagList(smithy_client_1.getArrayIfSingleItem(output["Tags"]["Tag"]), context);
     }
     return contents;
 };
@@ -15602,7 +15602,7 @@ const deserializeAws_queryHsmConfigurationAlreadyExistsFault = (output, context)
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -15622,13 +15622,13 @@ const deserializeAws_queryHsmConfigurationMessage = (output, context) => {
         HsmConfigurations: undefined,
     };
     if (output["Marker"] !== undefined) {
-        contents.Marker = (0, smithy_client_1.expectString)(output["Marker"]);
+        contents.Marker = smithy_client_1.expectString(output["Marker"]);
     }
     if (output.HsmConfigurations === "") {
         contents.HsmConfigurations = [];
     }
     if (output["HsmConfigurations"] !== undefined && output["HsmConfigurations"]["HsmConfiguration"] !== undefined) {
-        contents.HsmConfigurations = deserializeAws_queryHsmConfigurationList((0, smithy_client_1.getArrayIfSingleItem)(output["HsmConfigurations"]["HsmConfiguration"]), context);
+        contents.HsmConfigurations = deserializeAws_queryHsmConfigurationList(smithy_client_1.getArrayIfSingleItem(output["HsmConfigurations"]["HsmConfiguration"]), context);
     }
     return contents;
 };
@@ -15637,7 +15637,7 @@ const deserializeAws_queryHsmConfigurationNotFoundFault = (output, context) => {
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -15646,7 +15646,7 @@ const deserializeAws_queryHsmConfigurationQuotaExceededFault = (output, context)
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -15657,13 +15657,13 @@ const deserializeAws_queryHsmStatus = (output, context) => {
         Status: undefined,
     };
     if (output["HsmClientCertificateIdentifier"] !== undefined) {
-        contents.HsmClientCertificateIdentifier = (0, smithy_client_1.expectString)(output["HsmClientCertificateIdentifier"]);
+        contents.HsmClientCertificateIdentifier = smithy_client_1.expectString(output["HsmClientCertificateIdentifier"]);
     }
     if (output["HsmConfigurationIdentifier"] !== undefined) {
-        contents.HsmConfigurationIdentifier = (0, smithy_client_1.expectString)(output["HsmConfigurationIdentifier"]);
+        contents.HsmConfigurationIdentifier = smithy_client_1.expectString(output["HsmConfigurationIdentifier"]);
     }
     if (output["Status"] !== undefined) {
-        contents.Status = (0, smithy_client_1.expectString)(output["Status"]);
+        contents.Status = smithy_client_1.expectString(output["Status"]);
     }
     return contents;
 };
@@ -15674,7 +15674,7 @@ const deserializeAws_queryImportTablesCompleted = (output, context) => {
         if (entry === null) {
             return null;
         }
-        return (0, smithy_client_1.expectString)(entry);
+        return smithy_client_1.expectString(entry);
     });
 };
 const deserializeAws_queryImportTablesInProgress = (output, context) => {
@@ -15684,7 +15684,7 @@ const deserializeAws_queryImportTablesInProgress = (output, context) => {
         if (entry === null) {
             return null;
         }
-        return (0, smithy_client_1.expectString)(entry);
+        return smithy_client_1.expectString(entry);
     });
 };
 const deserializeAws_queryImportTablesNotStarted = (output, context) => {
@@ -15694,7 +15694,7 @@ const deserializeAws_queryImportTablesNotStarted = (output, context) => {
         if (entry === null) {
             return null;
         }
-        return (0, smithy_client_1.expectString)(entry);
+        return smithy_client_1.expectString(entry);
     });
 };
 const deserializeAws_queryIncompatibleOrderableOptions = (output, context) => {
@@ -15702,7 +15702,7 @@ const deserializeAws_queryIncompatibleOrderableOptions = (output, context) => {
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -15711,7 +15711,7 @@ const deserializeAws_queryInProgressTableRestoreQuotaExceededFault = (output, co
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -15720,7 +15720,7 @@ const deserializeAws_queryInsufficientClusterCapacityFault = (output, context) =
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -15729,7 +15729,7 @@ const deserializeAws_queryInsufficientS3BucketPolicyFault = (output, context) =>
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -15738,7 +15738,7 @@ const deserializeAws_queryInvalidAuthenticationProfileRequestFault = (output, co
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -15747,7 +15747,7 @@ const deserializeAws_queryInvalidAuthorizationStateFault = (output, context) =>
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -15756,7 +15756,7 @@ const deserializeAws_queryInvalidClusterParameterGroupStateFault = (output, cont
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -15765,7 +15765,7 @@ const deserializeAws_queryInvalidClusterSecurityGroupStateFault = (output, conte
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -15774,7 +15774,7 @@ const deserializeAws_queryInvalidClusterSnapshotScheduleStateFault = (output, co
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -15783,7 +15783,7 @@ const deserializeAws_queryInvalidClusterSnapshotStateFault = (output, context) =
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -15792,7 +15792,7 @@ const deserializeAws_queryInvalidClusterStateFault = (output, context) => {
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -15801,7 +15801,7 @@ const deserializeAws_queryInvalidClusterSubnetGroupStateFault = (output, context
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -15810,7 +15810,7 @@ const deserializeAws_queryInvalidClusterSubnetStateFault = (output, context) =>
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -15819,7 +15819,7 @@ const deserializeAws_queryInvalidClusterTrackFault = (output, context) => {
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -15828,7 +15828,7 @@ const deserializeAws_queryInvalidDataShareFault = (output, context) => {
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -15837,7 +15837,7 @@ const deserializeAws_queryInvalidElasticIpFault = (output, context) => {
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -15846,7 +15846,7 @@ const deserializeAws_queryInvalidEndpointStateFault = (output, context) => {
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -15855,7 +15855,7 @@ const deserializeAws_queryInvalidHsmClientCertificateStateFault = (output, conte
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -15864,7 +15864,7 @@ const deserializeAws_queryInvalidHsmConfigurationStateFault = (output, context)
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -15873,7 +15873,7 @@ const deserializeAws_queryInvalidNamespaceFault = (output, context) => {
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -15882,7 +15882,7 @@ const deserializeAws_queryInvalidReservedNodeStateFault = (output, context) => {
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -15891,7 +15891,7 @@ const deserializeAws_queryInvalidRestoreFault = (output, context) => {
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -15900,7 +15900,7 @@ const deserializeAws_queryInvalidRetentionPeriodFault = (output, context) => {
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -15909,7 +15909,7 @@ const deserializeAws_queryInvalidS3BucketNameFault = (output, context) => {
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -15918,7 +15918,7 @@ const deserializeAws_queryInvalidS3KeyPrefixFault = (output, context) => {
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -15927,7 +15927,7 @@ const deserializeAws_queryInvalidScheduledActionFault = (output, context) => {
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -15936,7 +15936,7 @@ const deserializeAws_queryInvalidScheduleFault = (output, context) => {
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -15945,7 +15945,7 @@ const deserializeAws_queryInvalidSnapshotCopyGrantStateFault = (output, context)
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -15954,7 +15954,7 @@ const deserializeAws_queryInvalidSubnet = (output, context) => {
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -15963,7 +15963,7 @@ const deserializeAws_queryInvalidSubscriptionStateFault = (output, context) => {
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -15972,7 +15972,7 @@ const deserializeAws_queryInvalidTableRestoreArgumentFault = (output, context) =
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -15981,7 +15981,7 @@ const deserializeAws_queryInvalidTagFault = (output, context) => {
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -15990,7 +15990,7 @@ const deserializeAws_queryInvalidUsageLimitFault = (output, context) => {
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -15999,7 +15999,7 @@ const deserializeAws_queryInvalidVPCNetworkStateFault = (output, context) => {
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -16010,16 +16010,16 @@ const deserializeAws_queryIPRange = (output, context) => {
         Tags: undefined,
     };
     if (output["Status"] !== undefined) {
-        contents.Status = (0, smithy_client_1.expectString)(output["Status"]);
+        contents.Status = smithy_client_1.expectString(output["Status"]);
     }
     if (output["CIDRIP"] !== undefined) {
-        contents.CIDRIP = (0, smithy_client_1.expectString)(output["CIDRIP"]);
+        contents.CIDRIP = smithy_client_1.expectString(output["CIDRIP"]);
     }
     if (output.Tags === "") {
         contents.Tags = [];
     }
     if (output["Tags"] !== undefined && output["Tags"]["Tag"] !== undefined) {
-        contents.Tags = deserializeAws_queryTagList((0, smithy_client_1.getArrayIfSingleItem)(output["Tags"]["Tag"]), context);
+        contents.Tags = deserializeAws_queryTagList(smithy_client_1.getArrayIfSingleItem(output["Tags"]["Tag"]), context);
     }
     return contents;
 };
@@ -16038,7 +16038,7 @@ const deserializeAws_queryLimitExceededFault = (output, context) => {
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -16052,22 +16052,22 @@ const deserializeAws_queryLoggingStatus = (output, context) => {
         LastFailureMessage: undefined,
     };
     if (output["LoggingEnabled"] !== undefined) {
-        contents.LoggingEnabled = (0, smithy_client_1.parseBoolean)(output["LoggingEnabled"]);
+        contents.LoggingEnabled = smithy_client_1.parseBoolean(output["LoggingEnabled"]);
     }
     if (output["BucketName"] !== undefined) {
-        contents.BucketName = (0, smithy_client_1.expectString)(output["BucketName"]);
+        contents.BucketName = smithy_client_1.expectString(output["BucketName"]);
     }
     if (output["S3KeyPrefix"] !== undefined) {
-        contents.S3KeyPrefix = (0, smithy_client_1.expectString)(output["S3KeyPrefix"]);
+        contents.S3KeyPrefix = smithy_client_1.expectString(output["S3KeyPrefix"]);
     }
     if (output["LastSuccessfulDeliveryTime"] !== undefined) {
-        contents.LastSuccessfulDeliveryTime = new Date(output["LastSuccessfulDeliveryTime"]);
+        contents.LastSuccessfulDeliveryTime = smithy_client_1.expectNonNull(smithy_client_1.parseRfc3339DateTime(output["LastSuccessfulDeliveryTime"]));
     }
     if (output["LastFailureTime"] !== undefined) {
-        contents.LastFailureTime = new Date(output["LastFailureTime"]);
+        contents.LastFailureTime = smithy_client_1.expectNonNull(smithy_client_1.parseRfc3339DateTime(output["LastFailureTime"]));
     }
     if (output["LastFailureMessage"] !== undefined) {
-        contents.LastFailureMessage = (0, smithy_client_1.expectString)(output["LastFailureMessage"]);
+        contents.LastFailureMessage = smithy_client_1.expectString(output["LastFailureMessage"]);
     }
     return contents;
 };
@@ -16078,16 +16078,16 @@ const deserializeAws_queryMaintenanceTrack = (output, context) => {
         UpdateTargets: undefined,
     };
     if (output["MaintenanceTrackName"] !== undefined) {
-        contents.MaintenanceTrackName = (0, smithy_client_1.expectString)(output["MaintenanceTrackName"]);
+        contents.MaintenanceTrackName = smithy_client_1.expectString(output["MaintenanceTrackName"]);
     }
     if (output["DatabaseVersion"] !== undefined) {
-        contents.DatabaseVersion = (0, smithy_client_1.expectString)(output["DatabaseVersion"]);
+        contents.DatabaseVersion = smithy_client_1.expectString(output["DatabaseVersion"]);
     }
     if (output.UpdateTargets === "") {
         contents.UpdateTargets = [];
     }
     if (output["UpdateTargets"] !== undefined && output["UpdateTargets"]["UpdateTarget"] !== undefined) {
-        contents.UpdateTargets = deserializeAws_queryEligibleTracksToUpdateList((0, smithy_client_1.getArrayIfSingleItem)(output["UpdateTargets"]["UpdateTarget"]), context);
+        contents.UpdateTargets = deserializeAws_queryEligibleTracksToUpdateList(smithy_client_1.getArrayIfSingleItem(output["UpdateTargets"]["UpdateTarget"]), context);
     }
     return contents;
 };
@@ -16106,10 +16106,10 @@ const deserializeAws_queryModifyAuthenticationProfileResult = (output, context)
         AuthenticationProfileContent: undefined,
     };
     if (output["AuthenticationProfileName"] !== undefined) {
-        contents.AuthenticationProfileName = (0, smithy_client_1.expectString)(output["AuthenticationProfileName"]);
+        contents.AuthenticationProfileName = smithy_client_1.expectString(output["AuthenticationProfileName"]);
     }
     if (output["AuthenticationProfileContent"] !== undefined) {
-        contents.AuthenticationProfileContent = (0, smithy_client_1.expectString)(output["AuthenticationProfileContent"]);
+        contents.AuthenticationProfileContent = smithy_client_1.expectString(output["AuthenticationProfileContent"]);
     }
     return contents;
 };
@@ -16193,16 +16193,16 @@ const deserializeAws_queryNetworkInterface = (output, context) => {
         AvailabilityZone: undefined,
     };
     if (output["NetworkInterfaceId"] !== undefined) {
-        contents.NetworkInterfaceId = (0, smithy_client_1.expectString)(output["NetworkInterfaceId"]);
+        contents.NetworkInterfaceId = smithy_client_1.expectString(output["NetworkInterfaceId"]);
     }
     if (output["SubnetId"] !== undefined) {
-        contents.SubnetId = (0, smithy_client_1.expectString)(output["SubnetId"]);
+        contents.SubnetId = smithy_client_1.expectString(output["SubnetId"]);
     }
     if (output["PrivateIpAddress"] !== undefined) {
-        contents.PrivateIpAddress = (0, smithy_client_1.expectString)(output["PrivateIpAddress"]);
+        contents.PrivateIpAddress = smithy_client_1.expectString(output["PrivateIpAddress"]);
     }
     if (output["AvailabilityZone"] !== undefined) {
-        contents.AvailabilityZone = (0, smithy_client_1.expectString)(output["AvailabilityZone"]);
+        contents.AvailabilityZone = smithy_client_1.expectString(output["AvailabilityZone"]);
     }
     return contents;
 };
@@ -16224,16 +16224,16 @@ const deserializeAws_queryNodeConfigurationOption = (output, context) => {
         Mode: undefined,
     };
     if (output["NodeType"] !== undefined) {
-        contents.NodeType = (0, smithy_client_1.expectString)(output["NodeType"]);
+        contents.NodeType = smithy_client_1.expectString(output["NodeType"]);
     }
     if (output["NumberOfNodes"] !== undefined) {
-        contents.NumberOfNodes = (0, smithy_client_1.strictParseInt32)(output["NumberOfNodes"]);
+        contents.NumberOfNodes = smithy_client_1.strictParseInt32(output["NumberOfNodes"]);
     }
     if (output["EstimatedDiskUtilizationPercent"] !== undefined) {
-        contents.EstimatedDiskUtilizationPercent = (0, smithy_client_1.strictParseFloat)(output["EstimatedDiskUtilizationPercent"]);
+        contents.EstimatedDiskUtilizationPercent = smithy_client_1.strictParseFloat(output["EstimatedDiskUtilizationPercent"]);
     }
     if (output["Mode"] !== undefined) {
-        contents.Mode = (0, smithy_client_1.expectString)(output["Mode"]);
+        contents.Mode = smithy_client_1.expectString(output["Mode"]);
     }
     return contents;
 };
@@ -16257,10 +16257,10 @@ const deserializeAws_queryNodeConfigurationOptionsMessage = (output, context) =>
     }
     if (output["NodeConfigurationOptionList"] !== undefined &&
         output["NodeConfigurationOptionList"]["NodeConfigurationOption"] !== undefined) {
-        contents.NodeConfigurationOptionList = deserializeAws_queryNodeConfigurationOptionList((0, smithy_client_1.getArrayIfSingleItem)(output["NodeConfigurationOptionList"]["NodeConfigurationOption"]), context);
+        contents.NodeConfigurationOptionList = deserializeAws_queryNodeConfigurationOptionList(smithy_client_1.getArrayIfSingleItem(output["NodeConfigurationOptionList"]["NodeConfigurationOption"]), context);
     }
     if (output["Marker"] !== undefined) {
-        contents.Marker = (0, smithy_client_1.expectString)(output["Marker"]);
+        contents.Marker = smithy_client_1.expectString(output["Marker"]);
     }
     return contents;
 };
@@ -16269,7 +16269,7 @@ const deserializeAws_queryNumberOfNodesPerClusterLimitExceededFault = (output, c
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -16278,7 +16278,7 @@ const deserializeAws_queryNumberOfNodesQuotaExceededFault = (output, context) =>
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -16290,19 +16290,19 @@ const deserializeAws_queryOrderableClusterOption = (output, context) => {
         AvailabilityZones: undefined,
     };
     if (output["ClusterVersion"] !== undefined) {
-        contents.ClusterVersion = (0, smithy_client_1.expectString)(output["ClusterVersion"]);
+        contents.ClusterVersion = smithy_client_1.expectString(output["ClusterVersion"]);
     }
     if (output["ClusterType"] !== undefined) {
-        contents.ClusterType = (0, smithy_client_1.expectString)(output["ClusterType"]);
+        contents.ClusterType = smithy_client_1.expectString(output["ClusterType"]);
     }
     if (output["NodeType"] !== undefined) {
-        contents.NodeType = (0, smithy_client_1.expectString)(output["NodeType"]);
+        contents.NodeType = smithy_client_1.expectString(output["NodeType"]);
     }
     if (output.AvailabilityZones === "") {
         contents.AvailabilityZones = [];
     }
     if (output["AvailabilityZones"] !== undefined && output["AvailabilityZones"]["AvailabilityZone"] !== undefined) {
-        contents.AvailabilityZones = deserializeAws_queryAvailabilityZoneList((0, smithy_client_1.getArrayIfSingleItem)(output["AvailabilityZones"]["AvailabilityZone"]), context);
+        contents.AvailabilityZones = deserializeAws_queryAvailabilityZoneList(smithy_client_1.getArrayIfSingleItem(output["AvailabilityZones"]["AvailabilityZone"]), context);
     }
     return contents;
 };
@@ -16326,10 +16326,10 @@ const deserializeAws_queryOrderableClusterOptionsMessage = (output, context) =>
     }
     if (output["OrderableClusterOptions"] !== undefined &&
         output["OrderableClusterOptions"]["OrderableClusterOption"] !== undefined) {
-        contents.OrderableClusterOptions = deserializeAws_queryOrderableClusterOptionsList((0, smithy_client_1.getArrayIfSingleItem)(output["OrderableClusterOptions"]["OrderableClusterOption"]), context);
+        contents.OrderableClusterOptions = deserializeAws_queryOrderableClusterOptionsList(smithy_client_1.getArrayIfSingleItem(output["OrderableClusterOptions"]["OrderableClusterOption"]), context);
     }
     if (output["Marker"] !== undefined) {
-        contents.Marker = (0, smithy_client_1.expectString)(output["Marker"]);
+        contents.Marker = smithy_client_1.expectString(output["Marker"]);
     }
     return contents;
 };
@@ -16346,31 +16346,31 @@ const deserializeAws_queryParameter = (output, context) => {
         MinimumEngineVersion: undefined,
     };
     if (output["ParameterName"] !== undefined) {
-        contents.ParameterName = (0, smithy_client_1.expectString)(output["ParameterName"]);
+        contents.ParameterName = smithy_client_1.expectString(output["ParameterName"]);
     }
     if (output["ParameterValue"] !== undefined) {
-        contents.ParameterValue = (0, smithy_client_1.expectString)(output["ParameterValue"]);
+        contents.ParameterValue = smithy_client_1.expectString(output["ParameterValue"]);
     }
     if (output["Description"] !== undefined) {
-        contents.Description = (0, smithy_client_1.expectString)(output["Description"]);
+        contents.Description = smithy_client_1.expectString(output["Description"]);
     }
     if (output["Source"] !== undefined) {
-        contents.Source = (0, smithy_client_1.expectString)(output["Source"]);
+        contents.Source = smithy_client_1.expectString(output["Source"]);
     }
     if (output["DataType"] !== undefined) {
-        contents.DataType = (0, smithy_client_1.expectString)(output["DataType"]);
+        contents.DataType = smithy_client_1.expectString(output["DataType"]);
     }
     if (output["AllowedValues"] !== undefined) {
-        contents.AllowedValues = (0, smithy_client_1.expectString)(output["AllowedValues"]);
+        contents.AllowedValues = smithy_client_1.expectString(output["AllowedValues"]);
     }
     if (output["ApplyType"] !== undefined) {
-        contents.ApplyType = (0, smithy_client_1.expectString)(output["ApplyType"]);
+        contents.ApplyType = smithy_client_1.expectString(output["ApplyType"]);
     }
     if (output["IsModifiable"] !== undefined) {
-        contents.IsModifiable = (0, smithy_client_1.parseBoolean)(output["IsModifiable"]);
+        contents.IsModifiable = smithy_client_1.parseBoolean(output["IsModifiable"]);
     }
     if (output["MinimumEngineVersion"] !== undefined) {
-        contents.MinimumEngineVersion = (0, smithy_client_1.expectString)(output["MinimumEngineVersion"]);
+        contents.MinimumEngineVersion = smithy_client_1.expectString(output["MinimumEngineVersion"]);
     }
     return contents;
 };
@@ -16404,22 +16404,22 @@ const deserializeAws_queryPartnerIntegrationInfo = (output, context) => {
         UpdatedAt: undefined,
     };
     if (output["DatabaseName"] !== undefined) {
-        contents.DatabaseName = (0, smithy_client_1.expectString)(output["DatabaseName"]);
+        contents.DatabaseName = smithy_client_1.expectString(output["DatabaseName"]);
     }
     if (output["PartnerName"] !== undefined) {
-        contents.PartnerName = (0, smithy_client_1.expectString)(output["PartnerName"]);
+        contents.PartnerName = smithy_client_1.expectString(output["PartnerName"]);
     }
     if (output["Status"] !== undefined) {
-        contents.Status = (0, smithy_client_1.expectString)(output["Status"]);
+        contents.Status = smithy_client_1.expectString(output["Status"]);
     }
     if (output["StatusMessage"] !== undefined) {
-        contents.StatusMessage = (0, smithy_client_1.expectString)(output["StatusMessage"]);
+        contents.StatusMessage = smithy_client_1.expectString(output["StatusMessage"]);
     }
     if (output["CreatedAt"] !== undefined) {
-        contents.CreatedAt = new Date(output["CreatedAt"]);
+        contents.CreatedAt = smithy_client_1.expectNonNull(smithy_client_1.parseRfc3339DateTime(output["CreatedAt"]));
     }
     if (output["UpdatedAt"] !== undefined) {
-        contents.UpdatedAt = new Date(output["UpdatedAt"]);
+        contents.UpdatedAt = smithy_client_1.expectNonNull(smithy_client_1.parseRfc3339DateTime(output["UpdatedAt"]));
     }
     return contents;
 };
@@ -16439,10 +16439,10 @@ const deserializeAws_queryPartnerIntegrationOutputMessage = (output, context) =>
         PartnerName: undefined,
     };
     if (output["DatabaseName"] !== undefined) {
-        contents.DatabaseName = (0, smithy_client_1.expectString)(output["DatabaseName"]);
+        contents.DatabaseName = smithy_client_1.expectString(output["DatabaseName"]);
     }
     if (output["PartnerName"] !== undefined) {
-        contents.PartnerName = (0, smithy_client_1.expectString)(output["PartnerName"]);
+        contents.PartnerName = smithy_client_1.expectString(output["PartnerName"]);
     }
     return contents;
 };
@@ -16451,7 +16451,7 @@ const deserializeAws_queryPartnerNotFoundFault = (output, context) => {
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -16460,7 +16460,7 @@ const deserializeAws_queryPauseClusterMessage = (output, context) => {
         ClusterIdentifier: undefined,
     };
     if (output["ClusterIdentifier"] !== undefined) {
-        contents.ClusterIdentifier = (0, smithy_client_1.expectString)(output["ClusterIdentifier"]);
+        contents.ClusterIdentifier = smithy_client_1.expectString(output["ClusterIdentifier"]);
     }
     return contents;
 };
@@ -16480,7 +16480,7 @@ const deserializeAws_queryPendingActionsList = (output, context) => {
         if (entry === null) {
             return null;
         }
-        return (0, smithy_client_1.expectString)(entry);
+        return smithy_client_1.expectString(entry);
     });
 };
 const deserializeAws_queryPendingModifiedValues = (output, context) => {
@@ -16498,37 +16498,37 @@ const deserializeAws_queryPendingModifiedValues = (output, context) => {
         EncryptionType: undefined,
     };
     if (output["MasterUserPassword"] !== undefined) {
-        contents.MasterUserPassword = (0, smithy_client_1.expectString)(output["MasterUserPassword"]);
+        contents.MasterUserPassword = smithy_client_1.expectString(output["MasterUserPassword"]);
     }
     if (output["NodeType"] !== undefined) {
-        contents.NodeType = (0, smithy_client_1.expectString)(output["NodeType"]);
+        contents.NodeType = smithy_client_1.expectString(output["NodeType"]);
     }
     if (output["NumberOfNodes"] !== undefined) {
-        contents.NumberOfNodes = (0, smithy_client_1.strictParseInt32)(output["NumberOfNodes"]);
+        contents.NumberOfNodes = smithy_client_1.strictParseInt32(output["NumberOfNodes"]);
     }
     if (output["ClusterType"] !== undefined) {
-        contents.ClusterType = (0, smithy_client_1.expectString)(output["ClusterType"]);
+        contents.ClusterType = smithy_client_1.expectString(output["ClusterType"]);
     }
     if (output["ClusterVersion"] !== undefined) {
-        contents.ClusterVersion = (0, smithy_client_1.expectString)(output["ClusterVersion"]);
+        contents.ClusterVersion = smithy_client_1.expectString(output["ClusterVersion"]);
     }
     if (output["AutomatedSnapshotRetentionPeriod"] !== undefined) {
-        contents.AutomatedSnapshotRetentionPeriod = (0, smithy_client_1.strictParseInt32)(output["AutomatedSnapshotRetentionPeriod"]);
+        contents.AutomatedSnapshotRetentionPeriod = smithy_client_1.strictParseInt32(output["AutomatedSnapshotRetentionPeriod"]);
     }
     if (output["ClusterIdentifier"] !== undefined) {
-        contents.ClusterIdentifier = (0, smithy_client_1.expectString)(output["ClusterIdentifier"]);
+        contents.ClusterIdentifier = smithy_client_1.expectString(output["ClusterIdentifier"]);
     }
     if (output["PubliclyAccessible"] !== undefined) {
-        contents.PubliclyAccessible = (0, smithy_client_1.parseBoolean)(output["PubliclyAccessible"]);
+        contents.PubliclyAccessible = smithy_client_1.parseBoolean(output["PubliclyAccessible"]);
     }
     if (output["EnhancedVpcRouting"] !== undefined) {
-        contents.EnhancedVpcRouting = (0, smithy_client_1.parseBoolean)(output["EnhancedVpcRouting"]);
+        contents.EnhancedVpcRouting = smithy_client_1.parseBoolean(output["EnhancedVpcRouting"]);
     }
     if (output["MaintenanceTrackName"] !== undefined) {
-        contents.MaintenanceTrackName = (0, smithy_client_1.expectString)(output["MaintenanceTrackName"]);
+        contents.MaintenanceTrackName = smithy_client_1.expectString(output["MaintenanceTrackName"]);
     }
     if (output["EncryptionType"] !== undefined) {
-        contents.EncryptionType = (0, smithy_client_1.expectString)(output["EncryptionType"]);
+        contents.EncryptionType = smithy_client_1.expectString(output["EncryptionType"]);
     }
     return contents;
 };
@@ -16556,10 +16556,10 @@ const deserializeAws_queryRecurringCharge = (output, context) => {
         RecurringChargeFrequency: undefined,
     };
     if (output["RecurringChargeAmount"] !== undefined) {
-        contents.RecurringChargeAmount = (0, smithy_client_1.strictParseFloat)(output["RecurringChargeAmount"]);
+        contents.RecurringChargeAmount = smithy_client_1.strictParseFloat(output["RecurringChargeAmount"]);
     }
     if (output["RecurringChargeFrequency"] !== undefined) {
-        contents.RecurringChargeFrequency = (0, smithy_client_1.expectString)(output["RecurringChargeFrequency"]);
+        contents.RecurringChargeFrequency = smithy_client_1.expectString(output["RecurringChargeFrequency"]);
     }
     return contents;
 };
@@ -16590,46 +16590,46 @@ const deserializeAws_queryReservedNode = (output, context) => {
         ReservedNodeOfferingType: undefined,
     };
     if (output["ReservedNodeId"] !== undefined) {
-        contents.ReservedNodeId = (0, smithy_client_1.expectString)(output["ReservedNodeId"]);
+        contents.ReservedNodeId = smithy_client_1.expectString(output["ReservedNodeId"]);
     }
     if (output["ReservedNodeOfferingId"] !== undefined) {
-        contents.ReservedNodeOfferingId = (0, smithy_client_1.expectString)(output["ReservedNodeOfferingId"]);
+        contents.ReservedNodeOfferingId = smithy_client_1.expectString(output["ReservedNodeOfferingId"]);
     }
     if (output["NodeType"] !== undefined) {
-        contents.NodeType = (0, smithy_client_1.expectString)(output["NodeType"]);
+        contents.NodeType = smithy_client_1.expectString(output["NodeType"]);
     }
     if (output["StartTime"] !== undefined) {
-        contents.StartTime = new Date(output["StartTime"]);
+        contents.StartTime = smithy_client_1.expectNonNull(smithy_client_1.parseRfc3339DateTime(output["StartTime"]));
     }
     if (output["Duration"] !== undefined) {
-        contents.Duration = (0, smithy_client_1.strictParseInt32)(output["Duration"]);
+        contents.Duration = smithy_client_1.strictParseInt32(output["Duration"]);
     }
     if (output["FixedPrice"] !== undefined) {
-        contents.FixedPrice = (0, smithy_client_1.strictParseFloat)(output["FixedPrice"]);
+        contents.FixedPrice = smithy_client_1.strictParseFloat(output["FixedPrice"]);
     }
     if (output["UsagePrice"] !== undefined) {
-        contents.UsagePrice = (0, smithy_client_1.strictParseFloat)(output["UsagePrice"]);
+        contents.UsagePrice = smithy_client_1.strictParseFloat(output["UsagePrice"]);
     }
     if (output["CurrencyCode"] !== undefined) {
-        contents.CurrencyCode = (0, smithy_client_1.expectString)(output["CurrencyCode"]);
+        contents.CurrencyCode = smithy_client_1.expectString(output["CurrencyCode"]);
     }
     if (output["NodeCount"] !== undefined) {
-        contents.NodeCount = (0, smithy_client_1.strictParseInt32)(output["NodeCount"]);
+        contents.NodeCount = smithy_client_1.strictParseInt32(output["NodeCount"]);
     }
     if (output["State"] !== undefined) {
-        contents.State = (0, smithy_client_1.expectString)(output["State"]);
+        contents.State = smithy_client_1.expectString(output["State"]);
     }
     if (output["OfferingType"] !== undefined) {
-        contents.OfferingType = (0, smithy_client_1.expectString)(output["OfferingType"]);
+        contents.OfferingType = smithy_client_1.expectString(output["OfferingType"]);
     }
     if (output.RecurringCharges === "") {
         contents.RecurringCharges = [];
     }
     if (output["RecurringCharges"] !== undefined && output["RecurringCharges"]["RecurringCharge"] !== undefined) {
-        contents.RecurringCharges = deserializeAws_queryRecurringChargeList((0, smithy_client_1.getArrayIfSingleItem)(output["RecurringCharges"]["RecurringCharge"]), context);
+        contents.RecurringCharges = deserializeAws_queryRecurringChargeList(smithy_client_1.getArrayIfSingleItem(output["RecurringCharges"]["RecurringCharge"]), context);
     }
     if (output["ReservedNodeOfferingType"] !== undefined) {
-        contents.ReservedNodeOfferingType = (0, smithy_client_1.expectString)(output["ReservedNodeOfferingType"]);
+        contents.ReservedNodeOfferingType = smithy_client_1.expectString(output["ReservedNodeOfferingType"]);
     }
     return contents;
 };
@@ -16638,7 +16638,7 @@ const deserializeAws_queryReservedNodeAlreadyExistsFault = (output, context) =>
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -16647,7 +16647,7 @@ const deserializeAws_queryReservedNodeAlreadyMigratedFault = (output, context) =
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -16666,7 +16666,7 @@ const deserializeAws_queryReservedNodeNotFoundFault = (output, context) => {
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -16683,34 +16683,34 @@ const deserializeAws_queryReservedNodeOffering = (output, context) => {
         ReservedNodeOfferingType: undefined,
     };
     if (output["ReservedNodeOfferingId"] !== undefined) {
-        contents.ReservedNodeOfferingId = (0, smithy_client_1.expectString)(output["ReservedNodeOfferingId"]);
+        contents.ReservedNodeOfferingId = smithy_client_1.expectString(output["ReservedNodeOfferingId"]);
     }
     if (output["NodeType"] !== undefined) {
-        contents.NodeType = (0, smithy_client_1.expectString)(output["NodeType"]);
+        contents.NodeType = smithy_client_1.expectString(output["NodeType"]);
     }
     if (output["Duration"] !== undefined) {
-        contents.Duration = (0, smithy_client_1.strictParseInt32)(output["Duration"]);
+        contents.Duration = smithy_client_1.strictParseInt32(output["Duration"]);
     }
     if (output["FixedPrice"] !== undefined) {
-        contents.FixedPrice = (0, smithy_client_1.strictParseFloat)(output["FixedPrice"]);
+        contents.FixedPrice = smithy_client_1.strictParseFloat(output["FixedPrice"]);
     }
     if (output["UsagePrice"] !== undefined) {
-        contents.UsagePrice = (0, smithy_client_1.strictParseFloat)(output["UsagePrice"]);
+        contents.UsagePrice = smithy_client_1.strictParseFloat(output["UsagePrice"]);
     }
     if (output["CurrencyCode"] !== undefined) {
-        contents.CurrencyCode = (0, smithy_client_1.expectString)(output["CurrencyCode"]);
+        contents.CurrencyCode = smithy_client_1.expectString(output["CurrencyCode"]);
     }
     if (output["OfferingType"] !== undefined) {
-        contents.OfferingType = (0, smithy_client_1.expectString)(output["OfferingType"]);
+        contents.OfferingType = smithy_client_1.expectString(output["OfferingType"]);
     }
     if (output.RecurringCharges === "") {
         contents.RecurringCharges = [];
     }
     if (output["RecurringCharges"] !== undefined && output["RecurringCharges"]["RecurringCharge"] !== undefined) {
-        contents.RecurringCharges = deserializeAws_queryRecurringChargeList((0, smithy_client_1.getArrayIfSingleItem)(output["RecurringCharges"]["RecurringCharge"]), context);
+        contents.RecurringCharges = deserializeAws_queryRecurringChargeList(smithy_client_1.getArrayIfSingleItem(output["RecurringCharges"]["RecurringCharge"]), context);
     }
     if (output["ReservedNodeOfferingType"] !== undefined) {
-        contents.ReservedNodeOfferingType = (0, smithy_client_1.expectString)(output["ReservedNodeOfferingType"]);
+        contents.ReservedNodeOfferingType = smithy_client_1.expectString(output["ReservedNodeOfferingType"]);
     }
     return contents;
 };
@@ -16729,7 +16729,7 @@ const deserializeAws_queryReservedNodeOfferingNotFoundFault = (output, context)
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -16739,14 +16739,14 @@ const deserializeAws_queryReservedNodeOfferingsMessage = (output, context) => {
         ReservedNodeOfferings: undefined,
     };
     if (output["Marker"] !== undefined) {
-        contents.Marker = (0, smithy_client_1.expectString)(output["Marker"]);
+        contents.Marker = smithy_client_1.expectString(output["Marker"]);
     }
     if (output.ReservedNodeOfferings === "") {
         contents.ReservedNodeOfferings = [];
     }
     if (output["ReservedNodeOfferings"] !== undefined &&
         output["ReservedNodeOfferings"]["ReservedNodeOffering"] !== undefined) {
-        contents.ReservedNodeOfferings = deserializeAws_queryReservedNodeOfferingList((0, smithy_client_1.getArrayIfSingleItem)(output["ReservedNodeOfferings"]["ReservedNodeOffering"]), context);
+        contents.ReservedNodeOfferings = deserializeAws_queryReservedNodeOfferingList(smithy_client_1.getArrayIfSingleItem(output["ReservedNodeOfferings"]["ReservedNodeOffering"]), context);
     }
     return contents;
 };
@@ -16755,7 +16755,7 @@ const deserializeAws_queryReservedNodeQuotaExceededFault = (output, context) =>
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -16765,13 +16765,13 @@ const deserializeAws_queryReservedNodesMessage = (output, context) => {
         ReservedNodes: undefined,
     };
     if (output["Marker"] !== undefined) {
-        contents.Marker = (0, smithy_client_1.expectString)(output["Marker"]);
+        contents.Marker = smithy_client_1.expectString(output["Marker"]);
     }
     if (output.ReservedNodes === "") {
         contents.ReservedNodes = [];
     }
     if (output["ReservedNodes"] !== undefined && output["ReservedNodes"]["ReservedNode"] !== undefined) {
-        contents.ReservedNodes = deserializeAws_queryReservedNodeList((0, smithy_client_1.getArrayIfSingleItem)(output["ReservedNodes"]["ReservedNode"]), context);
+        contents.ReservedNodes = deserializeAws_queryReservedNodeList(smithy_client_1.getArrayIfSingleItem(output["ReservedNodes"]["ReservedNode"]), context);
     }
     return contents;
 };
@@ -16784,19 +16784,19 @@ const deserializeAws_queryResizeClusterMessage = (output, context) => {
         Classic: undefined,
     };
     if (output["ClusterIdentifier"] !== undefined) {
-        contents.ClusterIdentifier = (0, smithy_client_1.expectString)(output["ClusterIdentifier"]);
+        contents.ClusterIdentifier = smithy_client_1.expectString(output["ClusterIdentifier"]);
     }
     if (output["ClusterType"] !== undefined) {
-        contents.ClusterType = (0, smithy_client_1.expectString)(output["ClusterType"]);
+        contents.ClusterType = smithy_client_1.expectString(output["ClusterType"]);
     }
     if (output["NodeType"] !== undefined) {
-        contents.NodeType = (0, smithy_client_1.expectString)(output["NodeType"]);
+        contents.NodeType = smithy_client_1.expectString(output["NodeType"]);
     }
     if (output["NumberOfNodes"] !== undefined) {
-        contents.NumberOfNodes = (0, smithy_client_1.strictParseInt32)(output["NumberOfNodes"]);
+        contents.NumberOfNodes = smithy_client_1.strictParseInt32(output["NumberOfNodes"]);
     }
     if (output["Classic"] !== undefined) {
-        contents.Classic = (0, smithy_client_1.parseBoolean)(output["Classic"]);
+        contents.Classic = smithy_client_1.parseBoolean(output["Classic"]);
     }
     return contents;
 };
@@ -16815,10 +16815,10 @@ const deserializeAws_queryResizeInfo = (output, context) => {
         AllowCancelResize: undefined,
     };
     if (output["ResizeType"] !== undefined) {
-        contents.ResizeType = (0, smithy_client_1.expectString)(output["ResizeType"]);
+        contents.ResizeType = smithy_client_1.expectString(output["ResizeType"]);
     }
     if (output["AllowCancelResize"] !== undefined) {
-        contents.AllowCancelResize = (0, smithy_client_1.parseBoolean)(output["AllowCancelResize"]);
+        contents.AllowCancelResize = smithy_client_1.parseBoolean(output["AllowCancelResize"]);
     }
     return contents;
 };
@@ -16827,7 +16827,7 @@ const deserializeAws_queryResizeNotFoundFault = (output, context) => {
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -16851,61 +16851,61 @@ const deserializeAws_queryResizeProgressMessage = (output, context) => {
         DataTransferProgressPercent: undefined,
     };
     if (output["TargetNodeType"] !== undefined) {
-        contents.TargetNodeType = (0, smithy_client_1.expectString)(output["TargetNodeType"]);
+        contents.TargetNodeType = smithy_client_1.expectString(output["TargetNodeType"]);
     }
     if (output["TargetNumberOfNodes"] !== undefined) {
-        contents.TargetNumberOfNodes = (0, smithy_client_1.strictParseInt32)(output["TargetNumberOfNodes"]);
+        contents.TargetNumberOfNodes = smithy_client_1.strictParseInt32(output["TargetNumberOfNodes"]);
     }
     if (output["TargetClusterType"] !== undefined) {
-        contents.TargetClusterType = (0, smithy_client_1.expectString)(output["TargetClusterType"]);
+        contents.TargetClusterType = smithy_client_1.expectString(output["TargetClusterType"]);
     }
     if (output["Status"] !== undefined) {
-        contents.Status = (0, smithy_client_1.expectString)(output["Status"]);
+        contents.Status = smithy_client_1.expectString(output["Status"]);
     }
     if (output.ImportTablesCompleted === "") {
         contents.ImportTablesCompleted = [];
     }
     if (output["ImportTablesCompleted"] !== undefined && output["ImportTablesCompleted"]["member"] !== undefined) {
-        contents.ImportTablesCompleted = deserializeAws_queryImportTablesCompleted((0, smithy_client_1.getArrayIfSingleItem)(output["ImportTablesCompleted"]["member"]), context);
+        contents.ImportTablesCompleted = deserializeAws_queryImportTablesCompleted(smithy_client_1.getArrayIfSingleItem(output["ImportTablesCompleted"]["member"]), context);
     }
     if (output.ImportTablesInProgress === "") {
         contents.ImportTablesInProgress = [];
     }
     if (output["ImportTablesInProgress"] !== undefined && output["ImportTablesInProgress"]["member"] !== undefined) {
-        contents.ImportTablesInProgress = deserializeAws_queryImportTablesInProgress((0, smithy_client_1.getArrayIfSingleItem)(output["ImportTablesInProgress"]["member"]), context);
+        contents.ImportTablesInProgress = deserializeAws_queryImportTablesInProgress(smithy_client_1.getArrayIfSingleItem(output["ImportTablesInProgress"]["member"]), context);
     }
     if (output.ImportTablesNotStarted === "") {
         contents.ImportTablesNotStarted = [];
     }
     if (output["ImportTablesNotStarted"] !== undefined && output["ImportTablesNotStarted"]["member"] !== undefined) {
-        contents.ImportTablesNotStarted = deserializeAws_queryImportTablesNotStarted((0, smithy_client_1.getArrayIfSingleItem)(output["ImportTablesNotStarted"]["member"]), context);
+        contents.ImportTablesNotStarted = deserializeAws_queryImportTablesNotStarted(smithy_client_1.getArrayIfSingleItem(output["ImportTablesNotStarted"]["member"]), context);
     }
     if (output["AvgResizeRateInMegaBytesPerSecond"] !== undefined) {
-        contents.AvgResizeRateInMegaBytesPerSecond = (0, smithy_client_1.strictParseFloat)(output["AvgResizeRateInMegaBytesPerSecond"]);
+        contents.AvgResizeRateInMegaBytesPerSecond = smithy_client_1.strictParseFloat(output["AvgResizeRateInMegaBytesPerSecond"]);
     }
     if (output["TotalResizeDataInMegaBytes"] !== undefined) {
-        contents.TotalResizeDataInMegaBytes = (0, smithy_client_1.strictParseLong)(output["TotalResizeDataInMegaBytes"]);
+        contents.TotalResizeDataInMegaBytes = smithy_client_1.strictParseLong(output["TotalResizeDataInMegaBytes"]);
     }
     if (output["ProgressInMegaBytes"] !== undefined) {
-        contents.ProgressInMegaBytes = (0, smithy_client_1.strictParseLong)(output["ProgressInMegaBytes"]);
+        contents.ProgressInMegaBytes = smithy_client_1.strictParseLong(output["ProgressInMegaBytes"]);
     }
     if (output["ElapsedTimeInSeconds"] !== undefined) {
-        contents.ElapsedTimeInSeconds = (0, smithy_client_1.strictParseLong)(output["ElapsedTimeInSeconds"]);
+        contents.ElapsedTimeInSeconds = smithy_client_1.strictParseLong(output["ElapsedTimeInSeconds"]);
     }
     if (output["EstimatedTimeToCompletionInSeconds"] !== undefined) {
-        contents.EstimatedTimeToCompletionInSeconds = (0, smithy_client_1.strictParseLong)(output["EstimatedTimeToCompletionInSeconds"]);
+        contents.EstimatedTimeToCompletionInSeconds = smithy_client_1.strictParseLong(output["EstimatedTimeToCompletionInSeconds"]);
     }
     if (output["ResizeType"] !== undefined) {
-        contents.ResizeType = (0, smithy_client_1.expectString)(output["ResizeType"]);
+        contents.ResizeType = smithy_client_1.expectString(output["ResizeType"]);
     }
     if (output["Message"] !== undefined) {
-        contents.Message = (0, smithy_client_1.expectString)(output["Message"]);
+        contents.Message = smithy_client_1.expectString(output["Message"]);
     }
     if (output["TargetEncryptionType"] !== undefined) {
-        contents.TargetEncryptionType = (0, smithy_client_1.expectString)(output["TargetEncryptionType"]);
+        contents.TargetEncryptionType = smithy_client_1.expectString(output["TargetEncryptionType"]);
     }
     if (output["DataTransferProgressPercent"] !== undefined) {
-        contents.DataTransferProgressPercent = (0, smithy_client_1.strictParseFloat)(output["DataTransferProgressPercent"]);
+        contents.DataTransferProgressPercent = smithy_client_1.strictParseFloat(output["DataTransferProgressPercent"]);
     }
     return contents;
 };
@@ -16914,7 +16914,7 @@ const deserializeAws_queryResourceNotFoundFault = (output, context) => {
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -16925,7 +16925,7 @@ const deserializeAws_queryRestorableNodeTypeList = (output, context) => {
         if (entry === null) {
             return null;
         }
-        return (0, smithy_client_1.expectString)(entry);
+        return smithy_client_1.expectString(entry);
     });
 };
 const deserializeAws_queryRestoreFromClusterSnapshotResult = (output, context) => {
@@ -16947,22 +16947,22 @@ const deserializeAws_queryRestoreStatus = (output, context) => {
         EstimatedTimeToCompletionInSeconds: undefined,
     };
     if (output["Status"] !== undefined) {
-        contents.Status = (0, smithy_client_1.expectString)(output["Status"]);
+        contents.Status = smithy_client_1.expectString(output["Status"]);
     }
     if (output["CurrentRestoreRateInMegaBytesPerSecond"] !== undefined) {
-        contents.CurrentRestoreRateInMegaBytesPerSecond = (0, smithy_client_1.strictParseFloat)(output["CurrentRestoreRateInMegaBytesPerSecond"]);
+        contents.CurrentRestoreRateInMegaBytesPerSecond = smithy_client_1.strictParseFloat(output["CurrentRestoreRateInMegaBytesPerSecond"]);
     }
     if (output["SnapshotSizeInMegaBytes"] !== undefined) {
-        contents.SnapshotSizeInMegaBytes = (0, smithy_client_1.strictParseLong)(output["SnapshotSizeInMegaBytes"]);
+        contents.SnapshotSizeInMegaBytes = smithy_client_1.strictParseLong(output["SnapshotSizeInMegaBytes"]);
     }
     if (output["ProgressInMegaBytes"] !== undefined) {
-        contents.ProgressInMegaBytes = (0, smithy_client_1.strictParseLong)(output["ProgressInMegaBytes"]);
+        contents.ProgressInMegaBytes = smithy_client_1.strictParseLong(output["ProgressInMegaBytes"]);
     }
     if (output["ElapsedTimeInSeconds"] !== undefined) {
-        contents.ElapsedTimeInSeconds = (0, smithy_client_1.strictParseLong)(output["ElapsedTimeInSeconds"]);
+        contents.ElapsedTimeInSeconds = smithy_client_1.strictParseLong(output["ElapsedTimeInSeconds"]);
     }
     if (output["EstimatedTimeToCompletionInSeconds"] !== undefined) {
-        contents.EstimatedTimeToCompletionInSeconds = (0, smithy_client_1.strictParseLong)(output["EstimatedTimeToCompletionInSeconds"]);
+        contents.EstimatedTimeToCompletionInSeconds = smithy_client_1.strictParseLong(output["EstimatedTimeToCompletionInSeconds"]);
     }
     return contents;
 };
@@ -16980,7 +16980,7 @@ const deserializeAws_queryResumeClusterMessage = (output, context) => {
         ClusterIdentifier: undefined,
     };
     if (output["ClusterIdentifier"] !== undefined) {
-        contents.ClusterIdentifier = (0, smithy_client_1.expectString)(output["ClusterIdentifier"]);
+        contents.ClusterIdentifier = smithy_client_1.expectString(output["ClusterIdentifier"]);
     }
     return contents;
 };
@@ -17000,13 +17000,13 @@ const deserializeAws_queryRevisionTarget = (output, context) => {
         DatabaseRevisionReleaseDate: undefined,
     };
     if (output["DatabaseRevision"] !== undefined) {
-        contents.DatabaseRevision = (0, smithy_client_1.expectString)(output["DatabaseRevision"]);
+        contents.DatabaseRevision = smithy_client_1.expectString(output["DatabaseRevision"]);
     }
     if (output["Description"] !== undefined) {
-        contents.Description = (0, smithy_client_1.expectString)(output["Description"]);
+        contents.Description = smithy_client_1.expectString(output["Description"]);
     }
     if (output["DatabaseRevisionReleaseDate"] !== undefined) {
-        contents.DatabaseRevisionReleaseDate = new Date(output["DatabaseRevisionReleaseDate"]);
+        contents.DatabaseRevisionReleaseDate = smithy_client_1.expectNonNull(smithy_client_1.parseRfc3339DateTime(output["DatabaseRevisionReleaseDate"]));
     }
     return contents;
 };
@@ -17060,34 +17060,34 @@ const deserializeAws_queryScheduledAction = (output, context) => {
         EndTime: undefined,
     };
     if (output["ScheduledActionName"] !== undefined) {
-        contents.ScheduledActionName = (0, smithy_client_1.expectString)(output["ScheduledActionName"]);
+        contents.ScheduledActionName = smithy_client_1.expectString(output["ScheduledActionName"]);
     }
     if (output["TargetAction"] !== undefined) {
         contents.TargetAction = deserializeAws_queryScheduledActionType(output["TargetAction"], context);
     }
     if (output["Schedule"] !== undefined) {
-        contents.Schedule = (0, smithy_client_1.expectString)(output["Schedule"]);
+        contents.Schedule = smithy_client_1.expectString(output["Schedule"]);
     }
     if (output["IamRole"] !== undefined) {
-        contents.IamRole = (0, smithy_client_1.expectString)(output["IamRole"]);
+        contents.IamRole = smithy_client_1.expectString(output["IamRole"]);
     }
     if (output["ScheduledActionDescription"] !== undefined) {
-        contents.ScheduledActionDescription = (0, smithy_client_1.expectString)(output["ScheduledActionDescription"]);
+        contents.ScheduledActionDescription = smithy_client_1.expectString(output["ScheduledActionDescription"]);
     }
     if (output["State"] !== undefined) {
-        contents.State = (0, smithy_client_1.expectString)(output["State"]);
+        contents.State = smithy_client_1.expectString(output["State"]);
     }
     if (output.NextInvocations === "") {
         contents.NextInvocations = [];
     }
     if (output["NextInvocations"] !== undefined && output["NextInvocations"]["ScheduledActionTime"] !== undefined) {
-        contents.NextInvocations = deserializeAws_queryScheduledActionTimeList((0, smithy_client_1.getArrayIfSingleItem)(output["NextInvocations"]["ScheduledActionTime"]), context);
+        contents.NextInvocations = deserializeAws_queryScheduledActionTimeList(smithy_client_1.getArrayIfSingleItem(output["NextInvocations"]["ScheduledActionTime"]), context);
     }
     if (output["StartTime"] !== undefined) {
-        contents.StartTime = new Date(output["StartTime"]);
+        contents.StartTime = smithy_client_1.expectNonNull(smithy_client_1.parseRfc3339DateTime(output["StartTime"]));
     }
     if (output["EndTime"] !== undefined) {
-        contents.EndTime = new Date(output["EndTime"]);
+        contents.EndTime = smithy_client_1.expectNonNull(smithy_client_1.parseRfc3339DateTime(output["EndTime"]));
     }
     return contents;
 };
@@ -17096,7 +17096,7 @@ const deserializeAws_queryScheduledActionAlreadyExistsFault = (output, context)
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -17115,7 +17115,7 @@ const deserializeAws_queryScheduledActionNotFoundFault = (output, context) => {
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -17124,7 +17124,7 @@ const deserializeAws_queryScheduledActionQuotaExceededFault = (output, context)
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -17134,13 +17134,13 @@ const deserializeAws_queryScheduledActionsMessage = (output, context) => {
         ScheduledActions: undefined,
     };
     if (output["Marker"] !== undefined) {
-        contents.Marker = (0, smithy_client_1.expectString)(output["Marker"]);
+        contents.Marker = smithy_client_1.expectString(output["Marker"]);
     }
     if (output.ScheduledActions === "") {
         contents.ScheduledActions = [];
     }
     if (output["ScheduledActions"] !== undefined && output["ScheduledActions"]["ScheduledAction"] !== undefined) {
-        contents.ScheduledActions = deserializeAws_queryScheduledActionList((0, smithy_client_1.getArrayIfSingleItem)(output["ScheduledActions"]["ScheduledAction"]), context);
+        contents.ScheduledActions = deserializeAws_queryScheduledActionList(smithy_client_1.getArrayIfSingleItem(output["ScheduledActions"]["ScheduledAction"]), context);
     }
     return contents;
 };
@@ -17151,7 +17151,7 @@ const deserializeAws_queryScheduledActionTimeList = (output, context) => {
         if (entry === null) {
             return null;
         }
-        return new Date(entry);
+        return smithy_client_1.expectNonNull(smithy_client_1.parseRfc3339DateTime(entry));
     });
 };
 const deserializeAws_queryScheduledActionType = (output, context) => {
@@ -17176,7 +17176,7 @@ const deserializeAws_queryScheduledActionTypeUnsupportedFault = (output, context
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -17187,7 +17187,7 @@ const deserializeAws_queryScheduleDefinitionList = (output, context) => {
         if (entry === null) {
             return null;
         }
-        return (0, smithy_client_1.expectString)(entry);
+        return smithy_client_1.expectString(entry);
     });
 };
 const deserializeAws_queryScheduleDefinitionTypeUnsupportedFault = (output, context) => {
@@ -17195,7 +17195,7 @@ const deserializeAws_queryScheduleDefinitionTypeUnsupportedFault = (output, cont
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -17206,7 +17206,7 @@ const deserializeAws_queryScheduledSnapshotTimeList = (output, context) => {
         if (entry === null) {
             return null;
         }
-        return new Date(entry);
+        return smithy_client_1.expectNonNull(smithy_client_1.parseRfc3339DateTime(entry));
     });
 };
 const deserializeAws_querySnapshot = (output, context) => {
@@ -17247,116 +17247,116 @@ const deserializeAws_querySnapshot = (output, context) => {
         SnapshotRetentionStartTime: undefined,
     };
     if (output["SnapshotIdentifier"] !== undefined) {
-        contents.SnapshotIdentifier = (0, smithy_client_1.expectString)(output["SnapshotIdentifier"]);
+        contents.SnapshotIdentifier = smithy_client_1.expectString(output["SnapshotIdentifier"]);
     }
     if (output["ClusterIdentifier"] !== undefined) {
-        contents.ClusterIdentifier = (0, smithy_client_1.expectString)(output["ClusterIdentifier"]);
+        contents.ClusterIdentifier = smithy_client_1.expectString(output["ClusterIdentifier"]);
     }
     if (output["SnapshotCreateTime"] !== undefined) {
-        contents.SnapshotCreateTime = new Date(output["SnapshotCreateTime"]);
+        contents.SnapshotCreateTime = smithy_client_1.expectNonNull(smithy_client_1.parseRfc3339DateTime(output["SnapshotCreateTime"]));
     }
     if (output["Status"] !== undefined) {
-        contents.Status = (0, smithy_client_1.expectString)(output["Status"]);
+        contents.Status = smithy_client_1.expectString(output["Status"]);
     }
     if (output["Port"] !== undefined) {
-        contents.Port = (0, smithy_client_1.strictParseInt32)(output["Port"]);
+        contents.Port = smithy_client_1.strictParseInt32(output["Port"]);
     }
     if (output["AvailabilityZone"] !== undefined) {
-        contents.AvailabilityZone = (0, smithy_client_1.expectString)(output["AvailabilityZone"]);
+        contents.AvailabilityZone = smithy_client_1.expectString(output["AvailabilityZone"]);
     }
     if (output["ClusterCreateTime"] !== undefined) {
-        contents.ClusterCreateTime = new Date(output["ClusterCreateTime"]);
+        contents.ClusterCreateTime = smithy_client_1.expectNonNull(smithy_client_1.parseRfc3339DateTime(output["ClusterCreateTime"]));
     }
     if (output["MasterUsername"] !== undefined) {
-        contents.MasterUsername = (0, smithy_client_1.expectString)(output["MasterUsername"]);
+        contents.MasterUsername = smithy_client_1.expectString(output["MasterUsername"]);
     }
     if (output["ClusterVersion"] !== undefined) {
-        contents.ClusterVersion = (0, smithy_client_1.expectString)(output["ClusterVersion"]);
+        contents.ClusterVersion = smithy_client_1.expectString(output["ClusterVersion"]);
     }
     if (output["EngineFullVersion"] !== undefined) {
-        contents.EngineFullVersion = (0, smithy_client_1.expectString)(output["EngineFullVersion"]);
+        contents.EngineFullVersion = smithy_client_1.expectString(output["EngineFullVersion"]);
     }
     if (output["SnapshotType"] !== undefined) {
-        contents.SnapshotType = (0, smithy_client_1.expectString)(output["SnapshotType"]);
+        contents.SnapshotType = smithy_client_1.expectString(output["SnapshotType"]);
     }
     if (output["NodeType"] !== undefined) {
-        contents.NodeType = (0, smithy_client_1.expectString)(output["NodeType"]);
+        contents.NodeType = smithy_client_1.expectString(output["NodeType"]);
     }
     if (output["NumberOfNodes"] !== undefined) {
-        contents.NumberOfNodes = (0, smithy_client_1.strictParseInt32)(output["NumberOfNodes"]);
+        contents.NumberOfNodes = smithy_client_1.strictParseInt32(output["NumberOfNodes"]);
     }
     if (output["DBName"] !== undefined) {
-        contents.DBName = (0, smithy_client_1.expectString)(output["DBName"]);
+        contents.DBName = smithy_client_1.expectString(output["DBName"]);
     }
     if (output["VpcId"] !== undefined) {
-        contents.VpcId = (0, smithy_client_1.expectString)(output["VpcId"]);
+        contents.VpcId = smithy_client_1.expectString(output["VpcId"]);
     }
     if (output["Encrypted"] !== undefined) {
-        contents.Encrypted = (0, smithy_client_1.parseBoolean)(output["Encrypted"]);
+        contents.Encrypted = smithy_client_1.parseBoolean(output["Encrypted"]);
     }
     if (output["KmsKeyId"] !== undefined) {
-        contents.KmsKeyId = (0, smithy_client_1.expectString)(output["KmsKeyId"]);
+        contents.KmsKeyId = smithy_client_1.expectString(output["KmsKeyId"]);
     }
     if (output["EncryptedWithHSM"] !== undefined) {
-        contents.EncryptedWithHSM = (0, smithy_client_1.parseBoolean)(output["EncryptedWithHSM"]);
+        contents.EncryptedWithHSM = smithy_client_1.parseBoolean(output["EncryptedWithHSM"]);
     }
     if (output.AccountsWithRestoreAccess === "") {
         contents.AccountsWithRestoreAccess = [];
     }
     if (output["AccountsWithRestoreAccess"] !== undefined &&
         output["AccountsWithRestoreAccess"]["AccountWithRestoreAccess"] !== undefined) {
-        contents.AccountsWithRestoreAccess = deserializeAws_queryAccountsWithRestoreAccessList((0, smithy_client_1.getArrayIfSingleItem)(output["AccountsWithRestoreAccess"]["AccountWithRestoreAccess"]), context);
+        contents.AccountsWithRestoreAccess = deserializeAws_queryAccountsWithRestoreAccessList(smithy_client_1.getArrayIfSingleItem(output["AccountsWithRestoreAccess"]["AccountWithRestoreAccess"]), context);
     }
     if (output["OwnerAccount"] !== undefined) {
-        contents.OwnerAccount = (0, smithy_client_1.expectString)(output["OwnerAccount"]);
+        contents.OwnerAccount = smithy_client_1.expectString(output["OwnerAccount"]);
     }
     if (output["TotalBackupSizeInMegaBytes"] !== undefined) {
-        contents.TotalBackupSizeInMegaBytes = (0, smithy_client_1.strictParseFloat)(output["TotalBackupSizeInMegaBytes"]);
+        contents.TotalBackupSizeInMegaBytes = smithy_client_1.strictParseFloat(output["TotalBackupSizeInMegaBytes"]);
     }
     if (output["ActualIncrementalBackupSizeInMegaBytes"] !== undefined) {
-        contents.ActualIncrementalBackupSizeInMegaBytes = (0, smithy_client_1.strictParseFloat)(output["ActualIncrementalBackupSizeInMegaBytes"]);
+        contents.ActualIncrementalBackupSizeInMegaBytes = smithy_client_1.strictParseFloat(output["ActualIncrementalBackupSizeInMegaBytes"]);
     }
     if (output["BackupProgressInMegaBytes"] !== undefined) {
-        contents.BackupProgressInMegaBytes = (0, smithy_client_1.strictParseFloat)(output["BackupProgressInMegaBytes"]);
+        contents.BackupProgressInMegaBytes = smithy_client_1.strictParseFloat(output["BackupProgressInMegaBytes"]);
     }
     if (output["CurrentBackupRateInMegaBytesPerSecond"] !== undefined) {
-        contents.CurrentBackupRateInMegaBytesPerSecond = (0, smithy_client_1.strictParseFloat)(output["CurrentBackupRateInMegaBytesPerSecond"]);
+        contents.CurrentBackupRateInMegaBytesPerSecond = smithy_client_1.strictParseFloat(output["CurrentBackupRateInMegaBytesPerSecond"]);
     }
     if (output["EstimatedSecondsToCompletion"] !== undefined) {
-        contents.EstimatedSecondsToCompletion = (0, smithy_client_1.strictParseLong)(output["EstimatedSecondsToCompletion"]);
+        contents.EstimatedSecondsToCompletion = smithy_client_1.strictParseLong(output["EstimatedSecondsToCompletion"]);
     }
     if (output["ElapsedTimeInSeconds"] !== undefined) {
-        contents.ElapsedTimeInSeconds = (0, smithy_client_1.strictParseLong)(output["ElapsedTimeInSeconds"]);
+        contents.ElapsedTimeInSeconds = smithy_client_1.strictParseLong(output["ElapsedTimeInSeconds"]);
     }
     if (output["SourceRegion"] !== undefined) {
-        contents.SourceRegion = (0, smithy_client_1.expectString)(output["SourceRegion"]);
+        contents.SourceRegion = smithy_client_1.expectString(output["SourceRegion"]);
     }
     if (output.Tags === "") {
         contents.Tags = [];
     }
     if (output["Tags"] !== undefined && output["Tags"]["Tag"] !== undefined) {
-        contents.Tags = deserializeAws_queryTagList((0, smithy_client_1.getArrayIfSingleItem)(output["Tags"]["Tag"]), context);
+        contents.Tags = deserializeAws_queryTagList(smithy_client_1.getArrayIfSingleItem(output["Tags"]["Tag"]), context);
     }
     if (output.RestorableNodeTypes === "") {
         contents.RestorableNodeTypes = [];
     }
     if (output["RestorableNodeTypes"] !== undefined && output["RestorableNodeTypes"]["NodeType"] !== undefined) {
-        contents.RestorableNodeTypes = deserializeAws_queryRestorableNodeTypeList((0, smithy_client_1.getArrayIfSingleItem)(output["RestorableNodeTypes"]["NodeType"]), context);
+        contents.RestorableNodeTypes = deserializeAws_queryRestorableNodeTypeList(smithy_client_1.getArrayIfSingleItem(output["RestorableNodeTypes"]["NodeType"]), context);
     }
     if (output["EnhancedVpcRouting"] !== undefined) {
-        contents.EnhancedVpcRouting = (0, smithy_client_1.parseBoolean)(output["EnhancedVpcRouting"]);
+        contents.EnhancedVpcRouting = smithy_client_1.parseBoolean(output["EnhancedVpcRouting"]);
     }
     if (output["MaintenanceTrackName"] !== undefined) {
-        contents.MaintenanceTrackName = (0, smithy_client_1.expectString)(output["MaintenanceTrackName"]);
+        contents.MaintenanceTrackName = smithy_client_1.expectString(output["MaintenanceTrackName"]);
     }
     if (output["ManualSnapshotRetentionPeriod"] !== undefined) {
-        contents.ManualSnapshotRetentionPeriod = (0, smithy_client_1.strictParseInt32)(output["ManualSnapshotRetentionPeriod"]);
+        contents.ManualSnapshotRetentionPeriod = smithy_client_1.strictParseInt32(output["ManualSnapshotRetentionPeriod"]);
     }
     if (output["ManualSnapshotRemainingDays"] !== undefined) {
-        contents.ManualSnapshotRemainingDays = (0, smithy_client_1.strictParseInt32)(output["ManualSnapshotRemainingDays"]);
+        contents.ManualSnapshotRemainingDays = smithy_client_1.strictParseInt32(output["ManualSnapshotRemainingDays"]);
     }
     if (output["SnapshotRetentionStartTime"] !== undefined) {
-        contents.SnapshotRetentionStartTime = new Date(output["SnapshotRetentionStartTime"]);
+        contents.SnapshotRetentionStartTime = smithy_client_1.expectNonNull(smithy_client_1.parseRfc3339DateTime(output["SnapshotRetentionStartTime"]));
     }
     return contents;
 };
@@ -17365,7 +17365,7 @@ const deserializeAws_querySnapshotCopyAlreadyDisabledFault = (output, context) =
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -17374,7 +17374,7 @@ const deserializeAws_querySnapshotCopyAlreadyEnabledFault = (output, context) =>
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -17383,7 +17383,7 @@ const deserializeAws_querySnapshotCopyDisabledFault = (output, context) => {
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -17394,16 +17394,16 @@ const deserializeAws_querySnapshotCopyGrant = (output, context) => {
         Tags: undefined,
     };
     if (output["SnapshotCopyGrantName"] !== undefined) {
-        contents.SnapshotCopyGrantName = (0, smithy_client_1.expectString)(output["SnapshotCopyGrantName"]);
+        contents.SnapshotCopyGrantName = smithy_client_1.expectString(output["SnapshotCopyGrantName"]);
     }
     if (output["KmsKeyId"] !== undefined) {
-        contents.KmsKeyId = (0, smithy_client_1.expectString)(output["KmsKeyId"]);
+        contents.KmsKeyId = smithy_client_1.expectString(output["KmsKeyId"]);
     }
     if (output.Tags === "") {
         contents.Tags = [];
     }
     if (output["Tags"] !== undefined && output["Tags"]["Tag"] !== undefined) {
-        contents.Tags = deserializeAws_queryTagList((0, smithy_client_1.getArrayIfSingleItem)(output["Tags"]["Tag"]), context);
+        contents.Tags = deserializeAws_queryTagList(smithy_client_1.getArrayIfSingleItem(output["Tags"]["Tag"]), context);
     }
     return contents;
 };
@@ -17412,7 +17412,7 @@ const deserializeAws_querySnapshotCopyGrantAlreadyExistsFault = (output, context
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -17432,13 +17432,13 @@ const deserializeAws_querySnapshotCopyGrantMessage = (output, context) => {
         SnapshotCopyGrants: undefined,
     };
     if (output["Marker"] !== undefined) {
-        contents.Marker = (0, smithy_client_1.expectString)(output["Marker"]);
+        contents.Marker = smithy_client_1.expectString(output["Marker"]);
     }
     if (output.SnapshotCopyGrants === "") {
         contents.SnapshotCopyGrants = [];
     }
     if (output["SnapshotCopyGrants"] !== undefined && output["SnapshotCopyGrants"]["SnapshotCopyGrant"] !== undefined) {
-        contents.SnapshotCopyGrants = deserializeAws_querySnapshotCopyGrantList((0, smithy_client_1.getArrayIfSingleItem)(output["SnapshotCopyGrants"]["SnapshotCopyGrant"]), context);
+        contents.SnapshotCopyGrants = deserializeAws_querySnapshotCopyGrantList(smithy_client_1.getArrayIfSingleItem(output["SnapshotCopyGrants"]["SnapshotCopyGrant"]), context);
     }
     return contents;
 };
@@ -17447,7 +17447,7 @@ const deserializeAws_querySnapshotCopyGrantNotFoundFault = (output, context) =>
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -17456,7 +17456,7 @@ const deserializeAws_querySnapshotCopyGrantQuotaExceededFault = (output, context
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -17468,16 +17468,16 @@ const deserializeAws_querySnapshotErrorMessage = (output, context) => {
         FailureReason: undefined,
     };
     if (output["SnapshotIdentifier"] !== undefined) {
-        contents.SnapshotIdentifier = (0, smithy_client_1.expectString)(output["SnapshotIdentifier"]);
+        contents.SnapshotIdentifier = smithy_client_1.expectString(output["SnapshotIdentifier"]);
     }
     if (output["SnapshotClusterIdentifier"] !== undefined) {
-        contents.SnapshotClusterIdentifier = (0, smithy_client_1.expectString)(output["SnapshotClusterIdentifier"]);
+        contents.SnapshotClusterIdentifier = smithy_client_1.expectString(output["SnapshotClusterIdentifier"]);
     }
     if (output["FailureCode"] !== undefined) {
-        contents.FailureCode = (0, smithy_client_1.expectString)(output["FailureCode"]);
+        contents.FailureCode = smithy_client_1.expectString(output["FailureCode"]);
     }
     if (output["FailureReason"] !== undefined) {
-        contents.FailureReason = (0, smithy_client_1.expectString)(output["FailureReason"]);
+        contents.FailureReason = smithy_client_1.expectString(output["FailureReason"]);
     }
     return contents;
 };
@@ -17488,7 +17488,7 @@ const deserializeAws_querySnapshotIdentifierList = (output, context) => {
         if (entry === null) {
             return null;
         }
-        return (0, smithy_client_1.expectString)(entry);
+        return smithy_client_1.expectString(entry);
     });
 };
 const deserializeAws_querySnapshotList = (output, context) => {
@@ -17507,13 +17507,13 @@ const deserializeAws_querySnapshotMessage = (output, context) => {
         Snapshots: undefined,
     };
     if (output["Marker"] !== undefined) {
-        contents.Marker = (0, smithy_client_1.expectString)(output["Marker"]);
+        contents.Marker = smithy_client_1.expectString(output["Marker"]);
     }
     if (output.Snapshots === "") {
         contents.Snapshots = [];
     }
     if (output["Snapshots"] !== undefined && output["Snapshots"]["Snapshot"] !== undefined) {
-        contents.Snapshots = deserializeAws_querySnapshotList((0, smithy_client_1.getArrayIfSingleItem)(output["Snapshots"]["Snapshot"]), context);
+        contents.Snapshots = deserializeAws_querySnapshotList(smithy_client_1.getArrayIfSingleItem(output["Snapshots"]["Snapshot"]), context);
     }
     return contents;
 };
@@ -17532,35 +17532,35 @@ const deserializeAws_querySnapshotSchedule = (output, context) => {
     }
     if (output["ScheduleDefinitions"] !== undefined &&
         output["ScheduleDefinitions"]["ScheduleDefinition"] !== undefined) {
-        contents.ScheduleDefinitions = deserializeAws_queryScheduleDefinitionList((0, smithy_client_1.getArrayIfSingleItem)(output["ScheduleDefinitions"]["ScheduleDefinition"]), context);
+        contents.ScheduleDefinitions = deserializeAws_queryScheduleDefinitionList(smithy_client_1.getArrayIfSingleItem(output["ScheduleDefinitions"]["ScheduleDefinition"]), context);
     }
     if (output["ScheduleIdentifier"] !== undefined) {
-        contents.ScheduleIdentifier = (0, smithy_client_1.expectString)(output["ScheduleIdentifier"]);
+        contents.ScheduleIdentifier = smithy_client_1.expectString(output["ScheduleIdentifier"]);
     }
     if (output["ScheduleDescription"] !== undefined) {
-        contents.ScheduleDescription = (0, smithy_client_1.expectString)(output["ScheduleDescription"]);
+        contents.ScheduleDescription = smithy_client_1.expectString(output["ScheduleDescription"]);
     }
     if (output.Tags === "") {
         contents.Tags = [];
     }
     if (output["Tags"] !== undefined && output["Tags"]["Tag"] !== undefined) {
-        contents.Tags = deserializeAws_queryTagList((0, smithy_client_1.getArrayIfSingleItem)(output["Tags"]["Tag"]), context);
+        contents.Tags = deserializeAws_queryTagList(smithy_client_1.getArrayIfSingleItem(output["Tags"]["Tag"]), context);
     }
     if (output.NextInvocations === "") {
         contents.NextInvocations = [];
     }
     if (output["NextInvocations"] !== undefined && output["NextInvocations"]["SnapshotTime"] !== undefined) {
-        contents.NextInvocations = deserializeAws_queryScheduledSnapshotTimeList((0, smithy_client_1.getArrayIfSingleItem)(output["NextInvocations"]["SnapshotTime"]), context);
+        contents.NextInvocations = deserializeAws_queryScheduledSnapshotTimeList(smithy_client_1.getArrayIfSingleItem(output["NextInvocations"]["SnapshotTime"]), context);
     }
     if (output["AssociatedClusterCount"] !== undefined) {
-        contents.AssociatedClusterCount = (0, smithy_client_1.strictParseInt32)(output["AssociatedClusterCount"]);
+        contents.AssociatedClusterCount = smithy_client_1.strictParseInt32(output["AssociatedClusterCount"]);
     }
     if (output.AssociatedClusters === "") {
         contents.AssociatedClusters = [];
     }
     if (output["AssociatedClusters"] !== undefined &&
         output["AssociatedClusters"]["ClusterAssociatedToSchedule"] !== undefined) {
-        contents.AssociatedClusters = deserializeAws_queryAssociatedClusterList((0, smithy_client_1.getArrayIfSingleItem)(output["AssociatedClusters"]["ClusterAssociatedToSchedule"]), context);
+        contents.AssociatedClusters = deserializeAws_queryAssociatedClusterList(smithy_client_1.getArrayIfSingleItem(output["AssociatedClusters"]["ClusterAssociatedToSchedule"]), context);
     }
     return contents;
 };
@@ -17569,7 +17569,7 @@ const deserializeAws_querySnapshotScheduleAlreadyExistsFault = (output, context)
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -17588,7 +17588,7 @@ const deserializeAws_querySnapshotScheduleNotFoundFault = (output, context) => {
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -17597,7 +17597,7 @@ const deserializeAws_querySnapshotScheduleQuotaExceededFault = (output, context)
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -17606,7 +17606,7 @@ const deserializeAws_querySnapshotScheduleUpdateInProgressFault = (output, conte
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -17615,7 +17615,7 @@ const deserializeAws_querySNSInvalidTopicFault = (output, context) => {
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -17624,7 +17624,7 @@ const deserializeAws_querySNSNoAuthorizationFault = (output, context) => {
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -17633,7 +17633,7 @@ const deserializeAws_querySNSTopicArnNotFoundFault = (output, context) => {
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -17644,7 +17644,7 @@ const deserializeAws_querySourceIdsList = (output, context) => {
         if (entry === null) {
             return null;
         }
-        return (0, smithy_client_1.expectString)(entry);
+        return smithy_client_1.expectString(entry);
     });
 };
 const deserializeAws_querySourceNotFoundFault = (output, context) => {
@@ -17652,7 +17652,7 @@ const deserializeAws_querySourceNotFoundFault = (output, context) => {
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -17663,13 +17663,13 @@ const deserializeAws_querySubnet = (output, context) => {
         SubnetStatus: undefined,
     };
     if (output["SubnetIdentifier"] !== undefined) {
-        contents.SubnetIdentifier = (0, smithy_client_1.expectString)(output["SubnetIdentifier"]);
+        contents.SubnetIdentifier = smithy_client_1.expectString(output["SubnetIdentifier"]);
     }
     if (output["SubnetAvailabilityZone"] !== undefined) {
         contents.SubnetAvailabilityZone = deserializeAws_queryAvailabilityZone(output["SubnetAvailabilityZone"], context);
     }
     if (output["SubnetStatus"] !== undefined) {
-        contents.SubnetStatus = (0, smithy_client_1.expectString)(output["SubnetStatus"]);
+        contents.SubnetStatus = smithy_client_1.expectString(output["SubnetStatus"]);
     }
     return contents;
 };
@@ -17678,7 +17678,7 @@ const deserializeAws_querySubnetAlreadyInUse = (output, context) => {
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -17697,7 +17697,7 @@ const deserializeAws_querySubscriptionAlreadyExistFault = (output, context) => {
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -17706,7 +17706,7 @@ const deserializeAws_querySubscriptionCategoryNotFoundFault = (output, context)
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -17715,7 +17715,7 @@ const deserializeAws_querySubscriptionEventIdNotFoundFault = (output, context) =
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -17724,7 +17724,7 @@ const deserializeAws_querySubscriptionNotFoundFault = (output, context) => {
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -17733,7 +17733,7 @@ const deserializeAws_querySubscriptionSeverityNotFoundFault = (output, context)
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -17742,7 +17742,7 @@ const deserializeAws_querySupportedOperation = (output, context) => {
         OperationName: undefined,
     };
     if (output["OperationName"] !== undefined) {
-        contents.OperationName = (0, smithy_client_1.expectString)(output["OperationName"]);
+        contents.OperationName = smithy_client_1.expectString(output["OperationName"]);
     }
     return contents;
 };
@@ -17761,7 +17761,7 @@ const deserializeAws_querySupportedPlatform = (output, context) => {
         Name: undefined,
     };
     if (output["Name"] !== undefined) {
-        contents.Name = (0, smithy_client_1.expectString)(output["Name"]);
+        contents.Name = smithy_client_1.expectString(output["Name"]);
     }
     return contents;
 };
@@ -17780,7 +17780,7 @@ const deserializeAws_queryTableLimitExceededFault = (output, context) => {
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -17789,7 +17789,7 @@ const deserializeAws_queryTableRestoreNotFoundFault = (output, context) => {
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -17811,46 +17811,46 @@ const deserializeAws_queryTableRestoreStatus = (output, context) => {
         NewTableName: undefined,
     };
     if (output["TableRestoreRequestId"] !== undefined) {
-        contents.TableRestoreRequestId = (0, smithy_client_1.expectString)(output["TableRestoreRequestId"]);
+        contents.TableRestoreRequestId = smithy_client_1.expectString(output["TableRestoreRequestId"]);
     }
     if (output["Status"] !== undefined) {
-        contents.Status = (0, smithy_client_1.expectString)(output["Status"]);
+        contents.Status = smithy_client_1.expectString(output["Status"]);
     }
     if (output["Message"] !== undefined) {
-        contents.Message = (0, smithy_client_1.expectString)(output["Message"]);
+        contents.Message = smithy_client_1.expectString(output["Message"]);
     }
     if (output["RequestTime"] !== undefined) {
-        contents.RequestTime = new Date(output["RequestTime"]);
+        contents.RequestTime = smithy_client_1.expectNonNull(smithy_client_1.parseRfc3339DateTime(output["RequestTime"]));
     }
     if (output["ProgressInMegaBytes"] !== undefined) {
-        contents.ProgressInMegaBytes = (0, smithy_client_1.strictParseLong)(output["ProgressInMegaBytes"]);
+        contents.ProgressInMegaBytes = smithy_client_1.strictParseLong(output["ProgressInMegaBytes"]);
     }
     if (output["TotalDataInMegaBytes"] !== undefined) {
-        contents.TotalDataInMegaBytes = (0, smithy_client_1.strictParseLong)(output["TotalDataInMegaBytes"]);
+        contents.TotalDataInMegaBytes = smithy_client_1.strictParseLong(output["TotalDataInMegaBytes"]);
     }
     if (output["ClusterIdentifier"] !== undefined) {
-        contents.ClusterIdentifier = (0, smithy_client_1.expectString)(output["ClusterIdentifier"]);
+        contents.ClusterIdentifier = smithy_client_1.expectString(output["ClusterIdentifier"]);
     }
     if (output["SnapshotIdentifier"] !== undefined) {
-        contents.SnapshotIdentifier = (0, smithy_client_1.expectString)(output["SnapshotIdentifier"]);
+        contents.SnapshotIdentifier = smithy_client_1.expectString(output["SnapshotIdentifier"]);
     }
     if (output["SourceDatabaseName"] !== undefined) {
-        contents.SourceDatabaseName = (0, smithy_client_1.expectString)(output["SourceDatabaseName"]);
+        contents.SourceDatabaseName = smithy_client_1.expectString(output["SourceDatabaseName"]);
     }
     if (output["SourceSchemaName"] !== undefined) {
-        contents.SourceSchemaName = (0, smithy_client_1.expectString)(output["SourceSchemaName"]);
+        contents.SourceSchemaName = smithy_client_1.expectString(output["SourceSchemaName"]);
     }
     if (output["SourceTableName"] !== undefined) {
-        contents.SourceTableName = (0, smithy_client_1.expectString)(output["SourceTableName"]);
+        contents.SourceTableName = smithy_client_1.expectString(output["SourceTableName"]);
     }
     if (output["TargetDatabaseName"] !== undefined) {
-        contents.TargetDatabaseName = (0, smithy_client_1.expectString)(output["TargetDatabaseName"]);
+        contents.TargetDatabaseName = smithy_client_1.expectString(output["TargetDatabaseName"]);
     }
     if (output["TargetSchemaName"] !== undefined) {
-        contents.TargetSchemaName = (0, smithy_client_1.expectString)(output["TargetSchemaName"]);
+        contents.TargetSchemaName = smithy_client_1.expectString(output["TargetSchemaName"]);
     }
     if (output["NewTableName"] !== undefined) {
-        contents.NewTableName = (0, smithy_client_1.expectString)(output["NewTableName"]);
+        contents.NewTableName = smithy_client_1.expectString(output["NewTableName"]);
     }
     return contents;
 };
@@ -17874,10 +17874,10 @@ const deserializeAws_queryTableRestoreStatusMessage = (output, context) => {
     }
     if (output["TableRestoreStatusDetails"] !== undefined &&
         output["TableRestoreStatusDetails"]["TableRestoreStatus"] !== undefined) {
-        contents.TableRestoreStatusDetails = deserializeAws_queryTableRestoreStatusList((0, smithy_client_1.getArrayIfSingleItem)(output["TableRestoreStatusDetails"]["TableRestoreStatus"]), context);
+        contents.TableRestoreStatusDetails = deserializeAws_queryTableRestoreStatusList(smithy_client_1.getArrayIfSingleItem(output["TableRestoreStatusDetails"]["TableRestoreStatus"]), context);
     }
     if (output["Marker"] !== undefined) {
-        contents.Marker = (0, smithy_client_1.expectString)(output["Marker"]);
+        contents.Marker = smithy_client_1.expectString(output["Marker"]);
     }
     return contents;
 };
@@ -17887,10 +17887,10 @@ const deserializeAws_queryTag = (output, context) => {
         Value: undefined,
     };
     if (output["Key"] !== undefined) {
-        contents.Key = (0, smithy_client_1.expectString)(output["Key"]);
+        contents.Key = smithy_client_1.expectString(output["Key"]);
     }
     if (output["Value"] !== undefined) {
-        contents.Value = (0, smithy_client_1.expectString)(output["Value"]);
+        contents.Value = smithy_client_1.expectString(output["Value"]);
     }
     return contents;
 };
@@ -17904,10 +17904,10 @@ const deserializeAws_queryTaggedResource = (output, context) => {
         contents.Tag = deserializeAws_queryTag(output["Tag"], context);
     }
     if (output["ResourceName"] !== undefined) {
-        contents.ResourceName = (0, smithy_client_1.expectString)(output["ResourceName"]);
+        contents.ResourceName = smithy_client_1.expectString(output["ResourceName"]);
     }
     if (output["ResourceType"] !== undefined) {
-        contents.ResourceType = (0, smithy_client_1.expectString)(output["ResourceType"]);
+        contents.ResourceType = smithy_client_1.expectString(output["ResourceType"]);
     }
     return contents;
 };
@@ -17930,10 +17930,10 @@ const deserializeAws_queryTaggedResourceListMessage = (output, context) => {
         contents.TaggedResources = [];
     }
     if (output["TaggedResources"] !== undefined && output["TaggedResources"]["TaggedResource"] !== undefined) {
-        contents.TaggedResources = deserializeAws_queryTaggedResourceList((0, smithy_client_1.getArrayIfSingleItem)(output["TaggedResources"]["TaggedResource"]), context);
+        contents.TaggedResources = deserializeAws_queryTaggedResourceList(smithy_client_1.getArrayIfSingleItem(output["TaggedResources"]["TaggedResource"]), context);
     }
     if (output["Marker"] !== undefined) {
-        contents.Marker = (0, smithy_client_1.expectString)(output["Marker"]);
+        contents.Marker = smithy_client_1.expectString(output["Marker"]);
     }
     return contents;
 };
@@ -17942,7 +17942,7 @@ const deserializeAws_queryTagLimitExceededFault = (output, context) => {
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -17975,10 +17975,10 @@ const deserializeAws_queryTrackListMessage = (output, context) => {
         contents.MaintenanceTracks = [];
     }
     if (output["MaintenanceTracks"] !== undefined && output["MaintenanceTracks"]["MaintenanceTrack"] !== undefined) {
-        contents.MaintenanceTracks = deserializeAws_queryTrackList((0, smithy_client_1.getArrayIfSingleItem)(output["MaintenanceTracks"]["MaintenanceTrack"]), context);
+        contents.MaintenanceTracks = deserializeAws_queryTrackList(smithy_client_1.getArrayIfSingleItem(output["MaintenanceTracks"]["MaintenanceTrack"]), context);
     }
     if (output["Marker"] !== undefined) {
-        contents.Marker = (0, smithy_client_1.expectString)(output["Marker"]);
+        contents.Marker = smithy_client_1.expectString(output["Marker"]);
     }
     return contents;
 };
@@ -17987,7 +17987,7 @@ const deserializeAws_queryUnauthorizedOperation = (output, context) => {
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -17996,7 +17996,7 @@ const deserializeAws_queryUnauthorizedPartnerIntegrationFault = (output, context
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -18005,7 +18005,7 @@ const deserializeAws_queryUnknownSnapshotCopyRegionFault = (output, context) =>
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -18014,7 +18014,7 @@ const deserializeAws_queryUnsupportedOperationFault = (output, context) => {
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -18023,7 +18023,7 @@ const deserializeAws_queryUnsupportedOptionFault = (output, context) => {
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -18034,17 +18034,17 @@ const deserializeAws_queryUpdateTarget = (output, context) => {
         SupportedOperations: undefined,
     };
     if (output["MaintenanceTrackName"] !== undefined) {
-        contents.MaintenanceTrackName = (0, smithy_client_1.expectString)(output["MaintenanceTrackName"]);
+        contents.MaintenanceTrackName = smithy_client_1.expectString(output["MaintenanceTrackName"]);
     }
     if (output["DatabaseVersion"] !== undefined) {
-        contents.DatabaseVersion = (0, smithy_client_1.expectString)(output["DatabaseVersion"]);
+        contents.DatabaseVersion = smithy_client_1.expectString(output["DatabaseVersion"]);
     }
     if (output.SupportedOperations === "") {
         contents.SupportedOperations = [];
     }
     if (output["SupportedOperations"] !== undefined &&
         output["SupportedOperations"]["SupportedOperation"] !== undefined) {
-        contents.SupportedOperations = deserializeAws_querySupportedOperationList((0, smithy_client_1.getArrayIfSingleItem)(output["SupportedOperations"]["SupportedOperation"]), context);
+        contents.SupportedOperations = deserializeAws_querySupportedOperationList(smithy_client_1.getArrayIfSingleItem(output["SupportedOperations"]["SupportedOperation"]), context);
     }
     return contents;
 };
@@ -18060,31 +18060,31 @@ const deserializeAws_queryUsageLimit = (output, context) => {
         Tags: undefined,
     };
     if (output["UsageLimitId"] !== undefined) {
-        contents.UsageLimitId = (0, smithy_client_1.expectString)(output["UsageLimitId"]);
+        contents.UsageLimitId = smithy_client_1.expectString(output["UsageLimitId"]);
     }
     if (output["ClusterIdentifier"] !== undefined) {
-        contents.ClusterIdentifier = (0, smithy_client_1.expectString)(output["ClusterIdentifier"]);
+        contents.ClusterIdentifier = smithy_client_1.expectString(output["ClusterIdentifier"]);
     }
     if (output["FeatureType"] !== undefined) {
-        contents.FeatureType = (0, smithy_client_1.expectString)(output["FeatureType"]);
+        contents.FeatureType = smithy_client_1.expectString(output["FeatureType"]);
     }
     if (output["LimitType"] !== undefined) {
-        contents.LimitType = (0, smithy_client_1.expectString)(output["LimitType"]);
+        contents.LimitType = smithy_client_1.expectString(output["LimitType"]);
     }
     if (output["Amount"] !== undefined) {
-        contents.Amount = (0, smithy_client_1.strictParseLong)(output["Amount"]);
+        contents.Amount = smithy_client_1.strictParseLong(output["Amount"]);
     }
     if (output["Period"] !== undefined) {
-        contents.Period = (0, smithy_client_1.expectString)(output["Period"]);
+        contents.Period = smithy_client_1.expectString(output["Period"]);
     }
     if (output["BreachAction"] !== undefined) {
-        contents.BreachAction = (0, smithy_client_1.expectString)(output["BreachAction"]);
+        contents.BreachAction = smithy_client_1.expectString(output["BreachAction"]);
     }
     if (output.Tags === "") {
         contents.Tags = [];
     }
     if (output["Tags"] !== undefined && output["Tags"]["Tag"] !== undefined) {
-        contents.Tags = deserializeAws_queryTagList((0, smithy_client_1.getArrayIfSingleItem)(output["Tags"]["Tag"]), context);
+        contents.Tags = deserializeAws_queryTagList(smithy_client_1.getArrayIfSingleItem(output["Tags"]["Tag"]), context);
     }
     return contents;
 };
@@ -18093,7 +18093,7 @@ const deserializeAws_queryUsageLimitAlreadyExistsFault = (output, context) => {
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -18106,10 +18106,10 @@ const deserializeAws_queryUsageLimitList = (output, context) => {
         contents.UsageLimits = [];
     }
     if (output["UsageLimits"] !== undefined && output["UsageLimits"]["member"] !== undefined) {
-        contents.UsageLimits = deserializeAws_queryUsageLimits((0, smithy_client_1.getArrayIfSingleItem)(output["UsageLimits"]["member"]), context);
+        contents.UsageLimits = deserializeAws_queryUsageLimits(smithy_client_1.getArrayIfSingleItem(output["UsageLimits"]["member"]), context);
     }
     if (output["Marker"] !== undefined) {
-        contents.Marker = (0, smithy_client_1.expectString)(output["Marker"]);
+        contents.Marker = smithy_client_1.expectString(output["Marker"]);
     }
     return contents;
 };
@@ -18118,7 +18118,7 @@ const deserializeAws_queryUsageLimitNotFoundFault = (output, context) => {
         message: undefined,
     };
     if (output["message"] !== undefined) {
-        contents.message = (0, smithy_client_1.expectString)(output["message"]);
+        contents.message = smithy_client_1.expectString(output["message"]);
     }
     return contents;
 };
@@ -18139,16 +18139,16 @@ const deserializeAws_queryVpcEndpoint = (output, context) => {
         NetworkInterfaces: undefined,
     };
     if (output["VpcEndpointId"] !== undefined) {
-        contents.VpcEndpointId = (0, smithy_client_1.expectString)(output["VpcEndpointId"]);
+        contents.VpcEndpointId = smithy_client_1.expectString(output["VpcEndpointId"]);
     }
     if (output["VpcId"] !== undefined) {
-        contents.VpcId = (0, smithy_client_1.expectString)(output["VpcId"]);
+        contents.VpcId = smithy_client_1.expectString(output["VpcId"]);
     }
     if (output.NetworkInterfaces === "") {
         contents.NetworkInterfaces = [];
     }
     if (output["NetworkInterfaces"] !== undefined && output["NetworkInterfaces"]["NetworkInterface"] !== undefined) {
-        contents.NetworkInterfaces = deserializeAws_queryNetworkInterfaceList((0, smithy_client_1.getArrayIfSingleItem)(output["NetworkInterfaces"]["NetworkInterface"]), context);
+        contents.NetworkInterfaces = deserializeAws_queryNetworkInterfaceList(smithy_client_1.getArrayIfSingleItem(output["NetworkInterfaces"]["NetworkInterface"]), context);
     }
     return contents;
 };
@@ -18169,7 +18169,7 @@ const deserializeAws_queryVpcIdentifierList = (output, context) => {
         if (entry === null) {
             return null;
         }
-        return (0, smithy_client_1.expectString)(entry);
+        return smithy_client_1.expectString(entry);
     });
 };
 const deserializeAws_queryVpcSecurityGroupMembership = (output, context) => {
@@ -18178,10 +18178,10 @@ const deserializeAws_queryVpcSecurityGroupMembership = (output, context) => {
         Status: undefined,
     };
     if (output["VpcSecurityGroupId"] !== undefined) {
-        contents.VpcSecurityGroupId = (0, smithy_client_1.expectString)(output["VpcSecurityGroupId"]);
+        contents.VpcSecurityGroupId = smithy_client_1.expectString(output["VpcSecurityGroupId"]);
     }
     if (output["Status"] !== undefined) {
-        contents.Status = (0, smithy_client_1.expectString)(output["Status"]);
+        contents.Status = smithy_client_1.expectString(output["Status"]);
     }
     return contents;
 };
@@ -18233,12 +18233,12 @@ const buildHttpRpcRequest = async (context, headers, path, resolvedHostname, bod
 };
 const parseBody = (streamBody, context) => collectBodyString(streamBody, context).then((encoded) => {
     if (encoded.length) {
-        const parsedObj = (0, fast_xml_parser_1.parse)(encoded, {
+        const parsedObj = fast_xml_parser_1.parse(encoded, {
             attributeNamePrefix: "",
             ignoreAttributes: false,
             parseNodeValue: false,
             trimValues: false,
-            tagValueProcessor: (val) => (val.trim() === "" && val.includes("\n") ? "" : (0, entities_1.decodeHTML)(val)),
+            tagValueProcessor: (val) => (val.trim() === "" && val.includes("\n") ? "" : entities_1.decodeHTML(val)),
         });
         const textNodeName = "#text";
         const key = Object.keys(parsedObj)[0];
@@ -18247,12 +18247,12 @@ const parseBody = (streamBody, context) => collectBodyString(streamBody, context
             parsedObjToReturn[key] = parsedObjToReturn[textNodeName];
             delete parsedObjToReturn[textNodeName];
         }
-        return (0, smithy_client_1.getValueFromTextNode)(parsedObjToReturn);
+        return smithy_client_1.getValueFromTextNode(parsedObjToReturn);
     }
     return {};
 });
 const buildFormUrlencodedString = (formEntries) => Object.entries(formEntries)
-    .map(([key, value]) => (0, smithy_client_1.extendedEncodeURIComponent)(key) + "=" + (0, smithy_client_1.extendedEncodeURIComponent)(value))
+    .map(([key, value]) => smithy_client_1.extendedEncodeURIComponent(key) + "=" + smithy_client_1.extendedEncodeURIComponent(value))
     .join("&");
 const loadQueryErrorCode = (output, data) => {
     if (data.Error.Code !== undefined) {