Skip to content

Commit d79d141

Browse files
authored
fix(clients): deserialization of jsonName complex shapes (#4670)
1 parent 79c46f3 commit d79d141

File tree

17 files changed

+1041
-961
lines changed

17 files changed

+1041
-961
lines changed

clients/client-amplifybackend/src/protocols/Aws_restJson1.ts

Lines changed: 22 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3576,7 +3576,7 @@ const de_BackendAPIAppSyncAuthSettings = (output: any, context: __SerdeContext):
35763576
const de_BackendAPIAuthType = (output: any, context: __SerdeContext): BackendAPIAuthType => {
35773577
return take(output, {
35783578
Mode: [, __expectString, `mode`],
3579-
Settings: (_) => [, de_BackendAPIAppSyncAuthSettings(_, context), `settings`],
3579+
Settings: [, (_: any) => de_BackendAPIAppSyncAuthSettings(_, context), `settings`],
35803580
}) as any;
35813581
};
35823582

@@ -3594,10 +3594,10 @@ const de_BackendAPIConflictResolution = (output: any, context: __SerdeContext):
35943594
*/
35953595
const de_BackendAPIResourceConfig = (output: any, context: __SerdeContext): BackendAPIResourceConfig => {
35963596
return take(output, {
3597-
AdditionalAuthTypes: (_) => [, de_ListOfBackendAPIAuthType(_, context), `additionalAuthTypes`],
3597+
AdditionalAuthTypes: [, (_: any) => de_ListOfBackendAPIAuthType(_, context), `additionalAuthTypes`],
35983598
ApiName: [, __expectString, `apiName`],
3599-
ConflictResolution: (_) => [, de_BackendAPIConflictResolution(_, context), `conflictResolution`],
3600-
DefaultAuthType: (_) => [, de_BackendAPIAuthType(_, context), `defaultAuthType`],
3599+
ConflictResolution: [, (_: any) => de_BackendAPIConflictResolution(_, context), `conflictResolution`],
3600+
DefaultAuthType: [, (_: any) => de_BackendAPIAuthType(_, context), `defaultAuthType`],
36013601
Service: [, __expectString, `service`],
36023602
TransformSchema: [, __expectString, `transformSchema`],
36033603
}) as any;
@@ -3660,8 +3660,8 @@ const de_CreateBackendAuthForgotPasswordConfig = (
36603660
): CreateBackendAuthForgotPasswordConfig => {
36613661
return take(output, {
36623662
DeliveryMethod: [, __expectString, `deliveryMethod`],
3663-
EmailSettings: (_) => [, de_EmailSettings(_, context), `emailSettings`],
3664-
SmsSettings: (_) => [, de_SmsSettings(_, context), `smsSettings`],
3663+
EmailSettings: [, (_: any) => de_EmailSettings(_, context), `emailSettings`],
3664+
SmsSettings: [, (_: any) => de_SmsSettings(_, context), `smsSettings`],
36653665
}) as any;
36663666
};
36673667

@@ -3684,7 +3684,7 @@ const de_CreateBackendAuthIdentityPoolConfig = (
36843684
const de_CreateBackendAuthMFAConfig = (output: any, context: __SerdeContext): CreateBackendAuthMFAConfig => {
36853685
return take(output, {
36863686
MFAMode: __expectString,
3687-
Settings: (_) => [, de_Settings(_, context), `settings`],
3687+
Settings: [, (_: any) => de_Settings(_, context), `settings`],
36883688
}) as any;
36893689
};
36903690

@@ -3698,7 +3698,7 @@ const de_CreateBackendAuthOAuthConfig = (output: any, context: __SerdeContext):
36983698
OAuthScopes: [, _json, `oAuthScopes`],
36993699
RedirectSignInURIs: [, _json, `redirectSignInURIs`],
37003700
RedirectSignOutURIs: [, _json, `redirectSignOutURIs`],
3701-
SocialProviderSettings: (_) => [, de_SocialProviderSettings(_, context), `socialProviderSettings`],
3701+
SocialProviderSettings: [, (_: any) => de_SocialProviderSettings(_, context), `socialProviderSettings`],
37023702
}) as any;
37033703
};
37043704

@@ -3721,9 +3721,9 @@ const de_CreateBackendAuthPasswordPolicyConfig = (
37213721
const de_CreateBackendAuthResourceConfig = (output: any, context: __SerdeContext): CreateBackendAuthResourceConfig => {
37223722
return take(output, {
37233723
AuthResources: [, __expectString, `authResources`],
3724-
IdentityPoolConfigs: (_) => [, de_CreateBackendAuthIdentityPoolConfig(_, context), `identityPoolConfigs`],
3724+
IdentityPoolConfigs: [, (_: any) => de_CreateBackendAuthIdentityPoolConfig(_, context), `identityPoolConfigs`],
37253725
Service: [, __expectString, `service`],
3726-
UserPoolConfigs: (_) => [, de_CreateBackendAuthUserPoolConfig(_, context), `userPoolConfigs`],
3726+
UserPoolConfigs: [, (_: any) => de_CreateBackendAuthUserPoolConfig(_, context), `userPoolConfigs`],
37273727
}) as any;
37283728
};
37293729

@@ -3732,14 +3732,18 @@ const de_CreateBackendAuthResourceConfig = (output: any, context: __SerdeContext
37323732
*/
37333733
const de_CreateBackendAuthUserPoolConfig = (output: any, context: __SerdeContext): CreateBackendAuthUserPoolConfig => {
37343734
return take(output, {
3735-
ForgotPassword: (_) => [, de_CreateBackendAuthForgotPasswordConfig(_, context), `forgotPassword`],
3736-
Mfa: (_) => [, de_CreateBackendAuthMFAConfig(_, context), `mfa`],
3737-
OAuth: (_) => [, de_CreateBackendAuthOAuthConfig(_, context), `oAuth`],
3738-
PasswordPolicy: (_) => [, de_CreateBackendAuthPasswordPolicyConfig(_, context), `passwordPolicy`],
3735+
ForgotPassword: [, (_: any) => de_CreateBackendAuthForgotPasswordConfig(_, context), `forgotPassword`],
3736+
Mfa: [, (_: any) => de_CreateBackendAuthMFAConfig(_, context), `mfa`],
3737+
OAuth: [, (_: any) => de_CreateBackendAuthOAuthConfig(_, context), `oAuth`],
3738+
PasswordPolicy: [, (_: any) => de_CreateBackendAuthPasswordPolicyConfig(_, context), `passwordPolicy`],
37393739
RequiredSignUpAttributes: [, _json, `requiredSignUpAttributes`],
37403740
SignInMethod: [, __expectString, `signInMethod`],
37413741
UserPoolName: [, __expectString, `userPoolName`],
3742-
VerificationMessage: (_) => [, de_CreateBackendAuthVerificationMessageConfig(_, context), `verificationMessage`],
3742+
VerificationMessage: [
3743+
,
3744+
(_: any) => de_CreateBackendAuthVerificationMessageConfig(_, context),
3745+
`verificationMessage`,
3746+
],
37433747
}) as any;
37443748
};
37453749

@@ -3752,8 +3756,8 @@ const de_CreateBackendAuthVerificationMessageConfig = (
37523756
): CreateBackendAuthVerificationMessageConfig => {
37533757
return take(output, {
37543758
DeliveryMethod: [, __expectString, `deliveryMethod`],
3755-
EmailSettings: (_) => [, de_EmailSettings(_, context), `emailSettings`],
3756-
SmsSettings: (_) => [, de_SmsSettings(_, context), `smsSettings`],
3759+
EmailSettings: [, (_: any) => de_EmailSettings(_, context), `emailSettings`],
3760+
SmsSettings: [, (_: any) => de_SmsSettings(_, context), `smsSettings`],
37573761
}) as any;
37583762
};
37593763

@@ -3774,7 +3778,7 @@ const de_GetBackendStorageResourceConfig = (output: any, context: __SerdeContext
37743778
return take(output, {
37753779
BucketName: [, __expectString, `bucketName`],
37763780
Imported: [, __expectBoolean, `imported`],
3777-
Permissions: (_) => [, de_BackendStoragePermissions(_, context), `permissions`],
3781+
Permissions: [, (_: any) => de_BackendStoragePermissions(_, context), `permissions`],
37783782
ServiceName: [, __expectString, `serviceName`],
37793783
}) as any;
37803784
};

clients/client-apigatewayv2/src/protocols/Aws_restJson1.ts

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7012,8 +7012,8 @@ const de_Api = (output: any, context: __SerdeContext): Api => {
70127012
ApiGatewayManaged: [, __expectBoolean, `apiGatewayManaged`],
70137013
ApiId: [, __expectString, `apiId`],
70147014
ApiKeySelectionExpression: [, __expectString, `apiKeySelectionExpression`],
7015-
CorsConfiguration: (_) => [, de_Cors(_, context), `corsConfiguration`],
7016-
CreatedDate: (_) => [, __expectNonNull(__parseRfc3339DateTimeWithOffset(_)), `createdDate`],
7015+
CorsConfiguration: [, (_: any) => de_Cors(_, context), `corsConfiguration`],
7016+
CreatedDate: [, (_: any) => __expectNonNull(__parseRfc3339DateTimeWithOffset(_)), `createdDate`],
70177017
Description: [, __expectString, `description`],
70187018
DisableExecuteApiEndpoint: [, __expectBoolean, `disableExecuteApiEndpoint`],
70197019
DisableSchemaValidation: [, __expectBoolean, `disableSchemaValidation`],
@@ -7055,7 +7055,7 @@ const de_Authorizer = (output: any, context: __SerdeContext): Authorizer => {
70557055
EnableSimpleResponses: [, __expectBoolean, `enableSimpleResponses`],
70567056
IdentitySource: [, _json, `identitySource`],
70577057
IdentityValidationExpression: [, __expectString, `identityValidationExpression`],
7058-
JwtConfiguration: (_) => [, de_JWTConfiguration(_, context), `jwtConfiguration`],
7058+
JwtConfiguration: [, (_: any) => de_JWTConfiguration(_, context), `jwtConfiguration`],
70597059
Name: [, __expectString, `name`],
70607060
}) as any;
70617061
};
@@ -7086,7 +7086,7 @@ const de_Cors = (output: any, context: __SerdeContext): Cors => {
70867086
const de_Deployment = (output: any, context: __SerdeContext): Deployment => {
70877087
return take(output, {
70887088
AutoDeployed: [, __expectBoolean, `autoDeployed`],
7089-
CreatedDate: (_) => [, __expectNonNull(__parseRfc3339DateTimeWithOffset(_)), `createdDate`],
7089+
CreatedDate: [, (_: any) => __expectNonNull(__parseRfc3339DateTimeWithOffset(_)), `createdDate`],
70907090
DeploymentId: [, __expectString, `deploymentId`],
70917091
DeploymentStatus: [, __expectString, `deploymentStatus`],
70927092
DeploymentStatusMessage: [, __expectString, `deploymentStatusMessage`],
@@ -7101,8 +7101,8 @@ const de_DomainName = (output: any, context: __SerdeContext): DomainName => {
71017101
return take(output, {
71027102
ApiMappingSelectionExpression: [, __expectString, `apiMappingSelectionExpression`],
71037103
DomainName: [, __expectString, `domainName`],
7104-
DomainNameConfigurations: (_) => [, de_DomainNameConfigurations(_, context), `domainNameConfigurations`],
7105-
MutualTlsAuthentication: (_) => [, de_MutualTlsAuthentication(_, context), `mutualTlsAuthentication`],
7104+
DomainNameConfigurations: [, (_: any) => de_DomainNameConfigurations(_, context), `domainNameConfigurations`],
7105+
MutualTlsAuthentication: [, (_: any) => de_MutualTlsAuthentication(_, context), `mutualTlsAuthentication`],
71067106
Tags: [, _json, `tags`],
71077107
}) as any;
71087108
};
@@ -7115,7 +7115,11 @@ const de_DomainNameConfiguration = (output: any, context: __SerdeContext): Domai
71157115
ApiGatewayDomainName: [, __expectString, `apiGatewayDomainName`],
71167116
CertificateArn: [, __expectString, `certificateArn`],
71177117
CertificateName: [, __expectString, `certificateName`],
7118-
CertificateUploadDate: (_) => [, __expectNonNull(__parseRfc3339DateTimeWithOffset(_)), `certificateUploadDate`],
7118+
CertificateUploadDate: [
7119+
,
7120+
(_: any) => __expectNonNull(__parseRfc3339DateTimeWithOffset(_)),
7121+
`certificateUploadDate`,
7122+
],
71197123
DomainNameStatus: [, __expectString, `domainNameStatus`],
71207124
DomainNameStatusMessage: [, __expectString, `domainNameStatusMessage`],
71217125
EndpointType: [, __expectString, `endpointType`],
@@ -7163,7 +7167,7 @@ const de_Integration = (output: any, context: __SerdeContext): Integration => {
71637167
ResponseParameters: [, _json, `responseParameters`],
71647168
TemplateSelectionExpression: [, __expectString, `templateSelectionExpression`],
71657169
TimeoutInMillis: [, __expectInt32, `timeoutInMillis`],
7166-
TlsConfig: (_) => [, de_TlsConfig(_, context), `tlsConfig`],
7170+
TlsConfig: [, (_: any) => de_TlsConfig(_, context), `tlsConfig`],
71677171
}) as any;
71687172
};
71697173

@@ -7241,7 +7245,7 @@ const de_Route = (output: any, context: __SerdeContext): Route => {
72417245
ModelSelectionExpression: [, __expectString, `modelSelectionExpression`],
72427246
OperationName: [, __expectString, `operationName`],
72437247
RequestModels: [, _json, `requestModels`],
7244-
RequestParameters: (_) => [, de_RouteParameters(_, context), `requestParameters`],
7248+
RequestParameters: [, (_: any) => de_RouteParameters(_, context), `requestParameters`],
72457249
RouteId: [, __expectString, `routeId`],
72467250
RouteKey: [, __expectString, `routeKey`],
72477251
RouteResponseSelectionExpression: [, __expectString, `routeResponseSelectionExpression`],
@@ -7271,7 +7275,7 @@ const de_RouteResponse = (output: any, context: __SerdeContext): RouteResponse =
72717275
return take(output, {
72727276
ModelSelectionExpression: [, __expectString, `modelSelectionExpression`],
72737277
ResponseModels: [, _json, `responseModels`],
7274-
ResponseParameters: (_) => [, de_RouteParameters(_, context), `responseParameters`],
7278+
ResponseParameters: [, (_: any) => de_RouteParameters(_, context), `responseParameters`],
72757279
RouteResponseId: [, __expectString, `routeResponseId`],
72767280
RouteResponseKey: [, __expectString, `routeResponseKey`],
72777281
}) as any;
@@ -7310,17 +7314,17 @@ const de_RouteSettingsMap = (output: any, context: __SerdeContext): Record<strin
73107314
*/
73117315
const de_Stage = (output: any, context: __SerdeContext): Stage => {
73127316
return take(output, {
7313-
AccessLogSettings: (_) => [, de_AccessLogSettings(_, context), `accessLogSettings`],
7317+
AccessLogSettings: [, (_: any) => de_AccessLogSettings(_, context), `accessLogSettings`],
73147318
ApiGatewayManaged: [, __expectBoolean, `apiGatewayManaged`],
73157319
AutoDeploy: [, __expectBoolean, `autoDeploy`],
73167320
ClientCertificateId: [, __expectString, `clientCertificateId`],
7317-
CreatedDate: (_) => [, __expectNonNull(__parseRfc3339DateTimeWithOffset(_)), `createdDate`],
7318-
DefaultRouteSettings: (_) => [, de_RouteSettings(_, context), `defaultRouteSettings`],
7321+
CreatedDate: [, (_: any) => __expectNonNull(__parseRfc3339DateTimeWithOffset(_)), `createdDate`],
7322+
DefaultRouteSettings: [, (_: any) => de_RouteSettings(_, context), `defaultRouteSettings`],
73197323
DeploymentId: [, __expectString, `deploymentId`],
73207324
Description: [, __expectString, `description`],
73217325
LastDeploymentStatusMessage: [, __expectString, `lastDeploymentStatusMessage`],
7322-
LastUpdatedDate: (_) => [, __expectNonNull(__parseRfc3339DateTimeWithOffset(_)), `lastUpdatedDate`],
7323-
RouteSettings: (_) => [, de_RouteSettingsMap(_, context), `routeSettings`],
7326+
LastUpdatedDate: [, (_: any) => __expectNonNull(__parseRfc3339DateTimeWithOffset(_)), `lastUpdatedDate`],
7327+
RouteSettings: [, (_: any) => de_RouteSettingsMap(_, context), `routeSettings`],
73247328
StageName: [, __expectString, `stageName`],
73257329
StageVariables: [, _json, `stageVariables`],
73267330
Tags: [, _json, `tags`],
@@ -7349,7 +7353,7 @@ const de_TlsConfig = (output: any, context: __SerdeContext): TlsConfig => {
73497353
*/
73507354
const de_VpcLink = (output: any, context: __SerdeContext): VpcLink => {
73517355
return take(output, {
7352-
CreatedDate: (_) => [, __expectNonNull(__parseRfc3339DateTimeWithOffset(_)), `createdDate`],
7356+
CreatedDate: [, (_: any) => __expectNonNull(__parseRfc3339DateTimeWithOffset(_)), `createdDate`],
73537357
Name: [, __expectString, `name`],
73547358
SecurityGroupIds: [, _json, `securityGroupIds`],
73557359
SubnetIds: [, _json, `subnetIds`],

0 commit comments

Comments
 (0)