@aws-sdk/client-accessanalyzer 3.28.0 → 3.32.0

package/protocols/Aws_restJson1.ts

@@ -112,10 +112,14 @@ import {
 import { HttpRequest as __HttpRequest, HttpResponse as __HttpResponse } from "@aws-sdk/protocol-http";
 import {
   expectBoolean as __expectBoolean,
-  expectInt as __expectInt,
+  expectInt32 as __expectInt32,
+  expectNonNull as __expectNonNull,
+  expectObject as __expectObject,
   expectString as __expectString,
+  expectUnion as __expectUnion,
   extendedEncodeURIComponent as __extendedEncodeURIComponent,
-  strictParseInt as __strictParseInt,
+  parseRfc3339DateTime as __parseRfc3339DateTime,
+  strictParseInt32 as __strictParseInt32,
 } from "@aws-sdk/smithy-client";
 import {
   Endpoint as __Endpoint,
@@ -1179,7 +1183,7 @@ export const deserializeAws_restJson1CreateAccessPreviewCommand = async (
     $metadata: deserializeMetadata(output),
     id: undefined,
   };
-  const data: any = await parseBody(output.body, context);
+  const data: { [key: string]: any } = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
   if (data.id !== undefined && data.id !== null) {
     contents.id = __expectString(data.id);
   }
@@ -1282,7 +1286,7 @@ export const deserializeAws_restJson1CreateAnalyzerCommand = async (
     $metadata: deserializeMetadata(output),
     arn: undefined,
   };
-  const data: any = await parseBody(output.body, context);
+  const data: { [key: string]: any } = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
   if (data.arn !== undefined && data.arn !== null) {
     contents.arn = __expectString(data.arn);
   }
@@ -1642,7 +1646,7 @@ export const deserializeAws_restJson1GetAccessPreviewCommand = async (
     $metadata: deserializeMetadata(output),
     accessPreview: undefined,
   };
-  const data: any = await parseBody(output.body, context);
+  const data: { [key: string]: any } = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
   if (data.accessPreview !== undefined && data.accessPreview !== null) {
     contents.accessPreview = deserializeAws_restJson1AccessPreview(data.accessPreview, context);
   }
@@ -1729,7 +1733,7 @@ export const deserializeAws_restJson1GetAnalyzedResourceCommand = async (
     $metadata: deserializeMetadata(output),
     resource: undefined,
   };
-  const data: any = await parseBody(output.body, context);
+  const data: { [key: string]: any } = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
   if (data.resource !== undefined && data.resource !== null) {
     contents.resource = deserializeAws_restJson1AnalyzedResource(data.resource, context);
   }
@@ -1816,7 +1820,7 @@ export const deserializeAws_restJson1GetAnalyzerCommand = async (
     $metadata: deserializeMetadata(output),
     analyzer: undefined,
   };
-  const data: any = await parseBody(output.body, context);
+  const data: { [key: string]: any } = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
   if (data.analyzer !== undefined && data.analyzer !== null) {
     contents.analyzer = deserializeAws_restJson1AnalyzerSummary(data.analyzer, context);
   }
@@ -1903,7 +1907,7 @@ export const deserializeAws_restJson1GetArchiveRuleCommand = async (
     $metadata: deserializeMetadata(output),
     archiveRule: undefined,
   };
-  const data: any = await parseBody(output.body, context);
+  const data: { [key: string]: any } = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
   if (data.archiveRule !== undefined && data.archiveRule !== null) {
     contents.archiveRule = deserializeAws_restJson1ArchiveRuleSummary(data.archiveRule, context);
   }
@@ -1990,7 +1994,7 @@ export const deserializeAws_restJson1GetFindingCommand = async (
     $metadata: deserializeMetadata(output),
     finding: undefined,
   };
-  const data: any = await parseBody(output.body, context);
+  const data: { [key: string]: any } = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
   if (data.finding !== undefined && data.finding !== null) {
     contents.finding = deserializeAws_restJson1Finding(data.finding, context);
   }
@@ -2078,7 +2082,7 @@ export const deserializeAws_restJson1GetGeneratedPolicyCommand = async (
     generatedPolicyResult: undefined,
     jobDetails: undefined,
   };
-  const data: any = await parseBody(output.body, context);
+  const data: { [key: string]: any } = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
   if (data.generatedPolicyResult !== undefined && data.generatedPolicyResult !== null) {
     contents.generatedPolicyResult = deserializeAws_restJson1GeneratedPolicyResult(data.generatedPolicyResult, context);
   }
@@ -2161,7 +2165,7 @@ export const deserializeAws_restJson1ListAccessPreviewFindingsCommand = async (
     findings: undefined,
     nextToken: undefined,
   };
-  const data: any = await parseBody(output.body, context);
+  const data: { [key: string]: any } = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
   if (data.findings !== undefined && data.findings !== null) {
     contents.findings = deserializeAws_restJson1AccessPreviewFindingsList(data.findings, context);
   }
@@ -2260,7 +2264,7 @@ export const deserializeAws_restJson1ListAccessPreviewsCommand = async (
     accessPreviews: undefined,
     nextToken: undefined,
   };
-  const data: any = await parseBody(output.body, context);
+  const data: { [key: string]: any } = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
   if (data.accessPreviews !== undefined && data.accessPreviews !== null) {
     contents.accessPreviews = deserializeAws_restJson1AccessPreviewsList(data.accessPreviews, context);
   }
@@ -2351,7 +2355,7 @@ export const deserializeAws_restJson1ListAnalyzedResourcesCommand = async (
     analyzedResources: undefined,
     nextToken: undefined,
   };
-  const data: any = await parseBody(output.body, context);
+  const data: { [key: string]: any } = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
   if (data.analyzedResources !== undefined && data.analyzedResources !== null) {
     contents.analyzedResources = deserializeAws_restJson1AnalyzedResourcesList(data.analyzedResources, context);
   }
@@ -2442,7 +2446,7 @@ export const deserializeAws_restJson1ListAnalyzersCommand = async (
     analyzers: undefined,
     nextToken: undefined,
   };
-  const data: any = await parseBody(output.body, context);
+  const data: { [key: string]: any } = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
   if (data.analyzers !== undefined && data.analyzers !== null) {
     contents.analyzers = deserializeAws_restJson1AnalyzersList(data.analyzers, context);
   }
@@ -2525,7 +2529,7 @@ export const deserializeAws_restJson1ListArchiveRulesCommand = async (
     archiveRules: undefined,
     nextToken: undefined,
   };
-  const data: any = await parseBody(output.body, context);
+  const data: { [key: string]: any } = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
   if (data.archiveRules !== undefined && data.archiveRules !== null) {
     contents.archiveRules = deserializeAws_restJson1ArchiveRulesList(data.archiveRules, context);
   }
@@ -2608,7 +2612,7 @@ export const deserializeAws_restJson1ListFindingsCommand = async (
     findings: undefined,
     nextToken: undefined,
   };
-  const data: any = await parseBody(output.body, context);
+  const data: { [key: string]: any } = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
   if (data.findings !== undefined && data.findings !== null) {
     contents.findings = deserializeAws_restJson1FindingsList(data.findings, context);
   }
@@ -2699,7 +2703,7 @@ export const deserializeAws_restJson1ListPolicyGenerationsCommand = async (
     nextToken: undefined,
     policyGenerations: undefined,
   };
-  const data: any = await parseBody(output.body, context);
+  const data: { [key: string]: any } = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
   if (data.nextToken !== undefined && data.nextToken !== null) {
     contents.nextToken = __expectString(data.nextToken);
   }
@@ -2781,7 +2785,7 @@ export const deserializeAws_restJson1ListTagsForResourceCommand = async (
     $metadata: deserializeMetadata(output),
     tags: undefined,
   };
-  const data: any = await parseBody(output.body, context);
+  const data: { [key: string]: any } = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
   if (data.tags !== undefined && data.tags !== null) {
     contents.tags = deserializeAws_restJson1TagsMap(data.tags, context);
   }
@@ -2868,7 +2872,7 @@ export const deserializeAws_restJson1StartPolicyGenerationCommand = async (
     $metadata: deserializeMetadata(output),
     jobId: undefined,
   };
-  const data: any = await parseBody(output.body, context);
+  const data: { [key: string]: any } = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
   if (data.jobId !== undefined && data.jobId !== null) {
     contents.jobId = __expectString(data.jobId);
   }
@@ -3379,7 +3383,7 @@ export const deserializeAws_restJson1ValidatePolicyCommand = async (
     findings: undefined,
     nextToken: undefined,
   };
-  const data: any = await parseBody(output.body, context);
+  const data: { [key: string]: any } = __expectNonNull(__expectObject(await parseBody(output.body, context)), "body");
   if (data.findings !== undefined && data.findings !== null) {
     contents.findings = deserializeAws_restJson1ValidatePolicyFindingList(data.findings, context);
   }
@@ -3505,7 +3509,7 @@ const deserializeAws_restJson1InternalServerExceptionResponse = async (
     retryAfterSeconds: undefined,
   };
   if (parsedOutput.headers["retry-after"] !== undefined) {
-    contents.retryAfterSeconds = __strictParseInt(parsedOutput.headers["retry-after"]);
+    contents.retryAfterSeconds = __strictParseInt32(parsedOutput.headers["retry-after"]);
   }
   const data: any = parsedOutput.body;
   if (data.message !== undefined && data.message !== null) {
@@ -3579,7 +3583,7 @@ const deserializeAws_restJson1ThrottlingExceptionResponse = async (
     retryAfterSeconds: undefined,
   };
   if (parsedOutput.headers["retry-after"] !== undefined) {
-    contents.retryAfterSeconds = __strictParseInt(parsedOutput.headers["retry-after"]);
+    contents.retryAfterSeconds = __strictParseInt32(parsedOutput.headers["retry-after"]);
   }
   const data: any = parsedOutput.body;
   if (data.message !== undefined && data.message !== null) {
@@ -4021,7 +4025,10 @@ const deserializeAws_restJson1AccessPreview = (output: any, context: __SerdeCont
       output.configurations !== undefined && output.configurations !== null
         ? deserializeAws_restJson1ConfigurationsMap(output.configurations, context)
         : undefined,
-    createdAt: output.createdAt !== undefined && output.createdAt !== null ? new Date(output.createdAt) : undefined,
+    createdAt:
+      output.createdAt !== undefined && output.createdAt !== null
+        ? __expectNonNull(__parseRfc3339DateTime(output.createdAt))
+        : undefined,
     id: __expectString(output.id),
     status: __expectString(output.status),
     statusReason:
@@ -4042,7 +4049,10 @@ const deserializeAws_restJson1AccessPreviewFinding = (output: any, context: __Se
       output.condition !== undefined && output.condition !== null
         ? deserializeAws_restJson1ConditionKeyMap(output.condition, context)
         : undefined,
-    createdAt: output.createdAt !== undefined && output.createdAt !== null ? new Date(output.createdAt) : undefined,
+    createdAt:
+      output.createdAt !== undefined && output.createdAt !== null
+        ? __expectNonNull(__parseRfc3339DateTime(output.createdAt))
+        : undefined,
     error: __expectString(output.error),
     existingFindingId: __expectString(output.existingFindingId),
     existingFindingStatus: __expectString(output.existingFindingStatus),
@@ -4100,7 +4110,10 @@ const deserializeAws_restJson1AccessPreviewStatusReason = (
 const deserializeAws_restJson1AccessPreviewSummary = (output: any, context: __SerdeContext): AccessPreviewSummary => {
   return {
     analyzerArn: __expectString(output.analyzerArn),
-    createdAt: output.createdAt !== undefined && output.createdAt !== null ? new Date(output.createdAt) : undefined,
+    createdAt:
+      output.createdAt !== undefined && output.createdAt !== null
+        ? __expectNonNull(__parseRfc3339DateTime(output.createdAt))
+        : undefined,
     id: __expectString(output.id),
     status: __expectString(output.status),
     statusReason:
@@ -4137,8 +4150,14 @@ const deserializeAws_restJson1AnalyzedResource = (output: any, context: __SerdeC
       output.actions !== undefined && output.actions !== null
         ? deserializeAws_restJson1ActionList(output.actions, context)
         : undefined,
-    analyzedAt: output.analyzedAt !== undefined && output.analyzedAt !== null ? new Date(output.analyzedAt) : undefined,
-    createdAt: output.createdAt !== undefined && output.createdAt !== null ? new Date(output.createdAt) : undefined,
+    analyzedAt:
+      output.analyzedAt !== undefined && output.analyzedAt !== null
+        ? __expectNonNull(__parseRfc3339DateTime(output.analyzedAt))
+        : undefined,
+    createdAt:
+      output.createdAt !== undefined && output.createdAt !== null
+        ? __expectNonNull(__parseRfc3339DateTime(output.createdAt))
+        : undefined,
     error: __expectString(output.error),
     isPublic: __expectBoolean(output.isPublic),
     resourceArn: __expectString(output.resourceArn),
@@ -4149,7 +4168,10 @@ const deserializeAws_restJson1AnalyzedResource = (output: any, context: __SerdeC
         ? deserializeAws_restJson1SharedViaList(output.sharedVia, context)
         : undefined,
     status: __expectString(output.status),
-    updatedAt: output.updatedAt !== undefined && output.updatedAt !== null ? new Date(output.updatedAt) : undefined,
+    updatedAt:
+      output.updatedAt !== undefined && output.updatedAt !== null
+        ? __expectNonNull(__parseRfc3339DateTime(output.updatedAt))
+        : undefined,
   } as any;
 };
 
@@ -4192,11 +4214,14 @@ const deserializeAws_restJson1AnalyzersList = (output: any, context: __SerdeCont
 const deserializeAws_restJson1AnalyzerSummary = (output: any, context: __SerdeContext): AnalyzerSummary => {
   return {
     arn: __expectString(output.arn),
-    createdAt: output.createdAt !== undefined && output.createdAt !== null ? new Date(output.createdAt) : undefined,
+    createdAt:
+      output.createdAt !== undefined && output.createdAt !== null
+        ? __expectNonNull(__parseRfc3339DateTime(output.createdAt))
+        : undefined,
     lastResourceAnalyzed: __expectString(output.lastResourceAnalyzed),
     lastResourceAnalyzedAt:
       output.lastResourceAnalyzedAt !== undefined && output.lastResourceAnalyzedAt !== null
-        ? new Date(output.lastResourceAnalyzedAt)
+        ? __expectNonNull(__parseRfc3339DateTime(output.lastResourceAnalyzedAt))
         : undefined,
     name: __expectString(output.name),
     status: __expectString(output.status),
@@ -4225,20 +4250,32 @@ const deserializeAws_restJson1ArchiveRulesList = (output: any, context: __SerdeC
 
 const deserializeAws_restJson1ArchiveRuleSummary = (output: any, context: __SerdeContext): ArchiveRuleSummary => {
   return {
-    createdAt: output.createdAt !== undefined && output.createdAt !== null ? new Date(output.createdAt) : undefined,
+    createdAt:
+      output.createdAt !== undefined && output.createdAt !== null
+        ? __expectNonNull(__parseRfc3339DateTime(output.createdAt))
+        : undefined,
     filter:
       output.filter !== undefined && output.filter !== null
         ? deserializeAws_restJson1FilterCriteriaMap(output.filter, context)
         : undefined,
     ruleName: __expectString(output.ruleName),
-    updatedAt: output.updatedAt !== undefined && output.updatedAt !== null ? new Date(output.updatedAt) : undefined,
+    updatedAt:
+      output.updatedAt !== undefined && output.updatedAt !== null
+        ? __expectNonNull(__parseRfc3339DateTime(output.updatedAt))
+        : undefined,
   } as any;
 };
 
 const deserializeAws_restJson1CloudTrailProperties = (output: any, context: __SerdeContext): CloudTrailProperties => {
   return {
-    endTime: output.endTime !== undefined && output.endTime !== null ? new Date(output.endTime) : undefined,
-    startTime: output.startTime !== undefined && output.startTime !== null ? new Date(output.startTime) : undefined,
+    endTime:
+      output.endTime !== undefined && output.endTime !== null
+        ? __expectNonNull(__parseRfc3339DateTime(output.endTime))
+        : undefined,
+    startTime:
+      output.startTime !== undefined && output.startTime !== null
+        ? __expectNonNull(__parseRfc3339DateTime(output.startTime))
+        : undefined,
     trailProperties:
       output.trailProperties !== undefined && output.trailProperties !== null
         ? deserializeAws_restJson1TrailPropertiesList(output.trailProperties, context)
@@ -4300,7 +4337,7 @@ const deserializeAws_restJson1ConfigurationsMap = (
     }
     return {
       ...acc,
-      [key]: deserializeAws_restJson1Configuration(value, context),
+      [key]: deserializeAws_restJson1Configuration(__expectUnion(value), context),
     };
   }, {});
 };
@@ -4342,12 +4379,18 @@ const deserializeAws_restJson1Finding = (output: any, context: __SerdeContext):
       output.action !== undefined && output.action !== null
         ? deserializeAws_restJson1ActionList(output.action, context)
         : undefined,
-    analyzedAt: output.analyzedAt !== undefined && output.analyzedAt !== null ? new Date(output.analyzedAt) : undefined,
+    analyzedAt:
+      output.analyzedAt !== undefined && output.analyzedAt !== null
+        ? __expectNonNull(__parseRfc3339DateTime(output.analyzedAt))
+        : undefined,
     condition:
       output.condition !== undefined && output.condition !== null
         ? deserializeAws_restJson1ConditionKeyMap(output.condition, context)
         : undefined,
-    createdAt: output.createdAt !== undefined && output.createdAt !== null ? new Date(output.createdAt) : undefined,
+    createdAt:
+      output.createdAt !== undefined && output.createdAt !== null
+        ? __expectNonNull(__parseRfc3339DateTime(output.createdAt))
+        : undefined,
     error: __expectString(output.error),
     id: __expectString(output.id),
     isPublic: __expectBoolean(output.isPublic),
@@ -4363,7 +4406,10 @@ const deserializeAws_restJson1Finding = (output: any, context: __SerdeContext):
         ? deserializeAws_restJson1FindingSourceList(output.sources, context)
         : undefined,
     status: __expectString(output.status),
-    updatedAt: output.updatedAt !== undefined && output.updatedAt !== null ? new Date(output.updatedAt) : undefined,
+    updatedAt:
+      output.updatedAt !== undefined && output.updatedAt !== null
+        ? __expectNonNull(__parseRfc3339DateTime(output.updatedAt))
+        : undefined,
   } as any;
 };
 
@@ -4411,12 +4457,18 @@ const deserializeAws_restJson1FindingSummary = (output: any, context: __SerdeCon
       output.action !== undefined && output.action !== null
         ? deserializeAws_restJson1ActionList(output.action, context)
         : undefined,
-    analyzedAt: output.analyzedAt !== undefined && output.analyzedAt !== null ? new Date(output.analyzedAt) : undefined,
+    analyzedAt:
+      output.analyzedAt !== undefined && output.analyzedAt !== null
+        ? __expectNonNull(__parseRfc3339DateTime(output.analyzedAt))
+        : undefined,
     condition:
       output.condition !== undefined && output.condition !== null
         ? deserializeAws_restJson1ConditionKeyMap(output.condition, context)
         : undefined,
-    createdAt: output.createdAt !== undefined && output.createdAt !== null ? new Date(output.createdAt) : undefined,
+    createdAt:
+      output.createdAt !== undefined && output.createdAt !== null
+        ? __expectNonNull(__parseRfc3339DateTime(output.createdAt))
+        : undefined,
     error: __expectString(output.error),
     id: __expectString(output.id),
     isPublic: __expectBoolean(output.isPublic),
@@ -4432,7 +4484,10 @@ const deserializeAws_restJson1FindingSummary = (output: any, context: __SerdeCon
         ? deserializeAws_restJson1FindingSourceList(output.sources, context)
         : undefined,
     status: __expectString(output.status),
-    updatedAt: output.updatedAt !== undefined && output.updatedAt !== null ? new Date(output.updatedAt) : undefined,
+    updatedAt:
+      output.updatedAt !== undefined && output.updatedAt !== null
+        ? __expectNonNull(__parseRfc3339DateTime(output.updatedAt))
+        : undefined,
   } as any;
 };
 
@@ -4493,13 +4548,18 @@ const deserializeAws_restJson1InternetConfiguration = (output: any, context: __S
 const deserializeAws_restJson1JobDetails = (output: any, context: __SerdeContext): JobDetails => {
   return {
     completedOn:
-      output.completedOn !== undefined && output.completedOn !== null ? new Date(output.completedOn) : undefined,
+      output.completedOn !== undefined && output.completedOn !== null
+        ? __expectNonNull(__parseRfc3339DateTime(output.completedOn))
+        : undefined,
     jobError:
       output.jobError !== undefined && output.jobError !== null
         ? deserializeAws_restJson1JobError(output.jobError, context)
         : undefined,
     jobId: __expectString(output.jobId),
-    startedOn: output.startedOn !== undefined && output.startedOn !== null ? new Date(output.startedOn) : undefined,
+    startedOn:
+      output.startedOn !== undefined && output.startedOn !== null
+        ? __expectNonNull(__parseRfc3339DateTime(output.startedOn))
+        : undefined,
     status: __expectString(output.status),
   } as any;
 };
@@ -4647,8 +4707,8 @@ const deserializeAws_restJson1NetworkOriginConfiguration = (
 };
 
 const deserializeAws_restJson1PathElement = (output: any, context: __SerdeContext): PathElement => {
-  if (__expectInt(output.index) !== undefined) {
-    return { index: __expectInt(output.index) as any };
+  if (__expectInt32(output.index) !== undefined) {
+    return { index: __expectInt32(output.index) as any };
   }
   if (__expectString(output.key) !== undefined) {
     return { key: __expectString(output.key) as any };
@@ -4671,17 +4731,22 @@ const deserializeAws_restJson1PathElementList = (output: any, context: __SerdeCo
       if (entry === null) {
         return null as any;
       }
-      return deserializeAws_restJson1PathElement(entry, context);
+      return deserializeAws_restJson1PathElement(__expectUnion(entry), context);
     });
 };
 
 const deserializeAws_restJson1PolicyGeneration = (output: any, context: __SerdeContext): PolicyGeneration => {
   return {
     completedOn:
-      output.completedOn !== undefined && output.completedOn !== null ? new Date(output.completedOn) : undefined,
+      output.completedOn !== undefined && output.completedOn !== null
+        ? __expectNonNull(__parseRfc3339DateTime(output.completedOn))
+        : undefined,
     jobId: __expectString(output.jobId),
     principalArn: __expectString(output.principalArn),
-    startedOn: output.startedOn !== undefined && output.startedOn !== null ? new Date(output.startedOn) : undefined,
+    startedOn:
+      output.startedOn !== undefined && output.startedOn !== null
+        ? __expectNonNull(__parseRfc3339DateTime(output.startedOn))
+        : undefined,
     status: __expectString(output.status),
   } as any;
 };
@@ -4699,9 +4764,9 @@ const deserializeAws_restJson1PolicyGenerationList = (output: any, context: __Se
 
 const deserializeAws_restJson1Position = (output: any, context: __SerdeContext): Position => {
   return {
-    column: __expectInt(output.column),
-    line: __expectInt(output.line),
-    offset: __expectInt(output.offset),
+    column: __expectInt32(output.column),
+    line: __expectInt32(output.line),
+    offset: __expectInt32(output.offset),
   } as any;
 };
 
@@ -4736,7 +4801,7 @@ const deserializeAws_restJson1S3AccessPointConfiguration = (
     accessPointPolicy: __expectString(output.accessPointPolicy),
     networkOrigin:
       output.networkOrigin !== undefined && output.networkOrigin !== null
-        ? deserializeAws_restJson1NetworkOriginConfiguration(output.networkOrigin, context)
+        ? deserializeAws_restJson1NetworkOriginConfiguration(__expectUnion(output.networkOrigin), context)
         : undefined,
     publicAccessBlock:
       output.publicAccessBlock !== undefined && output.publicAccessBlock !== null
@@ -4770,7 +4835,7 @@ const deserializeAws_restJson1S3BucketAclGrantConfiguration = (
   return {
     grantee:
       output.grantee !== undefined && output.grantee !== null
-        ? deserializeAws_restJson1AclGrantee(output.grantee, context)
+        ? deserializeAws_restJson1AclGrantee(__expectUnion(output.grantee), context)
         : undefined,
     permission: __expectString(output.permission),
   } as any;
@@ -4866,8 +4931,8 @@ const deserializeAws_restJson1StatusReason = (output: any, context: __SerdeConte
 
 const deserializeAws_restJson1Substring = (output: any, context: __SerdeContext): Substring => {
   return {
-    length: __expectInt(output.length),
-    start: __expectInt(output.start),
+    length: __expectInt32(output.length),
+    start: __expectInt32(output.start),
   } as any;
 };