get or create cdk handler to force singleton cdk handler and migration

Signed-off-by: Francis <colifran@amazon.com>

packages/@aws-cdk/custom-resource-handlers/lib/handler-framework/classes.ts

@@ -1,5 +1,5 @@
 /* eslint-disable import/no-extraneous-dependencies */
-import { ClassType, stmt, expr, Type, ExternalModule, PropertySpec, InterfaceSpec, InterfaceType } from '@cdklabs/typewriter';
+import { ClassType, stmt, expr, Type, MemberVisibility, ExternalModule, PropertySpec, InterfaceSpec, InterfaceType } from '@cdklabs/typewriter';
 import { CdkHandlerFrameworkConstructor } from './constructors';
 import { CdkHandlerFrameworkModule } from './framework';
 import { CDK_HANDLER_MODULE, CONSTRUCTS_MODULE, LAMBDA_MODULE, CORE_MODULE } from './modules';
@@ -73,7 +73,7 @@ export abstract class CdkHandlerFrameworkClass extends ClassType {
       public readonly compatibleRuntimes: FrameworkRuntime[];
       public readonly constructorPropsType = LAMBDA_MODULE.FunctionOptions;
 
-      protected readonly externalModules = [CONSTRUCTS_MODULE, LAMBDA_MODULE, CDK_HANDLER_MODULE];
+      protected readonly externalModules = [CONSTRUCTS_MODULE, CORE_MODULE, LAMBDA_MODULE, CDK_HANDLER_MODULE];
 
       public constructor() {
         super(scope, {
@@ -86,6 +86,7 @@ export abstract class CdkHandlerFrameworkClass extends ClassType {
         this.compatibleRuntimes = props.compatibleRuntimes;
 
         this.externalModules.forEach(module => scope.addExternalModule(module));
+        this.buildGetOrCreateCdkHandler();
 
         CdkHandlerFrameworkConstructor.forCdkFunction(this);
       }
@@ -102,7 +103,7 @@ export abstract class CdkHandlerFrameworkClass extends ClassType {
       public readonly compatibleRuntimes: FrameworkRuntime[];
       public readonly constructorPropsType: Type;
 
-      protected readonly externalModules = [CONSTRUCTS_MODULE, LAMBDA_MODULE, CDK_HANDLER_MODULE];
+      protected readonly externalModules = [CONSTRUCTS_MODULE, CORE_MODULE, LAMBDA_MODULE, CDK_HANDLER_MODULE];
 
       public constructor() {
         super(scope, {
@@ -115,6 +116,7 @@ export abstract class CdkHandlerFrameworkClass extends ClassType {
         this.compatibleRuntimes = props.compatibleRuntimes;
 
         this.externalModules.forEach(module => scope.addExternalModule(module));
+        this.buildGetOrCreateCdkHandler();
 
         const uuid: PropertySpec = {
           name: 'uuid',
@@ -159,7 +161,7 @@ export abstract class CdkHandlerFrameworkClass extends ClassType {
       public readonly compatibleRuntimes: FrameworkRuntime[];
       public readonly constructorPropsType = CORE_MODULE.CustomResourceProviderOptions;
 
-      protected readonly externalModules = [CONSTRUCTS_MODULE, CORE_MODULE, CDK_HANDLER_MODULE];
+      protected readonly externalModules = [CONSTRUCTS_MODULE, CORE_MODULE, LAMBDA_MODULE, CDK_HANDLER_MODULE];
 
       public constructor() {
         super(scope, {
@@ -172,6 +174,7 @@ export abstract class CdkHandlerFrameworkClass extends ClassType {
         this.compatibleRuntimes = props.compatibleRuntimes;
 
         this.externalModules.forEach(module => scope.addExternalModule(module));
+        this.buildGetOrCreateCdkHandler();
 
         const getOrCreateMethod = this.addMethod({
           name: 'getOrCreate',
@@ -221,7 +224,7 @@ export abstract class CdkHandlerFrameworkClass extends ClassType {
           stmt.constVar(expr.ident('id'), expr.directCode('`${uniqueid}CustomResourceProvider`')),
           stmt.constVar(expr.ident('stack'), expr.directCode('cdk.Stack.of(scope)')),
           stmt.constVar(expr.ident('existing'), expr.directCode(`stack.node.tryFindChild(id) as ${this.type}`)),
-          stmt.ret(expr.directCode(`existing ?? new ${this.name}(scope, id, props)`)),
+          stmt.ret(expr.directCode(`existing ?? new ${this.name}(stack, id, props)`)),
         );
 
         CdkHandlerFrameworkConstructor.forCdkCustomResourceProvider(this);
@@ -265,4 +268,46 @@ export abstract class CdkHandlerFrameworkClass extends ClassType {
     scope.registerInterface(_interface);
     return _interface;
   }
+
+  private buildGetOrCreateCdkHandler() {
+    const getOrCreateCdkHandler = this.addMethod({
+      name: 'getOrCreateCdkHandler',
+      returnType: CDK_HANDLER_MODULE.CdkHandler,
+      static: true,
+      visibility: MemberVisibility.Private,
+    });
+
+    getOrCreateCdkHandler.addParameter({
+      name: 'scope',
+      type: CONSTRUCTS_MODULE.Construct,
+    });
+    getOrCreateCdkHandler.addParameter({
+      name: 'uniqueid',
+      type: Type.STRING,
+    });
+
+    getOrCreateCdkHandler.addBody(
+      stmt.constVar(
+        expr.ident('id'),
+        expr.directCode('`${uniqueid}Handler`'),
+      ),
+      stmt.constVar(
+        expr.ident('stack'),
+        expr.directCode('cdk.Stack.of(scope)'),
+      ),
+      stmt.constVar(
+        expr.ident('existing'),
+        expr.directCode('stack.node.tryFindChild(id) as handler.CdkHandler'),
+      ),
+      stmt.if_(expr.ident('existing')).then(stmt.ret(expr.ident('existing'))),
+      stmt.constVar(
+        expr.directCode('cdkHandlerProps: handler.CdkHandlerProps'),
+        expr.object({
+          codeDirectory: expr.directCode(`path.join(__dirname, '${this.codeDirectory}')`),
+          compatibleRuntimes: expr.directCode(`[${this.compatibleRuntimes }]`),
+        }),
+      ),
+      stmt.ret(expr.directCode('new handler.CdkHandler(stack, id, cdkHandlerProps)')),
+    );
+  }
 }

packages/@aws-cdk/custom-resource-handlers/lib/handler-framework/config.ts

@@ -73,6 +73,7 @@ export const config: HandlerFrameworkConfig = {
         name: 'CertificateRequestFunction',
         sourceCode: path.resolve(__dirname, '..', 'aws-certificatemanager', 'dns-validated-certificate-handler', 'index.js'),
         compatibleRuntimes: [FrameworkRuntime.NODEJS_18_X],
+        entrypoint: 'index.certificateRequestHandler',
       },
     ],
   },

packages/@aws-cdk/custom-resource-handlers/lib/handler-framework/constructors.ts

@@ -30,7 +30,7 @@ export class CdkHandlerFrameworkConstructor {
   public static forCdkCustomResourceProvider(_class: CdkHandlerFrameworkClass) {
     const superProps = new ObjectLiteral([
       new Splat(expr.ident('props')),
-      ['codeDirectory', expr.lit(_class.codeDirectory)],
+      ['codeDirectory', expr.directCode(`path.join(__dirname, '${_class.codeDirectory}')`)],
       ['runtimeName', expr.directCode('cdkHandler.runtime.name')],
     ]);
     CdkHandlerFrameworkConstructor.forClass(_class, superProps);
@@ -52,20 +52,11 @@ export class CdkHandlerFrameworkConstructor {
       type: _class.constructorPropsType,
     });
 
-    // build CdkHandler instance
-    init.addBody(
-      stmt.constVar(
-        expr.directCode('cdkHandlerProps: handler.CdkHandlerProps'),
-        expr.object({
-          codeDirectory: expr.lit(_class.codeDirectory),
-          compatibleRuntimes: expr.directCode(`[${ _class.compatibleRuntimes }]`),
-        }),
-      ),
-    );
+    // get or create cdk handler
     init.addBody(
       stmt.constVar(
         expr.ident('cdkHandler'),
-        expr.directCode("new handler.CdkHandler(scope, 'Handler', cdkHandlerProps)"),
+        expr.directCode(`${_class.name}.getOrCreateCdkHandler(scope, id)`),
       ),
     );
 

packages/@aws-cdk/custom-resource-handlers/lib/handler-framework/framework.ts

@@ -3,7 +3,7 @@ import { ExternalModule, InterfaceType, Module, TypeScriptRenderer } from '@cdkl
 import * as fs from 'fs-extra';
 import { CdkHandlerClassProps, CdkHandlerFrameworkClass } from './classes';
 import { ComponentType, ConfigProps } from './config';
-import { CDK_HANDLER_MODULE, CONSTRUCTS_MODULE, CORE_MODULE, LAMBDA_MODULE } from './modules';
+import { CDK_HANDLER_MODULE, CONSTRUCTS_MODULE, CORE_MODULE, LAMBDA_MODULE, PATH_MODULE } from './modules';
 
 export class CdkHandlerFrameworkModule extends Module {
   private readonly renderer = new TypeScriptRenderer();
@@ -75,6 +75,7 @@ export class CdkHandlerFrameworkModule extends Module {
   }
 
   private importExternalModules() {
+    PATH_MODULE.import(this, 'path');
     for (const fqn of this.externalModules.keys()) {
       switch (fqn) {
         case CONSTRUCTS_MODULE.fqn: {

packages/@aws-cdk/custom-resource-handlers/lib/handler-framework/modules.ts

@@ -1,6 +1,12 @@
 /* eslint-disable import/no-extraneous-dependencies */
 import { ExternalModule, Type } from '@cdklabs/typewriter';
 
+class PathModule extends ExternalModule {
+  public constructor() {
+    super('path');
+  }
+}
+
 class ConstructsModule extends ExternalModule {
   public readonly Construct = Type.fromName(this, 'Construct');
   public readonly IConstruct = Type.fromName(this, 'IConstruct');
@@ -38,6 +44,7 @@ class LambdaModule extends ExternalModule {
   }
 }
 
+export const PATH_MODULE = new PathModule();
 export const CONSTRUCTS_MODULE = new ConstructsModule();
 export const CDK_HANDLER_MODULE = new CdkHandlerModule();
 export const CORE_MODULE = new CoreModule();

packages/@aws-cdk/custom-resource-handlers/scripts/generate.ts

@@ -19,7 +19,7 @@ async function main() {
         await bundleAndMinify(component.sourceCode, outfile);
       }
       const sourceCodeDirectory = path.dirname(outfile).split('/').pop();
-      module.build(component, `./${sourceCodeDirectory}`);
+      module.build(component, `${sourceCodeDirectory}`);
     }
     module.render(renderLocation);
   }

packages/aws-cdk-lib/aws-certificatemanager/lib/dns-validated-certificate.ts

@@ -1,12 +1,11 @@
-import * as path from 'path';
 import { Construct } from 'constructs';
 import { CertificateProps, ICertificate } from './certificate';
 import { CertificateBase } from './certificate-base';
 import * as iam from '../../aws-iam';
-import * as lambda from '../../aws-lambda';
 import * as route53 from '../../aws-route53';
 import * as cdk from '../../core';
 import { Token } from '../../core';
+import { CertificateRequestFunction } from '../../custom-resource-handlers/dist/aws-certificatemanager/certificate-request-provider.generated';
 
 /**
  * Properties to create a DNS validated certificate managed by AWS Certificate Manager
@@ -106,10 +105,7 @@ export class DnsValidatedCertificate extends CertificateBase implements ICertifi
       certificateTransparencyLoggingPreference = props.transparencyLoggingEnabled ? 'ENABLED' : 'DISABLED';
     }
 
-    const requestorFunction = new lambda.Function(this, 'CertificateRequestorFunction', {
-      code: lambda.Code.fromAsset(path.resolve(__dirname, '..', '..', 'custom-resource-handlers', 'dist', 'aws-certificatemanager', 'dns-validated-certificate-handler')),
-      handler: 'index.certificateRequestHandler',
-      runtime: lambda.Runtime.NODEJS_18_X,
+    const requestorFunction = new CertificateRequestFunction(this, 'CertificateRequestorFunction', {
       timeout: cdk.Duration.minutes(15),
       role: props.customResourceRole,
     });

packages/aws-cdk-lib/aws-cloudfront/lib/experimental/edge-function.ts

@@ -1,4 +1,3 @@
-import * as path from 'path';
 import { Construct, Node } from 'constructs';
 import * as cloudwatch from '../../../aws-cloudwatch';
 import * as ec2 from '../../../aws-ec2';
@@ -8,14 +7,13 @@ import * as ssm from '../../../aws-ssm';
 import {
   CfnResource,
   CustomResource,
-  CustomResourceProvider,
-  CustomResourceProviderRuntime,
   Lazy,
   Resource,
   Stack,
   Stage,
   Token,
 } from '../../../core';
+import { CrossRegionStringParamReaderProvider } from '../../../custom-resource-handlers/dist/aws-cloudfront/cross-region-string-param-reader-provider.generated';
 
 /**
  * Properties for creating a Lambda@Edge function
@@ -199,9 +197,7 @@ export class EdgeFunction extends Resource implements lambda.IVersion {
     });
 
     const resourceType = 'Custom::CrossRegionStringParameterReader';
-    const serviceToken = CustomResourceProvider.getOrCreate(this, resourceType, {
-      codeDirectory: path.join(__dirname, '..', '..', '..', 'custom-resource-handlers', 'dist', 'aws-cloudfront', 'edge-function'),
-      runtime: CustomResourceProviderRuntime.NODEJS_18_X,
+    const serviceToken = CrossRegionStringParamReaderProvider.getOrCreate(this, resourceType, {
       policyStatements: [{
         Effect: 'Allow',
         Resource: parameterArnPrefix,

packages/aws-cdk-lib/aws-ecs/lib/drain-hook/instance-drain-hook.ts

@@ -1,12 +1,10 @@
-import * as fs from 'fs';
-import * as path from 'path';
 import { Construct } from 'constructs';
 import * as autoscaling from '../../../aws-autoscaling';
 import * as hooks from '../../../aws-autoscaling-hooktargets';
 import * as iam from '../../../aws-iam';
 import * as kms from '../../../aws-kms';
-import * as lambda from '../../../aws-lambda';
 import * as cdk from '../../../core';
+import { DrainHookFunction } from '../../../custom-resource-handlers/dist/aws-ecs/drain-hook-provider.generated';
 import { ICluster } from '../cluster';
 
 // Reference for the source in this package:
@@ -60,10 +58,7 @@ export class InstanceDrainHook extends Construct {
     const drainTime = props.drainTime || cdk.Duration.minutes(5);
 
     // Invoke Lambda via SNS Topic
-    const fn = new lambda.Function(this, 'Function', {
-      code: lambda.Code.fromInline(fs.readFileSync(path.join(__dirname, '..', '..', '..', 'custom-resource-handlers', 'dist', 'aws-ecs', 'lambda-source', 'index.py'), { encoding: 'utf-8' })),
-      handler: 'index.lambda_handler',
-      runtime: lambda.Runtime.PYTHON_3_9,
+    const fn = new DrainHookFunction(this, 'Function', {
       // Timeout: some extra margin for additional API calls made by the Lambda,
       // up to a maximum of 15 minutes.
       timeout: cdk.Duration.seconds(Math.min(drainTime.toSeconds() + 10, 900)),

packages/aws-cdk-lib/aws-events-targets/lib/aws-api.ts

@@ -1,10 +1,10 @@
-import * as path from 'path';
 import { metadata } from './sdk-api-metadata.generated';
 import { addLambdaPermission } from './util';
 import * as events from '../../aws-events';
 import * as iam from '../../aws-iam';
 import * as lambda from '../../aws-lambda';
 import { Annotations, Duration } from '../../core';
+import { AwsApiFunction } from '../../custom-resource-handlers/dist/aws-events-targets/aws-api-provider.generated';
 
 /**
  * AWS SDK service metadata.
@@ -81,12 +81,9 @@ export class AwsApi implements events.IRuleTarget {
    * result from an EventBridge event.
    */
   public bind(rule: events.IRule, id?: string): events.RuleTargetConfig {
-    const handler = new lambda.SingletonFunction(rule as events.Rule, `${rule.node.id}${id}Handler`, {
-      code: lambda.Code.fromAsset(path.join(__dirname, '..', '..', 'custom-resource-handlers', 'dist', 'aws-events-targets', 'aws-api-handler')),
-      runtime: lambda.Runtime.NODEJS_18_X,
+    const handler = new AwsApiFunction(rule as events.Rule, `${rule.node.id}${id}Handler`, {
       timeout: Duration.seconds(60),
       memorySize: 256,
-      handler: 'index.handler',
       uuid: 'b4cf1abd-4e4f-4bc6-9944-1af7ccd9ec37',
       lambdaPurpose: 'AWS',
     });