@aws-amplify/graphql-model-transformer 1.4.0-rds.3 → 1.4.0

package/src/resolvers/rds/resolver.ts

@@ -1,9 +1,4 @@
-import {
-  CfnMapping,
-  Duration,
-  Fn,
-  Stack,
-} from 'aws-cdk-lib';
+import { CfnMapping, Duration, Fn, Stack } from 'aws-cdk-lib';
 import {
   Expression,
   compoundExpression,
@@ -20,15 +15,8 @@ import {
 } from 'graphql-mapping-template';
 import { ResourceConstants } from 'graphql-transformer-common';
 import { RDSConnectionSecrets } from '@aws-amplify/graphql-transformer-core';
-import { GraphQLAPIProvider } from '@aws-amplify/graphql-transformer-interfaces';
-import {
-  Effect,
-  IRole,
-  Policy,
-  PolicyStatement,
-  Role,
-  ServicePrincipal,
-} from 'aws-cdk-lib/aws-iam';
+import { GraphQLAPIProvider, RDSLayerMapping } from '@aws-amplify/graphql-transformer-interfaces';
+import { Effect, IRole, Policy, PolicyStatement, Role, ServicePrincipal } from 'aws-cdk-lib/aws-iam';
 import { IFunction, LayerVersion, Runtime } from 'aws-cdk-lib/aws-lambda';
 import { Construct } from 'constructs';
 import path from 'path';
@@ -47,85 +35,92 @@ const RDSLayerMappingID = 'RDSLayerResourceMapping';
  * Define RDS Lambda Layer region mappings
  * @param scope Construct
  */
-export const setRDSLayerMappings = (scope: Construct): CfnMapping => new CfnMapping(
-  scope,
-  // For beta use account '956468067974', layer name 'AmplifyRDSLayerBeta' and layer version '12' as of 2023-06-20
-  // For prod use account '582037449441', layer name 'AmplifyRDSLayer' and layer version '3' as of 2023-06-20
-  RDSLayerMappingID,
-  {
-    mapping: {
-      'ap-northeast-1': {
-        layerRegion: 'arn:aws:lambda:ap-northeast-1:582037449441:layer:AmplifyRDSLayer:5',
-      },
-      'us-east-1': {
-        layerRegion: 'arn:aws:lambda:us-east-1:582037449441:layer:AmplifyRDSLayer:5',
-      },
-      'ap-southeast-1': {
-        layerRegion: 'arn:aws:lambda:ap-southeast-1:582037449441:layer:AmplifyRDSLayer:5',
-      },
-      'eu-west-1': {
-        layerRegion: 'arn:aws:lambda:eu-west-1:582037449441:layer:AmplifyRDSLayer:5',
-      },
-      'us-west-1': {
-        layerRegion: 'arn:aws:lambda:us-west-1:582037449441:layer:AmplifyRDSLayer:5',
-      },
-      'ap-east-1': {
-        layerRegion: 'arn:aws:lambda:ap-east-1:582037449441:layer:AmplifyRDSLayer:5',
-      },
-      'ap-northeast-2': {
-        layerRegion: 'arn:aws:lambda:ap-northeast-2:582037449441:layer:AmplifyRDSLayer:5',
-      },
-      'ap-northeast-3': {
-        layerRegion: 'arn:aws:lambda:ap-northeast-3:582037449441:layer:AmplifyRDSLayer:5',
-      },
-      'ap-south-1': {
-        layerRegion: 'arn:aws:lambda:ap-south-1:582037449441:layer:AmplifyRDSLayer:5',
-      },
-      'ap-southeast-2': {
-        layerRegion: 'arn:aws:lambda:ap-southeast-2:582037449441:layer:AmplifyRDSLayer:5',
-      },
-      'ca-central-1': {
-        layerRegion: 'arn:aws:lambda:ca-central-1:582037449441:layer:AmplifyRDSLayer:5',
-      },
-      'eu-central-1': {
-        layerRegion: 'arn:aws:lambda:eu-central-1:582037449441:layer:AmplifyRDSLayer:5',
-      },
-      'eu-north-1': {
-        layerRegion: 'arn:aws:lambda:eu-north-1:582037449441:layer:AmplifyRDSLayer:5',
-      },
-      'eu-west-2': {
-        layerRegion: 'arn:aws:lambda:eu-west-2:582037449441:layer:AmplifyRDSLayer:5',
-      },
-      'eu-west-3': {
-        layerRegion: 'arn:aws:lambda:eu-west-3:582037449441:layer:AmplifyRDSLayer:5',
-      },
-      'sa-east-1': {
-        layerRegion: 'arn:aws:lambda:sa-east-1:582037449441:layer:AmplifyRDSLayer:5',
-      },
-      'us-east-2': {
-        layerRegion: 'arn:aws:lambda:us-east-2:582037449441:layer:AmplifyRDSLayer:5',
-      },
-      'us-west-2': {
-        layerRegion: 'arn:aws:lambda:us-west-2:582037449441:layer:AmplifyRDSLayer:5',
-      },
-      'cn-north-1': {
-        layerRegion: 'arn:aws:lambda:cn-north-1:582037449441:layer:AmplifyRDSLayer:5',
-      },
-      'cn-northwest-1': {
-        layerRegion: 'arn:aws:lambda:cn-northwest-1:582037449441:layer:AmplifyRDSLayer:5',
-      },
-      'us-gov-west-1': {
-        layerRegion: 'arn:aws:lambda:us-gov-west-1:582037449441:layer:AmplifyRDSLayer:5',
-      },
-      'us-gov-east-1': {
-        layerRegion: 'arn:aws:lambda:us-gov-east-1:582037449441:layer:AmplifyRDSLayer:5',
-      },
-      'me-south-1': {
-        layerRegion: 'arn:aws:lambda:me-south-1:582037449441:layer:AmplifyRDSLayer:5',
-      },
-    },
+export const setRDSLayerMappings = (scope: Construct, mapping?: RDSLayerMapping): CfnMapping =>
+  new CfnMapping(scope, RDSLayerMappingID, {
+    mapping: getLatestLayers(mapping),
+  });
+
+const getLatestLayers = (latestLayers?: RDSLayerMapping): RDSLayerMapping => {
+  if (latestLayers && Object.keys(latestLayers).length > 0) {
+    return latestLayers;
+  }
+  const defaultLayerMapping = getDefaultLayerMapping();
+  return defaultLayerMapping;
+};
+
+// For beta use account '956468067974', layer name 'AmplifyRDSLayerBeta' and layer version '12' as of 2023-06-20
+// For prod use account '582037449441', layer name 'AmplifyRDSLayer' and layer version '3' as of 2023-06-20
+const getDefaultLayerMapping = (): RDSLayerMapping => ({
+  'ap-northeast-1': {
+    layerRegion: 'arn:aws:lambda:ap-northeast-1:582037449441:layer:AmplifyRDSLayer:5',
+  },
+  'us-east-1': {
+    layerRegion: 'arn:aws:lambda:us-east-1:582037449441:layer:AmplifyRDSLayer:5',
+  },
+  'ap-southeast-1': {
+    layerRegion: 'arn:aws:lambda:ap-southeast-1:582037449441:layer:AmplifyRDSLayer:5',
+  },
+  'eu-west-1': {
+    layerRegion: 'arn:aws:lambda:eu-west-1:582037449441:layer:AmplifyRDSLayer:5',
+  },
+  'us-west-1': {
+    layerRegion: 'arn:aws:lambda:us-west-1:582037449441:layer:AmplifyRDSLayer:5',
+  },
+  'ap-east-1': {
+    layerRegion: 'arn:aws:lambda:ap-east-1:582037449441:layer:AmplifyRDSLayer:5',
+  },
+  'ap-northeast-2': {
+    layerRegion: 'arn:aws:lambda:ap-northeast-2:582037449441:layer:AmplifyRDSLayer:5',
+  },
+  'ap-northeast-3': {
+    layerRegion: 'arn:aws:lambda:ap-northeast-3:582037449441:layer:AmplifyRDSLayer:5',
+  },
+  'ap-south-1': {
+    layerRegion: 'arn:aws:lambda:ap-south-1:582037449441:layer:AmplifyRDSLayer:5',
+  },
+  'ap-southeast-2': {
+    layerRegion: 'arn:aws:lambda:ap-southeast-2:582037449441:layer:AmplifyRDSLayer:5',
+  },
+  'ca-central-1': {
+    layerRegion: 'arn:aws:lambda:ca-central-1:582037449441:layer:AmplifyRDSLayer:5',
+  },
+  'eu-central-1': {
+    layerRegion: 'arn:aws:lambda:eu-central-1:582037449441:layer:AmplifyRDSLayer:5',
+  },
+  'eu-north-1': {
+    layerRegion: 'arn:aws:lambda:eu-north-1:582037449441:layer:AmplifyRDSLayer:5',
   },
-);
+  'eu-west-2': {
+    layerRegion: 'arn:aws:lambda:eu-west-2:582037449441:layer:AmplifyRDSLayer:5',
+  },
+  'eu-west-3': {
+    layerRegion: 'arn:aws:lambda:eu-west-3:582037449441:layer:AmplifyRDSLayer:5',
+  },
+  'sa-east-1': {
+    layerRegion: 'arn:aws:lambda:sa-east-1:582037449441:layer:AmplifyRDSLayer:5',
+  },
+  'us-east-2': {
+    layerRegion: 'arn:aws:lambda:us-east-2:582037449441:layer:AmplifyRDSLayer:5',
+  },
+  'us-west-2': {
+    layerRegion: 'arn:aws:lambda:us-west-2:582037449441:layer:AmplifyRDSLayer:5',
+  },
+  'cn-north-1': {
+    layerRegion: 'arn:aws:lambda:cn-north-1:582037449441:layer:AmplifyRDSLayer:5',
+  },
+  'cn-northwest-1': {
+    layerRegion: 'arn:aws:lambda:cn-northwest-1:582037449441:layer:AmplifyRDSLayer:5',
+  },
+  'us-gov-west-1': {
+    layerRegion: 'arn:aws:lambda:us-gov-west-1:582037449441:layer:AmplifyRDSLayer:5',
+  },
+  'us-gov-east-1': {
+    layerRegion: 'arn:aws:lambda:us-gov-east-1:582037449441:layer:AmplifyRDSLayer:5',
+  },
+  'me-south-1': {
+    layerRegion: 'arn:aws:lambda:me-south-1:582037449441:layer:AmplifyRDSLayer:5',
+  },
+});
 
 /**
  * Create RDS Lambda function
@@ -226,20 +221,18 @@ export const createRdsLambdaRole = (roleName: string, stack: Construct, secretEn
     );
   }
 
-  role.attachInlinePolicy(new Policy(stack, RDSLambdaLogAccessPolicy, {
-    statements: policyStatements,
-    policyName: `${roleName}Policy`,
-  }));
+  role.attachInlinePolicy(
+    new Policy(stack, RDSLambdaLogAccessPolicy, {
+      statements: policyStatements,
+      policyName: `${roleName}Policy`,
+    }),
+  );
 
   role.addToPolicy(
     new PolicyStatement({
       effect: Effect.ALLOW,
       resources: ['*'],
-      actions: [
-        'ec2:CreateNetworkInterface',
-        'ec2:DescribeNetworkInterfaces',
-        'ec2:DeleteNetworkInterface',
-      ],
+      actions: ['ec2:CreateNetworkInterface', 'ec2:DescribeNetworkInterfaces', 'ec2:DeleteNetworkInterface'],
     }),
   );
 
@@ -276,20 +269,18 @@ export const createRdsPatchingLambdaRole = (roleName: string, stack: Construct,
     }),
   ];
 
-  role.attachInlinePolicy(new Policy(stack, RDSPatchingLambdaLogAccessPolicy, {
-    statements: policyStatements,
-    policyName: `${roleName}Policy`,
-  }));
+  role.attachInlinePolicy(
+    new Policy(stack, RDSPatchingLambdaLogAccessPolicy, {
+      statements: policyStatements,
+      policyName: `${roleName}Policy`,
+    }),
+  );
 
   role.addToPolicy(
     new PolicyStatement({
       effect: Effect.ALLOW,
       resources: ['*'],
-      actions: [
-        'ec2:CreateNetworkInterface',
-        'ec2:DescribeNetworkInterfaces',
-        'ec2:DeleteNetworkInterface',
-      ],
+      actions: ['ec2:CreateNetworkInterface', 'ec2:DescribeNetworkInterfaces', 'ec2:DeleteNetworkInterface'],
     }),
   );
 
@@ -302,25 +293,28 @@ export const createRdsPatchingLambdaRole = (roleName: string, stack: Construct,
  * @param operation string
  * @param operationName string
  */
-export const generateLambdaRequestTemplate = (tableName: string, operation: string, operationName: string): string => printBlock('Invoke RDS Lambda data source')(
-  compoundExpression([
-    set(ref('lambdaInput'), obj({})),
-    set(ref('lambdaInput.args'), obj({})),
-    set(ref('lambdaInput.table'), str(tableName)),
-    set(ref('lambdaInput.operation'), str(operation)),
-    set(ref('lambdaInput.operationName'), str(operationName)),
-    set(ref('lambdaInput.args.metadata'), obj({})),
-    set(ref('lambdaInput.args.metadata.keys'), list([])),
-    qref(methodCall(ref('lambdaInput.args.metadata.keys.addAll'), methodCall(ref('util.defaultIfNull'), ref('ctx.stash.keys'), list([])))),
-    set(ref('lambdaInput.args.input'), methodCall(ref('util.defaultIfNull'), ref('ctx.stash.defaultValues'), obj({}))),
-    qref(methodCall(ref('lambdaInput.args.input.putAll'), methodCall(ref('util.defaultIfNull'), ref('context.arguments'), obj({})))),
-    obj({
-      version: str('2018-05-29'),
-      operation: str('Invoke'),
-      payload: methodCall(ref('util.toJson'), ref('lambdaInput')),
-    }),
-  ]),
-);
+export const generateLambdaRequestTemplate = (tableName: string, operation: string, operationName: string): string =>
+  printBlock('Invoke RDS Lambda data source')(
+    compoundExpression([
+      set(ref('lambdaInput'), obj({})),
+      set(ref('lambdaInput.args'), obj({})),
+      set(ref('lambdaInput.table'), str(tableName)),
+      set(ref('lambdaInput.operation'), str(operation)),
+      set(ref('lambdaInput.operationName'), str(operationName)),
+      set(ref('lambdaInput.args.metadata'), obj({})),
+      set(ref('lambdaInput.args.metadata.keys'), list([])),
+      qref(
+        methodCall(ref('lambdaInput.args.metadata.keys.addAll'), methodCall(ref('util.defaultIfNull'), ref('ctx.stash.keys'), list([]))),
+      ),
+      set(ref('lambdaInput.args.input'), methodCall(ref('util.defaultIfNull'), ref('ctx.stash.defaultValues'), obj({}))),
+      qref(methodCall(ref('lambdaInput.args.input.putAll'), methodCall(ref('util.defaultIfNull'), ref('context.arguments'), obj({})))),
+      obj({
+        version: str('2018-05-29'),
+        operation: str('Invoke'),
+        payload: methodCall(ref('util.toJson'), ref('lambdaInput')),
+      }),
+    ]),
+  );
 
 /**
  * Generate RDS Lambda response template

package/src/resources/dynamo-model-resource-generator.ts

@@ -1,24 +1,14 @@
 import * as cdk from 'aws-cdk-lib';
 import { TransformerContextProvider } from '@aws-amplify/graphql-transformer-interfaces';
-import {
-  ModelResourceIDs,
-  ResourceConstants,
-  SyncResourceIDs,
-} from 'graphql-transformer-common';
+import { ModelResourceIDs, ResourceConstants, SyncResourceIDs } from 'graphql-transformer-common';
 import { ObjectTypeDefinitionNode } from 'graphql';
 import { SyncUtils, TransformerNestedStack } from '@aws-amplify/graphql-transformer-core';
-import {
-  AttributeType,
-  CfnTable,
-  StreamViewType,
-  Table,
-  TableEncryption,
-} from 'aws-cdk-lib/aws-dynamodb';
+import { AttributeType, CfnTable, StreamViewType, Table, TableEncryption } from 'aws-cdk-lib/aws-dynamodb';
 import { CfnDataSource } from 'aws-cdk-lib/aws-appsync';
 import * as iam from 'aws-cdk-lib/aws-iam';
 import { CfnRole } from 'aws-cdk-lib/aws-iam';
-import { ModelResourceGenerator } from './model-resource-generator';
 import { DynamoDBModelVTLGenerator, ModelVTLGenerator } from '../resolvers';
+import { ModelResourceGenerator } from './model-resource-generator';
 
 /**
  * DynamoModelResourceGenerator is an implementation of ModelResourceGenerator,
@@ -128,7 +118,6 @@ export class DynamoModelResourceGenerator extends ModelResourceGenerator {
     );
 
     // Add conditions.
-    // eslint-disable-next-line no-new
     new cdk.CfnCondition(stack, ResourceConstants.CONDITIONS.HasEnvironmentParameter, {
       expression: cdk.Fn.conditionNot(cdk.Fn.conditionEquals(env, ResourceConstants.NONE)),
     });
@@ -173,7 +162,6 @@ export class DynamoModelResourceGenerator extends ModelResourceGenerator {
     };
 
     const streamArnOutputId = `GetAtt${ModelResourceIDs.ModelTableStreamArn(def!.name.value)}`;
-    // eslint-disable-next-line no-new
     new cdk.CfnOutput(stack, streamArnOutputId, {
       value: cdk.Fn.getAtt(tableLogicalName, 'StreamArn').toString(),
       description: 'Your DynamoDB table StreamArn.',
@@ -181,7 +169,6 @@ export class DynamoModelResourceGenerator extends ModelResourceGenerator {
     });
 
     const tableNameOutputId = `GetAtt${tableLogicalName}Name`;
-    // eslint-disable-next-line no-new
     new cdk.CfnOutput(stack, tableNameOutputId, {
       value: cdk.Fn.ref(tableLogicalName),
       description: 'Your DynamoDB table name.',
@@ -210,7 +197,7 @@ export class DynamoModelResourceGenerator extends ModelResourceGenerator {
     );
 
     const cfnDataSource = dataSource.node.defaultChild as CfnDataSource;
-    cfnDataSource.addDependsOn(role.node.defaultChild as CfnRole);
+    cfnDataSource.addDependency(role.node.defaultChild as CfnRole);
 
     if (context.isProjectUsingDataStore()) {
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -224,7 +211,6 @@ export class DynamoModelResourceGenerator extends ModelResourceGenerator {
     }
 
     const datasourceOutputId = `GetAtt${datasourceRoleLogicalID}Name`;
-    // eslint-disable-next-line no-new
     new cdk.CfnOutput(stack, datasourceOutputId, {
       value: dataSource.ds.attrName,
       description: 'Your model DataSource name.',
@@ -273,15 +259,15 @@ export class DynamoModelResourceGenerator extends ModelResourceGenerator {
               }),
               ...(context.isProjectUsingDataStore()
                 ? [
-                  // eslint-disable-next-line no-template-curly-in-string
-                  cdk.Fn.sub('arn:aws:dynamodb:${AWS::Region}:${AWS::AccountId}:table/${tablename}', {
-                    tablename: amplifyDataStoreTableName,
-                  }),
-                  // eslint-disable-next-line no-template-curly-in-string
-                  cdk.Fn.sub('arn:aws:dynamodb:${AWS::Region}:${AWS::AccountId}:table/${tablename}/*', {
-                    tablename: amplifyDataStoreTableName,
-                  }),
-                ]
+                    // eslint-disable-next-line no-template-curly-in-string
+                    cdk.Fn.sub('arn:aws:dynamodb:${AWS::Region}:${AWS::AccountId}:table/${tablename}', {
+                      tablename: amplifyDataStoreTableName,
+                    }),
+                    // eslint-disable-next-line no-template-curly-in-string
+                    cdk.Fn.sub('arn:aws:dynamodb:${AWS::Region}:${AWS::AccountId}:table/${tablename}/*', {
+                      tablename: amplifyDataStoreTableName,
+                    }),
+                  ]
                 : []),
             ],
           }),
@@ -297,5 +283,5 @@ export class DynamoModelResourceGenerator extends ModelResourceGenerator {
     }
 
     return role;
-  }
+  };
 }

package/src/resources/model-resource-generator.ts

@@ -1,19 +1,15 @@
 import {
-  DataSourceProvider, MutationFieldType, QueryFieldType, SubscriptionFieldType,
+  DataSourceProvider,
+  MutationFieldType,
+  QueryFieldType,
+  SubscriptionFieldType,
   TransformerContextProvider,
   TransformerResolverProvider,
 } from '@aws-amplify/graphql-transformer-interfaces';
 import { ObjectTypeDefinitionNode } from 'graphql';
 import { MappingTemplate } from '@aws-amplify/graphql-transformer-core';
-import {
-  ResolverResourceIDs,
-  toCamelCase,
-} from 'graphql-transformer-common';
-import {
-  generateAuthExpressionForSandboxMode,
-  generateResolverKey,
-  ModelVTLGenerator,
-} from '../resolvers';
+import { ResolverResourceIDs, toCamelCase } from 'graphql-transformer-common';
+import { generateAuthExpressionForSandboxMode, generateResolverKey, ModelVTLGenerator } from '../resolvers';
 import { ModelDirectiveConfiguration, SubscriptionLevel } from '../directive';
 import { ModelTransformerOptions } from '../types';
 
@@ -24,13 +20,21 @@ import { ModelTransformerOptions } from '../types';
  */
 export abstract class ModelResourceGenerator {
   protected datasourceMap: Record<string, DataSourceProvider> = {};
+
   private resolverMap: Record<string, TransformerResolverProvider> = {};
+
   protected generatorType = 'ModelResourceGenerator';
+
   private enabled = false;
+
   private provisioned = false;
+
   private unprovisioned = false;
+
   protected models: Array<ObjectTypeDefinitionNode> = new Array<ObjectTypeDefinitionNode>();
+
   protected modelDirectiveMap: Map<string, ModelDirectiveConfiguration> = new Map<string, ModelDirectiveConfiguration>();
+
   protected options: ModelTransformerOptions;
 
   constructor(options: ModelTransformerOptions = {}) {
@@ -103,7 +107,6 @@ export abstract class ModelResourceGenerator {
 
   protected generateResolvers(context: TransformerContextProvider): void {
     this.models.forEach((def) => {
-
       const queryFields = this.getQueryFieldNames(def);
       queryFields.forEach((query) => {
         let resolver;
@@ -125,7 +128,7 @@ export abstract class ModelResourceGenerator {
         resolver.addToSlot(
           'postAuth',
           MappingTemplate.s3MappingTemplateFromString(
-            generateAuthExpressionForSandboxMode(context.sandboxModeEnabled),
+            generateAuthExpressionForSandboxMode(context.transformParameters.sandboxModeEnabled),
             `${query.typeName}.${query.fieldName}.{slotName}.{slotIndex}.req.vtl`,
           ),
         );
@@ -159,7 +162,7 @@ export abstract class ModelResourceGenerator {
         resolver.addToSlot(
           'postAuth',
           MappingTemplate.s3MappingTemplateFromString(
-            generateAuthExpressionForSandboxMode(context.sandboxModeEnabled),
+            generateAuthExpressionForSandboxMode(context.transformParameters.sandboxModeEnabled),
             `${mutation.typeName}.${mutation.fieldName}.{slotName}.{slotIndex}.req.vtl`,
           ),
         );
@@ -205,7 +208,7 @@ export abstract class ModelResourceGenerator {
             resolver.addToSlot(
               'postAuth',
               MappingTemplate.s3MappingTemplateFromString(
-                generateAuthExpressionForSandboxMode(context.sandboxModeEnabled),
+                generateAuthExpressionForSandboxMode(context.transformParameters.sandboxModeEnabled),
                 `${subscription.typeName}.${subscription.fieldName}.{slotName}.{slotIndex}.req.vtl`,
               ),
             );
@@ -228,7 +231,9 @@ export abstract class ModelResourceGenerator {
     const dataSource = this.datasourceMap[type.name.value];
     const resolverKey = `Get${generateResolverKey(typeName, fieldName)}`;
     const vtlGenerator = this.getVTLGenerator();
-    const modelIndexFields = type.fields!.filter((field) => field.directives?.some((it) => it.name.value === 'index')).map((it) => it.name.value);
+    const modelIndexFields = type
+      .fields!.filter((field) => field.directives?.some((it) => it.name.value === 'index'))
+      .map((it) => it.name.value);
     const requestConfig = {
       operation: 'GET',
       operationName: fieldName,
@@ -246,8 +251,14 @@ export abstract class ModelResourceGenerator {
         fieldName,
         resolverLogicalId,
         dataSource,
-        MappingTemplate.s3MappingTemplateFromString(vtlGenerator.generateGetRequestTemplate(requestConfig), `${typeName}.${fieldName}.req.vtl`),
-        MappingTemplate.s3MappingTemplateFromString(vtlGenerator.generateGetResponseTemplate(responseConfig), `${typeName}.${fieldName}.res.vtl`),
+        MappingTemplate.s3MappingTemplateFromString(
+          vtlGenerator.generateGetRequestTemplate(requestConfig),
+          `${typeName}.${fieldName}.req.vtl`,
+        ),
+        MappingTemplate.s3MappingTemplateFromString(
+          vtlGenerator.generateGetResponseTemplate(responseConfig),
+          `${typeName}.${fieldName}.res.vtl`,
+        ),
       );
     }
     return this.resolverMap[resolverKey];
@@ -280,7 +291,10 @@ export abstract class ModelResourceGenerator {
         fieldName,
         resolverLogicalId,
         dataSource,
-        MappingTemplate.s3MappingTemplateFromString(vtlGenerator.generateListRequestTemplate(requestConfig), `${typeName}.${fieldName}.req.vtl`),
+        MappingTemplate.s3MappingTemplateFromString(
+          vtlGenerator.generateListRequestTemplate(requestConfig),
+          `${typeName}.${fieldName}.req.vtl`,
+        ),
         MappingTemplate.s3MappingTemplateFromString(
           vtlGenerator.generateDefaultResponseMappingTemplate(responseConfig),
           `${typeName}.${fieldName}.res.vtl`,
@@ -301,7 +315,9 @@ export abstract class ModelResourceGenerator {
     const dataSource = this.datasourceMap[type.name.value];
     const resolverKey = `Create${generateResolverKey(typeName, fieldName)}`;
     const vtlGenerator = this.getVTLGenerator();
-    const modelIndexFields = type.fields!.filter((field) => field.directives?.some((it) => it.name.value === 'index')).map((it) => it.name.value);
+    const modelIndexFields = type
+      .fields!.filter((field) => field.directives?.some((it) => it.name.value === 'index'))
+      .map((it) => it.name.value);
     const requestConfig = {
       operation: 'CREATE',
       operationName: fieldName,
@@ -321,7 +337,10 @@ export abstract class ModelResourceGenerator {
         fieldName,
         resolverLogicalId,
         dataSource,
-        MappingTemplate.s3MappingTemplateFromString(vtlGenerator.generateCreateRequestTemplate(requestConfig), `${typeName}.${fieldName}.req.vtl`),
+        MappingTemplate.s3MappingTemplateFromString(
+          vtlGenerator.generateCreateRequestTemplate(requestConfig),
+          `${typeName}.${fieldName}.req.vtl`,
+        ),
         MappingTemplate.s3MappingTemplateFromString(
           vtlGenerator.generateDefaultResponseMappingTemplate(responseConfig),
           `${typeName}.${fieldName}.res.vtl`,
@@ -357,7 +376,9 @@ export abstract class ModelResourceGenerator {
     const dataSource = this.datasourceMap[type.name.value];
     const resolverKey = `Update${generateResolverKey(typeName, fieldName)}`;
     const vtlGenerator = this.getVTLGenerator();
-    const modelIndexFields = type.fields!.filter((field) => field.directives?.some((it) => it.name.value === 'index')).map((it) => it.name.value);
+    const modelIndexFields = type
+      .fields!.filter((field) => field.directives?.some((it) => it.name.value === 'index'))
+      .map((it) => it.name.value);
     const requestConfig = {
       operation: 'UPDATE',
       operationName: fieldName,
@@ -416,7 +437,9 @@ export abstract class ModelResourceGenerator {
     const dataSource = this.datasourceMap[type.name.value];
     const resolverKey = `delete${generateResolverKey(typeName, fieldName)}`;
     const vtlGenerator = this.getVTLGenerator();
-    const modelIndexFields = type.fields!.filter((field) => field.directives?.some((it) => it.name.value === 'index')).map((it) => it.name.value);
+    const modelIndexFields = type
+      .fields!.filter((field) => field.directives?.some((it) => it.name.value === 'index'))
+      .map((it) => it.name.value);
     const requestConfig = {
       operation: 'DELETE',
       operationName: fieldName,
@@ -437,7 +460,10 @@ export abstract class ModelResourceGenerator {
         fieldName,
         resolverLogicalId,
         dataSource,
-        MappingTemplate.s3MappingTemplateFromString(vtlGenerator.generateDeleteRequestTemplate(requestConfig), `${typeName}.${fieldName}.req.vtl`),
+        MappingTemplate.s3MappingTemplateFromString(
+          vtlGenerator.generateDeleteRequestTemplate(requestConfig),
+          `${typeName}.${fieldName}.req.vtl`,
+        ),
         MappingTemplate.s3MappingTemplateFromString(
           vtlGenerator.generateDefaultResponseMappingTemplate(responseConfig),
           `${typeName}.${fieldName}.res.vtl`,
@@ -461,7 +487,10 @@ export abstract class ModelResourceGenerator {
         fieldName,
         resolverLogicalId,
         MappingTemplate.s3MappingTemplateFromString(vtlGenerator.generateSubscriptionRequestTemplate(), `${typeName}.${fieldName}.req.vtl`),
-        MappingTemplate.s3MappingTemplateFromString(vtlGenerator.generateSubscriptionResponseTemplate(), `${typeName}.${fieldName}.res.vtl`),
+        MappingTemplate.s3MappingTemplateFromString(
+          vtlGenerator.generateSubscriptionResponseTemplate(),
+          `${typeName}.${fieldName}.res.vtl`,
+        ),
       );
     }
     return this.resolverMap[resolverKey];
@@ -481,7 +510,10 @@ export abstract class ModelResourceGenerator {
         fieldName,
         resolverLogicalId,
         MappingTemplate.s3MappingTemplateFromString(vtlGenerator.generateSubscriptionRequestTemplate(), `${typeName}.${fieldName}.req.vtl`),
-        MappingTemplate.s3MappingTemplateFromString(vtlGenerator.generateSubscriptionResponseTemplate(), `${typeName}.${fieldName}.res.vtl`),
+        MappingTemplate.s3MappingTemplateFromString(
+          vtlGenerator.generateSubscriptionResponseTemplate(),
+          `${typeName}.${fieldName}.res.vtl`,
+        ),
       );
     }
     return this.resolverMap[resolverKey];
@@ -501,7 +533,10 @@ export abstract class ModelResourceGenerator {
         fieldName,
         resolverLogicalId,
         MappingTemplate.s3MappingTemplateFromString(vtlGenerator.generateSubscriptionRequestTemplate(), `${typeName}.${fieldName}.req.vtl`),
-        MappingTemplate.s3MappingTemplateFromString(vtlGenerator.generateSubscriptionResponseTemplate(), `${typeName}.${fieldName}.res.vtl`),
+        MappingTemplate.s3MappingTemplateFromString(
+          vtlGenerator.generateSubscriptionResponseTemplate(),
+          `${typeName}.${fieldName}.res.vtl`,
+        ),
       );
     }
     return this.resolverMap[resolverKey];
@@ -535,7 +570,10 @@ export abstract class ModelResourceGenerator {
         fieldName,
         resolverLogicalId,
         dataSource,
-        MappingTemplate.s3MappingTemplateFromString(vtlGenerator.generateSyncRequestTemplate(requestConfig), `${typeName}.${fieldName}.req.vtl`),
+        MappingTemplate.s3MappingTemplateFromString(
+          vtlGenerator.generateSyncRequestTemplate(requestConfig),
+          `${typeName}.${fieldName}.req.vtl`,
+        ),
         MappingTemplate.s3MappingTemplateFromString(
           vtlGenerator.generateDefaultResponseMappingTemplate(responseConfig),
           `${typeName}.${fieldName}.res.vtl`,