@aws-sdk/client-securityhub 3.28.0 → 3.32.0

package/dist/cjs/protocols/Aws_restJson1.js

@@ -1417,7 +1417,7 @@ const deserializeAws_restJson1BatchDisableStandardsCommand = async (output, cont
         $metadata: deserializeMetadata(output),
         StandardsSubscriptions: undefined,
     };
-    const data = await parseBody(output.body, context);
+    const data = smithy_client_1.expectNonNull(smithy_client_1.expectObject(await parseBody(output.body, context)), "body");
     if (data.StandardsSubscriptions !== undefined && data.StandardsSubscriptions !== null) {
         contents.StandardsSubscriptions = deserializeAws_restJson1StandardsSubscriptions(data.StandardsSubscriptions, context);
     }
@@ -1489,7 +1489,7 @@ const deserializeAws_restJson1BatchEnableStandardsCommand = async (output, conte
         $metadata: deserializeMetadata(output),
         StandardsSubscriptions: undefined,
     };
-    const data = await parseBody(output.body, context);
+    const data = smithy_client_1.expectNonNull(smithy_client_1.expectObject(await parseBody(output.body, context)), "body");
     if (data.StandardsSubscriptions !== undefined && data.StandardsSubscriptions !== null) {
         contents.StandardsSubscriptions = deserializeAws_restJson1StandardsSubscriptions(data.StandardsSubscriptions, context);
     }
@@ -1563,15 +1563,15 @@ const deserializeAws_restJson1BatchImportFindingsCommand = async (output, contex
         FailedFindings: undefined,
         SuccessCount: undefined,
     };
-    const data = await parseBody(output.body, context);
+    const data = smithy_client_1.expectNonNull(smithy_client_1.expectObject(await parseBody(output.body, context)), "body");
     if (data.FailedCount !== undefined && data.FailedCount !== null) {
-        contents.FailedCount = smithy_client_1.expectInt(data.FailedCount);
+        contents.FailedCount = smithy_client_1.expectInt32(data.FailedCount);
     }
     if (data.FailedFindings !== undefined && data.FailedFindings !== null) {
         contents.FailedFindings = deserializeAws_restJson1ImportFindingsErrorList(data.FailedFindings, context);
     }
     if (data.SuccessCount !== undefined && data.SuccessCount !== null) {
-        contents.SuccessCount = smithy_client_1.expectInt(data.SuccessCount);
+        contents.SuccessCount = smithy_client_1.expectInt32(data.SuccessCount);
     }
     return Promise.resolve(contents);
 };
@@ -1642,7 +1642,7 @@ const deserializeAws_restJson1BatchUpdateFindingsCommand = async (output, contex
         ProcessedFindings: undefined,
         UnprocessedFindings: undefined,
     };
-    const data = await parseBody(output.body, context);
+    const data = smithy_client_1.expectNonNull(smithy_client_1.expectObject(await parseBody(output.body, context)), "body");
     if (data.ProcessedFindings !== undefined && data.ProcessedFindings !== null) {
         contents.ProcessedFindings = deserializeAws_restJson1AwsSecurityFindingIdentifierList(data.ProcessedFindings, context);
     }
@@ -1717,7 +1717,7 @@ const deserializeAws_restJson1CreateActionTargetCommand = async (output, context
         $metadata: deserializeMetadata(output),
         ActionTargetArn: undefined,
     };
-    const data = await parseBody(output.body, context);
+    const data = smithy_client_1.expectNonNull(smithy_client_1.expectObject(await parseBody(output.body, context)), "body");
     if (data.ActionTargetArn !== undefined && data.ActionTargetArn !== null) {
         contents.ActionTargetArn = smithy_client_1.expectString(data.ActionTargetArn);
     }
@@ -1797,7 +1797,7 @@ const deserializeAws_restJson1CreateInsightCommand = async (output, context) =>
         $metadata: deserializeMetadata(output),
         InsightArn: undefined,
     };
-    const data = await parseBody(output.body, context);
+    const data = smithy_client_1.expectNonNull(smithy_client_1.expectObject(await parseBody(output.body, context)), "body");
     if (data.InsightArn !== undefined && data.InsightArn !== null) {
         contents.InsightArn = smithy_client_1.expectString(data.InsightArn);
     }
@@ -1877,7 +1877,7 @@ const deserializeAws_restJson1CreateMembersCommand = async (output, context) =>
         $metadata: deserializeMetadata(output),
         UnprocessedAccounts: undefined,
     };
-    const data = await parseBody(output.body, context);
+    const data = smithy_client_1.expectNonNull(smithy_client_1.expectObject(await parseBody(output.body, context)), "body");
     if (data.UnprocessedAccounts !== undefined && data.UnprocessedAccounts !== null) {
         contents.UnprocessedAccounts = deserializeAws_restJson1ResultList(data.UnprocessedAccounts, context);
     }
@@ -1957,7 +1957,7 @@ const deserializeAws_restJson1DeclineInvitationsCommand = async (output, context
         $metadata: deserializeMetadata(output),
         UnprocessedAccounts: undefined,
     };
-    const data = await parseBody(output.body, context);
+    const data = smithy_client_1.expectNonNull(smithy_client_1.expectObject(await parseBody(output.body, context)), "body");
     if (data.UnprocessedAccounts !== undefined && data.UnprocessedAccounts !== null) {
         contents.UnprocessedAccounts = deserializeAws_restJson1ResultList(data.UnprocessedAccounts, context);
     }
@@ -2029,7 +2029,7 @@ const deserializeAws_restJson1DeleteActionTargetCommand = async (output, context
         $metadata: deserializeMetadata(output),
         ActionTargetArn: undefined,
     };
-    const data = await parseBody(output.body, context);
+    const data = smithy_client_1.expectNonNull(smithy_client_1.expectObject(await parseBody(output.body, context)), "body");
     if (data.ActionTargetArn !== undefined && data.ActionTargetArn !== null) {
         contents.ActionTargetArn = smithy_client_1.expectString(data.ActionTargetArn);
     }
@@ -2101,7 +2101,7 @@ const deserializeAws_restJson1DeleteInsightCommand = async (output, context) =>
         $metadata: deserializeMetadata(output),
         InsightArn: undefined,
     };
-    const data = await parseBody(output.body, context);
+    const data = smithy_client_1.expectNonNull(smithy_client_1.expectObject(await parseBody(output.body, context)), "body");
     if (data.InsightArn !== undefined && data.InsightArn !== null) {
         contents.InsightArn = smithy_client_1.expectString(data.InsightArn);
     }
@@ -2181,7 +2181,7 @@ const deserializeAws_restJson1DeleteInvitationsCommand = async (output, context)
         $metadata: deserializeMetadata(output),
         UnprocessedAccounts: undefined,
     };
-    const data = await parseBody(output.body, context);
+    const data = smithy_client_1.expectNonNull(smithy_client_1.expectObject(await parseBody(output.body, context)), "body");
     if (data.UnprocessedAccounts !== undefined && data.UnprocessedAccounts !== null) {
         contents.UnprocessedAccounts = deserializeAws_restJson1ResultList(data.UnprocessedAccounts, context);
     }
@@ -2261,7 +2261,7 @@ const deserializeAws_restJson1DeleteMembersCommand = async (output, context) =>
         $metadata: deserializeMetadata(output),
         UnprocessedAccounts: undefined,
     };
-    const data = await parseBody(output.body, context);
+    const data = smithy_client_1.expectNonNull(smithy_client_1.expectObject(await parseBody(output.body, context)), "body");
     if (data.UnprocessedAccounts !== undefined && data.UnprocessedAccounts !== null) {
         contents.UnprocessedAccounts = deserializeAws_restJson1ResultList(data.UnprocessedAccounts, context);
     }
@@ -2342,7 +2342,7 @@ const deserializeAws_restJson1DescribeActionTargetsCommand = async (output, cont
         ActionTargets: undefined,
         NextToken: undefined,
     };
-    const data = await parseBody(output.body, context);
+    const data = smithy_client_1.expectNonNull(smithy_client_1.expectObject(await parseBody(output.body, context)), "body");
     if (data.ActionTargets !== undefined && data.ActionTargets !== null) {
         contents.ActionTargets = deserializeAws_restJson1ActionTargetList(data.ActionTargets, context);
     }
@@ -2419,7 +2419,7 @@ const deserializeAws_restJson1DescribeHubCommand = async (output, context) => {
         HubArn: undefined,
         SubscribedAt: undefined,
     };
-    const data = await parseBody(output.body, context);
+    const data = smithy_client_1.expectNonNull(smithy_client_1.expectObject(await parseBody(output.body, context)), "body");
     if (data.AutoEnableControls !== undefined && data.AutoEnableControls !== null) {
         contents.AutoEnableControls = smithy_client_1.expectBoolean(data.AutoEnableControls);
     }
@@ -2506,7 +2506,7 @@ const deserializeAws_restJson1DescribeOrganizationConfigurationCommand = async (
         AutoEnable: undefined,
         MemberAccountLimitReached: undefined,
     };
-    const data = await parseBody(output.body, context);
+    const data = smithy_client_1.expectNonNull(smithy_client_1.expectObject(await parseBody(output.body, context)), "body");
     if (data.AutoEnable !== undefined && data.AutoEnable !== null) {
         contents.AutoEnable = smithy_client_1.expectBoolean(data.AutoEnable);
     }
@@ -2582,7 +2582,7 @@ const deserializeAws_restJson1DescribeProductsCommand = async (output, context)
         NextToken: undefined,
         Products: undefined,
     };
-    const data = await parseBody(output.body, context);
+    const data = smithy_client_1.expectNonNull(smithy_client_1.expectObject(await parseBody(output.body, context)), "body");
     if (data.NextToken !== undefined && data.NextToken !== null) {
         contents.NextToken = smithy_client_1.expectString(data.NextToken);
     }
@@ -2658,7 +2658,7 @@ const deserializeAws_restJson1DescribeStandardsCommand = async (output, context)
         NextToken: undefined,
         Standards: undefined,
     };
-    const data = await parseBody(output.body, context);
+    const data = smithy_client_1.expectNonNull(smithy_client_1.expectObject(await parseBody(output.body, context)), "body");
     if (data.NextToken !== undefined && data.NextToken !== null) {
         contents.NextToken = smithy_client_1.expectString(data.NextToken);
     }
@@ -2726,7 +2726,7 @@ const deserializeAws_restJson1DescribeStandardsControlsCommand = async (output,
         Controls: undefined,
         NextToken: undefined,
     };
-    const data = await parseBody(output.body, context);
+    const data = smithy_client_1.expectNonNull(smithy_client_1.expectObject(await parseBody(output.body, context)), "body");
     if (data.Controls !== undefined && data.Controls !== null) {
         contents.Controls = deserializeAws_restJson1StandardsControls(data.Controls, context);
     }
@@ -3241,7 +3241,7 @@ const deserializeAws_restJson1EnableImportFindingsForProductCommand = async (out
         $metadata: deserializeMetadata(output),
         ProductSubscriptionArn: undefined,
     };
-    const data = await parseBody(output.body, context);
+    const data = smithy_client_1.expectNonNull(smithy_client_1.expectObject(await parseBody(output.body, context)), "body");
     if (data.ProductSubscriptionArn !== undefined && data.ProductSubscriptionArn !== null) {
         contents.ProductSubscriptionArn = smithy_client_1.expectString(data.ProductSubscriptionArn);
     }
@@ -3465,7 +3465,7 @@ const deserializeAws_restJson1GetAdministratorAccountCommand = async (output, co
         $metadata: deserializeMetadata(output),
         Administrator: undefined,
     };
-    const data = await parseBody(output.body, context);
+    const data = smithy_client_1.expectNonNull(smithy_client_1.expectObject(await parseBody(output.body, context)), "body");
     if (data.Administrator !== undefined && data.Administrator !== null) {
         contents.Administrator = deserializeAws_restJson1Invitation(data.Administrator, context);
     }
@@ -3546,7 +3546,7 @@ const deserializeAws_restJson1GetEnabledStandardsCommand = async (output, contex
         NextToken: undefined,
         StandardsSubscriptions: undefined,
     };
-    const data = await parseBody(output.body, context);
+    const data = smithy_client_1.expectNonNull(smithy_client_1.expectObject(await parseBody(output.body, context)), "body");
     if (data.NextToken !== undefined && data.NextToken !== null) {
         contents.NextToken = smithy_client_1.expectString(data.NextToken);
     }
@@ -3622,7 +3622,7 @@ const deserializeAws_restJson1GetFindingsCommand = async (output, context) => {
         Findings: undefined,
         NextToken: undefined,
     };
-    const data = await parseBody(output.body, context);
+    const data = smithy_client_1.expectNonNull(smithy_client_1.expectObject(await parseBody(output.body, context)), "body");
     if (data.Findings !== undefined && data.Findings !== null) {
         contents.Findings = deserializeAws_restJson1AwsSecurityFindingList(data.Findings, context);
     }
@@ -3697,7 +3697,7 @@ const deserializeAws_restJson1GetInsightResultsCommand = async (output, context)
         $metadata: deserializeMetadata(output),
         InsightResults: undefined,
     };
-    const data = await parseBody(output.body, context);
+    const data = smithy_client_1.expectNonNull(smithy_client_1.expectObject(await parseBody(output.body, context)), "body");
     if (data.InsightResults !== undefined && data.InsightResults !== null) {
         contents.InsightResults = deserializeAws_restJson1InsightResults(data.InsightResults, context);
     }
@@ -3778,7 +3778,7 @@ const deserializeAws_restJson1GetInsightsCommand = async (output, context) => {
         Insights: undefined,
         NextToken: undefined,
     };
-    const data = await parseBody(output.body, context);
+    const data = smithy_client_1.expectNonNull(smithy_client_1.expectObject(await parseBody(output.body, context)), "body");
     if (data.Insights !== undefined && data.Insights !== null) {
         contents.Insights = deserializeAws_restJson1InsightList(data.Insights, context);
     }
@@ -3861,9 +3861,9 @@ const deserializeAws_restJson1GetInvitationsCountCommand = async (output, contex
         $metadata: deserializeMetadata(output),
         InvitationsCount: undefined,
     };
-    const data = await parseBody(output.body, context);
+    const data = smithy_client_1.expectNonNull(smithy_client_1.expectObject(await parseBody(output.body, context)), "body");
     if (data.InvitationsCount !== undefined && data.InvitationsCount !== null) {
-        contents.InvitationsCount = smithy_client_1.expectInt(data.InvitationsCount);
+        contents.InvitationsCount = smithy_client_1.expectInt32(data.InvitationsCount);
     }
     return Promise.resolve(contents);
 };
@@ -3933,7 +3933,7 @@ const deserializeAws_restJson1GetMasterAccountCommand = async (output, context)
         $metadata: deserializeMetadata(output),
         Master: undefined,
     };
-    const data = await parseBody(output.body, context);
+    const data = smithy_client_1.expectNonNull(smithy_client_1.expectObject(await parseBody(output.body, context)), "body");
     if (data.Master !== undefined && data.Master !== null) {
         contents.Master = deserializeAws_restJson1Invitation(data.Master, context);
     }
@@ -4014,7 +4014,7 @@ const deserializeAws_restJson1GetMembersCommand = async (output, context) => {
         Members: undefined,
         UnprocessedAccounts: undefined,
     };
-    const data = await parseBody(output.body, context);
+    const data = smithy_client_1.expectNonNull(smithy_client_1.expectObject(await parseBody(output.body, context)), "body");
     if (data.Members !== undefined && data.Members !== null) {
         contents.Members = deserializeAws_restJson1MemberList(data.Members, context);
     }
@@ -4097,7 +4097,7 @@ const deserializeAws_restJson1InviteMembersCommand = async (output, context) =>
         $metadata: deserializeMetadata(output),
         UnprocessedAccounts: undefined,
     };
-    const data = await parseBody(output.body, context);
+    const data = smithy_client_1.expectNonNull(smithy_client_1.expectObject(await parseBody(output.body, context)), "body");
     if (data.UnprocessedAccounts !== undefined && data.UnprocessedAccounts !== null) {
         contents.UnprocessedAccounts = deserializeAws_restJson1ResultList(data.UnprocessedAccounts, context);
     }
@@ -4178,7 +4178,7 @@ const deserializeAws_restJson1ListEnabledProductsForImportCommand = async (outpu
         NextToken: undefined,
         ProductSubscriptions: undefined,
     };
-    const data = await parseBody(output.body, context);
+    const data = smithy_client_1.expectNonNull(smithy_client_1.expectObject(await parseBody(output.body, context)), "body");
     if (data.NextToken !== undefined && data.NextToken !== null) {
         contents.NextToken = smithy_client_1.expectString(data.NextToken);
     }
@@ -4246,7 +4246,7 @@ const deserializeAws_restJson1ListInvitationsCommand = async (output, context) =
         Invitations: undefined,
         NextToken: undefined,
     };
-    const data = await parseBody(output.body, context);
+    const data = smithy_client_1.expectNonNull(smithy_client_1.expectObject(await parseBody(output.body, context)), "body");
     if (data.Invitations !== undefined && data.Invitations !== null) {
         contents.Invitations = deserializeAws_restJson1InvitationList(data.Invitations, context);
     }
@@ -4322,7 +4322,7 @@ const deserializeAws_restJson1ListMembersCommand = async (output, context) => {
         Members: undefined,
         NextToken: undefined,
     };
-    const data = await parseBody(output.body, context);
+    const data = smithy_client_1.expectNonNull(smithy_client_1.expectObject(await parseBody(output.body, context)), "body");
     if (data.Members !== undefined && data.Members !== null) {
         contents.Members = deserializeAws_restJson1MemberList(data.Members, context);
     }
@@ -4398,7 +4398,7 @@ const deserializeAws_restJson1ListOrganizationAdminAccountsCommand = async (outp
         AdminAccounts: undefined,
         NextToken: undefined,
     };
-    const data = await parseBody(output.body, context);
+    const data = smithy_client_1.expectNonNull(smithy_client_1.expectObject(await parseBody(output.body, context)), "body");
     if (data.AdminAccounts !== undefined && data.AdminAccounts !== null) {
         contents.AdminAccounts = deserializeAws_restJson1AdminAccounts(data.AdminAccounts, context);
     }
@@ -4473,7 +4473,7 @@ const deserializeAws_restJson1ListTagsForResourceCommand = async (output, contex
         $metadata: deserializeMetadata(output),
         Tags: undefined,
     };
-    const data = await parseBody(output.body, context);
+    const data = smithy_client_1.expectNonNull(smithy_client_1.expectObject(await parseBody(output.body, context)), "body");
     if (data.Tags !== undefined && data.Tags !== null) {
         contents.Tags = deserializeAws_restJson1TagMap(data.Tags, context);
     }
@@ -5278,6 +5278,22 @@ const serializeAws_restJson1ActionRemotePortDetails = (input, context) => {
         ...(input.PortName !== undefined && input.PortName !== null && { PortName: input.PortName }),
     };
 };
+const serializeAws_restJson1Adjustment = (input, context) => {
+    return {
+        ...(input.Metric !== undefined && input.Metric !== null && { Metric: input.Metric }),
+        ...(input.Reason !== undefined && input.Reason !== null && { Reason: input.Reason }),
+    };
+};
+const serializeAws_restJson1AdjustmentList = (input, context) => {
+    return input
+        .filter((e) => e != null)
+        .map((entry) => {
+        if (entry === null) {
+            return null;
+        }
+        return serializeAws_restJson1Adjustment(entry, context);
+    });
+};
 const serializeAws_restJson1ArnList = (input, context) => {
     return input
         .filter((e) => e != null)
@@ -5531,6 +5547,82 @@ const serializeAws_restJson1AwsAutoScalingAutoScalingGroupDetails = (input, cont
         }),
     };
 };
+const serializeAws_restJson1AwsAutoScalingLaunchConfigurationBlockDeviceMappingsDetails = (input, context) => {
+    return {
+        ...(input.DeviceName !== undefined && input.DeviceName !== null && { DeviceName: input.DeviceName }),
+        ...(input.Ebs !== undefined &&
+            input.Ebs !== null && {
+            Ebs: serializeAws_restJson1AwsAutoScalingLaunchConfigurationBlockDeviceMappingsEbsDetails(input.Ebs, context),
+        }),
+        ...(input.NoDevice !== undefined && input.NoDevice !== null && { NoDevice: input.NoDevice }),
+        ...(input.VirtualName !== undefined && input.VirtualName !== null && { VirtualName: input.VirtualName }),
+    };
+};
+const serializeAws_restJson1AwsAutoScalingLaunchConfigurationBlockDeviceMappingsEbsDetails = (input, context) => {
+    return {
+        ...(input.DeleteOnTermination !== undefined &&
+            input.DeleteOnTermination !== null && { DeleteOnTermination: input.DeleteOnTermination }),
+        ...(input.Encrypted !== undefined && input.Encrypted !== null && { Encrypted: input.Encrypted }),
+        ...(input.Iops !== undefined && input.Iops !== null && { Iops: input.Iops }),
+        ...(input.SnapshotId !== undefined && input.SnapshotId !== null && { SnapshotId: input.SnapshotId }),
+        ...(input.VolumeSize !== undefined && input.VolumeSize !== null && { VolumeSize: input.VolumeSize }),
+        ...(input.VolumeType !== undefined && input.VolumeType !== null && { VolumeType: input.VolumeType }),
+    };
+};
+const serializeAws_restJson1AwsAutoScalingLaunchConfigurationBlockDeviceMappingsList = (input, context) => {
+    return input
+        .filter((e) => e != null)
+        .map((entry) => {
+        if (entry === null) {
+            return null;
+        }
+        return serializeAws_restJson1AwsAutoScalingLaunchConfigurationBlockDeviceMappingsDetails(entry, context);
+    });
+};
+const serializeAws_restJson1AwsAutoScalingLaunchConfigurationDetails = (input, context) => {
+    return {
+        ...(input.AssociatePublicIpAddress !== undefined &&
+            input.AssociatePublicIpAddress !== null && { AssociatePublicIpAddress: input.AssociatePublicIpAddress }),
+        ...(input.BlockDeviceMappings !== undefined &&
+            input.BlockDeviceMappings !== null && {
+            BlockDeviceMappings: serializeAws_restJson1AwsAutoScalingLaunchConfigurationBlockDeviceMappingsList(input.BlockDeviceMappings, context),
+        }),
+        ...(input.ClassicLinkVpcId !== undefined &&
+            input.ClassicLinkVpcId !== null && { ClassicLinkVpcId: input.ClassicLinkVpcId }),
+        ...(input.ClassicLinkVpcSecurityGroups !== undefined &&
+            input.ClassicLinkVpcSecurityGroups !== null && {
+            ClassicLinkVpcSecurityGroups: serializeAws_restJson1NonEmptyStringList(input.ClassicLinkVpcSecurityGroups, context),
+        }),
+        ...(input.CreatedTime !== undefined && input.CreatedTime !== null && { CreatedTime: input.CreatedTime }),
+        ...(input.EbsOptimized !== undefined && input.EbsOptimized !== null && { EbsOptimized: input.EbsOptimized }),
+        ...(input.IamInstanceProfile !== undefined &&
+            input.IamInstanceProfile !== null && { IamInstanceProfile: input.IamInstanceProfile }),
+        ...(input.ImageId !== undefined && input.ImageId !== null && { ImageId: input.ImageId }),
+        ...(input.InstanceMonitoring !== undefined &&
+            input.InstanceMonitoring !== null && {
+            InstanceMonitoring: serializeAws_restJson1AwsAutoScalingLaunchConfigurationInstanceMonitoringDetails(input.InstanceMonitoring, context),
+        }),
+        ...(input.InstanceType !== undefined && input.InstanceType !== null && { InstanceType: input.InstanceType }),
+        ...(input.KernelId !== undefined && input.KernelId !== null && { KernelId: input.KernelId }),
+        ...(input.KeyName !== undefined && input.KeyName !== null && { KeyName: input.KeyName }),
+        ...(input.LaunchConfigurationName !== undefined &&
+            input.LaunchConfigurationName !== null && { LaunchConfigurationName: input.LaunchConfigurationName }),
+        ...(input.PlacementTenancy !== undefined &&
+            input.PlacementTenancy !== null && { PlacementTenancy: input.PlacementTenancy }),
+        ...(input.RamdiskId !== undefined && input.RamdiskId !== null && { RamdiskId: input.RamdiskId }),
+        ...(input.SecurityGroups !== undefined &&
+            input.SecurityGroups !== null && {
+            SecurityGroups: serializeAws_restJson1NonEmptyStringList(input.SecurityGroups, context),
+        }),
+        ...(input.SpotPrice !== undefined && input.SpotPrice !== null && { SpotPrice: input.SpotPrice }),
+        ...(input.UserData !== undefined && input.UserData !== null && { UserData: input.UserData }),
+    };
+};
+const serializeAws_restJson1AwsAutoScalingLaunchConfigurationInstanceMonitoringDetails = (input, context) => {
+    return {
+        ...(input.Enabled !== undefined && input.Enabled !== null && { Enabled: input.Enabled }),
+    };
+};
 const serializeAws_restJson1AwsCertificateManagerCertificateDetails = (input, context) => {
     return {
         ...(input.CertificateAuthorityArn !== undefined &&
@@ -6584,6 +6676,157 @@ const serializeAws_restJson1AwsEc2VpcDetails = (input, context) => {
         ...(input.State !== undefined && input.State !== null && { State: input.State }),
     };
 };
+const serializeAws_restJson1AwsEc2VpnConnectionDetails = (input, context) => {
+    return {
+        ...(input.Category !== undefined && input.Category !== null && { Category: input.Category }),
+        ...(input.CustomerGatewayConfiguration !== undefined &&
+            input.CustomerGatewayConfiguration !== null && {
+            CustomerGatewayConfiguration: input.CustomerGatewayConfiguration,
+        }),
+        ...(input.CustomerGatewayId !== undefined &&
+            input.CustomerGatewayId !== null && { CustomerGatewayId: input.CustomerGatewayId }),
+        ...(input.Options !== undefined &&
+            input.Options !== null && {
+            Options: serializeAws_restJson1AwsEc2VpnConnectionOptionsDetails(input.Options, context),
+        }),
+        ...(input.Routes !== undefined &&
+            input.Routes !== null && { Routes: serializeAws_restJson1AwsEc2VpnConnectionRoutesList(input.Routes, context) }),
+        ...(input.State !== undefined && input.State !== null && { State: input.State }),
+        ...(input.TransitGatewayId !== undefined &&
+            input.TransitGatewayId !== null && { TransitGatewayId: input.TransitGatewayId }),
+        ...(input.Type !== undefined && input.Type !== null && { Type: input.Type }),
+        ...(input.VgwTelemetry !== undefined &&
+            input.VgwTelemetry !== null && {
+            VgwTelemetry: serializeAws_restJson1AwsEc2VpnConnectionVgwTelemetryList(input.VgwTelemetry, context),
+        }),
+        ...(input.VpnConnectionId !== undefined &&
+            input.VpnConnectionId !== null && { VpnConnectionId: input.VpnConnectionId }),
+        ...(input.VpnGatewayId !== undefined && input.VpnGatewayId !== null && { VpnGatewayId: input.VpnGatewayId }),
+    };
+};
+const serializeAws_restJson1AwsEc2VpnConnectionOptionsDetails = (input, context) => {
+    return {
+        ...(input.StaticRoutesOnly !== undefined &&
+            input.StaticRoutesOnly !== null && { StaticRoutesOnly: input.StaticRoutesOnly }),
+        ...(input.TunnelOptions !== undefined &&
+            input.TunnelOptions !== null && {
+            TunnelOptions: serializeAws_restJson1AwsEc2VpnConnectionOptionsTunnelOptionsList(input.TunnelOptions, context),
+        }),
+    };
+};
+const serializeAws_restJson1AwsEc2VpnConnectionOptionsTunnelOptionsDetails = (input, context) => {
+    return {
+        ...(input.DpdTimeoutSeconds !== undefined &&
+            input.DpdTimeoutSeconds !== null && { DpdTimeoutSeconds: input.DpdTimeoutSeconds }),
+        ...(input.IkeVersions !== undefined &&
+            input.IkeVersions !== null && {
+            IkeVersions: serializeAws_restJson1NonEmptyStringList(input.IkeVersions, context),
+        }),
+        ...(input.OutsideIpAddress !== undefined &&
+            input.OutsideIpAddress !== null && { OutsideIpAddress: input.OutsideIpAddress }),
+        ...(input.Phase1DhGroupNumbers !== undefined &&
+            input.Phase1DhGroupNumbers !== null && {
+            Phase1DhGroupNumbers: serializeAws_restJson1IntegerList(input.Phase1DhGroupNumbers, context),
+        }),
+        ...(input.Phase1EncryptionAlgorithms !== undefined &&
+            input.Phase1EncryptionAlgorithms !== null && {
+            Phase1EncryptionAlgorithms: serializeAws_restJson1NonEmptyStringList(input.Phase1EncryptionAlgorithms, context),
+        }),
+        ...(input.Phase1IntegrityAlgorithms !== undefined &&
+            input.Phase1IntegrityAlgorithms !== null && {
+            Phase1IntegrityAlgorithms: serializeAws_restJson1NonEmptyStringList(input.Phase1IntegrityAlgorithms, context),
+        }),
+        ...(input.Phase1LifetimeSeconds !== undefined &&
+            input.Phase1LifetimeSeconds !== null && { Phase1LifetimeSeconds: input.Phase1LifetimeSeconds }),
+        ...(input.Phase2DhGroupNumbers !== undefined &&
+            input.Phase2DhGroupNumbers !== null && {
+            Phase2DhGroupNumbers: serializeAws_restJson1IntegerList(input.Phase2DhGroupNumbers, context),
+        }),
+        ...(input.Phase2EncryptionAlgorithms !== undefined &&
+            input.Phase2EncryptionAlgorithms !== null && {
+            Phase2EncryptionAlgorithms: serializeAws_restJson1NonEmptyStringList(input.Phase2EncryptionAlgorithms, context),
+        }),
+        ...(input.Phase2IntegrityAlgorithms !== undefined &&
+            input.Phase2IntegrityAlgorithms !== null && {
+            Phase2IntegrityAlgorithms: serializeAws_restJson1NonEmptyStringList(input.Phase2IntegrityAlgorithms, context),
+        }),
+        ...(input.Phase2LifetimeSeconds !== undefined &&
+            input.Phase2LifetimeSeconds !== null && { Phase2LifetimeSeconds: input.Phase2LifetimeSeconds }),
+        ...(input.PreSharedKey !== undefined && input.PreSharedKey !== null && { PreSharedKey: input.PreSharedKey }),
+        ...(input.RekeyFuzzPercentage !== undefined &&
+            input.RekeyFuzzPercentage !== null && { RekeyFuzzPercentage: input.RekeyFuzzPercentage }),
+        ...(input.RekeyMarginTimeSeconds !== undefined &&
+            input.RekeyMarginTimeSeconds !== null && { RekeyMarginTimeSeconds: input.RekeyMarginTimeSeconds }),
+        ...(input.ReplayWindowSize !== undefined &&
+            input.ReplayWindowSize !== null && { ReplayWindowSize: input.ReplayWindowSize }),
+        ...(input.TunnelInsideCidr !== undefined &&
+            input.TunnelInsideCidr !== null && { TunnelInsideCidr: input.TunnelInsideCidr }),
+    };
+};
+const serializeAws_restJson1AwsEc2VpnConnectionOptionsTunnelOptionsList = (input, context) => {
+    return input
+        .filter((e) => e != null)
+        .map((entry) => {
+        if (entry === null) {
+            return null;
+        }
+        return serializeAws_restJson1AwsEc2VpnConnectionOptionsTunnelOptionsDetails(entry, context);
+    });
+};
+const serializeAws_restJson1AwsEc2VpnConnectionRoutesDetails = (input, context) => {
+    return {
+        ...(input.DestinationCidrBlock !== undefined &&
+            input.DestinationCidrBlock !== null && { DestinationCidrBlock: input.DestinationCidrBlock }),
+        ...(input.State !== undefined && input.State !== null && { State: input.State }),
+    };
+};
+const serializeAws_restJson1AwsEc2VpnConnectionRoutesList = (input, context) => {
+    return input
+        .filter((e) => e != null)
+        .map((entry) => {
+        if (entry === null) {
+            return null;
+        }
+        return serializeAws_restJson1AwsEc2VpnConnectionRoutesDetails(entry, context);
+    });
+};
+const serializeAws_restJson1AwsEc2VpnConnectionVgwTelemetryDetails = (input, context) => {
+    return {
+        ...(input.AcceptedRouteCount !== undefined &&
+            input.AcceptedRouteCount !== null && { AcceptedRouteCount: input.AcceptedRouteCount }),
+        ...(input.CertificateArn !== undefined &&
+            input.CertificateArn !== null && { CertificateArn: input.CertificateArn }),
+        ...(input.LastStatusChange !== undefined &&
+            input.LastStatusChange !== null && { LastStatusChange: input.LastStatusChange }),
+        ...(input.OutsideIpAddress !== undefined &&
+            input.OutsideIpAddress !== null && { OutsideIpAddress: input.OutsideIpAddress }),
+        ...(input.Status !== undefined && input.Status !== null && { Status: input.Status }),
+        ...(input.StatusMessage !== undefined && input.StatusMessage !== null && { StatusMessage: input.StatusMessage }),
+    };
+};
+const serializeAws_restJson1AwsEc2VpnConnectionVgwTelemetryList = (input, context) => {
+    return input
+        .filter((e) => e != null)
+        .map((entry) => {
+        if (entry === null) {
+            return null;
+        }
+        return serializeAws_restJson1AwsEc2VpnConnectionVgwTelemetryDetails(entry, context);
+    });
+};
+const serializeAws_restJson1AwsEcrContainerImageDetails = (input, context) => {
+    return {
+        ...(input.Architecture !== undefined && input.Architecture !== null && { Architecture: input.Architecture }),
+        ...(input.ImageDigest !== undefined && input.ImageDigest !== null && { ImageDigest: input.ImageDigest }),
+        ...(input.ImagePublishedAt !== undefined &&
+            input.ImagePublishedAt !== null && { ImagePublishedAt: input.ImagePublishedAt }),
+        ...(input.ImageTags !== undefined &&
+            input.ImageTags !== null && { ImageTags: serializeAws_restJson1NonEmptyStringList(input.ImageTags, context) }),
+        ...(input.RegistryId !== undefined && input.RegistryId !== null && { RegistryId: input.RegistryId }),
+        ...(input.RepositoryName !== undefined &&
+            input.RepositoryName !== null && { RepositoryName: input.RepositoryName }),
+    };
+};
 const serializeAws_restJson1AwsEcsClusterClusterSettingsDetails = (input, context) => {
     return {
         ...(input.Name !== undefined && input.Name !== null && { Name: input.Name }),
@@ -8161,6 +8404,8 @@ const serializeAws_restJson1AwsKmsKeyDetails = (input, context) => {
         ...(input.Description !== undefined && input.Description !== null && { Description: input.Description }),
         ...(input.KeyId !== undefined && input.KeyId !== null && { KeyId: input.KeyId }),
         ...(input.KeyManager !== undefined && input.KeyManager !== null && { KeyManager: input.KeyManager }),
+        ...(input.KeyRotationStatus !== undefined &&
+            input.KeyRotationStatus !== null && { KeyRotationStatus: input.KeyRotationStatus }),
         ...(input.KeyState !== undefined && input.KeyState !== null && { KeyState: input.KeyState }),
         ...(input.Origin !== undefined && input.Origin !== null && { Origin: input.Origin }),
     };
@@ -9378,10 +9623,24 @@ const serializeAws_restJson1AwsS3BucketBucketLifecycleConfigurationRulesTransiti
 };
 const serializeAws_restJson1AwsS3BucketDetails = (input, context) => {
     return {
+        ...(input.AccessControlList !== undefined &&
+            input.AccessControlList !== null && { AccessControlList: input.AccessControlList }),
         ...(input.BucketLifecycleConfiguration !== undefined &&
             input.BucketLifecycleConfiguration !== null && {
             BucketLifecycleConfiguration: serializeAws_restJson1AwsS3BucketBucketLifecycleConfigurationDetails(input.BucketLifecycleConfiguration, context),
         }),
+        ...(input.BucketLoggingConfiguration !== undefined &&
+            input.BucketLoggingConfiguration !== null && {
+            BucketLoggingConfiguration: serializeAws_restJson1AwsS3BucketLoggingConfiguration(input.BucketLoggingConfiguration, context),
+        }),
+        ...(input.BucketNotificationConfiguration !== undefined &&
+            input.BucketNotificationConfiguration !== null && {
+            BucketNotificationConfiguration: serializeAws_restJson1AwsS3BucketNotificationConfiguration(input.BucketNotificationConfiguration, context),
+        }),
+        ...(input.BucketWebsiteConfiguration !== undefined &&
+            input.BucketWebsiteConfiguration !== null && {
+            BucketWebsiteConfiguration: serializeAws_restJson1AwsS3BucketWebsiteConfiguration(input.BucketWebsiteConfiguration, context),
+        }),
         ...(input.CreatedAt !== undefined && input.CreatedAt !== null && { CreatedAt: input.CreatedAt }),
         ...(input.OwnerId !== undefined && input.OwnerId !== null && { OwnerId: input.OwnerId }),
         ...(input.OwnerName !== undefined && input.OwnerName !== null && { OwnerName: input.OwnerName }),
@@ -9395,6 +9654,87 @@ const serializeAws_restJson1AwsS3BucketDetails = (input, context) => {
         }),
     };
 };
+const serializeAws_restJson1AwsS3BucketLoggingConfiguration = (input, context) => {
+    return {
+        ...(input.DestinationBucketName !== undefined &&
+            input.DestinationBucketName !== null && { DestinationBucketName: input.DestinationBucketName }),
+        ...(input.LogFilePrefix !== undefined && input.LogFilePrefix !== null && { LogFilePrefix: input.LogFilePrefix }),
+    };
+};
+const serializeAws_restJson1AwsS3BucketNotificationConfiguration = (input, context) => {
+    return {
+        ...(input.Configurations !== undefined &&
+            input.Configurations !== null && {
+            Configurations: serializeAws_restJson1AwsS3BucketNotificationConfigurationDetails(input.Configurations, context),
+        }),
+    };
+};
+const serializeAws_restJson1AwsS3BucketNotificationConfigurationDetail = (input, context) => {
+    return {
+        ...(input.Destination !== undefined && input.Destination !== null && { Destination: input.Destination }),
+        ...(input.Events !== undefined &&
+            input.Events !== null && {
+            Events: serializeAws_restJson1AwsS3BucketNotificationConfigurationEvents(input.Events, context),
+        }),
+        ...(input.Filter !== undefined &&
+            input.Filter !== null && {
+            Filter: serializeAws_restJson1AwsS3BucketNotificationConfigurationFilter(input.Filter, context),
+        }),
+        ...(input.Type !== undefined && input.Type !== null && { Type: input.Type }),
+    };
+};
+const serializeAws_restJson1AwsS3BucketNotificationConfigurationDetails = (input, context) => {
+    return input
+        .filter((e) => e != null)
+        .map((entry) => {
+        if (entry === null) {
+            return null;
+        }
+        return serializeAws_restJson1AwsS3BucketNotificationConfigurationDetail(entry, context);
+    });
+};
+const serializeAws_restJson1AwsS3BucketNotificationConfigurationEvents = (input, context) => {
+    return input
+        .filter((e) => e != null)
+        .map((entry) => {
+        if (entry === null) {
+            return null;
+        }
+        return entry;
+    });
+};
+const serializeAws_restJson1AwsS3BucketNotificationConfigurationFilter = (input, context) => {
+    return {
+        ...(input.S3KeyFilter !== undefined &&
+            input.S3KeyFilter !== null && {
+            S3KeyFilter: serializeAws_restJson1AwsS3BucketNotificationConfigurationS3KeyFilter(input.S3KeyFilter, context),
+        }),
+    };
+};
+const serializeAws_restJson1AwsS3BucketNotificationConfigurationS3KeyFilter = (input, context) => {
+    return {
+        ...(input.FilterRules !== undefined &&
+            input.FilterRules !== null && {
+            FilterRules: serializeAws_restJson1AwsS3BucketNotificationConfigurationS3KeyFilterRules(input.FilterRules, context),
+        }),
+    };
+};
+const serializeAws_restJson1AwsS3BucketNotificationConfigurationS3KeyFilterRule = (input, context) => {
+    return {
+        ...(input.Name !== undefined && input.Name !== null && { Name: input.Name }),
+        ...(input.Value !== undefined && input.Value !== null && { Value: input.Value }),
+    };
+};
+const serializeAws_restJson1AwsS3BucketNotificationConfigurationS3KeyFilterRules = (input, context) => {
+    return input
+        .filter((e) => e != null)
+        .map((entry) => {
+        if (entry === null) {
+            return null;
+        }
+        return serializeAws_restJson1AwsS3BucketNotificationConfigurationS3KeyFilterRule(entry, context);
+    });
+};
 const serializeAws_restJson1AwsS3BucketServerSideEncryptionByDefault = (input, context) => {
     return {
         ...(input.KMSMasterKeyID !== undefined &&
@@ -9428,6 +9768,69 @@ const serializeAws_restJson1AwsS3BucketServerSideEncryptionRules = (input, conte
         return serializeAws_restJson1AwsS3BucketServerSideEncryptionRule(entry, context);
     });
 };
+const serializeAws_restJson1AwsS3BucketWebsiteConfiguration = (input, context) => {
+    return {
+        ...(input.ErrorDocument !== undefined && input.ErrorDocument !== null && { ErrorDocument: input.ErrorDocument }),
+        ...(input.IndexDocumentSuffix !== undefined &&
+            input.IndexDocumentSuffix !== null && { IndexDocumentSuffix: input.IndexDocumentSuffix }),
+        ...(input.RedirectAllRequestsTo !== undefined &&
+            input.RedirectAllRequestsTo !== null && {
+            RedirectAllRequestsTo: serializeAws_restJson1AwsS3BucketWebsiteConfigurationRedirectTo(input.RedirectAllRequestsTo, context),
+        }),
+        ...(input.RoutingRules !== undefined &&
+            input.RoutingRules !== null && {
+            RoutingRules: serializeAws_restJson1AwsS3BucketWebsiteConfigurationRoutingRules(input.RoutingRules, context),
+        }),
+    };
+};
+const serializeAws_restJson1AwsS3BucketWebsiteConfigurationRedirectTo = (input, context) => {
+    return {
+        ...(input.Hostname !== undefined && input.Hostname !== null && { Hostname: input.Hostname }),
+        ...(input.Protocol !== undefined && input.Protocol !== null && { Protocol: input.Protocol }),
+    };
+};
+const serializeAws_restJson1AwsS3BucketWebsiteConfigurationRoutingRule = (input, context) => {
+    return {
+        ...(input.Condition !== undefined &&
+            input.Condition !== null && {
+            Condition: serializeAws_restJson1AwsS3BucketWebsiteConfigurationRoutingRuleCondition(input.Condition, context),
+        }),
+        ...(input.Redirect !== undefined &&
+            input.Redirect !== null && {
+            Redirect: serializeAws_restJson1AwsS3BucketWebsiteConfigurationRoutingRuleRedirect(input.Redirect, context),
+        }),
+    };
+};
+const serializeAws_restJson1AwsS3BucketWebsiteConfigurationRoutingRuleCondition = (input, context) => {
+    return {
+        ...(input.HttpErrorCodeReturnedEquals !== undefined &&
+            input.HttpErrorCodeReturnedEquals !== null && { HttpErrorCodeReturnedEquals: input.HttpErrorCodeReturnedEquals }),
+        ...(input.KeyPrefixEquals !== undefined &&
+            input.KeyPrefixEquals !== null && { KeyPrefixEquals: input.KeyPrefixEquals }),
+    };
+};
+const serializeAws_restJson1AwsS3BucketWebsiteConfigurationRoutingRuleRedirect = (input, context) => {
+    return {
+        ...(input.Hostname !== undefined && input.Hostname !== null && { Hostname: input.Hostname }),
+        ...(input.HttpRedirectCode !== undefined &&
+            input.HttpRedirectCode !== null && { HttpRedirectCode: input.HttpRedirectCode }),
+        ...(input.Protocol !== undefined && input.Protocol !== null && { Protocol: input.Protocol }),
+        ...(input.ReplaceKeyPrefixWith !== undefined &&
+            input.ReplaceKeyPrefixWith !== null && { ReplaceKeyPrefixWith: input.ReplaceKeyPrefixWith }),
+        ...(input.ReplaceKeyWith !== undefined &&
+            input.ReplaceKeyWith !== null && { ReplaceKeyWith: input.ReplaceKeyWith }),
+    };
+};
+const serializeAws_restJson1AwsS3BucketWebsiteConfigurationRoutingRules = (input, context) => {
+    return input
+        .filter((e) => e != null)
+        .map((entry) => {
+        if (entry === null) {
+            return null;
+        }
+        return serializeAws_restJson1AwsS3BucketWebsiteConfigurationRoutingRule(entry, context);
+    });
+};
 const serializeAws_restJson1AwsS3ObjectDetails = (input, context) => {
     return {
         ...(input.ContentType !== undefined && input.ContentType !== null && { ContentType: input.ContentType }),
@@ -10174,8 +10577,11 @@ const serializeAws_restJson1CustomDataIdentifiersResult = (input, context) => {
 };
 const serializeAws_restJson1Cvss = (input, context) => {
     return {
+        ...(input.Adjustments !== undefined &&
+            input.Adjustments !== null && { Adjustments: serializeAws_restJson1AdjustmentList(input.Adjustments, context) }),
         ...(input.BaseScore !== undefined && input.BaseScore !== null && { BaseScore: smithy_client_1.serializeFloat(input.BaseScore) }),
         ...(input.BaseVector !== undefined && input.BaseVector !== null && { BaseVector: input.BaseVector }),
+        ...(input.Source !== undefined && input.Source !== null && { Source: input.Source }),
         ...(input.Version !== undefined && input.Version !== null && { Version: input.Version }),
     };
 };
@@ -10271,6 +10677,16 @@ const serializeAws_restJson1IcmpTypeCode = (input, context) => {
         ...(input.Type !== undefined && input.Type !== null && { Type: input.Type }),
     };
 };
+const serializeAws_restJson1IntegerList = (input, context) => {
+    return input
+        .filter((e) => e != null)
+        .map((entry) => {
+        if (entry === null) {
+            return null;
+        }
+        return entry;
+    });
+};
 const serializeAws_restJson1IpFilter = (input, context) => {
     return {
         ...(input.Cidr !== undefined && input.Cidr !== null && { Cidr: input.Cidr }),
@@ -10721,6 +11137,10 @@ const serializeAws_restJson1ResourceDetails = (input, context) => {
             input.AwsAutoScalingAutoScalingGroup !== null && {
             AwsAutoScalingAutoScalingGroup: serializeAws_restJson1AwsAutoScalingAutoScalingGroupDetails(input.AwsAutoScalingAutoScalingGroup, context),
         }),
+        ...(input.AwsAutoScalingLaunchConfiguration !== undefined &&
+            input.AwsAutoScalingLaunchConfiguration !== null && {
+            AwsAutoScalingLaunchConfiguration: serializeAws_restJson1AwsAutoScalingLaunchConfigurationDetails(input.AwsAutoScalingLaunchConfiguration, context),
+        }),
         ...(input.AwsCertificateManagerCertificate !== undefined &&
             input.AwsCertificateManagerCertificate !== null && {
             AwsCertificateManagerCertificate: serializeAws_restJson1AwsCertificateManagerCertificateDetails(input.AwsCertificateManagerCertificate, context),
@@ -10769,6 +11189,14 @@ const serializeAws_restJson1ResourceDetails = (input, context) => {
         }),
         ...(input.AwsEc2Vpc !== undefined &&
             input.AwsEc2Vpc !== null && { AwsEc2Vpc: serializeAws_restJson1AwsEc2VpcDetails(input.AwsEc2Vpc, context) }),
+        ...(input.AwsEc2VpnConnection !== undefined &&
+            input.AwsEc2VpnConnection !== null && {
+            AwsEc2VpnConnection: serializeAws_restJson1AwsEc2VpnConnectionDetails(input.AwsEc2VpnConnection, context),
+        }),
+        ...(input.AwsEcrContainerImage !== undefined &&
+            input.AwsEcrContainerImage !== null && {
+            AwsEcrContainerImage: serializeAws_restJson1AwsEcrContainerImageDetails(input.AwsEcrContainerImage, context),
+        }),
         ...(input.AwsEcsCluster !== undefined &&
             input.AwsEcsCluster !== null && {
             AwsEcsCluster: serializeAws_restJson1AwsEcsClusterDetails(input.AwsEcsCluster, context),
@@ -10962,7 +11390,10 @@ const serializeAws_restJson1SoftwarePackage = (input, context) => {
     return {
         ...(input.Architecture !== undefined && input.Architecture !== null && { Architecture: input.Architecture }),
         ...(input.Epoch !== undefined && input.Epoch !== null && { Epoch: input.Epoch }),
+        ...(input.FilePath !== undefined && input.FilePath !== null && { FilePath: input.FilePath }),
         ...(input.Name !== undefined && input.Name !== null && { Name: input.Name }),
+        ...(input.PackageManager !== undefined &&
+            input.PackageManager !== null && { PackageManager: input.PackageManager }),
         ...(input.Release !== undefined && input.Release !== null && { Release: input.Release }),
         ...(input.Version !== undefined && input.Version !== null && { Version: input.Version }),
     };
@@ -11219,7 +11650,7 @@ const deserializeAws_restJson1ActionLocalIpDetails = (output, context) => {
 };
 const deserializeAws_restJson1ActionLocalPortDetails = (output, context) => {
     return {
-        Port: smithy_client_1.expectInt(output.Port),
+        Port: smithy_client_1.expectInt32(output.Port),
         PortName: smithy_client_1.expectString(output.PortName),
     };
 };
@@ -11242,7 +11673,7 @@ const deserializeAws_restJson1ActionRemoteIpDetails = (output, context) => {
 };
 const deserializeAws_restJson1ActionRemotePortDetails = (output, context) => {
     return {
-        Port: smithy_client_1.expectInt(output.Port),
+        Port: smithy_client_1.expectInt32(output.Port),
         PortName: smithy_client_1.expectString(output.PortName),
     };
 };
@@ -11263,6 +11694,22 @@ const deserializeAws_restJson1ActionTargetList = (output, context) => {
         return deserializeAws_restJson1ActionTarget(entry, context);
     });
 };
+const deserializeAws_restJson1Adjustment = (output, context) => {
+    return {
+        Metric: smithy_client_1.expectString(output.Metric),
+        Reason: smithy_client_1.expectString(output.Reason),
+    };
+};
+const deserializeAws_restJson1AdjustmentList = (output, context) => {
+    return (output || [])
+        .filter((e) => e != null)
+        .map((entry) => {
+        if (entry === null) {
+            return null;
+        }
+        return deserializeAws_restJson1Adjustment(entry, context);
+    });
+};
 const deserializeAws_restJson1AdminAccount = (output, context) => {
     return {
         AccountId: smithy_client_1.expectString(output.AccountId),
@@ -11327,7 +11774,7 @@ const deserializeAws_restJson1AwsApiGatewayAccessLogSettings = (output, context)
 const deserializeAws_restJson1AwsApiGatewayCanarySettings = (output, context) => {
     return {
         DeploymentId: smithy_client_1.expectString(output.DeploymentId),
-        PercentTraffic: smithy_client_1.limitedParseFloat(output.PercentTraffic),
+        PercentTraffic: smithy_client_1.limitedParseDouble(output.PercentTraffic),
         StageVariableOverrides: output.StageVariableOverrides !== undefined && output.StageVariableOverrides !== null
             ? deserializeAws_restJson1FieldMap(output.StageVariableOverrides, context)
             : undefined,
@@ -11344,7 +11791,7 @@ const deserializeAws_restJson1AwsApiGatewayEndpointConfiguration = (output, cont
 const deserializeAws_restJson1AwsApiGatewayMethodSettings = (output, context) => {
     return {
         CacheDataEncrypted: smithy_client_1.expectBoolean(output.CacheDataEncrypted),
-        CacheTtlInSeconds: smithy_client_1.expectInt(output.CacheTtlInSeconds),
+        CacheTtlInSeconds: smithy_client_1.expectInt32(output.CacheTtlInSeconds),
         CachingEnabled: smithy_client_1.expectBoolean(output.CachingEnabled),
         DataTraceEnabled: smithy_client_1.expectBoolean(output.DataTraceEnabled),
         HttpMethod: smithy_client_1.expectString(output.HttpMethod),
@@ -11352,8 +11799,8 @@ const deserializeAws_restJson1AwsApiGatewayMethodSettings = (output, context) =>
         MetricsEnabled: smithy_client_1.expectBoolean(output.MetricsEnabled),
         RequireAuthorizationForCacheControl: smithy_client_1.expectBoolean(output.RequireAuthorizationForCacheControl),
         ResourcePath: smithy_client_1.expectString(output.ResourcePath),
-        ThrottlingBurstLimit: smithy_client_1.expectInt(output.ThrottlingBurstLimit),
-        ThrottlingRateLimit: smithy_client_1.limitedParseFloat(output.ThrottlingRateLimit),
+        ThrottlingBurstLimit: smithy_client_1.expectInt32(output.ThrottlingBurstLimit),
+        ThrottlingRateLimit: smithy_client_1.limitedParseDouble(output.ThrottlingRateLimit),
         UnauthorizedCacheControlHeaderStrategy: smithy_client_1.expectString(output.UnauthorizedCacheControlHeaderStrategy),
     };
 };
@@ -11379,7 +11826,7 @@ const deserializeAws_restJson1AwsApiGatewayRestApiDetails = (output, context) =>
             ? deserializeAws_restJson1AwsApiGatewayEndpointConfiguration(output.EndpointConfiguration, context)
             : undefined,
         Id: smithy_client_1.expectString(output.Id),
-        MinimumCompressionSize: smithy_client_1.expectInt(output.MinimumCompressionSize),
+        MinimumCompressionSize: smithy_client_1.expectInt32(output.MinimumCompressionSize),
         Name: smithy_client_1.expectString(output.Name),
         Version: smithy_client_1.expectString(output.Version),
     };
@@ -11433,8 +11880,8 @@ const deserializeAws_restJson1AwsApiGatewayV2RouteSettings = (output, context) =
         DataTraceEnabled: smithy_client_1.expectBoolean(output.DataTraceEnabled),
         DetailedMetricsEnabled: smithy_client_1.expectBoolean(output.DetailedMetricsEnabled),
         LoggingLevel: smithy_client_1.expectString(output.LoggingLevel),
-        ThrottlingBurstLimit: smithy_client_1.expectInt(output.ThrottlingBurstLimit),
-        ThrottlingRateLimit: smithy_client_1.limitedParseFloat(output.ThrottlingRateLimit),
+        ThrottlingBurstLimit: smithy_client_1.expectInt32(output.ThrottlingBurstLimit),
+        ThrottlingRateLimit: smithy_client_1.limitedParseDouble(output.ThrottlingRateLimit),
     };
 };
 const deserializeAws_restJson1AwsApiGatewayV2StageDetails = (output, context) => {
@@ -11465,7 +11912,7 @@ const deserializeAws_restJson1AwsApiGatewayV2StageDetails = (output, context) =>
 const deserializeAws_restJson1AwsAutoScalingAutoScalingGroupDetails = (output, context) => {
     return {
         CreatedTime: smithy_client_1.expectString(output.CreatedTime),
-        HealthCheckGracePeriod: smithy_client_1.expectInt(output.HealthCheckGracePeriod),
+        HealthCheckGracePeriod: smithy_client_1.expectInt32(output.HealthCheckGracePeriod),
         HealthCheckType: smithy_client_1.expectString(output.HealthCheckType),
         LaunchConfigurationName: smithy_client_1.expectString(output.LaunchConfigurationName),
         LoadBalancerNames: output.LoadBalancerNames !== undefined && output.LoadBalancerNames !== null
@@ -11473,6 +11920,71 @@ const deserializeAws_restJson1AwsAutoScalingAutoScalingGroupDetails = (output, c
             : undefined,
     };
 };
+const deserializeAws_restJson1AwsAutoScalingLaunchConfigurationBlockDeviceMappingsDetails = (output, context) => {
+    return {
+        DeviceName: smithy_client_1.expectString(output.DeviceName),
+        Ebs: output.Ebs !== undefined && output.Ebs !== null
+            ? deserializeAws_restJson1AwsAutoScalingLaunchConfigurationBlockDeviceMappingsEbsDetails(output.Ebs, context)
+            : undefined,
+        NoDevice: smithy_client_1.expectBoolean(output.NoDevice),
+        VirtualName: smithy_client_1.expectString(output.VirtualName),
+    };
+};
+const deserializeAws_restJson1AwsAutoScalingLaunchConfigurationBlockDeviceMappingsEbsDetails = (output, context) => {
+    return {
+        DeleteOnTermination: smithy_client_1.expectBoolean(output.DeleteOnTermination),
+        Encrypted: smithy_client_1.expectBoolean(output.Encrypted),
+        Iops: smithy_client_1.expectInt32(output.Iops),
+        SnapshotId: smithy_client_1.expectString(output.SnapshotId),
+        VolumeSize: smithy_client_1.expectInt32(output.VolumeSize),
+        VolumeType: smithy_client_1.expectString(output.VolumeType),
+    };
+};
+const deserializeAws_restJson1AwsAutoScalingLaunchConfigurationBlockDeviceMappingsList = (output, context) => {
+    return (output || [])
+        .filter((e) => e != null)
+        .map((entry) => {
+        if (entry === null) {
+            return null;
+        }
+        return deserializeAws_restJson1AwsAutoScalingLaunchConfigurationBlockDeviceMappingsDetails(entry, context);
+    });
+};
+const deserializeAws_restJson1AwsAutoScalingLaunchConfigurationDetails = (output, context) => {
+    return {
+        AssociatePublicIpAddress: smithy_client_1.expectBoolean(output.AssociatePublicIpAddress),
+        BlockDeviceMappings: output.BlockDeviceMappings !== undefined && output.BlockDeviceMappings !== null
+            ? deserializeAws_restJson1AwsAutoScalingLaunchConfigurationBlockDeviceMappingsList(output.BlockDeviceMappings, context)
+            : undefined,
+        ClassicLinkVpcId: smithy_client_1.expectString(output.ClassicLinkVpcId),
+        ClassicLinkVpcSecurityGroups: output.ClassicLinkVpcSecurityGroups !== undefined && output.ClassicLinkVpcSecurityGroups !== null
+            ? deserializeAws_restJson1NonEmptyStringList(output.ClassicLinkVpcSecurityGroups, context)
+            : undefined,
+        CreatedTime: smithy_client_1.expectString(output.CreatedTime),
+        EbsOptimized: smithy_client_1.expectBoolean(output.EbsOptimized),
+        IamInstanceProfile: smithy_client_1.expectString(output.IamInstanceProfile),
+        ImageId: smithy_client_1.expectString(output.ImageId),
+        InstanceMonitoring: output.InstanceMonitoring !== undefined && output.InstanceMonitoring !== null
+            ? deserializeAws_restJson1AwsAutoScalingLaunchConfigurationInstanceMonitoringDetails(output.InstanceMonitoring, context)
+            : undefined,
+        InstanceType: smithy_client_1.expectString(output.InstanceType),
+        KernelId: smithy_client_1.expectString(output.KernelId),
+        KeyName: smithy_client_1.expectString(output.KeyName),
+        LaunchConfigurationName: smithy_client_1.expectString(output.LaunchConfigurationName),
+        PlacementTenancy: smithy_client_1.expectString(output.PlacementTenancy),
+        RamdiskId: smithy_client_1.expectString(output.RamdiskId),
+        SecurityGroups: output.SecurityGroups !== undefined && output.SecurityGroups !== null
+            ? deserializeAws_restJson1NonEmptyStringList(output.SecurityGroups, context)
+            : undefined,
+        SpotPrice: smithy_client_1.expectString(output.SpotPrice),
+        UserData: smithy_client_1.expectString(output.UserData),
+    };
+};
+const deserializeAws_restJson1AwsAutoScalingLaunchConfigurationInstanceMonitoringDetails = (output, context) => {
+    return {
+        Enabled: smithy_client_1.expectBoolean(output.Enabled),
+    };
+};
 const deserializeAws_restJson1AwsCertificateManagerCertificateDetails = (output, context) => {
     return {
         CertificateAuthorityArn: smithy_client_1.expectString(output.CertificateAuthorityArn),
@@ -11670,7 +12182,7 @@ const deserializeAws_restJson1AwsCloudFrontDistributionOriginGroupFailoverStatus
         Items: output.Items !== undefined && output.Items !== null
             ? deserializeAws_restJson1AwsCloudFrontDistributionOriginGroupFailoverStatusCodesItemList(output.Items, context)
             : undefined,
-        Quantity: smithy_client_1.expectInt(output.Quantity),
+        Quantity: smithy_client_1.expectInt32(output.Quantity),
     };
 };
 const deserializeAws_restJson1AwsCloudFrontDistributionOriginGroupFailoverStatusCodesItemList = (output, context) => {
@@ -11680,7 +12192,7 @@ const deserializeAws_restJson1AwsCloudFrontDistributionOriginGroupFailoverStatus
         if (entry === null) {
             return null;
         }
-        return smithy_client_1.expectInt(entry);
+        return smithy_client_1.expectInt32(entry);
     });
 };
 const deserializeAws_restJson1AwsCloudFrontDistributionOriginGroups = (output, context) => {
@@ -11785,7 +12297,7 @@ const deserializeAws_restJson1AwsCodeBuildProjectEnvironmentRegistryCredential =
 };
 const deserializeAws_restJson1AwsCodeBuildProjectSource = (output, context) => {
     return {
-        GitCloneDepth: smithy_client_1.expectInt(output.GitCloneDepth),
+        GitCloneDepth: smithy_client_1.expectInt32(output.GitCloneDepth),
         InsecureSsl: smithy_client_1.expectBoolean(output.InsecureSsl),
         Location: smithy_client_1.expectString(output.Location),
         Type: smithy_client_1.expectString(output.Type),
@@ -11817,7 +12329,7 @@ const deserializeAws_restJson1AwsCorsConfiguration = (output, context) => {
         ExposeHeaders: output.ExposeHeaders !== undefined && output.ExposeHeaders !== null
             ? deserializeAws_restJson1NonEmptyStringList(output.ExposeHeaders, context)
             : undefined,
-        MaxAge: smithy_client_1.expectInt(output.MaxAge),
+        MaxAge: smithy_client_1.expectInt32(output.MaxAge),
     };
 };
 const deserializeAws_restJson1AwsDynamoDbTableAttributeDefinition = (output, context) => {
@@ -11855,7 +12367,7 @@ const deserializeAws_restJson1AwsDynamoDbTableDetails = (output, context) => {
             ? deserializeAws_restJson1AwsDynamoDbTableGlobalSecondaryIndexList(output.GlobalSecondaryIndexes, context)
             : undefined,
         GlobalTableVersion: smithy_client_1.expectString(output.GlobalTableVersion),
-        ItemCount: smithy_client_1.expectInt(output.ItemCount),
+        ItemCount: smithy_client_1.expectInt32(output.ItemCount),
         KeySchema: output.KeySchema !== undefined && output.KeySchema !== null
             ? deserializeAws_restJson1AwsDynamoDbTableKeySchemaList(output.KeySchema, context)
             : undefined,
@@ -11881,7 +12393,7 @@ const deserializeAws_restJson1AwsDynamoDbTableDetails = (output, context) => {
             : undefined,
         TableId: smithy_client_1.expectString(output.TableId),
         TableName: smithy_client_1.expectString(output.TableName),
-        TableSizeBytes: smithy_client_1.expectInt(output.TableSizeBytes),
+        TableSizeBytes: smithy_client_1.expectLong(output.TableSizeBytes),
         TableStatus: smithy_client_1.expectString(output.TableStatus),
     };
 };
@@ -11890,9 +12402,9 @@ const deserializeAws_restJson1AwsDynamoDbTableGlobalSecondaryIndex = (output, co
         Backfilling: smithy_client_1.expectBoolean(output.Backfilling),
         IndexArn: smithy_client_1.expectString(output.IndexArn),
         IndexName: smithy_client_1.expectString(output.IndexName),
-        IndexSizeBytes: smithy_client_1.expectInt(output.IndexSizeBytes),
+        IndexSizeBytes: smithy_client_1.expectLong(output.IndexSizeBytes),
         IndexStatus: smithy_client_1.expectString(output.IndexStatus),
-        ItemCount: smithy_client_1.expectInt(output.ItemCount),
+        ItemCount: smithy_client_1.expectInt32(output.ItemCount),
         KeySchema: output.KeySchema !== undefined && output.KeySchema !== null
             ? deserializeAws_restJson1AwsDynamoDbTableKeySchemaList(output.KeySchema, context)
             : undefined,
@@ -11964,14 +12476,14 @@ const deserializeAws_restJson1AwsDynamoDbTableProvisionedThroughput = (output, c
     return {
         LastDecreaseDateTime: smithy_client_1.expectString(output.LastDecreaseDateTime),
         LastIncreaseDateTime: smithy_client_1.expectString(output.LastIncreaseDateTime),
-        NumberOfDecreasesToday: smithy_client_1.expectInt(output.NumberOfDecreasesToday),
-        ReadCapacityUnits: smithy_client_1.expectInt(output.ReadCapacityUnits),
-        WriteCapacityUnits: smithy_client_1.expectInt(output.WriteCapacityUnits),
+        NumberOfDecreasesToday: smithy_client_1.expectInt32(output.NumberOfDecreasesToday),
+        ReadCapacityUnits: smithy_client_1.expectInt32(output.ReadCapacityUnits),
+        WriteCapacityUnits: smithy_client_1.expectInt32(output.WriteCapacityUnits),
     };
 };
 const deserializeAws_restJson1AwsDynamoDbTableProvisionedThroughputOverride = (output, context) => {
     return {
-        ReadCapacityUnits: smithy_client_1.expectInt(output.ReadCapacityUnits),
+        ReadCapacityUnits: smithy_client_1.expectInt32(output.ReadCapacityUnits),
     };
 };
 const deserializeAws_restJson1AwsDynamoDbTableReplica = (output, context) => {
@@ -12131,7 +12643,7 @@ const deserializeAws_restJson1AwsEc2NetworkAclEntry = (output, context) => {
             : undefined,
         Protocol: smithy_client_1.expectString(output.Protocol),
         RuleAction: smithy_client_1.expectString(output.RuleAction),
-        RuleNumber: smithy_client_1.expectInt(output.RuleNumber),
+        RuleNumber: smithy_client_1.expectInt32(output.RuleNumber),
     };
 };
 const deserializeAws_restJson1AwsEc2NetworkAclEntryList = (output, context) => {
@@ -12149,7 +12661,7 @@ const deserializeAws_restJson1AwsEc2NetworkInterfaceAttachment = (output, contex
         AttachTime: smithy_client_1.expectString(output.AttachTime),
         AttachmentId: smithy_client_1.expectString(output.AttachmentId),
         DeleteOnTermination: smithy_client_1.expectBoolean(output.DeleteOnTermination),
-        DeviceIndex: smithy_client_1.expectInt(output.DeviceIndex),
+        DeviceIndex: smithy_client_1.expectInt32(output.DeviceIndex),
         InstanceId: smithy_client_1.expectString(output.InstanceId),
         InstanceOwnerId: smithy_client_1.expectString(output.InstanceOwnerId),
         Status: smithy_client_1.expectString(output.Status),
@@ -12238,7 +12750,7 @@ const deserializeAws_restJson1AwsEc2SecurityGroupDetails = (output, context) =>
 };
 const deserializeAws_restJson1AwsEc2SecurityGroupIpPermission = (output, context) => {
     return {
-        FromPort: smithy_client_1.expectInt(output.FromPort),
+        FromPort: smithy_client_1.expectInt32(output.FromPort),
         IpProtocol: smithy_client_1.expectString(output.IpProtocol),
         IpRanges: output.IpRanges !== undefined && output.IpRanges !== null
             ? deserializeAws_restJson1AwsEc2SecurityGroupIpRangeList(output.IpRanges, context)
@@ -12249,7 +12761,7 @@ const deserializeAws_restJson1AwsEc2SecurityGroupIpPermission = (output, context
         PrefixListIds: output.PrefixListIds !== undefined && output.PrefixListIds !== null
             ? deserializeAws_restJson1AwsEc2SecurityGroupPrefixListIdList(output.PrefixListIds, context)
             : undefined,
-        ToPort: smithy_client_1.expectInt(output.ToPort),
+        ToPort: smithy_client_1.expectInt32(output.ToPort),
         UserIdGroupPairs: output.UserIdGroupPairs !== undefined && output.UserIdGroupPairs !== null
             ? deserializeAws_restJson1AwsEc2SecurityGroupUserIdGroupPairList(output.UserIdGroupPairs, context)
             : undefined,
@@ -12335,7 +12847,7 @@ const deserializeAws_restJson1AwsEc2SubnetDetails = (output, context) => {
         AssignIpv6AddressOnCreation: smithy_client_1.expectBoolean(output.AssignIpv6AddressOnCreation),
         AvailabilityZone: smithy_client_1.expectString(output.AvailabilityZone),
         AvailabilityZoneId: smithy_client_1.expectString(output.AvailabilityZoneId),
-        AvailableIpAddressCount: smithy_client_1.expectInt(output.AvailableIpAddressCount),
+        AvailableIpAddressCount: smithy_client_1.expectInt32(output.AvailableIpAddressCount),
         CidrBlock: smithy_client_1.expectString(output.CidrBlock),
         DefaultForAz: smithy_client_1.expectBoolean(output.DefaultForAz),
         Ipv6CidrBlockAssociationSet: output.Ipv6CidrBlockAssociationSet !== undefined && output.Ipv6CidrBlockAssociationSet !== null
@@ -12375,7 +12887,7 @@ const deserializeAws_restJson1AwsEc2VolumeDetails = (output, context) => {
         CreateTime: smithy_client_1.expectString(output.CreateTime),
         Encrypted: smithy_client_1.expectBoolean(output.Encrypted),
         KmsKeyId: smithy_client_1.expectString(output.KmsKeyId),
-        Size: smithy_client_1.expectInt(output.Size),
+        Size: smithy_client_1.expectInt32(output.Size),
         SnapshotId: smithy_client_1.expectString(output.SnapshotId),
         Status: smithy_client_1.expectString(output.Status),
     };
@@ -12392,6 +12904,127 @@ const deserializeAws_restJson1AwsEc2VpcDetails = (output, context) => {
         State: smithy_client_1.expectString(output.State),
     };
 };
+const deserializeAws_restJson1AwsEc2VpnConnectionDetails = (output, context) => {
+    return {
+        Category: smithy_client_1.expectString(output.Category),
+        CustomerGatewayConfiguration: smithy_client_1.expectString(output.CustomerGatewayConfiguration),
+        CustomerGatewayId: smithy_client_1.expectString(output.CustomerGatewayId),
+        Options: output.Options !== undefined && output.Options !== null
+            ? deserializeAws_restJson1AwsEc2VpnConnectionOptionsDetails(output.Options, context)
+            : undefined,
+        Routes: output.Routes !== undefined && output.Routes !== null
+            ? deserializeAws_restJson1AwsEc2VpnConnectionRoutesList(output.Routes, context)
+            : undefined,
+        State: smithy_client_1.expectString(output.State),
+        TransitGatewayId: smithy_client_1.expectString(output.TransitGatewayId),
+        Type: smithy_client_1.expectString(output.Type),
+        VgwTelemetry: output.VgwTelemetry !== undefined && output.VgwTelemetry !== null
+            ? deserializeAws_restJson1AwsEc2VpnConnectionVgwTelemetryList(output.VgwTelemetry, context)
+            : undefined,
+        VpnConnectionId: smithy_client_1.expectString(output.VpnConnectionId),
+        VpnGatewayId: smithy_client_1.expectString(output.VpnGatewayId),
+    };
+};
+const deserializeAws_restJson1AwsEc2VpnConnectionOptionsDetails = (output, context) => {
+    return {
+        StaticRoutesOnly: smithy_client_1.expectBoolean(output.StaticRoutesOnly),
+        TunnelOptions: output.TunnelOptions !== undefined && output.TunnelOptions !== null
+            ? deserializeAws_restJson1AwsEc2VpnConnectionOptionsTunnelOptionsList(output.TunnelOptions, context)
+            : undefined,
+    };
+};
+const deserializeAws_restJson1AwsEc2VpnConnectionOptionsTunnelOptionsDetails = (output, context) => {
+    return {
+        DpdTimeoutSeconds: smithy_client_1.expectInt32(output.DpdTimeoutSeconds),
+        IkeVersions: output.IkeVersions !== undefined && output.IkeVersions !== null
+            ? deserializeAws_restJson1NonEmptyStringList(output.IkeVersions, context)
+            : undefined,
+        OutsideIpAddress: smithy_client_1.expectString(output.OutsideIpAddress),
+        Phase1DhGroupNumbers: output.Phase1DhGroupNumbers !== undefined && output.Phase1DhGroupNumbers !== null
+            ? deserializeAws_restJson1IntegerList(output.Phase1DhGroupNumbers, context)
+            : undefined,
+        Phase1EncryptionAlgorithms: output.Phase1EncryptionAlgorithms !== undefined && output.Phase1EncryptionAlgorithms !== null
+            ? deserializeAws_restJson1NonEmptyStringList(output.Phase1EncryptionAlgorithms, context)
+            : undefined,
+        Phase1IntegrityAlgorithms: output.Phase1IntegrityAlgorithms !== undefined && output.Phase1IntegrityAlgorithms !== null
+            ? deserializeAws_restJson1NonEmptyStringList(output.Phase1IntegrityAlgorithms, context)
+            : undefined,
+        Phase1LifetimeSeconds: smithy_client_1.expectInt32(output.Phase1LifetimeSeconds),
+        Phase2DhGroupNumbers: output.Phase2DhGroupNumbers !== undefined && output.Phase2DhGroupNumbers !== null
+            ? deserializeAws_restJson1IntegerList(output.Phase2DhGroupNumbers, context)
+            : undefined,
+        Phase2EncryptionAlgorithms: output.Phase2EncryptionAlgorithms !== undefined && output.Phase2EncryptionAlgorithms !== null
+            ? deserializeAws_restJson1NonEmptyStringList(output.Phase2EncryptionAlgorithms, context)
+            : undefined,
+        Phase2IntegrityAlgorithms: output.Phase2IntegrityAlgorithms !== undefined && output.Phase2IntegrityAlgorithms !== null
+            ? deserializeAws_restJson1NonEmptyStringList(output.Phase2IntegrityAlgorithms, context)
+            : undefined,
+        Phase2LifetimeSeconds: smithy_client_1.expectInt32(output.Phase2LifetimeSeconds),
+        PreSharedKey: smithy_client_1.expectString(output.PreSharedKey),
+        RekeyFuzzPercentage: smithy_client_1.expectInt32(output.RekeyFuzzPercentage),
+        RekeyMarginTimeSeconds: smithy_client_1.expectInt32(output.RekeyMarginTimeSeconds),
+        ReplayWindowSize: smithy_client_1.expectInt32(output.ReplayWindowSize),
+        TunnelInsideCidr: smithy_client_1.expectString(output.TunnelInsideCidr),
+    };
+};
+const deserializeAws_restJson1AwsEc2VpnConnectionOptionsTunnelOptionsList = (output, context) => {
+    return (output || [])
+        .filter((e) => e != null)
+        .map((entry) => {
+        if (entry === null) {
+            return null;
+        }
+        return deserializeAws_restJson1AwsEc2VpnConnectionOptionsTunnelOptionsDetails(entry, context);
+    });
+};
+const deserializeAws_restJson1AwsEc2VpnConnectionRoutesDetails = (output, context) => {
+    return {
+        DestinationCidrBlock: smithy_client_1.expectString(output.DestinationCidrBlock),
+        State: smithy_client_1.expectString(output.State),
+    };
+};
+const deserializeAws_restJson1AwsEc2VpnConnectionRoutesList = (output, context) => {
+    return (output || [])
+        .filter((e) => e != null)
+        .map((entry) => {
+        if (entry === null) {
+            return null;
+        }
+        return deserializeAws_restJson1AwsEc2VpnConnectionRoutesDetails(entry, context);
+    });
+};
+const deserializeAws_restJson1AwsEc2VpnConnectionVgwTelemetryDetails = (output, context) => {
+    return {
+        AcceptedRouteCount: smithy_client_1.expectInt32(output.AcceptedRouteCount),
+        CertificateArn: smithy_client_1.expectString(output.CertificateArn),
+        LastStatusChange: smithy_client_1.expectString(output.LastStatusChange),
+        OutsideIpAddress: smithy_client_1.expectString(output.OutsideIpAddress),
+        Status: smithy_client_1.expectString(output.Status),
+        StatusMessage: smithy_client_1.expectString(output.StatusMessage),
+    };
+};
+const deserializeAws_restJson1AwsEc2VpnConnectionVgwTelemetryList = (output, context) => {
+    return (output || [])
+        .filter((e) => e != null)
+        .map((entry) => {
+        if (entry === null) {
+            return null;
+        }
+        return deserializeAws_restJson1AwsEc2VpnConnectionVgwTelemetryDetails(entry, context);
+    });
+};
+const deserializeAws_restJson1AwsEcrContainerImageDetails = (output, context) => {
+    return {
+        Architecture: smithy_client_1.expectString(output.Architecture),
+        ImageDigest: smithy_client_1.expectString(output.ImageDigest),
+        ImagePublishedAt: smithy_client_1.expectString(output.ImagePublishedAt),
+        ImageTags: output.ImageTags !== undefined && output.ImageTags !== null
+            ? deserializeAws_restJson1NonEmptyStringList(output.ImageTags, context)
+            : undefined,
+        RegistryId: smithy_client_1.expectString(output.RegistryId),
+        RepositoryName: smithy_client_1.expectString(output.RepositoryName),
+    };
+};
 const deserializeAws_restJson1AwsEcsClusterClusterSettingsDetails = (output, context) => {
     return {
         Name: smithy_client_1.expectString(output.Name),
@@ -12435,9 +13068,9 @@ const deserializeAws_restJson1AwsEcsClusterConfigurationExecuteCommandConfigurat
 };
 const deserializeAws_restJson1AwsEcsClusterDefaultCapacityProviderStrategyDetails = (output, context) => {
     return {
-        Base: smithy_client_1.expectInt(output.Base),
+        Base: smithy_client_1.expectInt32(output.Base),
         CapacityProvider: smithy_client_1.expectString(output.CapacityProvider),
-        Weight: smithy_client_1.expectInt(output.Weight),
+        Weight: smithy_client_1.expectInt32(output.Weight),
     };
 };
 const deserializeAws_restJson1AwsEcsClusterDefaultCapacityProviderStrategyList = (output, context) => {
@@ -12468,9 +13101,9 @@ const deserializeAws_restJson1AwsEcsClusterDetails = (output, context) => {
 };
 const deserializeAws_restJson1AwsEcsServiceCapacityProviderStrategyDetails = (output, context) => {
     return {
-        Base: smithy_client_1.expectInt(output.Base),
+        Base: smithy_client_1.expectInt32(output.Base),
         CapacityProvider: smithy_client_1.expectString(output.CapacityProvider),
-        Weight: smithy_client_1.expectInt(output.Weight),
+        Weight: smithy_client_1.expectInt32(output.Weight),
     };
 };
 const deserializeAws_restJson1AwsEcsServiceCapacityProviderStrategyList = (output, context) => {
@@ -12494,8 +13127,8 @@ const deserializeAws_restJson1AwsEcsServiceDeploymentConfigurationDetails = (out
         DeploymentCircuitBreaker: output.DeploymentCircuitBreaker !== undefined && output.DeploymentCircuitBreaker !== null
             ? deserializeAws_restJson1AwsEcsServiceDeploymentConfigurationDeploymentCircuitBreakerDetails(output.DeploymentCircuitBreaker, context)
             : undefined,
-        MaximumPercent: smithy_client_1.expectInt(output.MaximumPercent),
-        MinimumHealthyPercent: smithy_client_1.expectInt(output.MinimumHealthyPercent),
+        MaximumPercent: smithy_client_1.expectInt32(output.MaximumPercent),
+        MinimumHealthyPercent: smithy_client_1.expectInt32(output.MinimumHealthyPercent),
     };
 };
 const deserializeAws_restJson1AwsEcsServiceDeploymentControllerDetails = (output, context) => {
@@ -12515,10 +13148,10 @@ const deserializeAws_restJson1AwsEcsServiceDetails = (output, context) => {
         DeploymentController: output.DeploymentController !== undefined && output.DeploymentController !== null
             ? deserializeAws_restJson1AwsEcsServiceDeploymentControllerDetails(output.DeploymentController, context)
             : undefined,
-        DesiredCount: smithy_client_1.expectInt(output.DesiredCount),
+        DesiredCount: smithy_client_1.expectInt32(output.DesiredCount),
         EnableEcsManagedTags: smithy_client_1.expectBoolean(output.EnableEcsManagedTags),
         EnableExecuteCommand: smithy_client_1.expectBoolean(output.EnableExecuteCommand),
-        HealthCheckGracePeriodSeconds: smithy_client_1.expectInt(output.HealthCheckGracePeriodSeconds),
+        HealthCheckGracePeriodSeconds: smithy_client_1.expectInt32(output.HealthCheckGracePeriodSeconds),
         LaunchType: smithy_client_1.expectString(output.LaunchType),
         LoadBalancers: output.LoadBalancers !== undefined && output.LoadBalancers !== null
             ? deserializeAws_restJson1AwsEcsServiceLoadBalancersList(output.LoadBalancers, context)
@@ -12548,7 +13181,7 @@ const deserializeAws_restJson1AwsEcsServiceDetails = (output, context) => {
 const deserializeAws_restJson1AwsEcsServiceLoadBalancersDetails = (output, context) => {
     return {
         ContainerName: smithy_client_1.expectString(output.ContainerName),
-        ContainerPort: smithy_client_1.expectInt(output.ContainerPort),
+        ContainerPort: smithy_client_1.expectInt32(output.ContainerPort),
         LoadBalancerName: smithy_client_1.expectString(output.LoadBalancerName),
         TargetGroupArn: smithy_client_1.expectString(output.TargetGroupArn),
     };
@@ -12616,8 +13249,8 @@ const deserializeAws_restJson1AwsEcsServicePlacementStrategiesList = (output, co
 const deserializeAws_restJson1AwsEcsServiceServiceRegistriesDetails = (output, context) => {
     return {
         ContainerName: smithy_client_1.expectString(output.ContainerName),
-        ContainerPort: smithy_client_1.expectInt(output.ContainerPort),
-        Port: smithy_client_1.expectInt(output.Port),
+        ContainerPort: smithy_client_1.expectInt32(output.ContainerPort),
+        Port: smithy_client_1.expectInt32(output.Port),
         RegistryArn: smithy_client_1.expectString(output.RegistryArn),
     };
 };
@@ -12652,7 +13285,7 @@ const deserializeAws_restJson1AwsEcsTaskDefinitionContainerDefinitionsDetails =
         Command: output.Command !== undefined && output.Command !== null
             ? deserializeAws_restJson1NonEmptyStringList(output.Command, context)
             : undefined,
-        Cpu: smithy_client_1.expectInt(output.Cpu),
+        Cpu: smithy_client_1.expectInt32(output.Cpu),
         DependsOn: output.DependsOn !== undefined && output.DependsOn !== null
             ? deserializeAws_restJson1AwsEcsTaskDefinitionContainerDefinitionsDependsOnList(output.DependsOn, context)
             : undefined,
@@ -12700,8 +13333,8 @@ const deserializeAws_restJson1AwsEcsTaskDefinitionContainerDefinitionsDetails =
         LogConfiguration: output.LogConfiguration !== undefined && output.LogConfiguration !== null
             ? deserializeAws_restJson1AwsEcsTaskDefinitionContainerDefinitionsLogConfigurationDetails(output.LogConfiguration, context)
             : undefined,
-        Memory: smithy_client_1.expectInt(output.Memory),
-        MemoryReservation: smithy_client_1.expectInt(output.MemoryReservation),
+        Memory: smithy_client_1.expectInt32(output.Memory),
+        MemoryReservation: smithy_client_1.expectInt32(output.MemoryReservation),
         MountPoints: output.MountPoints !== undefined && output.MountPoints !== null
             ? deserializeAws_restJson1AwsEcsTaskDefinitionContainerDefinitionsMountPointsList(output.MountPoints, context)
             : undefined,
@@ -12721,8 +13354,8 @@ const deserializeAws_restJson1AwsEcsTaskDefinitionContainerDefinitionsDetails =
         Secrets: output.Secrets !== undefined && output.Secrets !== null
             ? deserializeAws_restJson1AwsEcsTaskDefinitionContainerDefinitionsSecretsList(output.Secrets, context)
             : undefined,
-        StartTimeout: smithy_client_1.expectInt(output.StartTimeout),
-        StopTimeout: smithy_client_1.expectInt(output.StopTimeout),
+        StartTimeout: smithy_client_1.expectInt32(output.StartTimeout),
+        StopTimeout: smithy_client_1.expectInt32(output.StopTimeout),
         SystemControls: output.SystemControls !== undefined && output.SystemControls !== null
             ? deserializeAws_restJson1AwsEcsTaskDefinitionContainerDefinitionsSystemControlsList(output.SystemControls, context)
             : undefined,
@@ -12797,10 +13430,10 @@ const deserializeAws_restJson1AwsEcsTaskDefinitionContainerDefinitionsHealthChec
         Command: output.Command !== undefined && output.Command !== null
             ? deserializeAws_restJson1NonEmptyStringList(output.Command, context)
             : undefined,
-        Interval: smithy_client_1.expectInt(output.Interval),
-        Retries: smithy_client_1.expectInt(output.Retries),
-        StartPeriod: smithy_client_1.expectInt(output.StartPeriod),
-        Timeout: smithy_client_1.expectInt(output.Timeout),
+        Interval: smithy_client_1.expectInt32(output.Interval),
+        Retries: smithy_client_1.expectInt32(output.Retries),
+        StartPeriod: smithy_client_1.expectInt32(output.StartPeriod),
+        Timeout: smithy_client_1.expectInt32(output.Timeout),
     };
 };
 const deserializeAws_restJson1AwsEcsTaskDefinitionContainerDefinitionsLinuxParametersCapabilitiesDetails = (output, context) => {
@@ -12822,9 +13455,9 @@ const deserializeAws_restJson1AwsEcsTaskDefinitionContainerDefinitionsLinuxParam
             ? deserializeAws_restJson1AwsEcsTaskDefinitionContainerDefinitionsLinuxParametersDevicesList(output.Devices, context)
             : undefined,
         InitProcessEnabled: smithy_client_1.expectBoolean(output.InitProcessEnabled),
-        MaxSwap: smithy_client_1.expectInt(output.MaxSwap),
-        SharedMemorySize: smithy_client_1.expectInt(output.SharedMemorySize),
-        Swappiness: smithy_client_1.expectInt(output.Swappiness),
+        MaxSwap: smithy_client_1.expectInt32(output.MaxSwap),
+        SharedMemorySize: smithy_client_1.expectInt32(output.SharedMemorySize),
+        Swappiness: smithy_client_1.expectInt32(output.Swappiness),
         Tmpfs: output.Tmpfs !== undefined && output.Tmpfs !== null
             ? deserializeAws_restJson1AwsEcsTaskDefinitionContainerDefinitionsLinuxParametersTmpfsList(output.Tmpfs, context)
             : undefined,
@@ -12855,7 +13488,7 @@ const deserializeAws_restJson1AwsEcsTaskDefinitionContainerDefinitionsLinuxParam
         MountOptions: output.MountOptions !== undefined && output.MountOptions !== null
             ? deserializeAws_restJson1NonEmptyStringList(output.MountOptions, context)
             : undefined,
-        Size: smithy_client_1.expectInt(output.Size),
+        Size: smithy_client_1.expectInt32(output.Size),
     };
 };
 const deserializeAws_restJson1AwsEcsTaskDefinitionContainerDefinitionsLinuxParametersTmpfsList = (output, context) => {
@@ -12924,8 +13557,8 @@ const deserializeAws_restJson1AwsEcsTaskDefinitionContainerDefinitionsMountPoint
 };
 const deserializeAws_restJson1AwsEcsTaskDefinitionContainerDefinitionsPortMappingsDetails = (output, context) => {
     return {
-        ContainerPort: smithy_client_1.expectInt(output.ContainerPort),
-        HostPort: smithy_client_1.expectInt(output.HostPort),
+        ContainerPort: smithy_client_1.expectInt32(output.ContainerPort),
+        HostPort: smithy_client_1.expectInt32(output.HostPort),
         Protocol: smithy_client_1.expectString(output.Protocol),
     };
 };
@@ -12994,9 +13627,9 @@ const deserializeAws_restJson1AwsEcsTaskDefinitionContainerDefinitionsSystemCont
 };
 const deserializeAws_restJson1AwsEcsTaskDefinitionContainerDefinitionsUlimitsDetails = (output, context) => {
     return {
-        HardLimit: smithy_client_1.expectInt(output.HardLimit),
+        HardLimit: smithy_client_1.expectInt32(output.HardLimit),
         Name: smithy_client_1.expectString(output.Name),
-        SoftLimit: smithy_client_1.expectInt(output.SoftLimit),
+        SoftLimit: smithy_client_1.expectInt32(output.SoftLimit),
     };
 };
 const deserializeAws_restJson1AwsEcsTaskDefinitionContainerDefinitionsUlimitsList = (output, context) => {
@@ -13153,7 +13786,7 @@ const deserializeAws_restJson1AwsEcsTaskDefinitionVolumesEfsVolumeConfigurationD
         FilesystemId: smithy_client_1.expectString(output.FilesystemId),
         RootDirectory: smithy_client_1.expectString(output.RootDirectory),
         TransitEncryption: smithy_client_1.expectString(output.TransitEncryption),
-        TransitEncryptionPort: smithy_client_1.expectInt(output.TransitEncryptionPort),
+        TransitEncryptionPort: smithy_client_1.expectInt32(output.TransitEncryptionPort),
     };
 };
 const deserializeAws_restJson1AwsEcsTaskDefinitionVolumesHostDetails = (output, context) => {
@@ -13279,10 +13912,10 @@ const deserializeAws_restJson1AwsElasticsearchDomainDomainEndpointOptions = (out
 };
 const deserializeAws_restJson1AwsElasticsearchDomainElasticsearchClusterConfigDetails = (output, context) => {
     return {
-        DedicatedMasterCount: smithy_client_1.expectInt(output.DedicatedMasterCount),
+        DedicatedMasterCount: smithy_client_1.expectInt32(output.DedicatedMasterCount),
         DedicatedMasterEnabled: smithy_client_1.expectBoolean(output.DedicatedMasterEnabled),
         DedicatedMasterType: smithy_client_1.expectString(output.DedicatedMasterType),
-        InstanceCount: smithy_client_1.expectInt(output.InstanceCount),
+        InstanceCount: smithy_client_1.expectInt32(output.InstanceCount),
         InstanceType: smithy_client_1.expectString(output.InstanceType),
         ZoneAwarenessConfig: output.ZoneAwarenessConfig !== undefined && output.ZoneAwarenessConfig !== null
             ? deserializeAws_restJson1AwsElasticsearchDomainElasticsearchClusterConfigZoneAwarenessConfigDetails(output.ZoneAwarenessConfig, context)
@@ -13292,7 +13925,7 @@ const deserializeAws_restJson1AwsElasticsearchDomainElasticsearchClusterConfigDe
 };
 const deserializeAws_restJson1AwsElasticsearchDomainElasticsearchClusterConfigZoneAwarenessConfigDetails = (output, context) => {
     return {
-        AvailabilityZoneCount: smithy_client_1.expectInt(output.AvailabilityZoneCount),
+        AvailabilityZoneCount: smithy_client_1.expectInt32(output.AvailabilityZoneCount),
     };
 };
 const deserializeAws_restJson1AwsElasticsearchDomainEncryptionAtRestOptions = (output, context) => {
@@ -13378,13 +14011,13 @@ const deserializeAws_restJson1AwsElbLbCookieStickinessPolicies = (output, contex
 };
 const deserializeAws_restJson1AwsElbLbCookieStickinessPolicy = (output, context) => {
     return {
-        CookieExpirationPeriod: smithy_client_1.expectInt(output.CookieExpirationPeriod),
+        CookieExpirationPeriod: smithy_client_1.expectLong(output.CookieExpirationPeriod),
         PolicyName: smithy_client_1.expectString(output.PolicyName),
     };
 };
 const deserializeAws_restJson1AwsElbLoadBalancerAccessLog = (output, context) => {
     return {
-        EmitInterval: smithy_client_1.expectInt(output.EmitInterval),
+        EmitInterval: smithy_client_1.expectInt32(output.EmitInterval),
         Enabled: smithy_client_1.expectBoolean(output.Enabled),
         S3BucketName: smithy_client_1.expectString(output.S3BucketName),
         S3BucketPrefix: smithy_client_1.expectString(output.S3BucketPrefix),
@@ -13408,7 +14041,7 @@ const deserializeAws_restJson1AwsElbLoadBalancerAttributes = (output, context) =
 };
 const deserializeAws_restJson1AwsElbLoadBalancerBackendServerDescription = (output, context) => {
     return {
-        InstancePort: smithy_client_1.expectInt(output.InstancePort),
+        InstancePort: smithy_client_1.expectInt32(output.InstancePort),
         PolicyNames: output.PolicyNames !== undefined && output.PolicyNames !== null
             ? deserializeAws_restJson1StringList(output.PolicyNames, context)
             : undefined,
@@ -13427,12 +14060,12 @@ const deserializeAws_restJson1AwsElbLoadBalancerBackendServerDescriptions = (out
 const deserializeAws_restJson1AwsElbLoadBalancerConnectionDraining = (output, context) => {
     return {
         Enabled: smithy_client_1.expectBoolean(output.Enabled),
-        Timeout: smithy_client_1.expectInt(output.Timeout),
+        Timeout: smithy_client_1.expectInt32(output.Timeout),
     };
 };
 const deserializeAws_restJson1AwsElbLoadBalancerConnectionSettings = (output, context) => {
     return {
-        IdleTimeout: smithy_client_1.expectInt(output.IdleTimeout),
+        IdleTimeout: smithy_client_1.expectInt32(output.IdleTimeout),
     };
 };
 const deserializeAws_restJson1AwsElbLoadBalancerCrossZoneLoadBalancing = (output, context) => {
@@ -13483,11 +14116,11 @@ const deserializeAws_restJson1AwsElbLoadBalancerDetails = (output, context) => {
 };
 const deserializeAws_restJson1AwsElbLoadBalancerHealthCheck = (output, context) => {
     return {
-        HealthyThreshold: smithy_client_1.expectInt(output.HealthyThreshold),
-        Interval: smithy_client_1.expectInt(output.Interval),
+        HealthyThreshold: smithy_client_1.expectInt32(output.HealthyThreshold),
+        Interval: smithy_client_1.expectInt32(output.Interval),
         Target: smithy_client_1.expectString(output.Target),
-        Timeout: smithy_client_1.expectInt(output.Timeout),
-        UnhealthyThreshold: smithy_client_1.expectInt(output.UnhealthyThreshold),
+        Timeout: smithy_client_1.expectInt32(output.Timeout),
+        UnhealthyThreshold: smithy_client_1.expectInt32(output.UnhealthyThreshold),
     };
 };
 const deserializeAws_restJson1AwsElbLoadBalancerInstance = (output, context) => {
@@ -13507,9 +14140,9 @@ const deserializeAws_restJson1AwsElbLoadBalancerInstances = (output, context) =>
 };
 const deserializeAws_restJson1AwsElbLoadBalancerListener = (output, context) => {
     return {
-        InstancePort: smithy_client_1.expectInt(output.InstancePort),
+        InstancePort: smithy_client_1.expectInt32(output.InstancePort),
         InstanceProtocol: smithy_client_1.expectString(output.InstanceProtocol),
-        LoadBalancerPort: smithy_client_1.expectInt(output.LoadBalancerPort),
+        LoadBalancerPort: smithy_client_1.expectInt32(output.LoadBalancerPort),
         Protocol: smithy_client_1.expectString(output.Protocol),
         SslCertificateId: smithy_client_1.expectString(output.SslCertificateId),
     };
@@ -13708,13 +14341,13 @@ const deserializeAws_restJson1AwsIamPermissionsBoundary = (output, context) => {
 };
 const deserializeAws_restJson1AwsIamPolicyDetails = (output, context) => {
     return {
-        AttachmentCount: smithy_client_1.expectInt(output.AttachmentCount),
+        AttachmentCount: smithy_client_1.expectInt32(output.AttachmentCount),
         CreateDate: smithy_client_1.expectString(output.CreateDate),
         DefaultVersionId: smithy_client_1.expectString(output.DefaultVersionId),
         Description: smithy_client_1.expectString(output.Description),
         IsAttachable: smithy_client_1.expectBoolean(output.IsAttachable),
         Path: smithy_client_1.expectString(output.Path),
-        PermissionsBoundaryUsageCount: smithy_client_1.expectInt(output.PermissionsBoundaryUsageCount),
+        PermissionsBoundaryUsageCount: smithy_client_1.expectInt32(output.PermissionsBoundaryUsageCount),
         PolicyId: smithy_client_1.expectString(output.PolicyId),
         PolicyName: smithy_client_1.expectString(output.PolicyName),
         PolicyVersionList: output.PolicyVersionList !== undefined && output.PolicyVersionList !== null
@@ -13750,7 +14383,7 @@ const deserializeAws_restJson1AwsIamRoleDetails = (output, context) => {
         InstanceProfileList: output.InstanceProfileList !== undefined && output.InstanceProfileList !== null
             ? deserializeAws_restJson1AwsIamInstanceProfileList(output.InstanceProfileList, context)
             : undefined,
-        MaxSessionDuration: smithy_client_1.expectInt(output.MaxSessionDuration),
+        MaxSessionDuration: smithy_client_1.expectInt32(output.MaxSessionDuration),
         Path: smithy_client_1.expectString(output.Path),
         PermissionsBoundary: output.PermissionsBoundary !== undefined && output.PermissionsBoundary !== null
             ? deserializeAws_restJson1AwsIamPermissionsBoundary(output.PermissionsBoundary, context)
@@ -13815,10 +14448,11 @@ const deserializeAws_restJson1AwsIamUserPolicyList = (output, context) => {
 const deserializeAws_restJson1AwsKmsKeyDetails = (output, context) => {
     return {
         AWSAccountId: smithy_client_1.expectString(output.AWSAccountId),
-        CreationDate: smithy_client_1.limitedParseFloat(output.CreationDate),
+        CreationDate: smithy_client_1.limitedParseDouble(output.CreationDate),
         Description: smithy_client_1.expectString(output.Description),
         KeyId: smithy_client_1.expectString(output.KeyId),
         KeyManager: smithy_client_1.expectString(output.KeyManager),
+        KeyRotationStatus: smithy_client_1.expectBoolean(output.KeyRotationStatus),
         KeyState: smithy_client_1.expectString(output.KeyState),
         Origin: smithy_client_1.expectString(output.Origin),
     };
@@ -13856,11 +14490,11 @@ const deserializeAws_restJson1AwsLambdaFunctionDetails = (output, context) => {
             ? deserializeAws_restJson1AwsLambdaFunctionLayerList(output.Layers, context)
             : undefined,
         MasterArn: smithy_client_1.expectString(output.MasterArn),
-        MemorySize: smithy_client_1.expectInt(output.MemorySize),
+        MemorySize: smithy_client_1.expectInt32(output.MemorySize),
         RevisionId: smithy_client_1.expectString(output.RevisionId),
         Role: smithy_client_1.expectString(output.Role),
         Runtime: smithy_client_1.expectString(output.Runtime),
-        Timeout: smithy_client_1.expectInt(output.Timeout),
+        Timeout: smithy_client_1.expectInt32(output.Timeout),
         TracingConfig: output.TracingConfig !== undefined && output.TracingConfig !== null
             ? deserializeAws_restJson1AwsLambdaFunctionTracingConfig(output.TracingConfig, context)
             : undefined,
@@ -13889,7 +14523,7 @@ const deserializeAws_restJson1AwsLambdaFunctionEnvironmentError = (output, conte
 const deserializeAws_restJson1AwsLambdaFunctionLayer = (output, context) => {
     return {
         Arn: smithy_client_1.expectString(output.Arn),
-        CodeSize: smithy_client_1.expectInt(output.CodeSize),
+        CodeSize: smithy_client_1.expectInt32(output.CodeSize),
     };
 };
 const deserializeAws_restJson1AwsLambdaFunctionLayerList = (output, context) => {
@@ -13924,7 +14558,7 @@ const deserializeAws_restJson1AwsLambdaLayerVersionDetails = (output, context) =
             ? deserializeAws_restJson1NonEmptyStringList(output.CompatibleRuntimes, context)
             : undefined,
         CreatedDate: smithy_client_1.expectString(output.CreatedDate),
-        Version: smithy_client_1.expectInt(output.Version),
+        Version: smithy_client_1.expectLong(output.Version),
     };
 };
 const deserializeAws_restJson1AwsRdsDbClusterAssociatedRole = (output, context) => {
@@ -13946,14 +14580,14 @@ const deserializeAws_restJson1AwsRdsDbClusterAssociatedRoles = (output, context)
 const deserializeAws_restJson1AwsRdsDbClusterDetails = (output, context) => {
     return {
         ActivityStreamStatus: smithy_client_1.expectString(output.ActivityStreamStatus),
-        AllocatedStorage: smithy_client_1.expectInt(output.AllocatedStorage),
+        AllocatedStorage: smithy_client_1.expectInt32(output.AllocatedStorage),
         AssociatedRoles: output.AssociatedRoles !== undefined && output.AssociatedRoles !== null
             ? deserializeAws_restJson1AwsRdsDbClusterAssociatedRoles(output.AssociatedRoles, context)
             : undefined,
         AvailabilityZones: output.AvailabilityZones !== undefined && output.AvailabilityZones !== null
             ? deserializeAws_restJson1StringList(output.AvailabilityZones, context)
             : undefined,
-        BackupRetentionPeriod: smithy_client_1.expectInt(output.BackupRetentionPeriod),
+        BackupRetentionPeriod: smithy_client_1.expectInt32(output.BackupRetentionPeriod),
         ClusterCreateTime: smithy_client_1.expectString(output.ClusterCreateTime),
         CopyTagsToSnapshot: smithy_client_1.expectBoolean(output.CopyTagsToSnapshot),
         CrossAccountClone: smithy_client_1.expectBoolean(output.CrossAccountClone),
@@ -13988,7 +14622,7 @@ const deserializeAws_restJson1AwsRdsDbClusterDetails = (output, context) => {
         KmsKeyId: smithy_client_1.expectString(output.KmsKeyId),
         MasterUsername: smithy_client_1.expectString(output.MasterUsername),
         MultiAz: smithy_client_1.expectBoolean(output.MultiAz),
-        Port: smithy_client_1.expectInt(output.Port),
+        Port: smithy_client_1.expectInt32(output.Port),
         PreferredBackupWindow: smithy_client_1.expectString(output.PreferredBackupWindow),
         PreferredMaintenanceWindow: smithy_client_1.expectString(output.PreferredMaintenanceWindow),
         ReadReplicaIdentifiers: output.ReadReplicaIdentifiers !== undefined && output.ReadReplicaIdentifiers !== null
@@ -14007,7 +14641,7 @@ const deserializeAws_restJson1AwsRdsDbClusterMember = (output, context) => {
         DbClusterParameterGroupStatus: smithy_client_1.expectString(output.DbClusterParameterGroupStatus),
         DbInstanceIdentifier: smithy_client_1.expectString(output.DbInstanceIdentifier),
         IsClusterWriter: smithy_client_1.expectBoolean(output.IsClusterWriter),
-        PromotionTier: smithy_client_1.expectInt(output.PromotionTier),
+        PromotionTier: smithy_client_1.expectInt32(output.PromotionTier),
     };
 };
 const deserializeAws_restJson1AwsRdsDbClusterMembers = (output, context) => {
@@ -14038,7 +14672,7 @@ const deserializeAws_restJson1AwsRdsDbClusterOptionGroupMemberships = (output, c
 };
 const deserializeAws_restJson1AwsRdsDbClusterSnapshotDetails = (output, context) => {
     return {
-        AllocatedStorage: smithy_client_1.expectInt(output.AllocatedStorage),
+        AllocatedStorage: smithy_client_1.expectInt32(output.AllocatedStorage),
         AvailabilityZones: output.AvailabilityZones !== undefined && output.AvailabilityZones !== null
             ? deserializeAws_restJson1StringList(output.AvailabilityZones, context)
             : undefined,
@@ -14051,8 +14685,8 @@ const deserializeAws_restJson1AwsRdsDbClusterSnapshotDetails = (output, context)
         KmsKeyId: smithy_client_1.expectString(output.KmsKeyId),
         LicenseModel: smithy_client_1.expectString(output.LicenseModel),
         MasterUsername: smithy_client_1.expectString(output.MasterUsername),
-        PercentProgress: smithy_client_1.expectInt(output.PercentProgress),
-        Port: smithy_client_1.expectInt(output.Port),
+        PercentProgress: smithy_client_1.expectInt32(output.PercentProgress),
+        Port: smithy_client_1.expectInt32(output.Port),
         SnapshotCreateTime: smithy_client_1.expectString(output.SnapshotCreateTime),
         SnapshotType: smithy_client_1.expectString(output.SnapshotType),
         Status: smithy_client_1.expectString(output.Status),
@@ -14097,13 +14731,13 @@ const deserializeAws_restJson1AwsRdsDbInstanceAssociatedRoles = (output, context
 };
 const deserializeAws_restJson1AwsRdsDbInstanceDetails = (output, context) => {
     return {
-        AllocatedStorage: smithy_client_1.expectInt(output.AllocatedStorage),
+        AllocatedStorage: smithy_client_1.expectInt32(output.AllocatedStorage),
         AssociatedRoles: output.AssociatedRoles !== undefined && output.AssociatedRoles !== null
             ? deserializeAws_restJson1AwsRdsDbInstanceAssociatedRoles(output.AssociatedRoles, context)
             : undefined,
         AutoMinorVersionUpgrade: smithy_client_1.expectBoolean(output.AutoMinorVersionUpgrade),
         AvailabilityZone: smithy_client_1.expectString(output.AvailabilityZone),
-        BackupRetentionPeriod: smithy_client_1.expectInt(output.BackupRetentionPeriod),
+        BackupRetentionPeriod: smithy_client_1.expectInt32(output.BackupRetentionPeriod),
         CACertificateIdentifier: smithy_client_1.expectString(output.CACertificateIdentifier),
         CharacterSetName: smithy_client_1.expectString(output.CharacterSetName),
         CopyTagsToSnapshot: smithy_client_1.expectBoolean(output.CopyTagsToSnapshot),
@@ -14111,7 +14745,7 @@ const deserializeAws_restJson1AwsRdsDbInstanceDetails = (output, context) => {
         DBInstanceClass: smithy_client_1.expectString(output.DBInstanceClass),
         DBInstanceIdentifier: smithy_client_1.expectString(output.DBInstanceIdentifier),
         DBName: smithy_client_1.expectString(output.DBName),
-        DbInstancePort: smithy_client_1.expectInt(output.DbInstancePort),
+        DbInstancePort: smithy_client_1.expectInt32(output.DbInstancePort),
         DbInstanceStatus: smithy_client_1.expectString(output.DbInstanceStatus),
         DbParameterGroups: output.DbParameterGroups !== undefined && output.DbParameterGroups !== null
             ? deserializeAws_restJson1AwsRdsDbParameterGroups(output.DbParameterGroups, context)
@@ -14138,7 +14772,7 @@ const deserializeAws_restJson1AwsRdsDbInstanceDetails = (output, context) => {
         EnhancedMonitoringResourceArn: smithy_client_1.expectString(output.EnhancedMonitoringResourceArn),
         IAMDatabaseAuthenticationEnabled: smithy_client_1.expectBoolean(output.IAMDatabaseAuthenticationEnabled),
         InstanceCreateTime: smithy_client_1.expectString(output.InstanceCreateTime),
-        Iops: smithy_client_1.expectInt(output.Iops),
+        Iops: smithy_client_1.expectInt32(output.Iops),
         KmsKeyId: smithy_client_1.expectString(output.KmsKeyId),
         LatestRestorableTime: smithy_client_1.expectString(output.LatestRestorableTime),
         LicenseModel: smithy_client_1.expectString(output.LicenseModel),
@@ -14146,8 +14780,8 @@ const deserializeAws_restJson1AwsRdsDbInstanceDetails = (output, context) => {
             ? deserializeAws_restJson1AwsRdsDbInstanceEndpoint(output.ListenerEndpoint, context)
             : undefined,
         MasterUsername: smithy_client_1.expectString(output.MasterUsername),
-        MaxAllocatedStorage: smithy_client_1.expectInt(output.MaxAllocatedStorage),
-        MonitoringInterval: smithy_client_1.expectInt(output.MonitoringInterval),
+        MaxAllocatedStorage: smithy_client_1.expectInt32(output.MaxAllocatedStorage),
+        MonitoringInterval: smithy_client_1.expectInt32(output.MonitoringInterval),
         MonitoringRoleArn: smithy_client_1.expectString(output.MonitoringRoleArn),
         MultiAz: smithy_client_1.expectBoolean(output.MultiAz),
         OptionGroupMemberships: output.OptionGroupMemberships !== undefined && output.OptionGroupMemberships !== null
@@ -14158,13 +14792,13 @@ const deserializeAws_restJson1AwsRdsDbInstanceDetails = (output, context) => {
             : undefined,
         PerformanceInsightsEnabled: smithy_client_1.expectBoolean(output.PerformanceInsightsEnabled),
         PerformanceInsightsKmsKeyId: smithy_client_1.expectString(output.PerformanceInsightsKmsKeyId),
-        PerformanceInsightsRetentionPeriod: smithy_client_1.expectInt(output.PerformanceInsightsRetentionPeriod),
+        PerformanceInsightsRetentionPeriod: smithy_client_1.expectInt32(output.PerformanceInsightsRetentionPeriod),
         PreferredBackupWindow: smithy_client_1.expectString(output.PreferredBackupWindow),
         PreferredMaintenanceWindow: smithy_client_1.expectString(output.PreferredMaintenanceWindow),
         ProcessorFeatures: output.ProcessorFeatures !== undefined && output.ProcessorFeatures !== null
             ? deserializeAws_restJson1AwsRdsDbProcessorFeatures(output.ProcessorFeatures, context)
             : undefined,
-        PromotionTier: smithy_client_1.expectInt(output.PromotionTier),
+        PromotionTier: smithy_client_1.expectInt32(output.PromotionTier),
         PubliclyAccessible: smithy_client_1.expectBoolean(output.PubliclyAccessible),
         ReadReplicaDBClusterIdentifiers: output.ReadReplicaDBClusterIdentifiers !== undefined && output.ReadReplicaDBClusterIdentifiers !== null
             ? deserializeAws_restJson1StringList(output.ReadReplicaDBClusterIdentifiers, context)
@@ -14190,7 +14824,7 @@ const deserializeAws_restJson1AwsRdsDbInstanceEndpoint = (output, context) => {
     return {
         Address: smithy_client_1.expectString(output.Address),
         HostedZoneId: smithy_client_1.expectString(output.HostedZoneId),
-        Port: smithy_client_1.expectInt(output.Port),
+        Port: smithy_client_1.expectInt32(output.Port),
     };
 };
 const deserializeAws_restJson1AwsRdsDbInstanceVpcSecurityGroup = (output, context) => {
@@ -14243,21 +14877,21 @@ const deserializeAws_restJson1AwsRdsDbParameterGroups = (output, context) => {
 };
 const deserializeAws_restJson1AwsRdsDbPendingModifiedValues = (output, context) => {
     return {
-        AllocatedStorage: smithy_client_1.expectInt(output.AllocatedStorage),
-        BackupRetentionPeriod: smithy_client_1.expectInt(output.BackupRetentionPeriod),
+        AllocatedStorage: smithy_client_1.expectInt32(output.AllocatedStorage),
+        BackupRetentionPeriod: smithy_client_1.expectInt32(output.BackupRetentionPeriod),
         CaCertificateIdentifier: smithy_client_1.expectString(output.CaCertificateIdentifier),
         DbInstanceClass: smithy_client_1.expectString(output.DbInstanceClass),
         DbInstanceIdentifier: smithy_client_1.expectString(output.DbInstanceIdentifier),
         DbSubnetGroupName: smithy_client_1.expectString(output.DbSubnetGroupName),
         EngineVersion: smithy_client_1.expectString(output.EngineVersion),
-        Iops: smithy_client_1.expectInt(output.Iops),
+        Iops: smithy_client_1.expectInt32(output.Iops),
         LicenseModel: smithy_client_1.expectString(output.LicenseModel),
         MasterUserPassword: smithy_client_1.expectString(output.MasterUserPassword),
         MultiAZ: smithy_client_1.expectBoolean(output.MultiAZ),
         PendingCloudWatchLogsExports: output.PendingCloudWatchLogsExports !== undefined && output.PendingCloudWatchLogsExports !== null
             ? deserializeAws_restJson1AwsRdsPendingCloudWatchLogsExports(output.PendingCloudWatchLogsExports, context)
             : undefined,
-        Port: smithy_client_1.expectInt(output.Port),
+        Port: smithy_client_1.expectInt32(output.Port),
         ProcessorFeatures: output.ProcessorFeatures !== undefined && output.ProcessorFeatures !== null
             ? deserializeAws_restJson1AwsRdsDbProcessorFeatures(output.ProcessorFeatures, context)
             : undefined,
@@ -14282,7 +14916,7 @@ const deserializeAws_restJson1AwsRdsDbProcessorFeatures = (output, context) => {
 };
 const deserializeAws_restJson1AwsRdsDbSnapshotDetails = (output, context) => {
     return {
-        AllocatedStorage: smithy_client_1.expectInt(output.AllocatedStorage),
+        AllocatedStorage: smithy_client_1.expectInt32(output.AllocatedStorage),
         AvailabilityZone: smithy_client_1.expectString(output.AvailabilityZone),
         DbInstanceIdentifier: smithy_client_1.expectString(output.DbInstanceIdentifier),
         DbSnapshotIdentifier: smithy_client_1.expectString(output.DbSnapshotIdentifier),
@@ -14292,13 +14926,13 @@ const deserializeAws_restJson1AwsRdsDbSnapshotDetails = (output, context) => {
         EngineVersion: smithy_client_1.expectString(output.EngineVersion),
         IamDatabaseAuthenticationEnabled: smithy_client_1.expectBoolean(output.IamDatabaseAuthenticationEnabled),
         InstanceCreateTime: smithy_client_1.expectString(output.InstanceCreateTime),
-        Iops: smithy_client_1.expectInt(output.Iops),
+        Iops: smithy_client_1.expectInt32(output.Iops),
         KmsKeyId: smithy_client_1.expectString(output.KmsKeyId),
         LicenseModel: smithy_client_1.expectString(output.LicenseModel),
         MasterUsername: smithy_client_1.expectString(output.MasterUsername),
         OptionGroupName: smithy_client_1.expectString(output.OptionGroupName),
-        PercentProgress: smithy_client_1.expectInt(output.PercentProgress),
-        Port: smithy_client_1.expectInt(output.Port),
+        PercentProgress: smithy_client_1.expectInt32(output.PercentProgress),
+        Port: smithy_client_1.expectInt32(output.Port),
         ProcessorFeatures: output.ProcessorFeatures !== undefined && output.ProcessorFeatures !== null
             ? deserializeAws_restJson1AwsRdsDbProcessorFeatures(output.ProcessorFeatures, context)
             : undefined,
@@ -14467,8 +15101,8 @@ const deserializeAws_restJson1AwsRedshiftClusterClusterSecurityGroups = (output,
 const deserializeAws_restJson1AwsRedshiftClusterClusterSnapshotCopyStatus = (output, context) => {
     return {
         DestinationRegion: smithy_client_1.expectString(output.DestinationRegion),
-        ManualSnapshotRetentionPeriod: smithy_client_1.expectInt(output.ManualSnapshotRetentionPeriod),
-        RetentionPeriod: smithy_client_1.expectInt(output.RetentionPeriod),
+        ManualSnapshotRetentionPeriod: smithy_client_1.expectInt32(output.ManualSnapshotRetentionPeriod),
+        RetentionPeriod: smithy_client_1.expectInt32(output.RetentionPeriod),
         SnapshotCopyGrantName: smithy_client_1.expectString(output.SnapshotCopyGrantName),
     };
 };
@@ -14492,7 +15126,7 @@ const deserializeAws_restJson1AwsRedshiftClusterDeferredMaintenanceWindows = (ou
 const deserializeAws_restJson1AwsRedshiftClusterDetails = (output, context) => {
     return {
         AllowVersionUpgrade: smithy_client_1.expectBoolean(output.AllowVersionUpgrade),
-        AutomatedSnapshotRetentionPeriod: smithy_client_1.expectInt(output.AutomatedSnapshotRetentionPeriod),
+        AutomatedSnapshotRetentionPeriod: smithy_client_1.expectInt32(output.AutomatedSnapshotRetentionPeriod),
         AvailabilityZone: smithy_client_1.expectString(output.AvailabilityZone),
         ClusterAvailabilityStatus: smithy_client_1.expectString(output.ClusterAvailabilityStatus),
         ClusterCreateTime: smithy_client_1.expectString(output.ClusterCreateTime),
@@ -14537,11 +15171,11 @@ const deserializeAws_restJson1AwsRedshiftClusterDetails = (output, context) => {
             : undefined,
         KmsKeyId: smithy_client_1.expectString(output.KmsKeyId),
         MaintenanceTrackName: smithy_client_1.expectString(output.MaintenanceTrackName),
-        ManualSnapshotRetentionPeriod: smithy_client_1.expectInt(output.ManualSnapshotRetentionPeriod),
+        ManualSnapshotRetentionPeriod: smithy_client_1.expectInt32(output.ManualSnapshotRetentionPeriod),
         MasterUsername: smithy_client_1.expectString(output.MasterUsername),
         NextMaintenanceWindowStartTime: smithy_client_1.expectString(output.NextMaintenanceWindowStartTime),
         NodeType: smithy_client_1.expectString(output.NodeType),
-        NumberOfNodes: smithy_client_1.expectInt(output.NumberOfNodes),
+        NumberOfNodes: smithy_client_1.expectInt32(output.NumberOfNodes),
         PendingActions: output.PendingActions !== undefined && output.PendingActions !== null
             ? deserializeAws_restJson1StringList(output.PendingActions, context)
             : undefined,
@@ -14573,7 +15207,7 @@ const deserializeAws_restJson1AwsRedshiftClusterElasticIpStatus = (output, conte
 const deserializeAws_restJson1AwsRedshiftClusterEndpoint = (output, context) => {
     return {
         Address: smithy_client_1.expectString(output.Address),
-        Port: smithy_client_1.expectInt(output.Port),
+        Port: smithy_client_1.expectInt32(output.Port),
     };
 };
 const deserializeAws_restJson1AwsRedshiftClusterHsmStatus = (output, context) => {
@@ -14601,7 +15235,7 @@ const deserializeAws_restJson1AwsRedshiftClusterIamRoles = (output, context) =>
 };
 const deserializeAws_restJson1AwsRedshiftClusterPendingModifiedValues = (output, context) => {
     return {
-        AutomatedSnapshotRetentionPeriod: smithy_client_1.expectInt(output.AutomatedSnapshotRetentionPeriod),
+        AutomatedSnapshotRetentionPeriod: smithy_client_1.expectInt32(output.AutomatedSnapshotRetentionPeriod),
         ClusterIdentifier: smithy_client_1.expectString(output.ClusterIdentifier),
         ClusterType: smithy_client_1.expectString(output.ClusterType),
         ClusterVersion: smithy_client_1.expectString(output.ClusterVersion),
@@ -14610,7 +15244,7 @@ const deserializeAws_restJson1AwsRedshiftClusterPendingModifiedValues = (output,
         MaintenanceTrackName: smithy_client_1.expectString(output.MaintenanceTrackName),
         MasterUserPassword: smithy_client_1.expectString(output.MasterUserPassword),
         NodeType: smithy_client_1.expectString(output.NodeType),
-        NumberOfNodes: smithy_client_1.expectInt(output.NumberOfNodes),
+        NumberOfNodes: smithy_client_1.expectInt32(output.NumberOfNodes),
         PubliclyAccessible: smithy_client_1.expectBoolean(output.PubliclyAccessible),
     };
 };
@@ -14622,11 +15256,11 @@ const deserializeAws_restJson1AwsRedshiftClusterResizeInfo = (output, context) =
 };
 const deserializeAws_restJson1AwsRedshiftClusterRestoreStatus = (output, context) => {
     return {
-        CurrentRestoreRateInMegaBytesPerSecond: smithy_client_1.limitedParseFloat(output.CurrentRestoreRateInMegaBytesPerSecond),
-        ElapsedTimeInSeconds: smithy_client_1.expectInt(output.ElapsedTimeInSeconds),
-        EstimatedTimeToCompletionInSeconds: smithy_client_1.expectInt(output.EstimatedTimeToCompletionInSeconds),
-        ProgressInMegaBytes: smithy_client_1.expectInt(output.ProgressInMegaBytes),
-        SnapshotSizeInMegaBytes: smithy_client_1.expectInt(output.SnapshotSizeInMegaBytes),
+        CurrentRestoreRateInMegaBytesPerSecond: smithy_client_1.limitedParseDouble(output.CurrentRestoreRateInMegaBytesPerSecond),
+        ElapsedTimeInSeconds: smithy_client_1.expectLong(output.ElapsedTimeInSeconds),
+        EstimatedTimeToCompletionInSeconds: smithy_client_1.expectLong(output.EstimatedTimeToCompletionInSeconds),
+        ProgressInMegaBytes: smithy_client_1.expectLong(output.ProgressInMegaBytes),
+        SnapshotSizeInMegaBytes: smithy_client_1.expectLong(output.SnapshotSizeInMegaBytes),
         Status: smithy_client_1.expectString(output.Status),
     };
 };
@@ -14663,7 +15297,7 @@ const deserializeAws_restJson1AwsS3BucketBucketLifecycleConfigurationDetails = (
 };
 const deserializeAws_restJson1AwsS3BucketBucketLifecycleConfigurationRulesAbortIncompleteMultipartUploadDetails = (output, context) => {
     return {
-        DaysAfterInitiation: smithy_client_1.expectInt(output.DaysAfterInitiation),
+        DaysAfterInitiation: smithy_client_1.expectInt32(output.DaysAfterInitiation),
     };
 };
 const deserializeAws_restJson1AwsS3BucketBucketLifecycleConfigurationRulesDetails = (output, context) => {
@@ -14672,13 +15306,13 @@ const deserializeAws_restJson1AwsS3BucketBucketLifecycleConfigurationRulesDetail
             ? deserializeAws_restJson1AwsS3BucketBucketLifecycleConfigurationRulesAbortIncompleteMultipartUploadDetails(output.AbortIncompleteMultipartUpload, context)
             : undefined,
         ExpirationDate: smithy_client_1.expectString(output.ExpirationDate),
-        ExpirationInDays: smithy_client_1.expectInt(output.ExpirationInDays),
+        ExpirationInDays: smithy_client_1.expectInt32(output.ExpirationInDays),
         ExpiredObjectDeleteMarker: smithy_client_1.expectBoolean(output.ExpiredObjectDeleteMarker),
         Filter: output.Filter !== undefined && output.Filter !== null
             ? deserializeAws_restJson1AwsS3BucketBucketLifecycleConfigurationRulesFilterDetails(output.Filter, context)
             : undefined,
         ID: smithy_client_1.expectString(output.ID),
-        NoncurrentVersionExpirationInDays: smithy_client_1.expectInt(output.NoncurrentVersionExpirationInDays),
+        NoncurrentVersionExpirationInDays: smithy_client_1.expectInt32(output.NoncurrentVersionExpirationInDays),
         NoncurrentVersionTransitions: output.NoncurrentVersionTransitions !== undefined && output.NoncurrentVersionTransitions !== null
             ? deserializeAws_restJson1AwsS3BucketBucketLifecycleConfigurationRulesNoncurrentVersionTransitionsList(output.NoncurrentVersionTransitions, context)
             : undefined,
@@ -14751,7 +15385,7 @@ const deserializeAws_restJson1AwsS3BucketBucketLifecycleConfigurationRulesList =
 };
 const deserializeAws_restJson1AwsS3BucketBucketLifecycleConfigurationRulesNoncurrentVersionTransitionsDetails = (output, context) => {
     return {
-        Days: smithy_client_1.expectInt(output.Days),
+        Days: smithy_client_1.expectInt32(output.Days),
         StorageClass: smithy_client_1.expectString(output.StorageClass),
     };
 };
@@ -14768,7 +15402,7 @@ const deserializeAws_restJson1AwsS3BucketBucketLifecycleConfigurationRulesNoncur
 const deserializeAws_restJson1AwsS3BucketBucketLifecycleConfigurationRulesTransitionsDetails = (output, context) => {
     return {
         Date: smithy_client_1.expectString(output.Date),
-        Days: smithy_client_1.expectInt(output.Days),
+        Days: smithy_client_1.expectInt32(output.Days),
         StorageClass: smithy_client_1.expectString(output.StorageClass),
     };
 };
@@ -14784,9 +15418,19 @@ const deserializeAws_restJson1AwsS3BucketBucketLifecycleConfigurationRulesTransi
 };
 const deserializeAws_restJson1AwsS3BucketDetails = (output, context) => {
     return {
+        AccessControlList: smithy_client_1.expectString(output.AccessControlList),
         BucketLifecycleConfiguration: output.BucketLifecycleConfiguration !== undefined && output.BucketLifecycleConfiguration !== null
             ? deserializeAws_restJson1AwsS3BucketBucketLifecycleConfigurationDetails(output.BucketLifecycleConfiguration, context)
             : undefined,
+        BucketLoggingConfiguration: output.BucketLoggingConfiguration !== undefined && output.BucketLoggingConfiguration !== null
+            ? deserializeAws_restJson1AwsS3BucketLoggingConfiguration(output.BucketLoggingConfiguration, context)
+            : undefined,
+        BucketNotificationConfiguration: output.BucketNotificationConfiguration !== undefined && output.BucketNotificationConfiguration !== null
+            ? deserializeAws_restJson1AwsS3BucketNotificationConfiguration(output.BucketNotificationConfiguration, context)
+            : undefined,
+        BucketWebsiteConfiguration: output.BucketWebsiteConfiguration !== undefined && output.BucketWebsiteConfiguration !== null
+            ? deserializeAws_restJson1AwsS3BucketWebsiteConfiguration(output.BucketWebsiteConfiguration, context)
+            : undefined,
         CreatedAt: smithy_client_1.expectString(output.CreatedAt),
         OwnerId: smithy_client_1.expectString(output.OwnerId),
         OwnerName: smithy_client_1.expectString(output.OwnerName),
@@ -14798,6 +15442,81 @@ const deserializeAws_restJson1AwsS3BucketDetails = (output, context) => {
             : undefined,
     };
 };
+const deserializeAws_restJson1AwsS3BucketLoggingConfiguration = (output, context) => {
+    return {
+        DestinationBucketName: smithy_client_1.expectString(output.DestinationBucketName),
+        LogFilePrefix: smithy_client_1.expectString(output.LogFilePrefix),
+    };
+};
+const deserializeAws_restJson1AwsS3BucketNotificationConfiguration = (output, context) => {
+    return {
+        Configurations: output.Configurations !== undefined && output.Configurations !== null
+            ? deserializeAws_restJson1AwsS3BucketNotificationConfigurationDetails(output.Configurations, context)
+            : undefined,
+    };
+};
+const deserializeAws_restJson1AwsS3BucketNotificationConfigurationDetail = (output, context) => {
+    return {
+        Destination: smithy_client_1.expectString(output.Destination),
+        Events: output.Events !== undefined && output.Events !== null
+            ? deserializeAws_restJson1AwsS3BucketNotificationConfigurationEvents(output.Events, context)
+            : undefined,
+        Filter: output.Filter !== undefined && output.Filter !== null
+            ? deserializeAws_restJson1AwsS3BucketNotificationConfigurationFilter(output.Filter, context)
+            : undefined,
+        Type: smithy_client_1.expectString(output.Type),
+    };
+};
+const deserializeAws_restJson1AwsS3BucketNotificationConfigurationDetails = (output, context) => {
+    return (output || [])
+        .filter((e) => e != null)
+        .map((entry) => {
+        if (entry === null) {
+            return null;
+        }
+        return deserializeAws_restJson1AwsS3BucketNotificationConfigurationDetail(entry, context);
+    });
+};
+const deserializeAws_restJson1AwsS3BucketNotificationConfigurationEvents = (output, context) => {
+    return (output || [])
+        .filter((e) => e != null)
+        .map((entry) => {
+        if (entry === null) {
+            return null;
+        }
+        return smithy_client_1.expectString(entry);
+    });
+};
+const deserializeAws_restJson1AwsS3BucketNotificationConfigurationFilter = (output, context) => {
+    return {
+        S3KeyFilter: output.S3KeyFilter !== undefined && output.S3KeyFilter !== null
+            ? deserializeAws_restJson1AwsS3BucketNotificationConfigurationS3KeyFilter(output.S3KeyFilter, context)
+            : undefined,
+    };
+};
+const deserializeAws_restJson1AwsS3BucketNotificationConfigurationS3KeyFilter = (output, context) => {
+    return {
+        FilterRules: output.FilterRules !== undefined && output.FilterRules !== null
+            ? deserializeAws_restJson1AwsS3BucketNotificationConfigurationS3KeyFilterRules(output.FilterRules, context)
+            : undefined,
+    };
+};
+const deserializeAws_restJson1AwsS3BucketNotificationConfigurationS3KeyFilterRule = (output, context) => {
+    return {
+        Name: smithy_client_1.expectString(output.Name),
+        Value: smithy_client_1.expectString(output.Value),
+    };
+};
+const deserializeAws_restJson1AwsS3BucketNotificationConfigurationS3KeyFilterRules = (output, context) => {
+    return (output || [])
+        .filter((e) => e != null)
+        .map((entry) => {
+        if (entry === null) {
+            return null;
+        }
+        return deserializeAws_restJson1AwsS3BucketNotificationConfigurationS3KeyFilterRule(entry, context);
+    });
+};
 const deserializeAws_restJson1AwsS3BucketServerSideEncryptionByDefault = (output, context) => {
     return {
         KMSMasterKeyID: smithy_client_1.expectString(output.KMSMasterKeyID),
@@ -14828,6 +15547,59 @@ const deserializeAws_restJson1AwsS3BucketServerSideEncryptionRules = (output, co
         return deserializeAws_restJson1AwsS3BucketServerSideEncryptionRule(entry, context);
     });
 };
+const deserializeAws_restJson1AwsS3BucketWebsiteConfiguration = (output, context) => {
+    return {
+        ErrorDocument: smithy_client_1.expectString(output.ErrorDocument),
+        IndexDocumentSuffix: smithy_client_1.expectString(output.IndexDocumentSuffix),
+        RedirectAllRequestsTo: output.RedirectAllRequestsTo !== undefined && output.RedirectAllRequestsTo !== null
+            ? deserializeAws_restJson1AwsS3BucketWebsiteConfigurationRedirectTo(output.RedirectAllRequestsTo, context)
+            : undefined,
+        RoutingRules: output.RoutingRules !== undefined && output.RoutingRules !== null
+            ? deserializeAws_restJson1AwsS3BucketWebsiteConfigurationRoutingRules(output.RoutingRules, context)
+            : undefined,
+    };
+};
+const deserializeAws_restJson1AwsS3BucketWebsiteConfigurationRedirectTo = (output, context) => {
+    return {
+        Hostname: smithy_client_1.expectString(output.Hostname),
+        Protocol: smithy_client_1.expectString(output.Protocol),
+    };
+};
+const deserializeAws_restJson1AwsS3BucketWebsiteConfigurationRoutingRule = (output, context) => {
+    return {
+        Condition: output.Condition !== undefined && output.Condition !== null
+            ? deserializeAws_restJson1AwsS3BucketWebsiteConfigurationRoutingRuleCondition(output.Condition, context)
+            : undefined,
+        Redirect: output.Redirect !== undefined && output.Redirect !== null
+            ? deserializeAws_restJson1AwsS3BucketWebsiteConfigurationRoutingRuleRedirect(output.Redirect, context)
+            : undefined,
+    };
+};
+const deserializeAws_restJson1AwsS3BucketWebsiteConfigurationRoutingRuleCondition = (output, context) => {
+    return {
+        HttpErrorCodeReturnedEquals: smithy_client_1.expectString(output.HttpErrorCodeReturnedEquals),
+        KeyPrefixEquals: smithy_client_1.expectString(output.KeyPrefixEquals),
+    };
+};
+const deserializeAws_restJson1AwsS3BucketWebsiteConfigurationRoutingRuleRedirect = (output, context) => {
+    return {
+        Hostname: smithy_client_1.expectString(output.Hostname),
+        HttpRedirectCode: smithy_client_1.expectString(output.HttpRedirectCode),
+        Protocol: smithy_client_1.expectString(output.Protocol),
+        ReplaceKeyPrefixWith: smithy_client_1.expectString(output.ReplaceKeyPrefixWith),
+        ReplaceKeyWith: smithy_client_1.expectString(output.ReplaceKeyWith),
+    };
+};
+const deserializeAws_restJson1AwsS3BucketWebsiteConfigurationRoutingRules = (output, context) => {
+    return (output || [])
+        .filter((e) => e != null)
+        .map((entry) => {
+        if (entry === null) {
+            return null;
+        }
+        return deserializeAws_restJson1AwsS3BucketWebsiteConfigurationRoutingRule(entry, context);
+    });
+};
 const deserializeAws_restJson1AwsS3ObjectDetails = (output, context) => {
     return {
         ContentType: smithy_client_1.expectString(output.ContentType),
@@ -14854,7 +15626,7 @@ const deserializeAws_restJson1AwsSecretsManagerSecretDetails = (output, context)
 };
 const deserializeAws_restJson1AwsSecretsManagerSecretRotationRules = (output, context) => {
     return {
-        AutomaticallyAfterDays: smithy_client_1.expectInt(output.AutomaticallyAfterDays),
+        AutomaticallyAfterDays: smithy_client_1.expectInt32(output.AutomaticallyAfterDays),
     };
 };
 const deserializeAws_restJson1AwsSecurityFinding = (output, context) => {
@@ -14867,9 +15639,9 @@ const deserializeAws_restJson1AwsSecurityFinding = (output, context) => {
         Compliance: output.Compliance !== undefined && output.Compliance !== null
             ? deserializeAws_restJson1Compliance(output.Compliance, context)
             : undefined,
-        Confidence: smithy_client_1.expectInt(output.Confidence),
+        Confidence: smithy_client_1.expectInt32(output.Confidence),
         CreatedAt: smithy_client_1.expectString(output.CreatedAt),
-        Criticality: smithy_client_1.expectInt(output.Criticality),
+        Criticality: smithy_client_1.expectInt32(output.Criticality),
         Description: smithy_client_1.expectString(output.Description),
         FindingProviderFields: output.FindingProviderFields !== undefined && output.FindingProviderFields !== null
             ? deserializeAws_restJson1FindingProviderFields(output.FindingProviderFields, context)
@@ -15283,7 +16055,7 @@ const deserializeAws_restJson1AwsSnsTopicSubscriptionList = (output, context) =>
 const deserializeAws_restJson1AwsSqsQueueDetails = (output, context) => {
     return {
         DeadLetterTargetArn: smithy_client_1.expectString(output.DeadLetterTargetArn),
-        KmsDataKeyReusePeriodSeconds: smithy_client_1.expectInt(output.KmsDataKeyReusePeriodSeconds),
+        KmsDataKeyReusePeriodSeconds: smithy_client_1.expectInt32(output.KmsDataKeyReusePeriodSeconds),
         KmsMasterKeyId: smithy_client_1.expectString(output.KmsMasterKeyId),
         QueueName: smithy_client_1.expectString(output.QueueName),
     };
@@ -15291,19 +16063,19 @@ const deserializeAws_restJson1AwsSqsQueueDetails = (output, context) => {
 const deserializeAws_restJson1AwsSsmComplianceSummary = (output, context) => {
     return {
         ComplianceType: smithy_client_1.expectString(output.ComplianceType),
-        CompliantCriticalCount: smithy_client_1.expectInt(output.CompliantCriticalCount),
-        CompliantHighCount: smithy_client_1.expectInt(output.CompliantHighCount),
-        CompliantInformationalCount: smithy_client_1.expectInt(output.CompliantInformationalCount),
-        CompliantLowCount: smithy_client_1.expectInt(output.CompliantLowCount),
-        CompliantMediumCount: smithy_client_1.expectInt(output.CompliantMediumCount),
-        CompliantUnspecifiedCount: smithy_client_1.expectInt(output.CompliantUnspecifiedCount),
+        CompliantCriticalCount: smithy_client_1.expectInt32(output.CompliantCriticalCount),
+        CompliantHighCount: smithy_client_1.expectInt32(output.CompliantHighCount),
+        CompliantInformationalCount: smithy_client_1.expectInt32(output.CompliantInformationalCount),
+        CompliantLowCount: smithy_client_1.expectInt32(output.CompliantLowCount),
+        CompliantMediumCount: smithy_client_1.expectInt32(output.CompliantMediumCount),
+        CompliantUnspecifiedCount: smithy_client_1.expectInt32(output.CompliantUnspecifiedCount),
         ExecutionType: smithy_client_1.expectString(output.ExecutionType),
-        NonCompliantCriticalCount: smithy_client_1.expectInt(output.NonCompliantCriticalCount),
-        NonCompliantHighCount: smithy_client_1.expectInt(output.NonCompliantHighCount),
-        NonCompliantInformationalCount: smithy_client_1.expectInt(output.NonCompliantInformationalCount),
-        NonCompliantLowCount: smithy_client_1.expectInt(output.NonCompliantLowCount),
-        NonCompliantMediumCount: smithy_client_1.expectInt(output.NonCompliantMediumCount),
-        NonCompliantUnspecifiedCount: smithy_client_1.expectInt(output.NonCompliantUnspecifiedCount),
+        NonCompliantCriticalCount: smithy_client_1.expectInt32(output.NonCompliantCriticalCount),
+        NonCompliantHighCount: smithy_client_1.expectInt32(output.NonCompliantHighCount),
+        NonCompliantInformationalCount: smithy_client_1.expectInt32(output.NonCompliantInformationalCount),
+        NonCompliantLowCount: smithy_client_1.expectInt32(output.NonCompliantLowCount),
+        NonCompliantMediumCount: smithy_client_1.expectInt32(output.NonCompliantMediumCount),
+        NonCompliantUnspecifiedCount: smithy_client_1.expectInt32(output.NonCompliantUnspecifiedCount),
         OverallSeverity: smithy_client_1.expectString(output.OverallSeverity),
         PatchBaselineId: smithy_client_1.expectString(output.PatchBaselineId),
         PatchGroup: smithy_client_1.expectString(output.PatchGroup),
@@ -15345,7 +16117,7 @@ const deserializeAws_restJson1AwsWafWebAclRule = (output, context) => {
         OverrideAction: output.OverrideAction !== undefined && output.OverrideAction !== null
             ? deserializeAws_restJson1WafOverrideAction(output.OverrideAction, context)
             : undefined,
-        Priority: smithy_client_1.expectInt(output.Priority),
+        Priority: smithy_client_1.expectInt32(output.Priority),
         RuleId: smithy_client_1.expectString(output.RuleId),
         Type: smithy_client_1.expectString(output.Type),
     };
@@ -15392,9 +16164,9 @@ const deserializeAws_restJson1CategoryList = (output, context) => {
 const deserializeAws_restJson1Cell = (output, context) => {
     return {
         CellReference: smithy_client_1.expectString(output.CellReference),
-        Column: smithy_client_1.expectInt(output.Column),
+        Column: smithy_client_1.expectLong(output.Column),
         ColumnName: smithy_client_1.expectString(output.ColumnName),
-        Row: smithy_client_1.expectInt(output.Row),
+        Row: smithy_client_1.expectLong(output.Row),
     };
 };
 const deserializeAws_restJson1Cells = (output, context) => {
@@ -15439,7 +16211,7 @@ const deserializeAws_restJson1ClassificationResult = (output, context) => {
         SensitiveData: output.SensitiveData !== undefined && output.SensitiveData !== null
             ? deserializeAws_restJson1SensitiveDataResultList(output.SensitiveData, context)
             : undefined,
-        SizeClassified: smithy_client_1.expectInt(output.SizeClassified),
+        SizeClassified: smithy_client_1.expectLong(output.SizeClassified),
         Status: output.Status !== undefined && output.Status !== null
             ? deserializeAws_restJson1ClassificationStatus(output.Status, context)
             : undefined,
@@ -15479,7 +16251,7 @@ const deserializeAws_restJson1Country = (output, context) => {
 const deserializeAws_restJson1CustomDataIdentifiersDetections = (output, context) => {
     return {
         Arn: smithy_client_1.expectString(output.Arn),
-        Count: smithy_client_1.expectInt(output.Count),
+        Count: smithy_client_1.expectLong(output.Count),
         Name: smithy_client_1.expectString(output.Name),
         Occurrences: output.Occurrences !== undefined && output.Occurrences !== null
             ? deserializeAws_restJson1Occurrences(output.Occurrences, context)
@@ -15501,13 +16273,17 @@ const deserializeAws_restJson1CustomDataIdentifiersResult = (output, context) =>
         Detections: output.Detections !== undefined && output.Detections !== null
             ? deserializeAws_restJson1CustomDataIdentifiersDetectionsList(output.Detections, context)
             : undefined,
-        TotalCount: smithy_client_1.expectInt(output.TotalCount),
+        TotalCount: smithy_client_1.expectLong(output.TotalCount),
     };
 };
 const deserializeAws_restJson1Cvss = (output, context) => {
     return {
-        BaseScore: smithy_client_1.limitedParseFloat(output.BaseScore),
+        Adjustments: output.Adjustments !== undefined && output.Adjustments !== null
+            ? deserializeAws_restJson1AdjustmentList(output.Adjustments, context)
+            : undefined,
+        BaseScore: smithy_client_1.limitedParseDouble(output.BaseScore),
         BaseVector: smithy_client_1.expectString(output.BaseVector),
+        Source: smithy_client_1.expectString(output.Source),
         Version: smithy_client_1.expectString(output.Version),
     };
 };
@@ -15551,7 +16327,7 @@ const deserializeAws_restJson1DateFilterList = (output, context) => {
 const deserializeAws_restJson1DateRange = (output, context) => {
     return {
         Unit: smithy_client_1.expectString(output.Unit),
-        Value: smithy_client_1.expectInt(output.Value),
+        Value: smithy_client_1.expectInt32(output.Value),
     };
 };
 const deserializeAws_restJson1DnsRequestAction = (output, context) => {
@@ -15574,8 +16350,8 @@ const deserializeAws_restJson1FieldMap = (output, context) => {
 };
 const deserializeAws_restJson1FindingProviderFields = (output, context) => {
     return {
-        Confidence: smithy_client_1.expectInt(output.Confidence),
-        Criticality: smithy_client_1.expectInt(output.Criticality),
+        Confidence: smithy_client_1.expectInt32(output.Confidence),
+        Criticality: smithy_client_1.expectInt32(output.Criticality),
         RelatedFindings: output.RelatedFindings !== undefined && output.RelatedFindings !== null
             ? deserializeAws_restJson1RelatedFindingList(output.RelatedFindings, context)
             : undefined,
@@ -15595,14 +16371,14 @@ const deserializeAws_restJson1FindingProviderSeverity = (output, context) => {
 };
 const deserializeAws_restJson1GeoLocation = (output, context) => {
     return {
-        Lat: smithy_client_1.limitedParseFloat(output.Lat),
-        Lon: smithy_client_1.limitedParseFloat(output.Lon),
+        Lat: smithy_client_1.limitedParseDouble(output.Lat),
+        Lon: smithy_client_1.limitedParseDouble(output.Lon),
     };
 };
 const deserializeAws_restJson1IcmpTypeCode = (output, context) => {
     return {
-        Code: smithy_client_1.expectInt(output.Code),
-        Type: smithy_client_1.expectInt(output.Type),
+        Code: smithy_client_1.expectInt32(output.Code),
+        Type: smithy_client_1.expectInt32(output.Type),
     };
 };
 const deserializeAws_restJson1ImportFindingsError = (output, context) => {
@@ -15653,7 +16429,7 @@ const deserializeAws_restJson1InsightResults = (output, context) => {
 };
 const deserializeAws_restJson1InsightResultValue = (output, context) => {
     return {
-        Count: smithy_client_1.expectInt(output.Count),
+        Count: smithy_client_1.expectInt32(output.Count),
         GroupByAttributeValue: smithy_client_1.expectString(output.GroupByAttributeValue),
     };
 };
@@ -15667,6 +16443,16 @@ const deserializeAws_restJson1InsightResultValueList = (output, context) => {
         return deserializeAws_restJson1InsightResultValue(entry, context);
     });
 };
+const deserializeAws_restJson1IntegerList = (output, context) => {
+    return (output || [])
+        .filter((e) => e != null)
+        .map((entry) => {
+        if (entry === null) {
+            return null;
+        }
+        return smithy_client_1.expectInt32(entry);
+    });
+};
 const deserializeAws_restJson1IntegrationTypeList = (output, context) => {
     return (output || [])
         .filter((e) => e != null)
@@ -15681,7 +16467,9 @@ const deserializeAws_restJson1Invitation = (output, context) => {
     return {
         AccountId: smithy_client_1.expectString(output.AccountId),
         InvitationId: smithy_client_1.expectString(output.InvitationId),
-        InvitedAt: output.InvitedAt !== undefined && output.InvitedAt !== null ? new Date(output.InvitedAt) : undefined,
+        InvitedAt: output.InvitedAt !== undefined && output.InvitedAt !== null
+            ? smithy_client_1.expectNonNull(smithy_client_1.parseRfc3339DateTime(output.InvitedAt))
+            : undefined,
         MemberStatus: smithy_client_1.expectString(output.MemberStatus),
     };
 };
@@ -15712,7 +16500,7 @@ const deserializeAws_restJson1IpFilterList = (output, context) => {
 };
 const deserializeAws_restJson1IpOrganizationDetails = (output, context) => {
     return {
-        Asn: smithy_client_1.expectInt(output.Asn),
+        Asn: smithy_client_1.expectInt32(output.Asn),
         AsnOrg: smithy_client_1.expectString(output.AsnOrg),
         Isp: smithy_client_1.expectString(output.Isp),
         Org: smithy_client_1.expectString(output.Org),
@@ -15796,10 +16584,14 @@ const deserializeAws_restJson1Member = (output, context) => {
         AccountId: smithy_client_1.expectString(output.AccountId),
         AdministratorId: smithy_client_1.expectString(output.AdministratorId),
         Email: smithy_client_1.expectString(output.Email),
-        InvitedAt: output.InvitedAt !== undefined && output.InvitedAt !== null ? new Date(output.InvitedAt) : undefined,
+        InvitedAt: output.InvitedAt !== undefined && output.InvitedAt !== null
+            ? smithy_client_1.expectNonNull(smithy_client_1.parseRfc3339DateTime(output.InvitedAt))
+            : undefined,
         MasterId: smithy_client_1.expectString(output.MasterId),
         MemberStatus: smithy_client_1.expectString(output.MemberStatus),
-        UpdatedAt: output.UpdatedAt !== undefined && output.UpdatedAt !== null ? new Date(output.UpdatedAt) : undefined,
+        UpdatedAt: output.UpdatedAt !== undefined && output.UpdatedAt !== null
+            ? smithy_client_1.expectNonNull(smithy_client_1.parseRfc3339DateTime(output.UpdatedAt))
+            : undefined,
     };
 };
 const deserializeAws_restJson1MemberList = (output, context) => {
@@ -15817,7 +16609,7 @@ const deserializeAws_restJson1Network = (output, context) => {
         DestinationDomain: smithy_client_1.expectString(output.DestinationDomain),
         DestinationIpV4: smithy_client_1.expectString(output.DestinationIpV4),
         DestinationIpV6: smithy_client_1.expectString(output.DestinationIpV6),
-        DestinationPort: smithy_client_1.expectInt(output.DestinationPort),
+        DestinationPort: smithy_client_1.expectInt32(output.DestinationPort),
         Direction: smithy_client_1.expectString(output.Direction),
         OpenPortRange: output.OpenPortRange !== undefined && output.OpenPortRange !== null
             ? deserializeAws_restJson1PortRange(output.OpenPortRange, context)
@@ -15827,7 +16619,7 @@ const deserializeAws_restJson1Network = (output, context) => {
         SourceIpV4: smithy_client_1.expectString(output.SourceIpV4),
         SourceIpV6: smithy_client_1.expectString(output.SourceIpV6),
         SourceMac: smithy_client_1.expectString(output.SourceMac),
-        SourcePort: smithy_client_1.expectInt(output.SourcePort),
+        SourcePort: smithy_client_1.expectInt32(output.SourcePort),
     };
 };
 const deserializeAws_restJson1NetworkConnectionAction = (output, context) => {
@@ -15908,9 +16700,9 @@ const deserializeAws_restJson1Note = (output, context) => {
 };
 const deserializeAws_restJson1NumberFilter = (output, context) => {
     return {
-        Eq: smithy_client_1.limitedParseFloat(output.Eq),
-        Gte: smithy_client_1.limitedParseFloat(output.Gte),
-        Lte: smithy_client_1.limitedParseFloat(output.Lte),
+        Eq: smithy_client_1.limitedParseDouble(output.Eq),
+        Gte: smithy_client_1.limitedParseDouble(output.Gte),
+        Lte: smithy_client_1.limitedParseDouble(output.Lte),
     };
 };
 const deserializeAws_restJson1NumberFilterList = (output, context) => {
@@ -15950,7 +16742,7 @@ const deserializeAws_restJson1Page = (output, context) => {
         OffsetRange: output.OffsetRange !== undefined && output.OffsetRange !== null
             ? deserializeAws_restJson1Range(output.OffsetRange, context)
             : undefined,
-        PageNumber: smithy_client_1.expectInt(output.PageNumber),
+        PageNumber: smithy_client_1.expectLong(output.PageNumber),
     };
 };
 const deserializeAws_restJson1Pages = (output, context) => {
@@ -15965,13 +16757,13 @@ const deserializeAws_restJson1Pages = (output, context) => {
 };
 const deserializeAws_restJson1PatchSummary = (output, context) => {
     return {
-        FailedCount: smithy_client_1.expectInt(output.FailedCount),
+        FailedCount: smithy_client_1.expectInt32(output.FailedCount),
         Id: smithy_client_1.expectString(output.Id),
-        InstalledCount: smithy_client_1.expectInt(output.InstalledCount),
-        InstalledOtherCount: smithy_client_1.expectInt(output.InstalledOtherCount),
-        InstalledPendingReboot: smithy_client_1.expectInt(output.InstalledPendingReboot),
-        InstalledRejectedCount: smithy_client_1.expectInt(output.InstalledRejectedCount),
-        MissingCount: smithy_client_1.expectInt(output.MissingCount),
+        InstalledCount: smithy_client_1.expectInt32(output.InstalledCount),
+        InstalledOtherCount: smithy_client_1.expectInt32(output.InstalledOtherCount),
+        InstalledPendingReboot: smithy_client_1.expectInt32(output.InstalledPendingReboot),
+        InstalledRejectedCount: smithy_client_1.expectInt32(output.InstalledRejectedCount),
+        MissingCount: smithy_client_1.expectInt32(output.MissingCount),
         Operation: smithy_client_1.expectString(output.Operation),
         OperationEndTime: smithy_client_1.expectString(output.OperationEndTime),
         OperationStartTime: smithy_client_1.expectString(output.OperationStartTime),
@@ -16011,14 +16803,14 @@ const deserializeAws_restJson1PortProbeDetailList = (output, context) => {
 };
 const deserializeAws_restJson1PortRange = (output, context) => {
     return {
-        Begin: smithy_client_1.expectInt(output.Begin),
-        End: smithy_client_1.expectInt(output.End),
+        Begin: smithy_client_1.expectInt32(output.Begin),
+        End: smithy_client_1.expectInt32(output.End),
     };
 };
 const deserializeAws_restJson1PortRangeFromTo = (output, context) => {
     return {
-        From: smithy_client_1.expectInt(output.From),
-        To: smithy_client_1.expectInt(output.To),
+        From: smithy_client_1.expectInt32(output.From),
+        To: smithy_client_1.expectInt32(output.To),
     };
 };
 const deserializeAws_restJson1PortRangeList = (output, context) => {
@@ -16035,9 +16827,9 @@ const deserializeAws_restJson1ProcessDetails = (output, context) => {
     return {
         LaunchedAt: smithy_client_1.expectString(output.LaunchedAt),
         Name: smithy_client_1.expectString(output.Name),
-        ParentPid: smithy_client_1.expectInt(output.ParentPid),
+        ParentPid: smithy_client_1.expectInt32(output.ParentPid),
         Path: smithy_client_1.expectString(output.Path),
-        Pid: smithy_client_1.expectInt(output.Pid),
+        Pid: smithy_client_1.expectInt32(output.Pid),
         TerminatedAt: smithy_client_1.expectString(output.TerminatedAt),
     };
 };
@@ -16080,9 +16872,9 @@ const deserializeAws_restJson1ProductSubscriptionArnList = (output, context) =>
 };
 const deserializeAws_restJson1Range = (output, context) => {
     return {
-        End: smithy_client_1.expectInt(output.End),
-        Start: smithy_client_1.expectInt(output.Start),
-        StartColumn: smithy_client_1.expectInt(output.StartColumn),
+        End: smithy_client_1.expectLong(output.End),
+        Start: smithy_client_1.expectLong(output.Start),
+        StartColumn: smithy_client_1.expectLong(output.StartColumn),
     };
 };
 const deserializeAws_restJson1Ranges = (output, context) => {
@@ -16104,7 +16896,7 @@ const deserializeAws_restJson1Recommendation = (output, context) => {
 const deserializeAws_restJson1_Record = (output, context) => {
     return {
         JsonPath: smithy_client_1.expectString(output.JsonPath),
-        RecordIndex: smithy_client_1.expectInt(output.RecordIndex),
+        RecordIndex: smithy_client_1.expectLong(output.RecordIndex),
     };
 };
 const deserializeAws_restJson1Records = (output, context) => {
@@ -16185,6 +16977,9 @@ const deserializeAws_restJson1ResourceDetails = (output, context) => {
         AwsAutoScalingAutoScalingGroup: output.AwsAutoScalingAutoScalingGroup !== undefined && output.AwsAutoScalingAutoScalingGroup !== null
             ? deserializeAws_restJson1AwsAutoScalingAutoScalingGroupDetails(output.AwsAutoScalingAutoScalingGroup, context)
             : undefined,
+        AwsAutoScalingLaunchConfiguration: output.AwsAutoScalingLaunchConfiguration !== undefined && output.AwsAutoScalingLaunchConfiguration !== null
+            ? deserializeAws_restJson1AwsAutoScalingLaunchConfigurationDetails(output.AwsAutoScalingLaunchConfiguration, context)
+            : undefined,
         AwsCertificateManagerCertificate: output.AwsCertificateManagerCertificate !== undefined && output.AwsCertificateManagerCertificate !== null
             ? deserializeAws_restJson1AwsCertificateManagerCertificateDetails(output.AwsCertificateManagerCertificate, context)
             : undefined,
@@ -16224,6 +17019,12 @@ const deserializeAws_restJson1ResourceDetails = (output, context) => {
         AwsEc2Vpc: output.AwsEc2Vpc !== undefined && output.AwsEc2Vpc !== null
             ? deserializeAws_restJson1AwsEc2VpcDetails(output.AwsEc2Vpc, context)
             : undefined,
+        AwsEc2VpnConnection: output.AwsEc2VpnConnection !== undefined && output.AwsEc2VpnConnection !== null
+            ? deserializeAws_restJson1AwsEc2VpnConnectionDetails(output.AwsEc2VpnConnection, context)
+            : undefined,
+        AwsEcrContainerImage: output.AwsEcrContainerImage !== undefined && output.AwsEcrContainerImage !== null
+            ? deserializeAws_restJson1AwsEcrContainerImageDetails(output.AwsEcrContainerImage, context)
+            : undefined,
         AwsEcsCluster: output.AwsEcsCluster !== undefined && output.AwsEcsCluster !== null
             ? deserializeAws_restJson1AwsEcsClusterDetails(output.AwsEcsCluster, context)
             : undefined,
@@ -16357,7 +17158,7 @@ const deserializeAws_restJson1SecurityGroups = (output, context) => {
 };
 const deserializeAws_restJson1SensitiveDataDetections = (output, context) => {
     return {
-        Count: smithy_client_1.expectInt(output.Count),
+        Count: smithy_client_1.expectLong(output.Count),
         Occurrences: output.Occurrences !== undefined && output.Occurrences !== null
             ? deserializeAws_restJson1Occurrences(output.Occurrences, context)
             : undefined,
@@ -16380,7 +17181,7 @@ const deserializeAws_restJson1SensitiveDataResult = (output, context) => {
         Detections: output.Detections !== undefined && output.Detections !== null
             ? deserializeAws_restJson1SensitiveDataDetectionsList(output.Detections, context)
             : undefined,
-        TotalCount: smithy_client_1.expectInt(output.TotalCount),
+        TotalCount: smithy_client_1.expectLong(output.TotalCount),
     };
 };
 const deserializeAws_restJson1SensitiveDataResultList = (output, context) => {
@@ -16396,16 +17197,18 @@ const deserializeAws_restJson1SensitiveDataResultList = (output, context) => {
 const deserializeAws_restJson1Severity = (output, context) => {
     return {
         Label: smithy_client_1.expectString(output.Label),
-        Normalized: smithy_client_1.expectInt(output.Normalized),
+        Normalized: smithy_client_1.expectInt32(output.Normalized),
         Original: smithy_client_1.expectString(output.Original),
-        Product: smithy_client_1.limitedParseFloat(output.Product),
+        Product: smithy_client_1.limitedParseDouble(output.Product),
     };
 };
 const deserializeAws_restJson1SoftwarePackage = (output, context) => {
     return {
         Architecture: smithy_client_1.expectString(output.Architecture),
         Epoch: smithy_client_1.expectString(output.Epoch),
+        FilePath: smithy_client_1.expectString(output.FilePath),
         Name: smithy_client_1.expectString(output.Name),
+        PackageManager: smithy_client_1.expectString(output.PackageManager),
         Release: smithy_client_1.expectString(output.Release),
         Version: smithy_client_1.expectString(output.Version),
     };
@@ -16443,7 +17246,7 @@ const deserializeAws_restJson1StandardsControl = (output, context) => {
         ControlId: smithy_client_1.expectString(output.ControlId),
         ControlStatus: smithy_client_1.expectString(output.ControlStatus),
         ControlStatusUpdatedAt: output.ControlStatusUpdatedAt !== undefined && output.ControlStatusUpdatedAt !== null
-            ? new Date(output.ControlStatusUpdatedAt)
+            ? smithy_client_1.expectNonNull(smithy_client_1.parseRfc3339DateTime(output.ControlStatusUpdatedAt))
             : undefined,
         Description: smithy_client_1.expectString(output.Description),
         DisabledReason: smithy_client_1.expectString(output.DisabledReason),