@gradientedge/cdk-utils 4.1.2 → 4.2.3

package/src/lib/manager/{cloudWatchManager.ts → aws/cloudWatchManager.ts}

@@ -1,29 +1,31 @@
 import * as cdk from 'aws-cdk-lib'
 import * as watch from 'aws-cdk-lib/aws-cloudwatch'
 import { IMetric } from 'aws-cdk-lib/aws-cloudwatch'
-import {
-  AlarmProps,
-  AlarmStatusWidgetProps,
-  DashboardProps,
-  GraphWidgetProps,
-  LogQueryWidgetProps,
-  MetricProps,
-  NumericWidgetProps,
-  TextWidgetProps,
-} from '../types'
-import { CommonConstruct } from '../common/commonConstruct'
-import { CloudWatchWidgetType, createCfnOutput } from '../utils'
+import * as common from '../../common'
+import * as types from '../../types'
+import * as utils from '../../utils'
+
+/**
+ * @category Utils
+ */
+enum CloudWatchWidgetType {
+  Text = 'Text',
+  SingleValue = 'SingleValue',
+  Graph = 'Graph',
+  AlarmStatus = 'AlarmStatus',
+  LogQuery = 'LogQuery',
+}
 
 /**
  * @stability stable
  * @category Management & Governance
  * @summary Provides operations on AWS CloudWatch.
- * - A new instance of this class is injected into {@link CommonConstruct} constructor.
- * - If a custom construct extends {@link CommonConstruct}, an instance is available within the context.
+ * - A new instance of this class is injected into {@link common.CommonConstruct} constructor.
+ * - If a custom construct extends {@link common.CommonConstruct}, an instance is available within the context.
  * @example
  * import * as common from '@gradientedge/cdk-utils'
  *
- * class CustomConstruct extends common.CommonConstruct {
+ * class CustomConstruct extends common.common.CommonConstruct {
  *   constructor(parent: cdk.Construct, id: string, props: common.CommonStackProps) {
  *     super(parent, id, props)
  *     this.props = props
@@ -37,10 +39,10 @@ export class CloudWatchManager {
   /**
    * @summary Method to create a cloudwatch alarm for a given expression
    * @param {string} id scoped id of the resource
-   * @param {CommonConstruct} scope scope in which this resource is defined
-   * @param {AlarmProps} props
+   * @param {common.CommonConstruct} scope scope in which this resource is defined
+   * @param {types.AlarmProps} props
    */
-  public createAlarmForExpression(id: string, scope: CommonConstruct, props: AlarmProps) {
+  public createAlarmForExpression(id: string, scope: common.CommonConstruct, props: types.AlarmProps) {
     if (!props) throw `Alarm props undefined`
 
     if (!props.expression) throw `Could not find expression for Alarm props for id:${id}`
@@ -66,8 +68,8 @@ export class CloudWatchManager {
       datapointsToAlarm: props.datapointsToAlarm,
     })
 
-    createCfnOutput(`${id}-alarmArn`, scope, alarm.alarmArn)
-    createCfnOutput(`${id}-alarmName`, scope, alarm.alarmName)
+    utils.createCfnOutput(`${id}-alarmArn`, scope, alarm.alarmArn)
+    utils.createCfnOutput(`${id}-alarmName`, scope, alarm.alarmName)
 
     return alarm
   }
@@ -75,11 +77,16 @@ export class CloudWatchManager {
   /**
    * @summary Method to create a cloudwatch alarm for a given metric
    * @param {string} id scoped id of the resource
-   * @param {CommonConstruct} scope scope in which this resource is defined
-   * @param {AlarmProps} props
+   * @param {common.CommonConstruct} scope scope in which this resource is defined
+   * @param {types.AlarmProps} props
    * @param metric
    */
-  public createAlarmForMetric(id: string, scope: CommonConstruct, props: AlarmProps, metric: watch.Metric) {
+  public createAlarmForMetric(
+    id: string,
+    scope: common.CommonConstruct,
+    props: types.AlarmProps,
+    metric: watch.Metric
+  ) {
     if (!props) throw `Alarm props undefined`
 
     const alarm = metric.createAlarm(scope, `${id}`, {
@@ -92,8 +99,8 @@ export class CloudWatchManager {
       datapointsToAlarm: props.datapointsToAlarm,
     })
 
-    createCfnOutput(`${id}-alarmArn`, scope, alarm.alarmArn)
-    createCfnOutput(`${id}-alarmName`, scope, alarm.alarmName)
+    utils.createCfnOutput(`${id}-alarmArn`, scope, alarm.alarmArn)
+    utils.createCfnOutput(`${id}-alarmName`, scope, alarm.alarmName)
 
     return alarm
   }
@@ -101,11 +108,16 @@ export class CloudWatchManager {
   /**
    * @summary Method to create a cloudwatch dashboard
    * @param {string} id scoped id of the resource
-   * @param {CommonConstruct} scope scope in which this resource is defined
-   * @param {DashboardProps} props
+   * @param {common.CommonConstruct} scope scope in which this resource is defined
+   * @param {types.DashboardProps} props
    * @param widgets
    */
-  public createDashboard(id: string, scope: CommonConstruct, props: DashboardProps, widgets?: watch.IWidget[][]) {
+  public createDashboard(
+    id: string,
+    scope: common.CommonConstruct,
+    props: types.DashboardProps,
+    widgets?: watch.IWidget[][]
+  ) {
     if (!props) throw `Dashboard props undefined`
 
     const dashboard = new watch.Dashboard(scope, `${id}`, {
@@ -116,17 +128,17 @@ export class CloudWatchManager {
       widgets: widgets,
     })
 
-    createCfnOutput(`${id}-dashboardName`, scope, props.dashboardName)
+    utils.createCfnOutput(`${id}-dashboardName`, scope, props.dashboardName)
 
     return dashboard
   }
 
   /**
    * @summary Method to create cloudwatch widgets
-   * @param {CommonConstruct} scope scope in which this resource is defined
+   * @param {common.CommonConstruct} scope scope in which this resource is defined
    * @param props
    */
-  public createWidgets(scope: CommonConstruct, props: any[]) {
+  public createWidgets(scope: common.CommonConstruct, props: any[]) {
     if (!props || props.length == 0) throw `Widget props undefined`
 
     const widgets: any = []
@@ -138,10 +150,10 @@ export class CloudWatchManager {
   /**
    * @summary Method to create a cloudwatch widget
    * @param {string} id scoped id of the resource
-   * @param {CommonConstruct} scope scope in which this resource is defined
+   * @param {common.CommonConstruct} scope scope in which this resource is defined
    * @param props
    */
-  public createWidget(id: string, scope: CommonConstruct, props: any) {
+  public createWidget(id: string, scope: common.CommonConstruct, props: any) {
     if (!props) throw `Widget props undefined`
 
     const metrics = this.determineMetrics(scope, props.metricProps)
@@ -168,10 +180,10 @@ export class CloudWatchManager {
   /**
    * @summary Method to create a cloudwatch text widget
    * @param {string} id scoped id of the resource
-   * @param {CommonConstruct} scope scope in which this resource is defined
-   * @param {TextWidgetProps} props
+   * @param {common.CommonConstruct} scope scope in which this resource is defined
+   * @param {types.TextWidgetProps} props
    */
-  public createTextWidget(id: string, scope: CommonConstruct, props: TextWidgetProps) {
+  public createTextWidget(id: string, scope: common.CommonConstruct, props: types.TextWidgetProps) {
     const widget = new watch.TextWidget({
       markdown: props.markdown,
       width: props.width,
@@ -186,11 +198,16 @@ export class CloudWatchManager {
   /**
    * @summary Method to create a cloudwatch numeric widget
    * @param {string} id scoped id of the resource
-   * @param {CommonConstruct} scope scope in which this resource is defined
-   * @param {NumericWidgetProps} props
+   * @param {common.CommonConstruct} scope scope in which this resource is defined
+   * @param {types.NumericWidgetProps} props
    * @param metrics
    */
-  public createSingleValueWidget(id: string, scope: CommonConstruct, props: NumericWidgetProps, metrics: IMetric[]) {
+  public createSingleValueWidget(
+    id: string,
+    scope: common.CommonConstruct,
+    props: types.NumericWidgetProps,
+    metrics: IMetric[]
+  ) {
     const widget = new watch.SingleValueWidget({
       metrics: metrics,
       setPeriodToTimeRange: props.setPeriodToTimeRange,
@@ -208,15 +225,15 @@ export class CloudWatchManager {
   /**
    * @summary Method to create a cloudwatch graph widget
    * @param {string} id scoped id of the resource
-   * @param {CommonConstruct} scope scope in which this resource is defined
-   * @param {GraphWidgetProps} props
+   * @param {common.CommonConstruct} scope scope in which this resource is defined
+   * @param {types.GraphWidgetProps} props
    * @param leftYMetrics
    * @param rightYMetrics
    */
   public createGraphWidget(
     id: string,
-    scope: CommonConstruct,
-    props: GraphWidgetProps,
+    scope: common.CommonConstruct,
+    props: types.GraphWidgetProps,
     leftYMetrics?: IMetric[],
     rightYMetrics?: IMetric[]
   ) {
@@ -244,14 +261,14 @@ export class CloudWatchManager {
   /**
    * @summary Method to create a cloudwatch alarm status widget
    * @param {string} id scoped id of the resource
-   * @param {CommonConstruct} scope scope in which this resource is defined
-   * @param {AlarmStatusWidgetProps} props
+   * @param {common.CommonConstruct} scope scope in which this resource is defined
+   * @param {types.AlarmStatusWidgetProps} props
    * @param {watch.IAlarm[]} alarms
    */
   public createAlarmStatusWidget(
     id: string,
-    scope: CommonConstruct,
-    props: AlarmStatusWidgetProps,
+    scope: common.CommonConstruct,
+    props: types.AlarmStatusWidgetProps,
     alarms: watch.IAlarm[]
   ) {
     const widget = new watch.AlarmStatusWidget({
@@ -269,11 +286,16 @@ export class CloudWatchManager {
   /**
    * @summary Method to create a cloudwatch log query widget
    * @param {string} id scoped id of the resource
-   * @param {CommonConstruct} scope scope in which this resource is defined
-   * @param {LogQueryWidgetProps} props
+   * @param {common.CommonConstruct} scope scope in which this resource is defined
+   * @param {types.LogQueryWidgetProps} props
    * @param {string[]} logGroupNames
    */
-  public createLogQueryWidget(id: string, scope: CommonConstruct, props: LogQueryWidgetProps, logGroupNames: string[]) {
+  public createLogQueryWidget(
+    id: string,
+    scope: common.CommonConstruct,
+    props: types.LogQueryWidgetProps,
+    logGroupNames: string[]
+  ) {
     const widget = new watch.LogQueryWidget({
       logGroupNames: logGroupNames,
       queryString: props.queryString,
@@ -291,13 +313,13 @@ export class CloudWatchManager {
 
   /**
    * @summary Utility method to determine the metrics and dimensions
-   * @param {CommonConstruct} scope scope in which this resource is defined
-   * @param {MetricProps[]} metricProps
+   * @param {common.CommonConstruct} scope scope in which this resource is defined
+   * @param {types.MetricProps[]} metricProps
    */
-  private determineMetrics(scope: CommonConstruct, metricProps: MetricProps[]) {
+  private determineMetrics(scope: common.CommonConstruct, metricProps: types.MetricProps[]) {
     const metrics: watch.IMetric[] = []
     if (metricProps) {
-      metricProps.forEach((metricProp: MetricProps) => {
+      metricProps.forEach((metricProp: types.MetricProps) => {
         let metricDimensions: watch.DimensionHash = metricProp.dimensionsMap || {}
         if (metricProp.functionName) {
           metricDimensions = {
@@ -350,10 +372,10 @@ export class CloudWatchManager {
   /**
    * @summary Utility method to determine the configured alarms
    * @param {string} id scoped id of the resource
-   * @param {CommonConstruct} scope scope in which this resource is defined
+   * @param {common.CommonConstruct} scope scope in which this resource is defined
    * @param {watch.AlarmProps[]} alarmProps
    */
-  private determineAlarms(id: string, scope: CommonConstruct, alarmProps: watch.AlarmProps[]) {
+  private determineAlarms(id: string, scope: common.CommonConstruct, alarmProps: watch.AlarmProps[]) {
     const alarms: watch.IAlarm[] = []
     if (alarmProps) {
       alarmProps.forEach((alarmProp: watch.AlarmProps) => {

package/src/lib/manager/{codeBuildManager.ts → aws/codeBuildManager.ts}

@@ -1,17 +1,17 @@
-import { CommonConstruct } from '../common/commonConstruct'
-import * as codebuild from 'aws-cdk-lib/aws-codebuild'
 import * as cdk from 'aws-cdk-lib'
+import * as codebuild from 'aws-cdk-lib/aws-codebuild'
+import * as common from '../../common'
 
 /**
  * @stability stable
  * @category Developer Tools
  * @summary Provides operations on AWS Code Build.
- * - A new instance of this class is injected into {@link CommonConstruct} constructor.
- * - If a custom construct extends {@link CommonConstruct}, an instance is available within the context.
+ * - A new instance of this class is injected into {@link common.CommonConstruct} constructor.
+ * - If a custom construct extends {@link common.CommonConstruct}, an instance is available within the context.
  * @example
- * import { CommonConstruct } from '@gradientedge/cdk-utils'
+ * import { common.CommonConstruct } from '@gradientedge/cdk-utils'
  *
- * class CustomConstruct extends CommonConstruct {
+ * class CustomConstruct extends common.CommonConstruct {
  *   constructor(parent: cdk.Construct, id: string, props: common.CommonStackProps) {
  *     super(parent, id, props)
  *     this.props = props
@@ -28,7 +28,7 @@ export class CodeBuildManager {
    * @param scope
    * @param dockerfilePath
    */
-  public createImageForCloudfrontInvalidation(id: string, scope: CommonConstruct, dockerfilePath: string) {
+  public createImageForCloudfrontInvalidation(id: string, scope: common.CommonConstruct, dockerfilePath: string) {
     return scope.ecrManager.createDockerImage(`${id}-build-image`, scope, dockerfilePath)
   }
 
@@ -42,7 +42,7 @@ export class CodeBuildManager {
    */
   public createProjectForCloudfrontInvalidation(
     id: string,
-    scope: CommonConstruct,
+    scope: common.CommonConstruct,
     dockerFilepath: string,
     distributionId: string,
     paths?: string

package/src/lib/manager/{ecrManager.ts → aws/ecrManager.ts}

@@ -1,17 +1,17 @@
 import * as ecr from 'aws-cdk-lib/aws-ecr-assets'
-import { CommonConstruct } from '../common/commonConstruct'
-import { createCfnOutput } from '../utils'
+import * as common from '../../common'
+import * as utils from '../../utils'
 
 /**
  * @stability stable
  * @category Containers
  * @summary Provides operations on AWS Elastic Container Registry.
- * - A new instance of this class is injected into {@link CommonConstruct} constructor.
- * - If a custom construct extends {@link CommonConstruct}, an instance is available within the context.
+ * - A new instance of this class is injected into {@link common.CommonConstruct} constructor.
+ * - If a custom construct extends {@link common.CommonConstruct}, an instance is available within the context.
  * @example
  * import * as common from '@gradientedge/cdk-utils'
  *
- * class CustomConstruct extends common.CommonConstruct {
+ * class CustomConstruct extends common.common.CommonConstruct {
  *   constructor(parent: cdk.Construct, id: string, props: common.CommonStackProps) {
  *     super(parent, id, props)
  *     this.props = props
@@ -25,15 +25,15 @@ export class EcrManager {
   /**
    * @summary Method to create a docker image in ecr
    * @param {string} id scoped id of the resource
-   * @param {CommonConstruct} scope scope in which this resource is defined
+   * @param {common.CommonConstruct} scope scope in which this resource is defined
    * @param {string} dockerfilePath
    */
-  public createDockerImage(id: string, scope: CommonConstruct, dockerfilePath: string) {
+  public createDockerImage(id: string, scope: common.CommonConstruct, dockerfilePath: string) {
     const asset = new ecr.DockerImageAsset(scope, `${id}`, {
       directory: dockerfilePath,
     })
 
-    createCfnOutput(`${id}-dockerImageArn`, scope, asset.imageUri)
+    utils.createCfnOutput(`${id}-dockerImageArn`, scope, asset.imageUri)
 
     return asset
   }

package/src/lib/manager/{ecsManager.ts → aws/ecsManager.ts}

@@ -2,20 +2,20 @@ import * as ec2 from 'aws-cdk-lib/aws-ec2'
 import * as ecs from 'aws-cdk-lib/aws-ecs'
 import * as iam from 'aws-cdk-lib/aws-iam'
 import * as logs from 'aws-cdk-lib/aws-logs'
-import { CommonConstruct } from '../common/commonConstruct'
-import { EcsClusterProps, EcsTaskProps } from '../types'
-import { createCfnOutput } from '../utils'
+import * as common from '../../common'
+import * as types from '../../types'
+import * as utils from '../../utils'
 
 /**
  * @stability stable
  * @category Containers
  * @summary Provides operations on AWS Elastic Container Service.
- * - A new instance of this class is injected into {@link CommonConstruct} constructor.
- * - If a custom construct extends {@link CommonConstruct}, an instance is available within the context.
+ * - A new instance of this class is injected into {@link common.CommonConstruct} constructor.
+ * - If a custom construct extends {@link common.CommonConstruct}, an instance is available within the context.
  * @example
  * import * as common from '@gradientedge/cdk-utils'
  *
- * class CustomConstruct extends common.CommonConstruct {
+ * class CustomConstruct extends common.common.CommonConstruct {
  *   constructor(parent: cdk.Construct, id: string, props: common.CommonStackProps) {
  *     super(parent, id, props)
  *     this.props = props
@@ -29,11 +29,11 @@ export class EcsManager {
   /**
    * @summary Method to create an ecs cluster
    * @param {string} id scoped id of the resource
-   * @param {CommonConstruct} scope scope in which this resource is defined
-   * @param {EcsClusterProps} props
+   * @param {common.CommonConstruct} scope scope in which this resource is defined
+   * @param {types.EcsClusterProps} props
    * @param {ec2.IVpc} vpc
    */
-  public createEcsCluster(id: string, scope: CommonConstruct, props: EcsClusterProps, vpc: ec2.IVpc) {
+  public createEcsCluster(id: string, scope: common.CommonConstruct, props: types.EcsClusterProps, vpc: ec2.IVpc) {
     if (!props) throw `Ecs Cluster props undefined`
 
     const ecsCluster = new ecs.Cluster(scope, `${id}`, {
@@ -41,8 +41,8 @@ export class EcsManager {
       vpc: vpc,
     })
 
-    createCfnOutput(`${id}-clusterArn`, scope, ecsCluster.clusterArn)
-    createCfnOutput(`${id}-clusterName`, scope, ecsCluster.clusterName)
+    utils.createCfnOutput(`${id}-clusterArn`, scope, ecsCluster.clusterArn)
+    utils.createCfnOutput(`${id}-clusterName`, scope, ecsCluster.clusterName)
 
     return ecsCluster
   }
@@ -50,8 +50,8 @@ export class EcsManager {
   /**
    * @summary Method to create an ecs fargate task
    * @param {string} id scoped id of the resource
-   * @param {CommonConstruct} scope scope in which this resource is defined
-   * @param {EcsTaskProps} props
+   * @param {common.CommonConstruct} scope scope in which this resource is defined
+   * @param {types.EcsTaskProps} props
    * @param {ecs.ICluster} cluster
    * @param {iam.Role} role
    * @param {logs.ILogGroup} logGroup
@@ -60,8 +60,8 @@ export class EcsManager {
    */
   public createEcsFargateTask(
     id: string,
-    scope: CommonConstruct,
-    props: EcsTaskProps,
+    scope: common.CommonConstruct,
+    props: types.EcsTaskProps,
     cluster: ecs.ICluster,
     role: iam.Role,
     logGroup: logs.ILogGroup,
@@ -93,7 +93,7 @@ export class EcsManager {
       privileged: false,
     })
 
-    createCfnOutput(`${id}-taskArn`, scope, ecsTask.taskDefinitionArn)
+    utils.createCfnOutput(`${id}-taskArn`, scope, ecsTask.taskDefinitionArn)
 
     return ecsTask
   }

package/src/lib/manager/{eksManager.ts → aws/eksManager.ts}

@@ -1,20 +1,20 @@
 import * as ec2 from 'aws-cdk-lib/aws-ec2'
 import * as ecr from 'aws-cdk-lib/aws-ecr-assets'
 import * as eks from 'aws-cdk-lib/aws-eks'
-import { CommonConstruct } from '../common/commonConstruct'
-import { EksClusterProps } from '../types'
-import { createCfnOutput } from '../utils'
+import * as common from '../../common'
+import * as types from '../../types'
+import * as utils from '../../utils'
 
 /**
  * @stability stable
  * @category Containers
  * @summary Provides operations on AWS Elastic Kubernetes Service.
- * - A new instance of this class is injected into {@link CommonConstruct} constructor.
- * - If a custom construct extends {@link CommonConstruct}, an instance is available within the context.
+ * - A new instance of this class is injected into {@link common.CommonConstruct} constructor.
+ * - If a custom construct extends {@link common.CommonConstruct}, an instance is available within the context.
  * @example
  * import * as common from '@gradientedge/cdk-utils'
  *
- * class CustomConstruct extends common.CommonConstruct {
+ * class CustomConstruct extends common.common.CommonConstruct {
  *   constructor(parent: cdk.Construct, id: string, props: common.CommonStackProps) {
  *     super(parent, id, props)
  *     this.props = props
@@ -28,15 +28,15 @@ export class EksManager {
   /**
    * @summary Method to create an eks deployment
    * @param {string} id scoped id of the resource
-   * @param {CommonConstruct} scope scope in which this resource is defined
-   * @param {EksClusterProps} props
+   * @param {common.CommonConstruct} scope scope in which this resource is defined
+   * @param {types.EksClusterProps} props
    * @param {ecr.DockerImageAsset} image
    * @param {ec2.IVpc} vpc
    */
   public createEksDeployment(
     id: string,
-    scope: CommonConstruct,
-    props: EksClusterProps,
+    scope: common.CommonConstruct,
+    props: types.EksClusterProps,
     image: ecr.DockerImageAsset,
     vpc: ec2.IVpc
   ) {
@@ -93,8 +93,8 @@ export class EksManager {
 
     cluster.addManifest(`${id}Pod`, service, deployment)
 
-    createCfnOutput(`${id}-clusterArn`, scope, cluster.clusterArn)
-    createCfnOutput(`${id}-clusterEndpoint`, scope, cluster.clusterEndpoint)
+    utils.createCfnOutput(`${id}-clusterArn`, scope, cluster.clusterArn)
+    utils.createCfnOutput(`${id}-clusterEndpoint`, scope, cluster.clusterEndpoint)
 
     return cluster
   }

package/src/lib/manager/{eventManager.ts → aws/eventManager.ts}

@@ -2,20 +2,20 @@ import * as ecs from 'aws-cdk-lib/aws-ecs'
 import * as events from 'aws-cdk-lib/aws-events'
 import * as iam from 'aws-cdk-lib/aws-iam'
 import * as lambda from 'aws-cdk-lib/aws-lambda'
-import { CommonConstruct } from '../common/commonConstruct'
-import { RuleProps } from '../types'
-import { createCfnOutput } from '../utils'
+import * as common from '../../common'
+import * as types from '../../types'
+import * as utils from '../../utils'
 
 /**
  * @stability stable
  * @category Application Integration
  * @summary Provides operations on AWS EventBridge.
- * - A new instance of this class is injected into {@link CommonConstruct} constructor.
- * - If a custom construct extends {@link CommonConstruct}, an instance is available within the context.
+ * - A new instance of this class is injected into {@link common.CommonConstruct} constructor.
+ * - If a custom construct extends {@link common.CommonConstruct}, an instance is available within the context.
  * @example
  * import * as common from '@gradientedge/cdk-utils'
  *
- * class CustomConstruct extends common.CommonConstruct {
+ * class CustomConstruct extends common.common.CommonConstruct {
  *   constructor(parent: cdk.Construct, id: string, props: common.CommonStackProps) {
  *     super(parent, id, props)
  *     this.props = props
@@ -29,8 +29,8 @@ export class EventManager {
   /**
    * @summary Method to create an eventbridge rule with lambda target
    * @param {string} id scoped id of the resource
-   * @param {CommonConstruct} scope scope in which this resource is defined
-   * @param {RuleProps} props
+   * @param {common.CommonConstruct} scope scope in which this resource is defined
+   * @param {types.RuleProps} props
    * @param {lambda.Function} lambdaFunction
    * @param {string} eventBusName
    * @param {any} eventPattern
@@ -38,8 +38,8 @@ export class EventManager {
    */
   public createLambdaRule(
     id: string,
-    scope: CommonConstruct,
-    props: RuleProps,
+    scope: common.CommonConstruct,
+    props: types.RuleProps,
     lambdaFunction: lambda.Function,
     eventBusName?: string,
     eventPattern?: any,
@@ -64,8 +64,8 @@ export class EventManager {
       sourceArn: eventRule.attrArn,
     })
 
-    createCfnOutput(`${id}-ruleArn`, scope, eventRule.attrArn)
-    createCfnOutput(`${id}-ruleName`, scope, eventRule.name)
+    utils.createCfnOutput(`${id}-ruleArn`, scope, eventRule.attrArn)
+    utils.createCfnOutput(`${id}-ruleName`, scope, eventRule.name)
 
     return eventRule
   }
@@ -73,8 +73,8 @@ export class EventManager {
   /**
    * @summary Method to create an eventbridge rule with fargate task target
    * @param {string} id scoped id of the resource
-   * @param {CommonConstruct} scope scope in which this resource is defined
-   * @param {RuleProps} props
+   * @param {common.CommonConstruct} scope scope in which this resource is defined
+   * @param {types.RuleProps} props
    * @param {ecs.ICluster} cluster
    * @param {ecs.ITaskDefinition} task
    * @param {string[]} subnetIds
@@ -83,8 +83,8 @@ export class EventManager {
    */
   public createFargateTaskRule(
     id: string,
-    scope: CommonConstruct,
-    props: RuleProps,
+    scope: common.CommonConstruct,
+    props: types.RuleProps,
     cluster: ecs.ICluster,
     task: ecs.ITaskDefinition,
     subnetIds: string[],
@@ -115,8 +115,8 @@ export class EventManager {
       ],
     })
 
-    createCfnOutput(`${id}-ruleArn`, scope, eventRule.attrArn)
-    createCfnOutput(`${id}-ruleName`, scope, eventRule.name)
+    utils.createCfnOutput(`${id}-ruleArn`, scope, eventRule.attrArn)
+    utils.createCfnOutput(`${id}-ruleName`, scope, eventRule.name)
 
     return eventRule
   }