@aws-amplify/graphql-model-transformer 1.5.0-rds.0 → 2.1.0

package/src/graphql-types/mutation.ts

@@ -1,6 +1,6 @@
 import { TransformerTransformSchemaStepContextProvider } from '@aws-amplify/graphql-transformer-interfaces';
 import { DocumentNode, InputObjectTypeDefinitionNode, ObjectTypeDefinitionNode } from 'graphql';
-import { ModelResourceIDs, getBaseType, toPascalCase } from 'graphql-transformer-common';
+import { ModelResourceIDs, toPascalCase } from 'graphql-transformer-common';
 import { InputFieldWrapper, InputObjectDefinitionWrapper, ObjectDefinitionWrapper } from '@aws-amplify/graphql-transformer-core';
 import { ModelDirectiveConfiguration } from '../directive';
 import { makeConditionFilterInput } from './common';
@@ -104,15 +104,7 @@ export const makeCreateInputField = (
   const typeName = objectWrapped.name;
   const name = ModelResourceIDs.ModelCreateInputObjectName(typeName);
 
-  const idFieldName = 'id';
-  const hasIdField = objectWrapped.hasField(idFieldName);
-  let shouldAutogenerateIdField = false;
-  if (hasIdField) {
-    const idField = objectWrapped.getField(idFieldName);
-    const idBaseType = getBaseType(idField.type);
-    shouldAutogenerateIdField = idBaseType === 'ID' || idBaseType === 'String';
-  }
-
+  const hasIdField = objectWrapped.hasField('id');
   const fieldsToRemove = objectWrapped
     .fields!.filter((field) => {
       if (knownModelTypes.has(field.getTypeName())) {
@@ -134,7 +126,7 @@ export const makeCreateInputField = (
     input.addField(InputFieldWrapper.create('id', 'ID', true));
   } else {
     const idField = input.fields.find((f) => f.name === 'id');
-    if (idField && shouldAutogenerateIdField) {
+    if (idField) {
       idField.makeNullable();
     }
   }

package/src/resolvers/generators/dynamodb-vtl-generator.ts

@@ -1,4 +1,3 @@
-import { TransformerContextProvider } from '@aws-amplify/graphql-transformer-interfaces';
 import {
   generateUpdateRequestTemplate,
   generateCreateRequestTemplate,
@@ -23,19 +22,18 @@ import {
 } from './vtl-generator';
 
 export class DynamoDBModelVTLGenerator implements ModelVTLGenerator {
-  generateUpdateRequestTemplate(config: ModelUpdateRequestConfig, ctx: TransformerContextProvider): string {
+  generateUpdateRequestTemplate(config: ModelUpdateRequestConfig): string {
     return generateUpdateRequestTemplate(config.modelName, config.isSyncEnabled);
   }
 
-  generateCreateRequestTemplate(config: ModelCreateRequestConfig, ctx: TransformerContextProvider): string {
+  generateCreateRequestTemplate(config: ModelCreateRequestConfig): string {
     return generateCreateRequestTemplate(config.modelName, config.modelIndexFields);
   }
-
   generateCreateInitSlotTemplate(config: ModelCreateInitSlotConfig, initializeIdField: boolean): string {
     return generateCreateInitSlotTemplate(config.modelConfig, initializeIdField);
   }
 
-  generateDeleteRequestTemplate(config: ModelUpdateRequestConfig, ctx: TransformerContextProvider): string {
+  generateDeleteRequestTemplate(config: ModelUpdateRequestConfig): string {
     return generateDeleteRequestTemplate(config.modelName, config.isSyncEnabled);
   }
 
@@ -43,7 +41,7 @@ export class DynamoDBModelVTLGenerator implements ModelVTLGenerator {
     return generateUpdateInitSlotTemplate(config.modelConfig);
   }
 
-  generateGetRequestTemplate(config: ModelRequestConfig, ctx: TransformerContextProvider): string {
+  generateGetRequestTemplate(config: ModelRequestConfig): string {
     return generateGetRequestTemplate();
   }
 
@@ -51,7 +49,7 @@ export class DynamoDBModelVTLGenerator implements ModelVTLGenerator {
     return generateGetResponseTemplate(config.isSyncEnabled);
   }
 
-  generateListRequestTemplate(config: ModelRequestConfig, ctx: TransformerContextProvider): string {
+  generateListRequestTemplate(config: ModelRequestConfig): string {
     return generateListRequestTemplate();
   }
 

package/src/resolvers/generators/rds-vtl-generator.ts

@@ -18,40 +18,38 @@ import {
   ModelUpdateRequestConfig,
   ModelVTLGenerator,
 } from './vtl-generator';
-import { TransformerContextProvider } from '@aws-amplify/graphql-transformer-interfaces';
 
 // TODO: This class is created only to show the class structure. This needs a revisit to generate correct resolvers for RDS.
 export class RDSModelVTLGenerator implements ModelVTLGenerator {
-  generateUpdateRequestTemplate(config: ModelUpdateRequestConfig, ctx: TransformerContextProvider): string {
-    return generateLambdaUpdateRequestTemplate(config.modelName, config.operationName, config.modelIndexFields ?? ['id'], ctx);
+  generateUpdateRequestTemplate(config: ModelUpdateRequestConfig): string {
+    return generateLambdaUpdateRequestTemplate(config.modelName, config.operationName, config.modelIndexFields ?? ['id']);
   }
 
-  generateCreateRequestTemplate(config: ModelCreateRequestConfig, ctx: TransformerContextProvider): string {
-    return generateLambdaCreateRequestTemplate(config.modelName, config.operationName, ctx);
+  generateCreateRequestTemplate(config: ModelCreateRequestConfig): string {
+    return generateLambdaCreateRequestTemplate(config.modelName, config.operationName);
   }
-
   generateCreateInitSlotTemplate(config: ModelCreateInitSlotConfig, initializeIdField: boolean): string {
     return generateCreateInitSlotTemplate(config.modelConfig, initializeIdField);
   }
 
-  generateDeleteRequestTemplate(config: ModelUpdateRequestConfig, ctx: TransformerContextProvider): string {
-    return generateLambdaDeleteRequestTemplate(config.modelName, config.operationName, config.modelIndexFields ?? ['id'], ctx);
+  generateDeleteRequestTemplate(config: ModelUpdateRequestConfig): string {
+    return generateLambdaDeleteRequestTemplate(config.modelName, config.operationName, config.modelIndexFields ?? ['id']);
   }
 
   generateUpdateInitSlotTemplate(config: ModelCreateInitSlotConfig): string {
     return generateUpdateInitSlotTemplate(config.modelConfig);
   }
 
-  generateGetRequestTemplate(config: ModelRequestConfig, ctx: TransformerContextProvider): string {
-    return generateLambdaRequestTemplate(config.modelName, config.operation, config.operationName, ctx);
+  generateGetRequestTemplate(config: ModelRequestConfig): string {
+    return generateLambdaRequestTemplate(config.modelName, config.operation, config.operationName);
   }
 
   generateGetResponseTemplate(config: ModelUpdateRequestConfig): string {
     return generateGetLambdaResponseTemplate(false);
   }
 
-  generateListRequestTemplate(config: ModelRequestConfig, ctx: TransformerContextProvider): string {
-    return generateLambdaListRequestTemplate(config.modelName, config.operation, config.operationName, ctx);
+  generateListRequestTemplate(config: ModelRequestConfig): string {
+    return generateLambdaListRequestTemplate(config.modelName, config.operation, config.operationName);
   }
 
   generateSyncRequestTemplate(config: ModelRequestConfig): string {

package/src/resolvers/generators/vtl-generator.ts

@@ -1,4 +1,3 @@
-import { TransformerContextProvider } from '@aws-amplify/graphql-transformer-interfaces';
 import { ModelDirectiveConfiguration } from '../../directive';
 
 export type ModelRequestConfig = {
@@ -32,14 +31,14 @@ export type ModelDefaultResponseConfig = ModelRequestConfig & {
 };
 
 export interface ModelVTLGenerator {
-  generateUpdateRequestTemplate(config: ModelUpdateRequestConfig, ctx: TransformerContextProvider): string;
-  generateCreateRequestTemplate(config: ModelCreateRequestConfig, ctx: TransformerContextProvider): string;
+  generateUpdateRequestTemplate(config: ModelUpdateRequestConfig): string;
+  generateCreateRequestTemplate(config: ModelCreateRequestConfig): string;
   generateCreateInitSlotTemplate(config: ModelCreateInitSlotConfig, initializeIdField: boolean): string;
-  generateDeleteRequestTemplate(config: ModelDeleteRequestConfig, ctx: TransformerContextProvider): string;
+  generateDeleteRequestTemplate(config: ModelDeleteRequestConfig): string;
   generateUpdateInitSlotTemplate(config: ModelUpdateInitSlotConfig): string;
-  generateGetRequestTemplate(config: ModelRequestConfig, ctx: TransformerContextProvider): string;
+  generateGetRequestTemplate(config: ModelRequestConfig): string;
   generateGetResponseTemplate(config: ModelGetResponseConfig): string;
-  generateListRequestTemplate(config: ModelRequestConfig, ctx: TransformerContextProvider): string;
+  generateListRequestTemplate(config: ModelRequestConfig): string;
   generateSyncRequestTemplate(config: ModelRequestConfig): string;
   generateSubscriptionRequestTemplate(): string;
   generateSubscriptionResponseTemplate(): string;

package/src/resolvers/rds/mutation.ts

@@ -12,9 +12,7 @@ import {
   str,
   toJson,
 } from 'graphql-mapping-template';
-import { TransformerContextProvider } from '@aws-amplify/graphql-transformer-interfaces';
 import { ModelDirectiveConfiguration } from '../../directive';
-import { constructNonScalarFieldsStatement } from './resolver';
 
 /**
  * Generate mapping template that sets default values for create mutation
@@ -55,7 +53,7 @@ export const generateCreateInitSlotTemplate = (modelConfig: ModelDirectiveConfig
   return printBlock('Initialization default values')(compoundExpression(statements));
 };
 
-export const generateLambdaCreateRequestTemplate = (tableName: string, operationName: string, ctx: TransformerContextProvider): string =>
+export const generateLambdaCreateRequestTemplate = (tableName: string, operationName: string): string =>
   printBlock('Invoke RDS Lambda data source')(
     compoundExpression([
       set(ref('lambdaInput'), obj({})),
@@ -65,7 +63,6 @@ export const generateLambdaCreateRequestTemplate = (tableName: string, operation
       set(ref('lambdaInput.operationName'), str(operationName)),
       set(ref('lambdaInput.args.metadata'), obj({})),
       set(ref('lambdaInput.args.metadata.keys'), list([])),
-      constructNonScalarFieldsStatement(tableName, ctx),
       qref(
         methodCall(ref('lambdaInput.args.metadata.keys.addAll'), methodCall(ref('util.defaultIfNull'), ref('ctx.stash.keys'), list([]))),
       ),
@@ -118,12 +115,7 @@ export const generateUpdateInitSlotTemplate = (modelConfig: ModelDirectiveConfig
 /**
  * Generate VTL template that calls the lambda for an Update mutation
  */
-export const generateLambdaUpdateRequestTemplate = (
-  tableName: string,
-  operationName: string,
-  modelIndexFields: string[],
-  ctx: TransformerContextProvider,
-): string =>
+export const generateLambdaUpdateRequestTemplate = (tableName: string, operationName: string, modelIndexFields: string[]): string =>
   printBlock('Invoke RDS Lambda data source')(
     compoundExpression([
       set(ref('lambdaInput'), obj({})),
@@ -133,7 +125,6 @@ export const generateLambdaUpdateRequestTemplate = (
       set(ref('lambdaInput.operationName'), str(operationName)),
       set(ref('lambdaInput.args.metadata'), obj({})),
       set(ref('lambdaInput.args.metadata.keys'), list([])),
-      constructNonScalarFieldsStatement(tableName, ctx),
       qref(
         methodCall(ref('lambdaInput.args.metadata.keys.addAll'), methodCall(ref('util.defaultIfNull'), ref('ctx.stash.keys'), list([]))),
       ),
@@ -155,12 +146,7 @@ export const generateLambdaUpdateRequestTemplate = (
 /**
  * Generate VTL template that calls the lambda for a Delete mutation
  */
-export const generateLambdaDeleteRequestTemplate = (
-  tableName: string,
-  operationName: string,
-  modelIndexFields: string[],
-  ctx: TransformerContextProvider,
-): string =>
+export const generateLambdaDeleteRequestTemplate = (tableName: string, operationName: string, modelIndexFields: string[]): string =>
   printBlock('Invoke RDS Lambda data source')(
     compoundExpression([
       set(ref('lambdaInput'), obj({})),
@@ -170,7 +156,6 @@ export const generateLambdaDeleteRequestTemplate = (
       set(ref('lambdaInput.operationName'), str(operationName)),
       set(ref('lambdaInput.args.metadata'), obj({})),
       set(ref('lambdaInput.args.metadata.keys'), list([])),
-      constructNonScalarFieldsStatement(tableName, ctx),
       qref(
         methodCall(ref('lambdaInput.args.metadata.keys.addAll'), methodCall(ref('util.defaultIfNull'), ref('ctx.stash.keys'), list([]))),
       ),

package/src/resolvers/rds/query.ts

@@ -1,13 +1,6 @@
-import { TransformerContextProvider } from '@aws-amplify/graphql-transformer-interfaces';
 import { compoundExpression, list, methodCall, obj, printBlock, qref, ref, set, str } from 'graphql-mapping-template';
-import { constructNonScalarFieldsStatement } from './resolver';
 
-export const generateLambdaListRequestTemplate = (
-  tableName: string,
-  operation: string,
-  operationName: string,
-  ctx: TransformerContextProvider,
-): string => {
+export const generateLambdaListRequestTemplate = (tableName: string, operation: string, operationName: string): string => {
   return printBlock('Invoke RDS Lambda data source')(
     compoundExpression([
       set(ref('lambdaInput'), obj({})),
@@ -17,7 +10,6 @@ export const generateLambdaListRequestTemplate = (
       set(ref('lambdaInput.operationName'), str(operationName)),
       set(ref('lambdaInput.args.metadata'), obj({})),
       set(ref('lambdaInput.args.metadata.keys'), list([])),
-      constructNonScalarFieldsStatement(tableName, ctx),
       qref(
         methodCall(ref('lambdaInput.args.metadata.keys.addAll'), methodCall(ref('util.defaultIfNull'), ref('ctx.stash.keys'), list([]))),
       ),

package/src/resolvers/rds/resolver.ts

@@ -1,4 +1,4 @@
-import { CfnMapping, Duration, Fn, Stack } from 'aws-cdk-lib';
+import { CfnMapping, Duration, Fn } from 'aws-cdk-lib';
 import {
   Expression,
   compoundExpression,
@@ -13,15 +13,14 @@ import {
   str,
   toJson,
 } from 'graphql-mapping-template';
-import { ResourceConstants, isArrayOrObject } from 'graphql-transformer-common';
-import { RDSConnectionSecrets } from '@aws-amplify/graphql-transformer-core';
-import { GraphQLAPIProvider, RDSLayerMapping, TransformerContextProvider } from '@aws-amplify/graphql-transformer-interfaces';
+import { ResourceConstants } from 'graphql-transformer-common';
+import { RDSConnectionSecrets, setResourceName } from '@aws-amplify/graphql-transformer-core';
+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';
 import { VpcConfig } from '@aws-amplify/graphql-transformer-interfaces/src';
-import { EnumTypeDefinitionNode, FieldDefinitionNode, Kind, ObjectTypeDefinitionNode } from 'graphql';
 
 /**
  * Define RDS Lambda operations
@@ -45,7 +44,6 @@ const getLatestLayers = (latestLayers?: RDSLayerMapping): RDSLayerMapping => {
   if (latestLayers && Object.keys(latestLayers).length > 0) {
     return latestLayers;
   }
-  console.warn('Unable to load the latest RDS layer configuration, using local configuration.');
   const defaultLayerMapping = getDefaultLayerMapping();
   return defaultLayerMapping;
 };
@@ -54,84 +52,84 @@ const getLatestLayers = (latestLayers?: RDSLayerMapping): RDSLayerMapping => {
 // 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:11',
+    layerRegion: 'arn:aws:lambda:ap-northeast-1:582037449441:layer:AmplifyRDSLayer:5',
   },
   'us-east-1': {
-    layerRegion: 'arn:aws:lambda:us-east-1:582037449441:layer:AmplifyRDSLayer:11',
+    layerRegion: 'arn:aws:lambda:us-east-1:582037449441:layer:AmplifyRDSLayer:5',
   },
   'ap-southeast-1': {
-    layerRegion: 'arn:aws:lambda:ap-southeast-1:582037449441:layer:AmplifyRDSLayer:11',
+    layerRegion: 'arn:aws:lambda:ap-southeast-1:582037449441:layer:AmplifyRDSLayer:5',
   },
   'eu-west-1': {
-    layerRegion: 'arn:aws:lambda:eu-west-1:582037449441:layer:AmplifyRDSLayer:11',
+    layerRegion: 'arn:aws:lambda:eu-west-1:582037449441:layer:AmplifyRDSLayer:5',
   },
   'us-west-1': {
-    layerRegion: 'arn:aws:lambda:us-west-1:582037449441:layer:AmplifyRDSLayer:11',
+    layerRegion: 'arn:aws:lambda:us-west-1:582037449441:layer:AmplifyRDSLayer:5',
   },
   'ap-east-1': {
-    layerRegion: 'arn:aws:lambda:ap-east-1:582037449441:layer:AmplifyRDSLayer:11',
+    layerRegion: 'arn:aws:lambda:ap-east-1:582037449441:layer:AmplifyRDSLayer:5',
   },
   'ap-northeast-2': {
-    layerRegion: 'arn:aws:lambda:ap-northeast-2:582037449441:layer:AmplifyRDSLayer:11',
+    layerRegion: 'arn:aws:lambda:ap-northeast-2:582037449441:layer:AmplifyRDSLayer:5',
   },
   'ap-northeast-3': {
-    layerRegion: 'arn:aws:lambda:ap-northeast-3:582037449441:layer:AmplifyRDSLayer:11',
+    layerRegion: 'arn:aws:lambda:ap-northeast-3:582037449441:layer:AmplifyRDSLayer:5',
   },
   'ap-south-1': {
-    layerRegion: 'arn:aws:lambda:ap-south-1:582037449441:layer:AmplifyRDSLayer:11',
+    layerRegion: 'arn:aws:lambda:ap-south-1:582037449441:layer:AmplifyRDSLayer:5',
   },
   'ap-southeast-2': {
-    layerRegion: 'arn:aws:lambda:ap-southeast-2:582037449441:layer:AmplifyRDSLayer:11',
+    layerRegion: 'arn:aws:lambda:ap-southeast-2:582037449441:layer:AmplifyRDSLayer:5',
   },
   'ca-central-1': {
-    layerRegion: 'arn:aws:lambda:ca-central-1:582037449441:layer:AmplifyRDSLayer:11',
+    layerRegion: 'arn:aws:lambda:ca-central-1:582037449441:layer:AmplifyRDSLayer:5',
   },
   'eu-central-1': {
-    layerRegion: 'arn:aws:lambda:eu-central-1:582037449441:layer:AmplifyRDSLayer:11',
+    layerRegion: 'arn:aws:lambda:eu-central-1:582037449441:layer:AmplifyRDSLayer:5',
   },
   'eu-north-1': {
-    layerRegion: 'arn:aws:lambda:eu-north-1:582037449441:layer:AmplifyRDSLayer:11',
+    layerRegion: 'arn:aws:lambda:eu-north-1:582037449441:layer:AmplifyRDSLayer:5',
   },
   'eu-west-2': {
-    layerRegion: 'arn:aws:lambda:eu-west-2:582037449441:layer:AmplifyRDSLayer:11',
+    layerRegion: 'arn:aws:lambda:eu-west-2:582037449441:layer:AmplifyRDSLayer:5',
   },
   'eu-west-3': {
-    layerRegion: 'arn:aws:lambda:eu-west-3:582037449441:layer:AmplifyRDSLayer:11',
+    layerRegion: 'arn:aws:lambda:eu-west-3:582037449441:layer:AmplifyRDSLayer:5',
   },
   'sa-east-1': {
-    layerRegion: 'arn:aws:lambda:sa-east-1:582037449441:layer:AmplifyRDSLayer:11',
+    layerRegion: 'arn:aws:lambda:sa-east-1:582037449441:layer:AmplifyRDSLayer:5',
   },
   'us-east-2': {
-    layerRegion: 'arn:aws:lambda:us-east-2:582037449441:layer:AmplifyRDSLayer:11',
+    layerRegion: 'arn:aws:lambda:us-east-2:582037449441:layer:AmplifyRDSLayer:5',
   },
   'us-west-2': {
-    layerRegion: 'arn:aws:lambda:us-west-2:582037449441:layer:AmplifyRDSLayer:11',
+    layerRegion: 'arn:aws:lambda:us-west-2:582037449441:layer:AmplifyRDSLayer:5',
   },
   'cn-north-1': {
-    layerRegion: 'arn:aws:lambda:cn-north-1:582037449441:layer:AmplifyRDSLayer:11',
+    layerRegion: 'arn:aws:lambda:cn-north-1:582037449441:layer:AmplifyRDSLayer:5',
   },
   'cn-northwest-1': {
-    layerRegion: 'arn:aws:lambda:cn-northwest-1:582037449441:layer:AmplifyRDSLayer:11',
+    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:11',
+    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:11',
+    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:11',
+    layerRegion: 'arn:aws:lambda:me-south-1:582037449441:layer:AmplifyRDSLayer:5',
   },
 });
 
 /**
  * Create RDS Lambda function
- * @param stack Construct
+ * @param scope Construct
  * @param apiGraphql GraphQLAPIProvider
  * @param lambdaRole IRole
  */
 export const createRdsLambda = (
-  stack: Stack,
+  scope: Construct,
   apiGraphql: GraphQLAPIProvider,
   lambdaRole: IRole,
   environment?: { [key: string]: string },
@@ -146,7 +144,7 @@ export const createRdsLambda = (
     Runtime.NODEJS_18_X,
     [
       LayerVersion.fromLayerVersionArn(
-        stack,
+        scope,
         'SQLLambdaLayerVersion',
         Fn.findInMap(RDSLayerMappingID, Fn.ref('AWS::Region'), 'layerRegion'),
       ),
@@ -154,19 +152,19 @@ export const createRdsLambda = (
     lambdaRole,
     environment,
     Duration.seconds(30),
-    stack,
+    scope,
     sqlLambdaVpcConfig,
   );
 };
 
 /**
  * Create RDS Patching Lambda function
- * @param stack Construct
+ * @param scope Construct
  * @param apiGraphql GraphQLAPIProvider
  * @param lambdaRole IRole
  */
 export const createRdsPatchingLambda = (
-  stack: Stack,
+  scope: Construct,
   apiGraphql: GraphQLAPIProvider,
   lambdaRole: IRole,
   environment?: { [key: string]: string },
@@ -183,7 +181,7 @@ export const createRdsPatchingLambda = (
     lambdaRole,
     environment,
     Duration.minutes(6), // We have an arbituary wait time of up to 5 minutes in the lambda function to avoid throttling errors
-    stack,
+    scope,
     sqlLambdaVpcConfig,
   );
 };
@@ -191,15 +189,16 @@ export const createRdsPatchingLambda = (
 /**
  * Create RDS Lambda IAM role
  * @param roleName string
- * @param stack Construct
+ * @param scope Construct
  * @param secretEntry RDSConnectionSecrets
  */
-export const createRdsLambdaRole = (roleName: string, stack: Construct, secretEntry: RDSConnectionSecrets): IRole => {
+export const createRdsLambdaRole = (roleName: string, scope: Construct, secretEntry: RDSConnectionSecrets): IRole => {
   const { RDSLambdaIAMRoleLogicalID, RDSLambdaLogAccessPolicy } = ResourceConstants.RESOURCES;
-  const role = new Role(stack, RDSLambdaIAMRoleLogicalID, {
+  const role = new Role(scope, RDSLambdaIAMRoleLogicalID, {
     assumedBy: new ServicePrincipal('lambda.amazonaws.com'),
     roleName,
   });
+  setResourceName(role, { name: RDSLambdaIAMRoleLogicalID, setOnDefaultChild: true });
   const policyStatements = [
     new PolicyStatement({
       actions: ['logs:CreateLogGroup', 'logs:CreateLogStream', 'logs:PutLogEvents'],
@@ -224,7 +223,7 @@ export const createRdsLambdaRole = (roleName: string, stack: Construct, secretEn
   }
 
   role.attachInlinePolicy(
-    new Policy(stack, RDSLambdaLogAccessPolicy, {
+    new Policy(scope, RDSLambdaLogAccessPolicy, {
       statements: policyStatements,
       policyName: `${roleName}Policy`,
     }),
@@ -244,15 +243,16 @@ export const createRdsLambdaRole = (roleName: string, stack: Construct, secretEn
 /**
  * Create RDS Patching Lambda IAM role
  * @param roleName string
- * @param stack Construct
+ * @param scope Construct
  * @param functionArn FunctionArn
  */
-export const createRdsPatchingLambdaRole = (roleName: string, stack: Construct, functionArn: string): IRole => {
+export const createRdsPatchingLambdaRole = (roleName: string, scope: Construct, functionArn: string): IRole => {
   const { RDSPatchingLambdaIAMRoleLogicalID, RDSPatchingLambdaLogAccessPolicy } = ResourceConstants.RESOURCES;
-  const role = new Role(stack, RDSPatchingLambdaIAMRoleLogicalID, {
+  const role = new Role(scope, RDSPatchingLambdaIAMRoleLogicalID, {
     assumedBy: new ServicePrincipal('lambda.amazonaws.com'),
     roleName,
   });
+  setResourceName(role, { name: RDSPatchingLambdaIAMRoleLogicalID, setOnDefaultChild: true });
   const policyStatements = [
     new PolicyStatement({
       actions: ['logs:CreateLogGroup', 'logs:CreateLogStream', 'logs:PutLogEvents'],
@@ -272,7 +272,7 @@ export const createRdsPatchingLambdaRole = (roleName: string, stack: Construct,
   ];
 
   role.attachInlinePolicy(
-    new Policy(stack, RDSPatchingLambdaLogAccessPolicy, {
+    new Policy(scope, RDSPatchingLambdaLogAccessPolicy, {
       statements: policyStatements,
       policyName: `${roleName}Policy`,
     }),
@@ -295,12 +295,7 @@ export const createRdsPatchingLambdaRole = (roleName: string, stack: Construct,
  * @param operation string
  * @param operationName string
  */
-export const generateLambdaRequestTemplate = (
-  tableName: string,
-  operation: string,
-  operationName: string,
-  ctx: TransformerContextProvider,
-): string =>
+export const generateLambdaRequestTemplate = (tableName: string, operation: string, operationName: string): string =>
   printBlock('Invoke RDS Lambda data source')(
     compoundExpression([
       set(ref('lambdaInput'), obj({})),
@@ -310,7 +305,6 @@ export const generateLambdaRequestTemplate = (
       set(ref('lambdaInput.operationName'), str(operationName)),
       set(ref('lambdaInput.args.metadata'), obj({})),
       set(ref('lambdaInput.args.metadata.keys'), list([])),
-      constructNonScalarFieldsStatement(tableName, ctx),
       qref(
         methodCall(ref('lambdaInput.args.metadata.keys.addAll'), methodCall(ref('util.defaultIfNull'), ref('ctx.stash.keys'), list([]))),
       ),
@@ -372,14 +366,3 @@ export const generateDefaultLambdaResponseMappingTemplate = (isSyncEnabled: bool
 
   return printBlock('ResponseTemplate')(compoundExpression(statements));
 };
-
-export const getNonScalarFields = (object: ObjectTypeDefinitionNode | undefined, ctx: TransformerContextProvider): string[] => {
-  if (!object) {
-    return [];
-  }
-  const enums = ctx.output.getTypeDefinitionsOfKind(Kind.ENUM_TYPE_DEFINITION) as EnumTypeDefinitionNode[];
-  return object.fields?.filter((f: FieldDefinitionNode) => isArrayOrObject(f.type, enums)).map((f) => f.name.value) || [];
-};
-
-export const constructNonScalarFieldsStatement = (tableName: string, ctx: TransformerContextProvider): Expression =>
-  set(ref('lambdaInput.args.metadata.nonScalarFields'), list(getNonScalarFields(ctx.output.getObject(tableName), ctx).map(str)));