@gradientedge/cdk-utils 8.89.0 → 8.90.0

package/src/lib/{manager/aws/cloudwatch-manager.ts → services/aws/cloudwatch/main.ts}

@@ -1,9 +1,19 @@
 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 * as common from '../../common'
-import * as types from '../../types'
-import * as utils from '../../utils'
+import * as utils from '../../../utils'
+import { CommonConstruct } from '../../../common'
+import {
+  AlarmProps,
+  AlarmStatusWidgetProps,
+  DashboardProps,
+  GraphWidgetProps,
+  GuageWidgetProps,
+  LogQueryWidgetProps,
+  MetricProps,
+  NumericWidgetProps,
+  TextWidgetProps,
+} from './types'
 
 /**
  * @category cdk-utils.cloudwatch-manager
@@ -23,12 +33,12 @@ enum CloudWatchWidgetType {
  * @category cdk-utils.cloudwatch-manager
  * @subcategory Construct
  * @classdesc Provides operations on AWS CloudWatch.
- * - 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.
+ * - 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.
  * @example
- * import * as common from '@gradientedge/cdk-utils'
+ * import { CommonConstruct } from '@gradientedge/cdk-utils'
  *
- * class CustomConstruct extends common.common.CommonConstruct {
+ * class CustomConstruct extends CommonConstruct {
  *   constructor(parent: cdk.Construct, id: string, props: common.CommonStackProps) {
  *     super(parent, id, props)
  *     this.props = props
@@ -42,10 +52,10 @@ export class CloudWatchManager {
   /**
    * @summary Method to create a cloudwatch alarm for a given expression
    * @param {string} id scoped id of the resource
-   * @param {common.CommonConstruct} scope scope in which this resource is defined
-   * @param {types.AlarmProps} props
+   * @param {CommonConstruct} scope scope in which this resource is defined
+   * @param {AlarmProps} props
    */
-  public createAlarmForExpression(id: string, scope: common.CommonConstruct, props: types.AlarmProps) {
+  public createAlarmForExpression(id: string, scope: CommonConstruct, props: AlarmProps) {
     if (!props) throw `Alarm props undefined for ${id}`
 
     if (!props.expression) throw `Could not find expression for Alarm props for id:${id}`
@@ -80,16 +90,11 @@ export class CloudWatchManager {
   /**
    * @summary Method to create a cloudwatch alarm for a given metric
    * @param {string} id scoped id of the resource
-   * @param {common.CommonConstruct} scope scope in which this resource is defined
-   * @param {types.AlarmProps} props
+   * @param {CommonConstruct} scope scope in which this resource is defined
+   * @param {AlarmProps} props
    * @param metric
    */
-  public createAlarmForMetric(
-    id: string,
-    scope: common.CommonConstruct,
-    props: types.AlarmProps,
-    metric: watch.Metric
-  ) {
+  public createAlarmForMetric(id: string, scope: CommonConstruct, props: AlarmProps, metric: watch.Metric) {
     if (!props) throw `Alarm props undefined for ${id}`
 
     const alarm = metric.createAlarm(scope, `${id}`, {
@@ -111,16 +116,11 @@ export class CloudWatchManager {
   /**
    * @summary Method to create a cloudwatch dashboard
    * @param {string} id scoped id of the resource
-   * @param {common.CommonConstruct} scope scope in which this resource is defined
-   * @param {types.DashboardProps} props
+   * @param {CommonConstruct} scope scope in which this resource is defined
+   * @param {DashboardProps} props
    * @param widgets
    */
-  public createDashboard(
-    id: string,
-    scope: common.CommonConstruct,
-    props: types.DashboardProps,
-    widgets?: watch.IWidget[][]
-  ) {
+  public createDashboard(id: string, scope: CommonConstruct, props: DashboardProps, widgets?: watch.IWidget[][]) {
     if (!props) throw `Dashboard props undefined for ${id}`
 
     const dashboard = new watch.Dashboard(scope, `${id}`, {
@@ -138,10 +138,10 @@ export class CloudWatchManager {
 
   /**
    * @summary Method to create cloudwatch widgets
-   * @param {common.CommonConstruct} scope scope in which this resource is defined
+   * @param {CommonConstruct} scope scope in which this resource is defined
    * @param props
    */
-  public createWidgets(scope: common.CommonConstruct, props: any[]) {
+  public createWidgets(scope: CommonConstruct, props: any[]) {
     if (!props || props.length == 0) throw `Widget props undefined`
 
     const widgets: any = []
@@ -153,10 +153,10 @@ export class CloudWatchManager {
   /**
    * @summary Method to create a cloudwatch widget
    * @param {string} id scoped id of the resource
-   * @param {common.CommonConstruct} scope scope in which this resource is defined
+   * @param {CommonConstruct} scope scope in which this resource is defined
    * @param props
    */
-  public createWidget(id: string, scope: common.CommonConstruct, props: any) {
+  public createWidget(id: string, scope: CommonConstruct, props: any) {
     if (!props) throw `Widget props undefined for ${id}`
 
     const metrics = this.determineMetrics(scope, props.metricProps)
@@ -185,16 +185,11 @@ export class CloudWatchManager {
   /**
    * @summary Method to create a cloudfront distribution widget
    * @param {string} id scoped id of the resource
-   * @param {common.CommonConstruct} scope scope in which this resource is defined
-   * @param {types.TextWidgetProps} props
+   * @param {CommonConstruct} scope scope in which this resource is defined
+   * @param {TextWidgetProps} props
    * @param {string} distributionId the cloudfront distribution id
    */
-  public createCloudfrontDistributionWidget(
-    id: string,
-    scope: common.CommonConstruct,
-    props: any,
-    distributionId: string
-  ) {
+  public createCloudfrontDistributionWidget(id: string, scope: CommonConstruct, props: any, distributionId: string) {
     if (!props) throw `Widget props undefined for ${id}`
     const metricProps: any[] = props.metricProps
     return this.createWidget(id, scope, {
@@ -208,11 +203,11 @@ export class CloudWatchManager {
   /**
    * @summary Method to create a step function widget
    * @param {string} id scoped id of the resource
-   * @param {common.CommonConstruct} scope scope in which this resource is defined
-   * @param {types.TextWidgetProps} props
+   * @param {CommonConstruct} scope scope in which this resource is defined
+   * @param {TextWidgetProps} props
    * @param {string} stateMachineArn the step function arn
    */
-  public createStateWidget(id: string, scope: common.CommonConstruct, props: any, stateMachineArn: string) {
+  public createStateWidget(id: string, scope: CommonConstruct, props: any, stateMachineArn: string) {
     if (!props) throw `Widget props undefined for ${id}`
     const metricProps: any[] = props.metricProps
     return this.createWidget(id, scope, {
@@ -226,18 +221,12 @@ export class CloudWatchManager {
   /**
    * @summary Method to create an event widget
    * @param {string} id scoped id of the resource
-   * @param {common.CommonConstruct} scope scope in which this resource is defined
-   * @param {types.TextWidgetProps} props
+   * @param {CommonConstruct} scope scope in which this resource is defined
+   * @param {TextWidgetProps} props
    * @param {string} eventBusName the event bus name
    * @param {string} ruleName the event rule name
    */
-  public createEventWidget(
-    id: string,
-    scope: common.CommonConstruct,
-    props: any,
-    eventBusName: string,
-    ruleName: string
-  ) {
+  public createEventWidget(id: string, scope: CommonConstruct, props: any, eventBusName: string, ruleName: string) {
     if (!props) throw `Widget props undefined for ${id}`
     const metricProps: any[] = props.metricProps
     return this.createWidget(id, scope, {
@@ -254,11 +243,11 @@ export class CloudWatchManager {
   /**
    * @summary Method to create an api gateway widget
    * @param {string} id scoped id of the resource
-   * @param {common.CommonConstruct} scope scope in which this resource is defined
-   * @param {types.TextWidgetProps} props
+   * @param {CommonConstruct} scope scope in which this resource is defined
+   * @param {TextWidgetProps} props
    * @param {string} apiName the api name
    */
-  public createApiGatewayWidget(id: string, scope: common.CommonConstruct, props: any, apiName: string) {
+  public createApiGatewayWidget(id: string, scope: CommonConstruct, props: any, apiName: string) {
     if (!props) throw `Widget props undefined for ${id}`
     const metricProps: any[] = props.metricProps
     return this.createWidget(id, scope, {
@@ -272,11 +261,11 @@ export class CloudWatchManager {
   /**
    * @summary Method to create a lambda function widget
    * @param {string} id scoped id of the resource
-   * @param {common.CommonConstruct} scope scope in which this resource is defined
-   * @param {types.TextWidgetProps} props
+   * @param {CommonConstruct} scope scope in which this resource is defined
+   * @param {TextWidgetProps} props
    * @param {string} functionName the lambda function name
    */
-  public createLambdaWidget(id: string, scope: common.CommonConstruct, props: any, functionName: string) {
+  public createLambdaWidget(id: string, scope: CommonConstruct, props: any, functionName: string) {
     if (!props) throw `Widget props undefined for ${id}`
     const metricProps: any[] = props.metricProps
     return this.createWidget(id, scope, {
@@ -290,11 +279,11 @@ export class CloudWatchManager {
   /**
    * @summary Method to create a custom widget
    * @param {string} id scoped id of the resource
-   * @param {common.CommonConstruct} scope scope in which this resource is defined
-   * @param {types.TextWidgetProps} props
+   * @param {CommonConstruct} scope scope in which this resource is defined
+   * @param {TextWidgetProps} props
    * @param {string} service the service identifier
    */
-  public createCustomWidget(id: string, scope: common.CommonConstruct, props: any, service: string) {
+  public createCustomWidget(id: string, scope: CommonConstruct, props: any, service: string) {
     if (!props) throw `Widget props undefined for ${id}`
     const metricProps: any[] = props.metricProps
     return this.createWidget(id, scope, {
@@ -308,11 +297,11 @@ export class CloudWatchManager {
   /**
    * @summary Method to create an ecs cluster widget
    * @param {string} id scoped id of the resource
-   * @param {common.CommonConstruct} scope scope in which this resource is defined
-   * @param {types.TextWidgetProps} props
+   * @param {CommonConstruct} scope scope in which this resource is defined
+   * @param {TextWidgetProps} props
    * @param {string} clusterName the ecs cluster name
    */
-  public createEcsClusterWidget(id: string, scope: common.CommonConstruct, props: any, clusterName: string) {
+  public createEcsClusterWidget(id: string, scope: CommonConstruct, props: any, clusterName: string) {
     if (!props) throw `Widget props undefined for ${id}`
     const metricProps: any[] = props.metricProps
     return this.createWidget(id, scope, {
@@ -326,14 +315,14 @@ export class CloudWatchManager {
   /**
    * @summary Method to create an ecs service widget
    * @param {string} id scoped id of the resource
-   * @param {common.CommonConstruct} scope scope in which this resource is defined
-   * @param {types.TextWidgetProps} props
+   * @param {CommonConstruct} scope scope in which this resource is defined
+   * @param {TextWidgetProps} props
    * @param {string} clusterName the ecs cluster name
    * @param {string} serviceName the ecs service name
    */
   public createEcsServiceWidget(
     id: string,
-    scope: common.CommonConstruct,
+    scope: CommonConstruct,
     props: any,
     clusterName: string,
     serviceName: string
@@ -354,11 +343,11 @@ export class CloudWatchManager {
   /**
    * @summary Method to create an elb widget
    * @param {string} id scoped id of the resource
-   * @param {common.CommonConstruct} scope scope in which this resource is defined
-   * @param {types.TextWidgetProps} props
+   * @param {CommonConstruct} scope scope in which this resource is defined
+   * @param {TextWidgetProps} props
    * @param {string} loadBalancer the loadbalancer reference
    */
-  public createElbWidget(id: string, scope: common.CommonConstruct, props: any, loadBalancer: string) {
+  public createElbWidget(id: string, scope: CommonConstruct, props: any, loadBalancer: string) {
     if (!props) throw `Widget props undefined for ${id}`
     const metricProps: any[] = props.metricProps
     return this.createWidget(id, scope, {
@@ -372,11 +361,11 @@ export class CloudWatchManager {
   /**
    * @summary Method to create an elasticache widget
    * @param {string} id scoped id of the resource
-   * @param {common.CommonConstruct} scope scope in which this resource is defined
-   * @param {types.TextWidgetProps} props
+   * @param {CommonConstruct} scope scope in which this resource is defined
+   * @param {TextWidgetProps} props
    * @param {string} cacheClusterId the elasticache cluster id
    */
-  public createCacheWidget(id: string, scope: common.CommonConstruct, props: any, cacheClusterId: string) {
+  public createCacheWidget(id: string, scope: CommonConstruct, props: any, cacheClusterId: string) {
     if (!props) throw `Widget props undefined for ${id}`
     const metricProps: any[] = props.metricProps
     return this.createWidget(id, scope, {
@@ -390,10 +379,10 @@ export class CloudWatchManager {
   /**
    * @summary Method to create a cloudwatch text widget
    * @param {string} id scoped id of the resource
-   * @param {common.CommonConstruct} scope scope in which this resource is defined
-   * @param {types.TextWidgetProps} props
+   * @param {CommonConstruct} scope scope in which this resource is defined
+   * @param {TextWidgetProps} props
    */
-  public createTextWidget(id: string, scope: common.CommonConstruct, props: types.TextWidgetProps) {
+  public createTextWidget(id: string, scope: CommonConstruct, props: TextWidgetProps) {
     if (!props) throw `Widget props undefined for ${id}`
     const widget = new watch.TextWidget({
       markdown: props.markdown,
@@ -409,16 +398,11 @@ export class CloudWatchManager {
   /**
    * @summary Method to create a cloudwatch numeric widget
    * @param {string} id scoped id of the resource
-   * @param {common.CommonConstruct} scope scope in which this resource is defined
-   * @param {types.NumericWidgetProps} props
+   * @param {CommonConstruct} scope scope in which this resource is defined
+   * @param {NumericWidgetProps} props
    * @param metrics
    */
-  public createSingleValueWidget(
-    id: string,
-    scope: common.CommonConstruct,
-    props: types.NumericWidgetProps,
-    metrics: IMetric[]
-  ) {
+  public createSingleValueWidget(id: string, scope: CommonConstruct, props: NumericWidgetProps, metrics: IMetric[]) {
     if (!props) throw `Widget props undefined for ${id}`
     const widget = new watch.SingleValueWidget({
       region: props.region ?? scope.props.region,
@@ -439,16 +423,11 @@ export class CloudWatchManager {
   /**
    * @summary Method to create a cloudwatch guage widget
    * @param {string} id scoped id of the resource
-   * @param {common.CommonConstruct} scope scope in which this resource is defined
-   * @param {types.GuageWidgetProps} props
+   * @param {CommonConstruct} scope scope in which this resource is defined
+   * @param {GuageWidgetProps} props
    * @param metrics
    */
-  public createGuageWidget(
-    id: string,
-    scope: common.CommonConstruct,
-    props: types.GuageWidgetProps,
-    metrics: IMetric[]
-  ) {
+  public createGuageWidget(id: string, scope: CommonConstruct, props: GuageWidgetProps, metrics: IMetric[]) {
     if (!props) throw `Widget props undefined for ${id}`
     const widget = new watch.GaugeWidget({
       region: props.region ?? scope.props.region,
@@ -469,15 +448,15 @@ export class CloudWatchManager {
   /**
    * @summary Method to create a cloudwatch graph widget
    * @param {string} id scoped id of the resource
-   * @param {common.CommonConstruct} scope scope in which this resource is defined
-   * @param {types.GraphWidgetProps} props
+   * @param {CommonConstruct} scope scope in which this resource is defined
+   * @param {GraphWidgetProps} props
    * @param leftYMetrics
    * @param rightYMetrics
    */
   public createGraphWidget(
     id: string,
-    scope: common.CommonConstruct,
-    props: types.GraphWidgetProps,
+    scope: CommonConstruct,
+    props: GraphWidgetProps,
     leftYMetrics?: IMetric[],
     rightYMetrics?: IMetric[]
   ) {
@@ -507,14 +486,14 @@ export class CloudWatchManager {
   /**
    * @summary Method to create a cloudwatch alarm status widget
    * @param {string} id scoped id of the resource
-   * @param {common.CommonConstruct} scope scope in which this resource is defined
-   * @param {types.AlarmStatusWidgetProps} props
+   * @param {CommonConstruct} scope scope in which this resource is defined
+   * @param {AlarmStatusWidgetProps} props
    * @param {watch.IAlarm[]} alarms
    */
   public createAlarmStatusWidget(
     id: string,
-    scope: common.CommonConstruct,
-    props: types.AlarmStatusWidgetProps,
+    scope: CommonConstruct,
+    props: AlarmStatusWidgetProps,
     alarms: watch.IAlarm[]
   ) {
     if (!props) throw `Widget props undefined for ${id}`
@@ -533,16 +512,11 @@ export class CloudWatchManager {
   /**
    * @summary Method to create a cloudwatch log query widget
    * @param {string} id scoped id of the resource
-   * @param {common.CommonConstruct} scope scope in which this resource is defined
-   * @param {types.LogQueryWidgetProps} props
+   * @param {CommonConstruct} scope scope in which this resource is defined
+   * @param {LogQueryWidgetProps} props
    * @param {string[]} logGroupNames
    */
-  public createLogQueryWidget(
-    id: string,
-    scope: common.CommonConstruct,
-    props: types.LogQueryWidgetProps,
-    logGroupNames: string[]
-  ) {
+  public createLogQueryWidget(id: string, scope: CommonConstruct, props: LogQueryWidgetProps, logGroupNames: string[]) {
     if (!props) throw `Widget props undefined for ${id}`
     const widget = new watch.LogQueryWidget({
       region: props.region ?? scope.props.region,
@@ -562,13 +536,13 @@ export class CloudWatchManager {
 
   /**
    * @summary Utility method to determine the metrics and dimensions
-   * @param {common.CommonConstruct} scope scope in which this resource is defined
-   * @param {types.MetricProps[]} metricProps
+   * @param {CommonConstruct} scope scope in which this resource is defined
+   * @param {MetricProps[]} metricProps
    */
-  private determineMetrics(scope: common.CommonConstruct, metricProps: types.MetricProps[]) {
+  private determineMetrics(scope: CommonConstruct, metricProps: MetricProps[]) {
     const metrics: watch.IMetric[] = []
     if (metricProps) {
-      metricProps.forEach((metricProp: types.MetricProps) => {
+      metricProps.forEach((metricProp: MetricProps) => {
         let metricDimensions: watch.DimensionHash = metricProp.dimensionsMap || {}
         if (metricProp.functionName) {
           metricDimensions = {
@@ -705,10 +679,10 @@ export class CloudWatchManager {
   /**
    * @summary Utility method to determine the configured alarms
    * @param {string} id scoped id of the resource
-   * @param {common.CommonConstruct} scope scope in which this resource is defined
+   * @param {CommonConstruct} scope scope in which this resource is defined
    * @param {watch.AlarmProps[]} alarmProps
    */
-  private determineAlarms(id: string, scope: common.CommonConstruct, alarmProps: watch.AlarmProps[]) {
+  private determineAlarms(id: string, scope: CommonConstruct, alarmProps: watch.AlarmProps[]) {
     const alarms: watch.IAlarm[] = []
     if (alarmProps) {
       alarmProps.forEach((alarmProp: watch.AlarmProps) => {

package/src/lib/services/aws/cloudwatch/types.ts

@@ -0,0 +1,121 @@
+import * as watch from 'aws-cdk-lib/aws-cloudwatch'
+import * as logs from 'aws-cdk-lib/aws-logs'
+import { TagProps } from '../../../types'
+
+/**
+ * @category cdk-utils.cloudwatch-manager
+ * @subcategory Properties
+ */
+export interface AlarmProps extends watch.AlarmProps {
+  expression?: string
+  metricProps?: MetricProps[]
+  periodInSecs?: number
+}
+
+/**
+ * @category cdk-utils.cloudwatch-manager
+ * @subcategory Properties
+ */
+export interface DashboardProps extends watch.DashboardProps {}
+
+/**
+ * @category cdk-utils.cloudwatch-manager
+ * @subcategory Properties
+ */
+export interface MetricProps extends watch.MetricProps {
+  stageSuffix: boolean
+  periodInSecs?: number
+  functionName?: string
+  dbClusterIdentifier?: string
+  distributionId?: string
+  loadBalancer?: string
+  serviceName?: string
+  clusterName?: string
+  apiName?: string
+  cacheClusterId?: string
+  stateMachineArn?: string
+  eventBusName?: string
+  ruleName?: string
+  service?: string
+}
+
+/**
+ * @category cdk-utils.cloudwatch-manager
+ * @subcategory Properties
+ */
+export interface TextWidgetProps extends watch.TextWidgetProps {
+  type: string
+  positionX: number
+  positionY: number
+}
+
+/**
+ * @category cdk-utils.cloudwatch-manager
+ * @subcategory Properties
+ */
+export interface NumericWidgetProps extends watch.SingleValueWidgetProps {
+  type: string
+  positionX: number
+  positionY: number
+  metricProps: watch.MetricProps[]
+}
+
+/**
+ * @category cdk-utils.cloudwatch-manager
+ * @subcategory Properties
+ */
+export interface GuageWidgetProps extends watch.GaugeWidgetProps {
+  type: string
+  positionX: number
+  positionY: number
+  metricProps: watch.MetricProps[]
+}
+
+/**
+ * @category cdk-utils.cloudwatch-manager
+ * @subcategory Properties
+ */
+export interface GraphWidgetProps extends watch.GraphWidgetProps {
+  type: string
+  positionX: number
+  positionY: number
+  metricProps: MetricProps[]
+}
+
+/**
+ * @category cdk-utils.cloudwatch-manager
+ * @subcategory Properties
+ */
+export interface AlarmStatusWidgetProps extends watch.AlarmStatusWidgetProps {
+  type: string
+  positionX: number
+  positionY: number
+  alarmProps: watch.AlarmProps[]
+}
+
+/**
+ * @category cdk-utils.cloudwatch-manager
+ * @subcategory Properties
+ */
+export interface LogQueryWidgetProps extends watch.LogQueryWidgetProps {
+  type: string
+  positionX: number
+  positionY: number
+}
+
+/**
+ * @category cdk-utils.cloudwatch-manager
+ * @subcategory Properties
+ */
+export interface MetricFilterProps extends logs.MetricFilterProps {
+  periodInSecs: number
+  options: watch.MetricOptions
+}
+
+/**
+ * @category cdk-utils.cloudwatch-manager
+ * @subcategory Properties
+ */
+export interface LogProps extends logs.LogGroupProps {
+  tags?: TagProps[]
+}

package/src/lib/services/aws/codebuild/index.ts

@@ -0,0 +1 @@
+export * from './main'

package/src/lib/{manager/aws/codebuild-manager.ts → services/aws/codebuild/main.ts}

@@ -1,18 +1,18 @@
 import * as cdk from 'aws-cdk-lib'
 import * as codebuild from 'aws-cdk-lib/aws-codebuild'
-import * as common from '../../common'
+import { CommonConstruct } from '../../../common'
 
 /**
  * @stability stable
  * @category cdk-utils.codebuild-manager
  * @subcategory Construct
  * @classdesc Provides operations on AWS Code Build.
- * - 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.
+ * - 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.
  * @example
- * import { common.CommonConstruct } from '@gradientedge/cdk-utils'
+ * import { CommonConstruct } from '@gradientedge/cdk-utils'
  *
- * class CustomConstruct extends common.CommonConstruct {
+ * class CustomConstruct extends CommonConstruct {
  *   constructor(parent: cdk.Construct, id: string, props: common.CommonStackProps) {
  *     super(parent, id, props)
  *     this.props = props
@@ -29,7 +29,7 @@ export class CodeBuildManager {
    * @param scope
    * @param dockerfilePath
    */
-  public createImageForCloudfrontInvalidation(id: string, scope: common.CommonConstruct, dockerfilePath: string) {
+  public createImageForCloudfrontInvalidation(id: string, scope: CommonConstruct, dockerfilePath: string) {
     return scope.ecrManager.createDockerImage(`${id}-build-image`, scope, dockerfilePath)
   }
 
@@ -43,7 +43,7 @@ export class CodeBuildManager {
    */
   public createProjectForCloudfrontInvalidation(
     id: string,
-    scope: common.CommonConstruct,
+    scope: CommonConstruct,
     dockerFilepath: string,
     distributionId: string,
     paths?: string

package/src/lib/services/aws/dynamodb/index.ts

@@ -0,0 +1,2 @@
+export * from './main'
+export * from './types'

package/src/lib/{manager/aws/dynamodb-manager.ts → services/aws/dynamodb/main.ts}

@@ -1,16 +1,16 @@
 import * as dynamodb from 'aws-cdk-lib/aws-dynamodb'
-import * as common from '../../common'
-import * as types from '../../types'
-import * as utils from '../../utils'
+import * as utils from '../../../utils'
 import * as cdk from 'aws-cdk-lib'
+import { CommonConstruct } from '../../../common'
+import { TableProps } from './types'
 
 /**
  * @stability stable
  * @category cdk-utils.dynamodb-manager
  * @subcategory Construct
  * @classdesc Provides operations on AWS DynamoDB.
- * - 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.
+ * - 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.
  * @example
  * import { CommonConstruct } from '@gradientedge/cdk-utils'
  *
@@ -28,10 +28,10 @@ export class DynamodbManager {
   /**
    * @summary Method to create a table
    * @param {string} id scoped id of the resource
-   * @param {common.CommonConstruct} scope scope in which this resource is defined
-   * @param {types.TableProps} props table props
+   * @param {CommonConstruct} scope scope in which this resource is defined
+   * @param {TableProps} props table props
    */
-  public createTable(id: string, scope: common.CommonConstruct, props: types.TableProps) {
+  public createTable(id: string, scope: CommonConstruct, props: TableProps) {
     if (!props) throw `Table props undefined for ${id}`
 
     const table = new dynamodb.Table(scope, `${id}`, {

package/src/lib/services/aws/dynamodb/types.ts

@@ -0,0 +1,10 @@
+import * as dynamodb from 'aws-cdk-lib/aws-dynamodb'
+import { TagProps } from '../../../types'
+
+/**
+ * @category cdk-utils.dynamodb-manager
+ * @subcategory Properties
+ */
+export interface TableProps extends dynamodb.TableProps {
+  tags?: TagProps[]
+}

package/src/lib/services/aws/elastic-container-registry/index.ts

@@ -0,0 +1 @@
+export * from './main'