@gradientedge/cdk-utils 8.89.0 → 8.90.0

package/src/lib/construct/rest-api-lambda/types.ts

@@ -0,0 +1,29 @@
+import { AcmProps, LambdaEnvironment, LambdaProps } from '../../services'
+import { CommonStackProps } from '../../common'
+import { LambdaRestApiProps } from 'aws-cdk-lib/aws-apigateway'
+import { AssetCode } from 'aws-cdk-lib/aws-lambda'
+
+/**
+ * @category cdk-utils.rest-api-lambda
+ * @subcategory Types
+ */
+export interface RestApiLambdaEnvironment extends LambdaEnvironment {}
+
+/**
+ * @category cdk-utils.rest-api-lambda
+ * @subcategory Properties
+ */
+export interface RestApiLambdaProps extends CommonStackProps {
+  apiRootPaths?: string[]
+  apiSubDomain: string
+  restApiCertificate: AcmProps
+  restApi: LambdaRestApiProps
+  restApiLambdaLayerSources?: AssetCode[]
+  restApiHandler: string
+  restApiSource: AssetCode
+  restApiLambda: LambdaProps
+  useExistingHostedZone: boolean
+  nodeEnv: string
+  logLevel: string
+  timezone: string
+}

package/src/lib/construct/rest-api-lambda-with-cache/index.ts

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

package/src/lib/construct/rest-api-lambda-with-cache/main.ts

@@ -4,7 +4,7 @@ import * as elasticache from 'aws-cdk-lib/aws-elasticache'
 import * as iam from 'aws-cdk-lib/aws-iam'
 import { Construct } from 'constructs'
 import { RestApiLambda } from '..'
-import { RestApiLambdaWithCacheProps } from '../../types'
+import { RestApiLambdaWithCacheProps } from './types'
 import * as utils from '../../utils'
 
 /**

package/src/lib/construct/rest-api-lambda-with-cache/types.ts

@@ -0,0 +1,15 @@
+import { RestApiLambdaProps } from '../rest-api-lambda'
+import { VpcProps } from 'aws-cdk-lib/aws-ec2'
+import { ReplicatedElastiCacheProps } from '../../services'
+
+/**
+ * @category cdk-utils.rest-api-lambda-with-cache
+ * @subcategory Properties
+ */
+export interface RestApiLambdaWithCacheProps extends RestApiLambdaProps {
+  restApiVpc: VpcProps
+  restApiCache: ReplicatedElastiCacheProps
+  securityGroupExportName: string
+  useExistingVpc: boolean
+  vpcName?: string
+}

package/src/lib/construct/site-with-ecs-backend/index.ts

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

package/src/lib/construct/site-with-ecs-backend/main.ts

@@ -13,7 +13,7 @@ import * as s3 from 'aws-cdk-lib/aws-s3'
 import * as efs from 'aws-cdk-lib/aws-efs'
 import { Construct } from 'constructs'
 import { CommonConstruct } from '../../common'
-import { SiteWithEcsBackendProps } from '../../types'
+import { SiteWithEcsBackendProps } from './types'
 
 /**
  * @stability stable

package/src/lib/construct/site-with-ecs-backend/types.ts

@@ -0,0 +1,42 @@
+import { CommonStackProps } from '../../common'
+import {
+  AcmProps,
+  CloudfrontFunctionProps,
+  DistributionProps,
+  EcsApplicationLoadBalancedFargateServiceProps,
+  EcsClusterProps,
+  EfsAccessPointOptions,
+  EfsFileSystemProps,
+  HealthCheck,
+  LogProps,
+  S3BucketProps,
+} from '../../services'
+import { VpcProps } from 'aws-cdk-lib/aws-ec2'
+
+/**
+ * @category cdk-utils.site-with-ecs-backend
+ * @subcategory Properties
+ */
+export interface SiteWithEcsBackendProps extends CommonStackProps {
+  siteCacheInvalidationDockerFilePath?: string
+  siteHealthCheck: HealthCheck
+  siteCertificate: AcmProps
+  siteRegionalCertificate: AcmProps
+  siteCluster: EcsClusterProps
+  siteDistribution: DistributionProps
+  siteCloudfrontFunctionProps?: CloudfrontFunctionProps
+  siteFunctionFilePath?: string
+  siteEcsContainerImagePath: string
+  siteLog: LogProps
+  siteLogBucket: S3BucketProps
+  siteRecordName?: string
+  siteSubDomain: string
+  siteTask: EcsApplicationLoadBalancedFargateServiceProps
+  siteVpc: VpcProps
+  siteFileSystem?: EfsFileSystemProps
+  siteFileSystemAccessPoints?: EfsAccessPointOptions[]
+  useExistingHostedZone: boolean
+  nodeEnv: string
+  logLevel: string
+  timezone: string
+}

package/src/lib/construct/static-asset-deployment/types.ts

@@ -1,4 +1,5 @@
-import { BucketDeploymentProps, CommonStackProps, S3BucketProps } from '../../types'
+import { BucketDeploymentProps, S3BucketProps } from '../../services'
+import { CommonStackProps } from '../../common'
 
 export interface AssetExport {
   key: string

package/src/lib/construct/static-site/index.ts

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

package/src/lib/construct/static-site/main.ts

@@ -5,7 +5,7 @@ import * as route53 from 'aws-cdk-lib/aws-route53'
 import * as s3 from 'aws-cdk-lib/aws-s3'
 import { Construct } from 'constructs'
 import { CommonConstruct } from '../../common'
-import { StaticSiteProps } from '../../types'
+import { StaticSiteProps } from './types'
 
 /**
  * @stability stable

package/src/lib/construct/static-site/types.ts

@@ -0,0 +1,27 @@
+import { CommonStackProps } from '../../common'
+import { AcmProps, CloudfrontFunctionProps, DistributionProps, S3BucketProps } from '../../services'
+import { ISource } from 'aws-cdk-lib/aws-s3-deployment'
+
+/**
+ * @category cdk-utils.static-site
+ * @subcategory Properties
+ */
+export interface StaticSiteProps extends CommonStackProps {
+  siteCacheInvalidationDockerFilePath?: string
+  siteCreateAltARecord: boolean
+  siteCertificate: AcmProps
+  siteBucket: S3BucketProps
+  siteLogBucket: S3BucketProps
+  siteDistribution?: DistributionProps
+  siteCloudfrontFunctionProps?: CloudfrontFunctionProps
+  siteFunctionFilePath?: string
+  siteSource: ISource
+  siteHostedZoneDomainName?: string
+  siteRecordName?: string
+  siteSubDomain?: string
+  siteAliases?: string[]
+  useExistingHostedZone: boolean
+  nodeEnv: string
+  logLevel: string
+  timezone: string
+}

package/src/lib/index.ts

@@ -0,0 +1,5 @@
+export * from './common'
+export * from './construct'
+export * from './services'
+export * from './types'
+export * from './utils'

package/src/lib/services/aws/api-gateway/index.ts

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

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

@@ -1,22 +1,22 @@
 import * as apig from 'aws-cdk-lib/aws-apigateway'
 import * as acm from 'aws-cdk-lib/aws-certificatemanager'
 import * as lambda from 'aws-cdk-lib/aws-lambda'
-import * as common from '../../common'
-import * as utils from '../../utils'
+import * as utils from '../../../utils'
 import * as cdk from 'aws-cdk-lib'
-import * as types from '../../types'
+import { LambdaRestApiProps } from './types'
+import { CommonConstruct } from '../../../common'
 
 /**
  * @stability stable
  * @category cdk-utils.api-manager
  * @subcategory Construct
  * @classdesc Provides operations on AWS API Gateway.
- * - 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
@@ -31,14 +31,14 @@ export class ApiManager {
   /**
    * @summary Method to create a Rest API with Lambda backend/target
    * @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 {AcmProps} props lambda rest restApi props
    * @param lambdaFunction
    */
   public createLambdaRestApi(
     id: string,
-    scope: common.CommonConstruct,
-    props: types.LambdaRestApiProps,
+    scope: CommonConstruct,
+    props: LambdaRestApiProps,
     lambdaFunction: lambda.IFunction
   ) {
     if (!props) throw `Api props undefined for ${id}`
@@ -96,11 +96,11 @@ export class ApiManager {
   /**
    * @summary Method to create custom restApi domain
    * @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 domainName the domain name to use
    * @param certificate the certificate used for custom restApi domain
    */
-  public createApiDomain(id: string, scope: common.CommonConstruct, domainName: string, certificate: acm.ICertificate) {
+  public createApiDomain(id: string, scope: CommonConstruct, domainName: string, certificate: acm.ICertificate) {
     const apiDomain = new apig.DomainName(scope, `${id}`, {
       domainName: domainName,
       certificate: certificate,
@@ -116,7 +116,7 @@ export class ApiManager {
   /**
    * @summary Method to create an API gateway resource
    * @param {string} id
-   * @param {common.CommonConstruct} scope
+   * @param {CommonConstruct} scope
    * @param {apig.IResource} parent
    * @param {string} path
    * @param {apig.Integration} integration
@@ -130,7 +130,7 @@ export class ApiManager {
    */
   public createApiResource(
     id: string,
-    scope: common.CommonConstruct,
+    scope: CommonConstruct,
     parent: apig.IResource,
     path: string,
     integration: apig.Integration,
@@ -152,7 +152,10 @@ export class ApiManager {
       },
     })
     methods.forEach(method =>
-      resource.addMethod(method, integration, { authorizer, requestParameters: methodRequestParameters })
+      resource.addMethod(method, integration, {
+        authorizer,
+        requestParameters: methodRequestParameters,
+      })
     )
     utils.createCfnOutput(`${id}-${path}ResourceId`, scope, resource.resourceId)
 
@@ -180,10 +183,10 @@ export class ApiManager {
   /**
    * @summary Method to create an api deployment
    * @param {string} id
-   * @param {common.CommonConstruct} scope
+   * @param {CommonConstruct} scope
    * @param {apig.IRestApi} restApi
    */
-  public createApiDeployment(id: string, scope: common.CommonConstruct, restApi: apig.IRestApi) {
+  public createApiDeployment(id: string, scope: CommonConstruct, restApi: apig.IRestApi) {
     new apig.Deployment(scope, `${id}`, {
       api: restApi,
       retainDeployments: false,

package/src/lib/services/aws/api-gateway/types.ts

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

package/src/lib/services/aws/appconfig/constants.ts

@@ -0,0 +1,58 @@
+/**
+ * @stability stable
+ * @category cdk-utils.app-config-manager
+ * @subcategory Construct
+ * @returns { Map<string, string> } AppConfig extension ARN by region for x84
+ */
+export const ArnsByRegionForX86_64: { [region: string]: string } = {
+  'us-east-1': 'arn:aws:lambda:us-east-1:027255383542:layer:AWS-AppConfig-Extension:110',
+  'us-east-2': 'arn:aws:lambda:us-east-2:728743619870:layer:AWS-AppConfig-Extension:79',
+  'us-west-1': 'arn:aws:lambda:us-west-1:958113053741:layer:AWS-AppConfig-Extension:121',
+  'us-west-2': 'arn:aws:lambda:us-west-2:359756378197:layer:AWS-AppConfig-Extension:143',
+  'ca-central-1': 'arn:aws:lambda:ca-central-1:039592058896:layer:AWS-AppConfig-Extension:79',
+  'eu-central-1': 'arn:aws:lambda:eu-central-1:066940009817:layer:AWS-AppConfig-Extension:91',
+  'eu-central-2': 'arn:aws:lambda:eu-central-2:758369105281:layer:AWS-AppConfig-Extension:29',
+  'eu-west-1': 'arn:aws:lambda:eu-west-1:434848589818:layer:AWS-AppConfig-Extension:108',
+  'eu-west-2': 'arn:aws:lambda:eu-west-2:282860088358:layer:AWS-AppConfig-Extension:79',
+  'eu-west-3': 'arn:aws:lambda:eu-west-3:493207061005:layer:AWS-AppConfig-Extension:80',
+  'eu-north-1': 'arn:aws:lambda:eu-north-1:646970417810:layer:AWS-AppConfig-Extension:139',
+  'eu-south-1': 'arn:aws:lambda:eu-south-1:203683718741:layer:AWS-AppConfig-Extension:71',
+  'eu-south-2': 'arn:aws:lambda:eu-south-2:586093569114:layer:AWS-AppConfig-Extension:26',
+  'cn-north-1': 'arn:aws-cn:lambda:cn-north-1:615057806174:layer:AWS-AppConfig-Extension:66',
+  'cn-northwest-1': 'arn:aws-cn:lambda:cn-northwest-1:615084187847:layer:AWS-AppConfig-Extension:66',
+  'ap-east-1': 'arn:aws:lambda:ap-east-1:630222743974:layer:AWS-AppConfig-Extension:71',
+  'ap-northeast-1': 'arn:aws:lambda:ap-northeast-1:980059726660:layer:AWS-AppConfig-Extension:82',
+  'ap-northeast-2': 'arn:aws:lambda:ap-northeast-2:826293736237:layer:AWS-AppConfig-Extension:91',
+  'ap-northeast-3': 'arn:aws:lambda:ap-northeast-3:706869817123:layer:AWS-AppConfig-Extension:84',
+  'ap-southeast-1': 'arn:aws:lambda:ap-southeast-1:421114256042:layer:AWS-AppConfig-Extension:89',
+  'ap-southeast-2': 'arn:aws:lambda:ap-southeast-2:080788657173:layer:AWS-AppConfig-Extension:91',
+  'ap-southeast-3': 'arn:aws:lambda:ap-southeast-3:418787028745:layer:AWS-AppConfig-Extension:60',
+  'ap-southeast-4': 'arn:aws:lambda:ap-southeast-4:307021474294:layer:AWS-AppConfig-Extension:2',
+  'ap-south-1': 'arn:aws:lambda:ap-south-1:554480029851:layer:AWS-AppConfig-Extension:92',
+  'ap-south-2': 'arn:aws:lambda:ap-south-2:489524808438:layer:AWS-AppConfig-Extension:29',
+  'sa-east-1': 'arn:aws:lambda:sa-east-1:000010852771:layer:AWS-AppConfig-Extension:110',
+  'af-south-1': 'arn:aws:lambda:af-south-1:574348263942:layer:AWS-AppConfig-Extension:71',
+  'me-central-1': 'arn:aws:lambda:me-central-1:662846165436:layer:AWS-AppConfig-Extension:31',
+  'me-south-1': 'arn:aws:lambda:me-south-1:559955524753:layer:AWS-AppConfig-Extension:71',
+  'us-gov-east-1': 'arn:aws-us-gov:lambda:us-gov-east-1:946561847325:layer:AWS-AppConfig-Extension:44',
+  'us-gov-west-1': 'arn:aws-us-gov:lambda:us-gov-west-1:946746059096:layer:AWS-AppConfig-Extension:44',
+}
+
+/**
+ * @stability stable
+ * @category cdk-utils.app-config-manager
+ * @subcategory Construct
+ * @returns { Map<string, string> } AppConfig extension ARN by region for arm64
+ */
+export const ArnsByRegionForArm64: { [region: string]: string } = {
+  'us-east-1': 'arn:aws:lambda:us-east-1:027255383542:layer:AWS-AppConfig-Extension-Arm64:43',
+  'us-east-2': 'arn:aws:lambda:us-east-2:728743619870:layer:AWS-AppConfig-Extension-Arm64:31',
+  'us-west-2': 'arn:aws:lambda:us-west-2:359756378197:layer:AWS-AppConfig-Extension-Arm64:45',
+  'eu-central-1': 'arn:aws:lambda:eu-central-1:066940009817:layer:AWS-AppConfig-Extension-Arm64:34',
+  'eu-west-1': 'arn:aws:lambda:eu-west-1:434848589818:layer:AWS-AppConfig-Extension-Arm64:46',
+  'eu-west-2': 'arn:aws:lambda:eu-west-2:282860088358:layer:AWS-AppConfig-Extension-Arm64:31',
+  'ap-northeast-1': 'arn:aws:lambda:ap-northeast-1:980059726660:layer:AWS-AppConfig-Extension-Arm64:35',
+  'ap-southeast-1': 'arn:aws:lambda:ap-southeast-1:421114256042:layer:AWS-AppConfig-Extension-Arm64:41',
+  'ap-southeast-2': 'arn:aws:lambda:ap-southeast-2:080788657173:layer:AWS-AppConfig-Extension-Arm64:34',
+  'ap-south-1': 'arn:aws:lambda:ap-south-1:554480029851:layer:AWS-AppConfig-Extension-Arm64:34',
+}

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

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

package/src/lib/services/aws/appconfig/main.ts

@@ -0,0 +1,130 @@
+import * as cdk from 'aws-cdk-lib'
+import * as appconfig from 'aws-cdk-lib/aws-appconfig'
+import * as utils from '../../../utils'
+import { Architecture } from '../constants'
+import { AppConfigProps } from './types'
+import { ArnsByRegionForArm64, ArnsByRegionForX86_64 } from './constants'
+import { CommonConstruct } from '../../../common'
+
+/**
+ * @category cdk-utils.app-config-manager
+ * @subcategory Construct
+ * @classdesc Provides operations on AWS AppConfig.
+ * - 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'
+ *
+ * class CustomConstruct extends CommonConstruct {
+ *   constructor(parent: cdk.Construct, id: string, props: common.CommonStackProps) {
+ *     super(parent, id, props)
+ *     this.props = props
+ *     this.appConfigManager.createApplication('MyApplication', this)
+ *   }
+ * }
+ *
+ * @see [CDK AppConfig Module]{@link https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_appconfig-readme.html}
+ */
+export class AppConfigManager {
+  /**
+   * Method to get static ARNs for AppConfig extensions
+   * @param {CommonConstruct} scope scope in which this resource is defined
+   * @param {Architecture} type type of the architecture
+   */
+  public getArnForAppConfigExtension(scope: CommonConstruct, type: Architecture) {
+    switch (type) {
+      case Architecture.ARM_64:
+        return ArnsByRegionForArm64[scope.props.region]
+      case Architecture.X86_64:
+        return ArnsByRegionForX86_64[scope.props.region]
+      default:
+        throw `Invalid type ${type} specified`
+    }
+  }
+
+  /**
+   * @summary Method to create an AppConfig Application
+   * @param {string} id scoped id of the resource
+   * @param {CommonConstruct} scope scope in which this resource is defined
+   * @param {AppConfigProps} props
+   * @returns {appconfig.CfnApplication}
+   */
+  public createApplication(id: string, scope: CommonConstruct, props: AppConfigProps): appconfig.CfnApplication {
+    if (!props) throw `AppConfig props undefined for ${id}`
+
+    const application = new appconfig.CfnApplication(scope, `${id}`, {
+      name: `${props.application.name}-${scope.props.stage}`,
+      description: props.application.description,
+      tags: props.application.tags,
+    })
+
+    utils.createCfnOutput(`${id}-ApplicationId`, scope, cdk.Fn.ref(application.logicalId))
+    utils.createCfnOutput(`${id}-ApplicationName`, scope, application.name)
+
+    return application
+  }
+
+  /**
+   * @summary Method to create an AppConfig Environment for a given application
+   * @param {string} id scoped id of the resource
+   * @param {CommonConstruct} scope scope in which this resource is defined
+   * @param {string} applicationId id of the application
+   * @param {AppConfigProps} props
+   * @returns {appconfig.CfnEnvironment}
+   */
+  public createEnvironment(
+    id: string,
+    scope: CommonConstruct,
+    applicationId: string,
+    props: AppConfigProps
+  ): appconfig.CfnEnvironment {
+    if (!props) throw `AppConfig props undefined for ${id}`
+
+    const environment = new appconfig.CfnEnvironment(scope, `${id}`, {
+      applicationId: applicationId,
+      name: props.environment.name ?? scope.props.stage,
+      description: props.environment.description,
+      monitors: props.environment.monitors,
+      tags: props.environment.tags,
+    })
+
+    utils.createCfnOutput(`${id}-configurationEnvironmentId`, scope, cdk.Fn.ref(environment.logicalId))
+    utils.createCfnOutput(`${id}-configurationEnvironmentName`, scope, environment.name)
+
+    return environment
+  }
+
+  /**
+   * @summary Method to create an AppConfig Configuration Profile for a given application
+   * - <p>&#9888; The <b>locationUri</b> is defaulted to <i>hosted</i> if undefined</p>
+   * @param {string} id scoped id of the resource
+   * @param {CommonConstruct} scope scope in which this resource is defined
+   * @param {string} applicationId id of the application
+   * @param {AppConfigProps} props
+   * @returns {appconfig.CfnConfigurationProfile}
+   */
+  public createConfigurationProfile(
+    id: string,
+    scope: CommonConstruct,
+    applicationId: string,
+    props: AppConfigProps
+  ): appconfig.CfnConfigurationProfile {
+    if (!props) throw `AppConfig props undefined for ${id}`
+
+    const profile = new appconfig.CfnConfigurationProfile(scope, `${id}`, {
+      applicationId: applicationId,
+      locationUri: props.configurationProfile.locationUri || 'hosted',
+      name: `${props.configurationProfile.name}-${scope.props.stage}`,
+      description: props.configurationProfile.description,
+      retrievalRoleArn: props.configurationProfile.retrievalRoleArn,
+      tags: props.configurationProfile.tags,
+      type: props.configurationProfile.type,
+      validators: props.configurationProfile.validators,
+    })
+
+    utils.createCfnOutput(`${id}-configurationProfileId`, scope, cdk.Fn.ref(profile.logicalId))
+    utils.createCfnOutput(`${id}-configurationProfileName`, scope, profile.name)
+
+    return profile
+  }
+}

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

@@ -0,0 +1,20 @@
+import {
+  CfnApplicationProps,
+  CfnConfigurationProfileProps,
+  CfnDeploymentProps,
+  CfnDeploymentStrategyProps,
+  CfnEnvironmentProps,
+} from 'aws-cdk-lib/aws-appconfig'
+
+/**
+ * @category cdk-utils.app-config-manager
+ * @subcategory Properties
+ */
+export interface AppConfigProps {
+  id: string
+  application: CfnApplicationProps
+  configurationProfile: CfnConfigurationProfileProps
+  deployment: CfnDeploymentProps
+  deploymentStrategy: CfnDeploymentStrategyProps
+  environment: CfnEnvironmentProps
+}

package/src/lib/services/aws/certificate-manager/index.ts

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

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

@@ -1,17 +1,17 @@
 import * as cdk from 'aws-cdk-lib'
 import * as acm from 'aws-cdk-lib/aws-certificatemanager'
 import * as route53 from 'aws-cdk-lib/aws-route53'
-import * as common from '../../common'
-import * as types from '../../types'
-import * as utils from '../../utils'
+import * as utils from '../../../utils'
+import { AcmProps } from './types'
+import { CommonConstruct } from '../../../common'
 
 /**
  * @stability stable
  * @category cdk-utils.acm-manager
  * @subcategory Construct
  * @classdesc Provides operations on AWS Certificates.
- * - 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'
  *
@@ -29,8 +29,8 @@ export class AcmManager {
   /**
    * @summary Method to create/import a certificate
    * @param {string} id scoped id of the resource
-   * @param {common.CommonConstruct} scope scope in which this resource is defined
-   * @param {types.AcmProps} props certificate props
+   * @param {CommonConstruct} scope scope in which this resource is defined
+   * @param {AcmProps} props certificate props
    * @param {route53.HostedZone?} hostedZone optional hosted zone to perform DNS validation
    * @returns {acm.ICertificate}
    *
@@ -47,8 +47,8 @@ export class AcmManager {
    */
   public resolveCertificate(
     id: string,
-    scope: common.CommonConstruct,
-    props: types.AcmProps,
+    scope: CommonConstruct,
+    props: AcmProps,
     hostedZone?: route53.IHostedZone
   ): acm.ICertificate {
     if (!props) throw `Certificate props undefined for ${id}`

package/src/lib/services/aws/certificate-manager/types.ts

@@ -0,0 +1,14 @@
+import * as acm from 'aws-cdk-lib/aws-certificatemanager'
+
+/**
+ * @category cdk-utils.acm-manager
+ * @subcategory Properties
+ */
+export interface AcmProps extends acm.CertificateProps {
+  certificateSsmName?: string
+  certificateAccount?: string
+  certificateRegion?: string
+  certificateId?: string
+  certificateArn?: string
+  useExistingCertificate: boolean
+}

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

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