@gradientedge/cdk-utils 4.6.7 → 4.7.0

package/dist/src/lib/construct/api-to-eventbridge-target/main.d.ts

@@ -95,6 +95,13 @@ export declare class ApiToEventBridgeTarget extends CommonConstruct {
     protected createApiDestinationRuleFailure(): void;
     protected createApiDestinedTopicRole(): void;
     protected createApiDestinedTopic(): void;
+    protected createApiDestinedIntegrationRequestParameters(): void;
+    protected createApiDestinedIntegrationRequestTemplates(): void;
+    protected createApiDestinedIntegrationResponse(): void;
+    protected createApiDestinedIntegrationErrorResponse(): void;
+    protected createApiDestinedIntegration(): void;
+    protected createApiDestinedMethodResponse(): void;
+    protected createApiDestinedMethodErrorResponse(): void;
     /**
      * @summary Method to create rest restApi for Api
      * @protected
@@ -103,13 +110,6 @@ export declare class ApiToEventBridgeTarget extends CommonConstruct {
     protected createApiDestinedResponseModel(): void;
     protected createApiDestinedErrorResponseModel(): void;
     protected createApiDestinedResource(): void;
-    protected createApiDestinedIntegrationRequestParameters(): void;
-    protected createApiDestinedIntegrationRequestTemplates(): void;
-    protected createApiDestinedIntegrationResponse(): void;
-    protected createApiDestinedIntegrationErrorResponse(): void;
-    protected createApiDestinedIntegration(): void;
-    protected createApiDestinedMethodResponse(): void;
-    protected createApiDestinedMethodErrorResponse(): void;
     protected createApiDestinedResourceMethod(): void;
     /**
      * @summary Method to create custom restApi domain for Api API

package/dist/src/lib/construct/api-to-eventbridge-target/main.js

@@ -25,7 +25,6 @@ const apig = __importStar(require("aws-cdk-lib/aws-apigateway"));
 const eventstargets = __importStar(require("aws-cdk-lib/aws-events-targets"));
 const iam = __importStar(require("aws-cdk-lib/aws-iam"));
 const destinations = __importStar(require("aws-cdk-lib/aws-lambda-destinations"));
-const sns = __importStar(require("aws-cdk-lib/aws-sns"));
 const common_1 = require("../../common");
 const api_destination_event_1 = require("./api-destination-event");
 const api_destined_lambda_1 = require("./api-destined-lambda");
@@ -96,15 +95,15 @@ class ApiToEventBridgeTarget extends common_1.CommonConstruct {
         /* restApi related resources */
         this.createApiDestinedTopicRole();
         this.createApiDestinedTopic();
-        this.createApiDestinedRestApi();
-        this.createApiDestinedResponseModel();
-        this.createApiDestinedErrorResponseModel();
-        this.createApiDestinedResource();
         this.createApiDestinedIntegrationRequestParameters();
         this.createApiDestinedIntegrationRequestTemplates();
         this.createApiDestinedIntegrationResponse();
         this.createApiDestinedIntegrationErrorResponse();
         this.createApiDestinedIntegration();
+        this.createApiDestinedRestApi();
+        this.createApiDestinedResource();
+        this.createApiDestinedResponseModel();
+        this.createApiDestinedErrorResponseModel();
         this.createApiDestinedMethodResponse();
         this.createApiDestinedMethodErrorResponse();
         this.createApiDestinedResourceMethod();
@@ -291,96 +290,18 @@ class ApiToEventBridgeTarget extends common_1.CommonConstruct {
         this.apiEvent.ruleFailure = this.eventManager.createRule(`${this.id}-api-destination-rule-failure`, this, this.props.event.ruleFailure, this.apiEvent.eventBus, [new eventstargets.CloudWatchLogGroup(this.apiEvent.logGroupFailure)]);
     }
     createApiDestinedTopicRole() {
-        if (this.props.api.useExisting)
-            return;
         this.apiDestinedRestApi.topicRole = new iam.Role(this, `${this.id}-sns-rest-api-role`, {
             assumedBy: new iam.ServicePrincipal('apigateway.amazonaws.com'),
         });
     }
     createApiDestinedTopic() {
-        if (this.props.api.useExisting) {
-            this.apiDestinedRestApi.topic = sns.Topic.fromTopicArn(this, `${this.id}-destined-topic`, `arn:aws:sns:${this.props.region}:${cdk.Stack.of(this).account}:${this.id}-destined-topic-${this.props.stage}`);
+        if (!this.props.api.withResource)
             return;
-        }
         this.apiDestinedRestApi.topic = this.snsManager.createLambdaNotificationService(`${this.id}-destined-topic`, this, {
             topicName: `${this.id}-destined-topic`,
         }, this.apiDestinedLambda.function);
         this.apiDestinedRestApi.topic.grantPublish(this.apiDestinedRestApi.topicRole);
     }
-    /**
-     * @summary Method to create rest restApi for Api
-     * @protected
-     */
-    createApiDestinedRestApi() {
-        if (this.props.api.useExisting) {
-            this.apiDestinedRestApi.api = apig.RestApi.fromRestApiId(this, `${this.id}-sns-rest-api`, cdk.Fn.importValue('importedRestApiRef'));
-            return;
-        }
-        this.apiDestinedRestApi.api = new apig.RestApi(this, `${this.id}-sns-rest-api`, {
-            ...{
-                deployOptions: {
-                    dataTraceEnabled: true,
-                    description: `${this.id} - ${this.props.stage} stage`,
-                    loggingLevel: apig.MethodLoggingLevel.INFO,
-                    metricsEnabled: true,
-                    stageName: this.props.stage,
-                },
-                endpointConfiguration: {
-                    types: [apig.EndpointType.REGIONAL],
-                },
-                defaultCorsPreflightOptions: {
-                    allowOrigins: apig.Cors.ALL_ORIGINS,
-                    allowMethods: ['POST'],
-                    allowHeaders: apig.Cors.DEFAULT_HEADERS,
-                },
-                restApiName: `${this.id}-destined-rest-api-${this.props.stage}`,
-            },
-            ...this.props.api,
-        });
-        this.addCfnOutput(`${this.id}-restApiId`, this.apiDestinedRestApi.api.restApiId);
-    }
-    createApiDestinedResponseModel() {
-        if (this.props.api.useExisting)
-            return;
-        this.apiDestinedRestApi.responseModel = this.apiDestinedRestApi.api.addModel(`${this.id}-response-model`, {
-            ...{
-                contentType: 'application/json',
-                modelName: 'ResponseModel',
-                schema: {
-                    schema: apig.JsonSchemaVersion.DRAFT4,
-                    title: 'pollResponse',
-                    type: apig.JsonSchemaType.OBJECT,
-                    properties: { message: { type: apig.JsonSchemaType.STRING } },
-                },
-            },
-            ...this.props.api.responseModel,
-        });
-    }
-    createApiDestinedErrorResponseModel() {
-        if (this.props.api.useExisting)
-            return;
-        this.apiDestinedRestApi.errorResponseModel = this.apiDestinedRestApi.api.addModel(`${this.id}-error-response-model`, {
-            ...{
-                contentType: 'application/json',
-                modelName: 'ErrorResponseModel',
-                schema: {
-                    schema: apig.JsonSchemaVersion.DRAFT4,
-                    title: 'errorResponse',
-                    type: apig.JsonSchemaType.OBJECT,
-                    properties: {
-                        state: { type: apig.JsonSchemaType.STRING },
-                        message: { type: apig.JsonSchemaType.STRING },
-                    },
-                },
-            },
-            ...this.props.api.errorResponseModel,
-        });
-    }
-    createApiDestinedResource() {
-        if (!this.props.api.withResource)
-            return;
-        this.apiDestinedRestApi.resource = this.apiDestinedRestApi.api.root.addResource(this.props.api.resource ?? this.apiResource);
-    }
     createApiDestinedIntegrationRequestParameters() {
         if (!this.props.api.withResource)
             return;
@@ -493,6 +414,98 @@ class ApiToEventBridgeTarget extends common_1.CommonConstruct {
             ...this.props.api.methodErrorResponse,
         };
     }
+    /**
+     * @summary Method to create rest restApi for Api
+     * @protected
+     */
+    createApiDestinedRestApi() {
+        if (this.props.api.useExisting && this.props.api.importedRestApiRef) {
+            this.apiDestinedRestApi.api = apig.RestApi.fromRestApiId(this, `${this.id}-sns-rest-api`, cdk.Fn.importValue(this.props.api.importedRestApiRef));
+            return;
+        }
+        this.apiDestinedRestApi.api = new apig.RestApi(this, `${this.id}-sns-rest-api`, {
+            ...{
+                defaultIntegration: this.apiDestinedRestApi.integration,
+                defaultMethodOptions: {
+                    methodResponses: [this.apiDestinedRestApi.methodResponse, this.apiDestinedRestApi.methodErrorResponse],
+                },
+                deployOptions: {
+                    dataTraceEnabled: true,
+                    description: `${this.id} - ${this.props.stage} stage`,
+                    loggingLevel: apig.MethodLoggingLevel.INFO,
+                    metricsEnabled: true,
+                    stageName: this.props.stage,
+                },
+                endpointConfiguration: {
+                    types: [apig.EndpointType.REGIONAL],
+                },
+                defaultCorsPreflightOptions: {
+                    allowOrigins: apig.Cors.ALL_ORIGINS,
+                    allowMethods: ['POST'],
+                    allowHeaders: apig.Cors.DEFAULT_HEADERS,
+                },
+                restApiName: `${this.id}-destined-rest-api-${this.props.stage}`,
+            },
+            ...this.props.api,
+        });
+        this.addCfnOutput(`${this.id}-restApiId`, this.apiDestinedRestApi.api.restApiId);
+        this.addCfnOutput(`${this.id}-restApiRootResourceId`, this.apiDestinedRestApi.api.root.resourceId);
+    }
+    createApiDestinedResponseModel() {
+        if (!this.props.api.withResource)
+            return;
+        this.apiDestinedRestApi.responseModel = new apig.Model(this, `${this.id}-response-model`, {
+            restApi: this.apiDestinedRestApi.api,
+            ...{
+                contentType: 'application/json',
+                modelName: 'ResponseModel',
+                schema: {
+                    schema: apig.JsonSchemaVersion.DRAFT4,
+                    title: 'pollResponse',
+                    type: apig.JsonSchemaType.OBJECT,
+                    properties: { message: { type: apig.JsonSchemaType.STRING } },
+                },
+            },
+            ...this.props.api.responseModel,
+        });
+    }
+    createApiDestinedErrorResponseModel() {
+        if (!this.props.api.withResource)
+            return;
+        this.apiDestinedRestApi.errorResponseModel = new apig.Model(this, `${this.id}-error-response-model`, {
+            restApi: this.apiDestinedRestApi.api,
+            ...{
+                contentType: 'application/json',
+                modelName: 'ErrorResponseModel',
+                schema: {
+                    schema: apig.JsonSchemaVersion.DRAFT4,
+                    title: 'errorResponse',
+                    type: apig.JsonSchemaType.OBJECT,
+                    properties: {
+                        state: { type: apig.JsonSchemaType.STRING },
+                        message: { type: apig.JsonSchemaType.STRING },
+                    },
+                },
+            },
+            ...this.props.api.errorResponseModel,
+        });
+    }
+    createApiDestinedResource() {
+        if (!this.props.api.withResource)
+            return;
+        let rootResource;
+        if (this.props.api.withResource && this.props.api.importedRestApiRootResourceRef) {
+            rootResource = apig.Resource.fromResourceAttributes(this, `${this.id}-root-resource`, {
+                resourceId: cdk.Fn.importValue(this.props.api.importedRestApiRootResourceRef),
+                restApi: this.apiDestinedRestApi.api,
+                path: '/',
+            });
+        }
+        else {
+            rootResource = this.apiDestinedRestApi.api.root;
+        }
+        this.apiDestinedRestApi.resource = rootResource.addResource(this.props.api.resource ?? this.apiResource);
+    }
     createApiDestinedResourceMethod() {
         if (!this.props.api.withResource)
             return;

package/dist/src/lib/manager/aws/sns-manager.d.ts

@@ -36,7 +36,7 @@ export declare class SnsManager {
      * @param {string} id scoped id of the resource
      * @param {common.CommonConstruct} scope scope in which this resource is defined
      * @param {types.SubscriptionProps} props
-     * @param {lambda.Function} lambdaFunction
+     * @param {lambda.IFunction} lambdaFunction
      */
-    createLambdaNotificationService(id: string, scope: common.CommonConstruct, props: types.SubscriptionProps, lambdaFunction: lambda.Function): sns.Topic;
+    createLambdaNotificationService(id: string, scope: common.CommonConstruct, props: types.SubscriptionProps, lambdaFunction: lambda.IFunction): sns.Topic;
 }

package/dist/src/lib/manager/aws/sns-manager.js

@@ -71,7 +71,7 @@ class SnsManager {
      * @param {string} id scoped id of the resource
      * @param {common.CommonConstruct} scope scope in which this resource is defined
      * @param {types.SubscriptionProps} props
-     * @param {lambda.Function} lambdaFunction
+     * @param {lambda.IFunction} lambdaFunction
      */
     createLambdaNotificationService(id, scope, props, lambdaFunction) {
         if (!props)

package/dist/src/lib/types/aws/index.d.ts

@@ -200,7 +200,7 @@ export interface ApiDestinedLambdaType {
     destinationFailure: destinations.EventBridgeDestination;
     destinationSuccess: destinations.EventBridgeDestination;
     environment: types.ApiDestinedLambdaEnvironment;
-    function: lambda.Function;
+    function: lambda.IFunction;
     layers: lambda.LayerVersion[];
     layerSource?: lambda.AssetCode;
     policy: iam.PolicyDocument;
@@ -222,6 +222,8 @@ export interface ApiToEventBridgeTargetRestApiProps {
     errorResponseModel?: apig.ModelOptions;
     responseModel?: apig.ModelOptions;
     restApi?: apig.RestApiProps;
+    importedRestApiRef?: string;
+    importedRestApiRootResourceRef?: string;
     useExisting: boolean;
     withResource?: boolean;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gradientedge/cdk-utils",
-  "version": "4.6.7",
+  "version": "4.7.0",
   "description": "Utilities for AWS CDK provisioning",
   "main": "dist/index.js",
   "engines": {
@@ -50,7 +50,7 @@
     "app-root-path": "^3.0.0",
     "aws-cdk-lib": "^2.12.0",
     "aws-sdk": "^2.1074.0",
-    "constructs": "^10.0.62",
+    "constructs": "^10.0.63",
     "lodash": "^4.17.21",
     "moment": "^2.29.1",
     "nconf": "^0.11.3",

package/src/lib/construct/api-to-eventbridge-target/main.ts

@@ -5,7 +5,6 @@ import * as iam from 'aws-cdk-lib/aws-iam'
 import * as lambda from 'aws-cdk-lib/aws-lambda'
 import * as destinations from 'aws-cdk-lib/aws-lambda-destinations'
 import * as secretsmanager from 'aws-cdk-lib/aws-secretsmanager'
-import * as sns from 'aws-cdk-lib/aws-sns'
 import { Construct } from 'constructs'
 import { CommonConstruct } from '../../common'
 import * as types from '../../types'
@@ -92,15 +91,15 @@ export class ApiToEventBridgeTarget extends CommonConstruct {
     /* restApi related resources */
     this.createApiDestinedTopicRole()
     this.createApiDestinedTopic()
-    this.createApiDestinedRestApi()
-    this.createApiDestinedResponseModel()
-    this.createApiDestinedErrorResponseModel()
-    this.createApiDestinedResource()
     this.createApiDestinedIntegrationRequestParameters()
     this.createApiDestinedIntegrationRequestTemplates()
     this.createApiDestinedIntegrationResponse()
     this.createApiDestinedIntegrationErrorResponse()
     this.createApiDestinedIntegration()
+    this.createApiDestinedRestApi()
+    this.createApiDestinedResource()
+    this.createApiDestinedResponseModel()
+    this.createApiDestinedErrorResponseModel()
     this.createApiDestinedMethodResponse()
     this.createApiDestinedMethodErrorResponse()
     this.createApiDestinedResourceMethod()
@@ -334,21 +333,13 @@ export class ApiToEventBridgeTarget extends CommonConstruct {
   }
 
   protected createApiDestinedTopicRole() {
-    if (this.props.api.useExisting) return
     this.apiDestinedRestApi.topicRole = new iam.Role(this, `${this.id}-sns-rest-api-role`, {
       assumedBy: new iam.ServicePrincipal('apigateway.amazonaws.com'),
     })
   }
 
   protected createApiDestinedTopic() {
-    if (this.props.api.useExisting) {
-      this.apiDestinedRestApi.topic = sns.Topic.fromTopicArn(
-        this,
-        `${this.id}-destined-topic`,
-        `arn:aws:sns:${this.props.region}:${cdk.Stack.of(this).account}:${this.id}-destined-topic-${this.props.stage}`
-      )
-      return
-    }
+    if (!this.props.api.withResource) return
     this.apiDestinedRestApi.topic = this.snsManager.createLambdaNotificationService(
       `${this.id}-destined-topic`,
       this,
@@ -361,93 +352,6 @@ export class ApiToEventBridgeTarget extends CommonConstruct {
     this.apiDestinedRestApi.topic.grantPublish(this.apiDestinedRestApi.topicRole)
   }
 
-  /**
-   * @summary Method to create rest restApi for Api
-   * @protected
-   */
-  protected createApiDestinedRestApi() {
-    if (this.props.api.useExisting) {
-      this.apiDestinedRestApi.api = apig.RestApi.fromRestApiId(
-        this,
-        `${this.id}-sns-rest-api`,
-        cdk.Fn.importValue('importedRestApiRef')
-      )
-      return
-    }
-    this.apiDestinedRestApi.api = new apig.RestApi(this, `${this.id}-sns-rest-api`, {
-      ...{
-        deployOptions: {
-          dataTraceEnabled: true,
-          description: `${this.id} - ${this.props.stage} stage`,
-          loggingLevel: apig.MethodLoggingLevel.INFO,
-          metricsEnabled: true,
-          stageName: this.props.stage,
-        },
-        endpointConfiguration: {
-          types: [apig.EndpointType.REGIONAL],
-        },
-        defaultCorsPreflightOptions: {
-          allowOrigins: apig.Cors.ALL_ORIGINS,
-          allowMethods: ['POST'],
-          allowHeaders: apig.Cors.DEFAULT_HEADERS,
-        },
-        restApiName: `${this.id}-destined-rest-api-${this.props.stage}`,
-      },
-      ...this.props.api,
-    })
-    this.addCfnOutput(`${this.id}-restApiId`, this.apiDestinedRestApi.api.restApiId)
-  }
-
-  protected createApiDestinedResponseModel() {
-    if (this.props.api.useExisting) return
-    this.apiDestinedRestApi.responseModel = (this.apiDestinedRestApi.api as apig.RestApi).addModel(
-      `${this.id}-response-model`,
-      {
-        ...{
-          contentType: 'application/json',
-          modelName: 'ResponseModel',
-          schema: {
-            schema: apig.JsonSchemaVersion.DRAFT4,
-            title: 'pollResponse',
-            type: apig.JsonSchemaType.OBJECT,
-            properties: { message: { type: apig.JsonSchemaType.STRING } },
-          },
-        },
-        ...this.props.api.responseModel,
-      }
-    )
-  }
-
-  protected createApiDestinedErrorResponseModel() {
-    if (this.props.api.useExisting) return
-    this.apiDestinedRestApi.errorResponseModel = (this.apiDestinedRestApi.api as apig.RestApi).addModel(
-      `${this.id}-error-response-model`,
-      {
-        ...{
-          contentType: 'application/json',
-          modelName: 'ErrorResponseModel',
-          schema: {
-            schema: apig.JsonSchemaVersion.DRAFT4,
-            title: 'errorResponse',
-            type: apig.JsonSchemaType.OBJECT,
-            properties: {
-              state: { type: apig.JsonSchemaType.STRING },
-              message: { type: apig.JsonSchemaType.STRING },
-            },
-          },
-        },
-        ...this.props.api.errorResponseModel,
-      }
-    )
-  }
-
-  protected createApiDestinedResource() {
-    if (!this.props.api.withResource) return
-    this.apiDestinedRestApi.resource = this.apiDestinedRestApi.api.root.addResource(
-      this.props.api.resource ?? this.apiResource
-    )
-  }
-
   protected createApiDestinedIntegrationRequestParameters() {
     if (!this.props.api.withResource) return
     this.apiDestinedRestApi.integrationRequestParameters = {
@@ -560,6 +464,104 @@ export class ApiToEventBridgeTarget extends CommonConstruct {
     }
   }
 
+  /**
+   * @summary Method to create rest restApi for Api
+   * @protected
+   */
+  protected createApiDestinedRestApi() {
+    if (this.props.api.useExisting && this.props.api.importedRestApiRef) {
+      this.apiDestinedRestApi.api = apig.RestApi.fromRestApiId(
+        this,
+        `${this.id}-sns-rest-api`,
+        cdk.Fn.importValue(this.props.api.importedRestApiRef)
+      )
+      return
+    }
+    this.apiDestinedRestApi.api = new apig.RestApi(this, `${this.id}-sns-rest-api`, {
+      ...{
+        defaultIntegration: this.apiDestinedRestApi.integration,
+        defaultMethodOptions: {
+          methodResponses: [this.apiDestinedRestApi.methodResponse, this.apiDestinedRestApi.methodErrorResponse],
+        },
+        deployOptions: {
+          dataTraceEnabled: true,
+          description: `${this.id} - ${this.props.stage} stage`,
+          loggingLevel: apig.MethodLoggingLevel.INFO,
+          metricsEnabled: true,
+          stageName: this.props.stage,
+        },
+        endpointConfiguration: {
+          types: [apig.EndpointType.REGIONAL],
+        },
+        defaultCorsPreflightOptions: {
+          allowOrigins: apig.Cors.ALL_ORIGINS,
+          allowMethods: ['POST'],
+          allowHeaders: apig.Cors.DEFAULT_HEADERS,
+        },
+        restApiName: `${this.id}-destined-rest-api-${this.props.stage}`,
+      },
+      ...this.props.api,
+    })
+    this.addCfnOutput(`${this.id}-restApiId`, this.apiDestinedRestApi.api.restApiId)
+    this.addCfnOutput(`${this.id}-restApiRootResourceId`, this.apiDestinedRestApi.api.root.resourceId)
+  }
+
+  protected createApiDestinedResponseModel() {
+    if (!this.props.api.withResource) return
+    this.apiDestinedRestApi.responseModel = new apig.Model(this, `${this.id}-response-model`, {
+      restApi: this.apiDestinedRestApi.api,
+      ...{
+        contentType: 'application/json',
+        modelName: 'ResponseModel',
+        schema: {
+          schema: apig.JsonSchemaVersion.DRAFT4,
+          title: 'pollResponse',
+          type: apig.JsonSchemaType.OBJECT,
+          properties: { message: { type: apig.JsonSchemaType.STRING } },
+        },
+      },
+      ...this.props.api.responseModel,
+    })
+  }
+
+  protected createApiDestinedErrorResponseModel() {
+    if (!this.props.api.withResource) return
+    this.apiDestinedRestApi.errorResponseModel = new apig.Model(this, `${this.id}-error-response-model`, {
+      restApi: this.apiDestinedRestApi.api,
+      ...{
+        contentType: 'application/json',
+        modelName: 'ErrorResponseModel',
+        schema: {
+          schema: apig.JsonSchemaVersion.DRAFT4,
+          title: 'errorResponse',
+          type: apig.JsonSchemaType.OBJECT,
+          properties: {
+            state: { type: apig.JsonSchemaType.STRING },
+            message: { type: apig.JsonSchemaType.STRING },
+          },
+        },
+      },
+      ...this.props.api.errorResponseModel,
+    })
+  }
+
+  protected createApiDestinedResource() {
+    if (!this.props.api.withResource) return
+
+    let rootResource
+    if (this.props.api.withResource && this.props.api.importedRestApiRootResourceRef) {
+      rootResource = apig.Resource.fromResourceAttributes(this, `${this.id}-root-resource`, {
+        resourceId: cdk.Fn.importValue(this.props.api.importedRestApiRootResourceRef),
+        restApi: this.apiDestinedRestApi.api,
+        path: '/',
+      })
+    } else {
+      rootResource = this.apiDestinedRestApi.api.root
+    }
+
+    this.apiDestinedRestApi.resource = rootResource.addResource(this.props.api.resource ?? this.apiResource)
+  }
+
   protected createApiDestinedResourceMethod() {
     if (!this.props.api.withResource) return
     this.apiDestinedRestApi.method = this.apiDestinedRestApi.resource.addMethod(

package/src/lib/manager/aws/sns-manager.ts

@@ -62,13 +62,13 @@ export class SnsManager {
    * @param {string} id scoped id of the resource
    * @param {common.CommonConstruct} scope scope in which this resource is defined
    * @param {types.SubscriptionProps} props
-   * @param {lambda.Function} lambdaFunction
+   * @param {lambda.IFunction} lambdaFunction
    */
   public createLambdaNotificationService(
     id: string,
     scope: common.CommonConstruct,
     props: types.SubscriptionProps,
-    lambdaFunction: lambda.Function
+    lambdaFunction: lambda.IFunction
   ) {
     if (!props) throw `Subscription props undefined`
 

package/src/lib/types/aws/index.ts

@@ -208,7 +208,7 @@ export interface ApiDestinedLambdaType {
   destinationFailure: destinations.EventBridgeDestination
   destinationSuccess: destinations.EventBridgeDestination
   environment: types.ApiDestinedLambdaEnvironment
-  function: lambda.Function
+  function: lambda.IFunction
   layers: lambda.LayerVersion[]
   layerSource?: lambda.AssetCode
   policy: iam.PolicyDocument
@@ -231,6 +231,8 @@ export interface ApiToEventBridgeTargetRestApiProps {
   errorResponseModel?: apig.ModelOptions
   responseModel?: apig.ModelOptions
   restApi?: apig.RestApiProps
+  importedRestApiRef?: string
+  importedRestApiRootResourceRef?: string
   useExisting: boolean
   withResource?: boolean
 }