@gradientedge/cdk-utils 8.118.0 → 8.120.0

package/src/lib/services/{aws/appconfig → appconfig}/main.ts

@@ -1,20 +1,20 @@
-import * as cdk from 'aws-cdk-lib'
-import * as appconfig from 'aws-cdk-lib/aws-appconfig'
-import * as utils from '../../../utils'
+import { Fn } from 'aws-cdk-lib'
+import { CfnApplication, CfnConfigurationProfile, CfnEnvironment } from 'aws-cdk-lib/aws-appconfig'
+import { CommonConstruct } from '../../common'
+import { createCfnOutput } from '../../utils'
 import { Architecture } from '../constants'
-import { AppConfigProps } from './types'
 import { ArnsByRegionForArm64, ArnsByRegionForX86_64 } from './constants'
-import { CommonConstruct } from '../../../common'
+import { AppConfigProps } from './types'
 
 /**
- * @classdesc Provides operations on AWS AppConfig.
+ * @classdesc Provides operations on AWS
  * - 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) {
+ *   constructor(parent: Construct, id: string, props: common.CommonStackProps) {
  *     super(parent, id, props)
  *     this.props = props
  *     this.appConfigManager.createApplication('MyApplication', this)
@@ -46,17 +46,17 @@ export class AppConfigManager {
    * @param props
    * @returns the appconfig application
    */
-  public createApplication(id: string, scope: CommonConstruct, props: AppConfigProps): appconfig.CfnApplication {
+  public createApplication(id: string, scope: CommonConstruct, props: AppConfigProps): CfnApplication {
     if (!props) throw `AppConfig props undefined for ${id}`
 
-    const application = new appconfig.CfnApplication(scope, `${id}`, {
+    const application = new CfnApplication(scope, `${id}`, {
       description: props.application.description,
       name: `${props.application.name}-${scope.props.stage}`,
       tags: props.application.tags,
     })
 
-    utils.createCfnOutput(`${id}-ApplicationId`, scope, cdk.Fn.ref(application.logicalId))
-    utils.createCfnOutput(`${id}-ApplicationName`, scope, application.name)
+    createCfnOutput(`${id}-ApplicationId`, scope, Fn.ref(application.logicalId))
+    createCfnOutput(`${id}-ApplicationName`, scope, application.name)
 
     return application
   }
@@ -74,10 +74,10 @@ export class AppConfigManager {
     scope: CommonConstruct,
     applicationId: string,
     props: AppConfigProps
-  ): appconfig.CfnEnvironment {
+  ): CfnEnvironment {
     if (!props) throw `AppConfig props undefined for ${id}`
 
-    const environment = new appconfig.CfnEnvironment(scope, `${id}`, {
+    const environment = new CfnEnvironment(scope, `${id}`, {
       applicationId: applicationId,
       description: props.environment.description,
       monitors: props.environment.monitors,
@@ -85,8 +85,8 @@ export class AppConfigManager {
       tags: props.environment.tags,
     })
 
-    utils.createCfnOutput(`${id}-configurationEnvironmentId`, scope, cdk.Fn.ref(environment.logicalId))
-    utils.createCfnOutput(`${id}-configurationEnvironmentName`, scope, environment.name)
+    createCfnOutput(`${id}-configurationEnvironmentId`, scope, Fn.ref(environment.logicalId))
+    createCfnOutput(`${id}-configurationEnvironmentName`, scope, environment.name)
 
     return environment
   }
@@ -105,10 +105,10 @@ export class AppConfigManager {
     scope: CommonConstruct,
     applicationId: string,
     props: AppConfigProps
-  ): appconfig.CfnConfigurationProfile {
+  ): CfnConfigurationProfile {
     if (!props) throw `AppConfig props undefined for ${id}`
 
-    const profile = new appconfig.CfnConfigurationProfile(scope, `${id}`, {
+    const profile = new CfnConfigurationProfile(scope, `${id}`, {
       applicationId: applicationId,
       description: props.configurationProfile.description,
       locationUri: props.configurationProfile.locationUri || 'hosted',
@@ -119,8 +119,8 @@ export class AppConfigManager {
       validators: props.configurationProfile.validators,
     })
 
-    utils.createCfnOutput(`${id}-configurationProfileId`, scope, cdk.Fn.ref(profile.logicalId))
-    utils.createCfnOutput(`${id}-configurationProfileName`, scope, profile.name)
+    createCfnOutput(`${id}-configurationProfileId`, scope, Fn.ref(profile.logicalId))
+    createCfnOutput(`${id}-configurationProfileName`, scope, profile.name)
 
     return profile
   }

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

@@ -1,9 +1,9 @@
-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 utils from '../../../utils'
+import { Stack } from 'aws-cdk-lib'
+import { Certificate, CertificateValidation, ICertificate } from 'aws-cdk-lib/aws-certificatemanager'
+import { IHostedZone } from 'aws-cdk-lib/aws-route53'
+import { CommonConstruct } from '../../common'
+import { createCfnOutput } from '../../utils'
 import { AcmProps } from './types'
-import { CommonConstruct } from '../../../common'
 
 /**
  * @classdesc Provides operations on AWS Certificates.
@@ -13,7 +13,7 @@ import { CommonConstruct } from '../../../common'
  * import { CommonConstruct } from '@gradientedge/cdk-utils'
  *
  * class CustomConstruct extends CommonConstruct {
- *   constructor(parent: cdk.Construct, id: string, props: common.CommonStackProps) {
+ *   constructor(parent: Construct, id: string, props: common.CommonStackProps) {
  *     super(parent, id, props)
  *     this.props = props
  *     this.acmManager.createCertificate('MyCertificate', this)
@@ -44,8 +44,8 @@ export class AcmManager {
     id: string,
     scope: CommonConstruct,
     props: AcmProps,
-    hostedZone?: route53.IHostedZone
-  ): acm.ICertificate {
+    hostedZone?: IHostedZone
+  ): ICertificate {
     if (!props) throw `Certificate props undefined for ${id}`
 
     let certificate
@@ -53,20 +53,20 @@ export class AcmManager {
     if (props.useExistingCertificate) {
       let certificateArn = props.certificateArn
       if (!certificateArn) {
-        const certificateAccount = props.certificateAccount ? props.certificateAccount : cdk.Stack.of(scope).account
-        const certificateRegion = props.certificateRegion ? props.certificateRegion : cdk.Stack.of(scope).region
+        const certificateAccount = props.certificateAccount ? props.certificateAccount : Stack.of(scope).account
+        const certificateRegion = props.certificateRegion ? props.certificateRegion : Stack.of(scope).region
         certificateArn = `arn:aws:acm:${certificateRegion}:${certificateAccount}:certificate/${props.certificateId}`
       }
-      certificate = acm.Certificate.fromCertificateArn(scope, `${id}`, certificateArn)
+      certificate = Certificate.fromCertificateArn(scope, `${id}`, certificateArn)
     } else {
-      certificate = new acm.Certificate(scope, `${id}`, {
+      certificate = new Certificate(scope, `${id}`, {
         domainName: props.domainName,
         subjectAlternativeNames: props.subjectAlternativeNames,
-        validation: acm.CertificateValidation.fromDns(hostedZone),
+        validation: CertificateValidation.fromDns(hostedZone),
       })
     }
 
-    utils.createCfnOutput(`${id}-certificateArn`, scope, certificate.certificateArn)
+    createCfnOutput(`${id}-certificateArn`, scope, certificate.certificateArn)
 
     return certificate
   }

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

@@ -1,8 +1,8 @@
-import * as acm from 'aws-cdk-lib/aws-certificatemanager'
+import { CertificateProps } from 'aws-cdk-lib/aws-certificatemanager'
 
 /**
  */
-export interface AcmProps extends acm.CertificateProps {
+export interface AcmProps extends CertificateProps {
   certificateAccount?: string
   certificateArn?: string
   certificateId?: string

package/src/lib/services/{aws/cloudfront → cloudfront}/main.ts

@@ -1,27 +1,41 @@
-import * as cdk from 'aws-cdk-lib'
-import * as acm from 'aws-cdk-lib/aws-certificatemanager'
-import * as cloudfront from 'aws-cdk-lib/aws-cloudfront'
-import * as origins from 'aws-cdk-lib/aws-cloudfront-origins'
-import * as ec2 from 'aws-cdk-lib/aws-ec2'
-import * as efs from 'aws-cdk-lib/aws-efs'
-import * as iam from 'aws-cdk-lib/aws-iam'
-import * as lambda from 'aws-cdk-lib/aws-lambda'
-import * as s3 from 'aws-cdk-lib/aws-s3'
-import * as cr from 'aws-cdk-lib/custom-resources'
-import { CommonConstruct, CommonStack } from '../../../common'
-import * as utils from '../../../utils'
-import { CloudfrontFunctionProps, CloudFrontProps, DistributionProps } from './types'
+import { Duration, Tags } from 'aws-cdk-lib'
+import { ICertificate } from 'aws-cdk-lib/aws-certificatemanager'
+import * as cf from 'aws-cdk-lib/aws-cloudfront'
+import {
+  CloudFrontWebDistribution,
+  Distribution,
+  Function,
+  FunctionAssociation,
+  FunctionCode,
+  HttpVersion,
+  IResponseHeadersPolicy,
+  OriginAccessIdentity,
+  PriceClass,
+  SSLMethod,
+  SecurityPolicyProtocol,
+  ViewerCertificate,
+} from 'aws-cdk-lib/aws-cloudfront'
+import { HttpOrigin, S3Origin } from 'aws-cdk-lib/aws-cloudfront-origins'
+import { ISecurityGroup, IVpc } from 'aws-cdk-lib/aws-ec2'
+import { IAccessPoint } from 'aws-cdk-lib/aws-efs'
+import { Role } from 'aws-cdk-lib/aws-iam'
+import { AssetCode, FileSystem, ILayerVersion } from 'aws-cdk-lib/aws-lambda'
+import { IBucket } from 'aws-cdk-lib/aws-s3'
+import { AwsCustomResource, AwsCustomResourcePolicy, PhysicalResourceId } from 'aws-cdk-lib/custom-resources'
+import { CommonConstruct, CommonStack } from '../../common'
+import { createCfnOutput } from '../../utils'
 import { LambdaEdgeProps } from '../lambda'
+import { CloudFrontProps, CloudfrontFunctionProps, DistributionProps } from './types'
 
 /**
- * @classdesc Provides operations on AWS CloudFront.
+ * @classdesc Provides operations on AWS
  * - 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) {
+ *   constructor(parent: Construct, id: string, props: common.CommonStackProps) {
  *     super(parent, id, props)
  *     this.props = props
  *     this.cloudFrontManager.createCloudFrontDistribution(
@@ -37,8 +51,8 @@ import { LambdaEdgeProps } from '../lambda'
  * @see [CDK CloudFront Module]{@link https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_cloudfront-readme.html}
  */
 export class CloudFrontManager {
-  public createOriginAccessIdentity(id: string, scope: CommonConstruct, accessBucket?: s3.IBucket) {
-    const oai = new cloudfront.OriginAccessIdentity(scope, `${id}`, {
+  public createOriginAccessIdentity(id: string, scope: CommonConstruct, accessBucket?: IBucket) {
+    const oai = new OriginAccessIdentity(scope, `${id}`, {
       comment: `${id} - ${scope.props.stage} stage`,
     })
     if (accessBucket) accessBucket.grantRead(oai)
@@ -61,24 +75,24 @@ export class CloudFrontManager {
     id: string,
     scope: CommonConstruct,
     props: CloudFrontProps,
-    siteBucket?: s3.IBucket,
-    logBucket?: s3.IBucket,
-    oai?: cloudfront.OriginAccessIdentity,
-    certificate?: acm.ICertificate,
+    siteBucket?: IBucket,
+    logBucket?: IBucket,
+    oai?: OriginAccessIdentity,
+    certificate?: ICertificate,
     aliases?: string[]
   ) {
     if (!siteBucket) throw `SiteBucket not defined for ${id}`
     if (!certificate) throw `Certificate not defined for ${id}`
     if (!props) throw `CloudFront props undefined for ${id}`
 
-    const distribution = new cloudfront.CloudFrontWebDistribution(scope, `${id}`, {
+    const distribution = new CloudFrontWebDistribution(scope, `${id}`, {
       comment: `${id} - ${scope.props.stage} stage`,
       defaultRootObject: props.defaultRootObject,
       enableIpV6: props.enableIpV6,
       enabled: props.enabled ?? true,
       errorConfigurations: props.errorConfigurations,
       geoRestriction: props.geoRestriction,
-      httpVersion: props.httpVersion ?? cloudfront.HttpVersion.HTTP2,
+      httpVersion: props.httpVersion ?? HttpVersion.HTTP2,
       loggingConfig: {
         bucket: logBucket,
         prefix: 'cloudfront/',
@@ -92,23 +106,23 @@ export class CloudFrontManager {
           },
         },
       ],
-      priceClass: props.priceClass ?? cloudfront.PriceClass.PRICE_CLASS_ALL,
-      viewerCertificate: cloudfront.ViewerCertificate.fromAcmCertificate(certificate, {
+      priceClass: props.priceClass ?? PriceClass.PRICE_CLASS_ALL,
+      viewerCertificate: ViewerCertificate.fromAcmCertificate(certificate, {
         aliases: aliases,
-        securityPolicy: cloudfront.SecurityPolicyProtocol.TLS_V1_1_2016,
-        sslMethod: cloudfront.SSLMethod.SNI,
+        securityPolicy: SecurityPolicyProtocol.TLS_V1_1_2016,
+        sslMethod: SSLMethod.SNI,
       }),
       webACLId: props.webACLId,
     })
 
     if (props.tags && props.tags.length > 0) {
       props.tags.forEach(tag => {
-        cdk.Tags.of(distribution).add(tag.key, tag.value)
+        Tags.of(distribution).add(tag.key, tag.value)
       })
     }
 
-    utils.createCfnOutput(`${id}-distributionId`, scope, distribution.distributionId)
-    utils.createCfnOutput(`${id}-distributionDomainName`, scope, distribution.distributionDomainName)
+    createCfnOutput(`${id}-distributionId`, scope, distribution.distributionId)
+    createCfnOutput(`${id}-distributionDomainName`, scope, distribution.distributionDomainName)
 
     return distribution
   }
@@ -130,15 +144,15 @@ export class CloudFrontManager {
     id: string,
     scope: CommonConstruct,
     props: DistributionProps,
-    origin: origins.S3Origin,
-    siteBucket: s3.IBucket,
-    logBucket?: s3.IBucket,
-    oai?: cloudfront.OriginAccessIdentity,
-    certificate?: acm.ICertificate,
+    origin: S3Origin,
+    siteBucket: IBucket,
+    logBucket?: IBucket,
+    oai?: OriginAccessIdentity,
+    certificate?: ICertificate,
     aliases?: string[],
-    defaultFunctionAssociations?: cloudfront.FunctionAssociation[]
+    defaultFunctionAssociations?: FunctionAssociation[]
   ) {
-    const distribution = new cloudfront.Distribution(scope, `${id}`, {
+    const distribution = new Distribution(scope, `${id}`, {
       additionalBehaviors: props.additionalBehaviors,
       certificate: certificate,
       comment: `${id} - ${scope.props.stage} stage`,
@@ -157,23 +171,23 @@ export class CloudFrontManager {
       enabled: props.enabled ?? true,
       errorResponses: props.errorResponses,
       geoRestriction: props.geoRestriction,
-      httpVersion: props.httpVersion ?? cloudfront.HttpVersion.HTTP2,
+      httpVersion: props.httpVersion ?? HttpVersion.HTTP2,
       logBucket: logBucket,
       logFilePrefix: props.logFilePrefix ?? `edge/`,
       logIncludesCookies: props.logIncludesCookies ?? true,
-      minimumProtocolVersion: props.minimumProtocolVersion ?? cloudfront.SecurityPolicyProtocol.TLS_V1_2_2021,
-      priceClass: props.priceClass ?? cloudfront.PriceClass.PRICE_CLASS_ALL,
+      minimumProtocolVersion: props.minimumProtocolVersion ?? SecurityPolicyProtocol.TLS_V1_2_2021,
+      priceClass: props.priceClass ?? PriceClass.PRICE_CLASS_ALL,
       webAclId: props.webAclId,
     })
 
     if (props.tags && props.tags.length > 0) {
       props.tags.forEach(tag => {
-        cdk.Tags.of(distribution).add(tag.key, tag.value)
+        Tags.of(distribution).add(tag.key, tag.value)
       })
     }
 
-    utils.createCfnOutput(`${id}-distributionId`, scope, distribution.distributionId)
-    utils.createCfnOutput(`${id}-distributionDomainName`, scope, distribution.distributionDomainName)
+    createCfnOutput(`${id}-distributionId`, scope, distribution.distributionId)
+    createCfnOutput(`${id}-distributionDomainName`, scope, distribution.distributionDomainName)
 
     return distribution
   }
@@ -194,14 +208,14 @@ export class CloudFrontManager {
     id: string,
     scope: CommonConstruct,
     props: DistributionProps,
-    origin: origins.HttpOrigin,
+    origin: HttpOrigin,
     domainNames: string[],
-    logBucket?: s3.IBucket,
-    certificate?: acm.ICertificate,
-    defaultFunctionAssociations?: cloudfront.FunctionAssociation[],
-    responseHeadersPolicy?: cloudfront.IResponseHeadersPolicy
+    logBucket?: IBucket,
+    certificate?: ICertificate,
+    defaultFunctionAssociations?: FunctionAssociation[],
+    responseHeadersPolicy?: IResponseHeadersPolicy
   ) {
-    const distribution = new cloudfront.Distribution(scope, `${id}`, {
+    const distribution = new Distribution(scope, `${id}`, {
       additionalBehaviors: props.additionalBehaviors,
       certificate: certificate,
       comment: `${id} - ${scope.props.stage} stage`,
@@ -221,23 +235,23 @@ export class CloudFrontManager {
       enabled: props.enabled ?? true,
       errorResponses: props.errorResponses,
       geoRestriction: props.geoRestriction,
-      httpVersion: props.httpVersion ?? cloudfront.HttpVersion.HTTP2,
+      httpVersion: props.httpVersion ?? HttpVersion.HTTP2,
       logBucket: logBucket,
       logFilePrefix: props.logFilePrefix ?? `edge/`,
       logIncludesCookies: props.logIncludesCookies ?? true,
-      minimumProtocolVersion: props.minimumProtocolVersion ?? cloudfront.SecurityPolicyProtocol.TLS_V1_2_2021,
-      priceClass: props.priceClass ?? cloudfront.PriceClass.PRICE_CLASS_ALL,
+      minimumProtocolVersion: props.minimumProtocolVersion ?? SecurityPolicyProtocol.TLS_V1_2_2021,
+      priceClass: props.priceClass ?? PriceClass.PRICE_CLASS_ALL,
       webAclId: props.webAclId,
     })
 
     if (props.tags && props.tags.length > 0) {
       props.tags.forEach(tag => {
-        cdk.Tags.of(distribution).add(tag.key, tag.value)
+        Tags.of(distribution).add(tag.key, tag.value)
       })
     }
 
-    utils.createCfnOutput(`${id}-distributionId`, scope, distribution.distributionId)
-    utils.createCfnOutput(`${id}-distributionDomainName`, scope, distribution.distributionDomainName)
+    createCfnOutput(`${id}-distributionId`, scope, distribution.distributionId)
+    createCfnOutput(`${id}-distributionDomainName`, scope, distribution.distributionDomainName)
 
     return distribution
   }
@@ -260,24 +274,24 @@ export class CloudFrontManager {
     id: string,
     scope: CommonConstruct,
     props: LambdaEdgeProps,
-    layers: lambda.ILayerVersion[],
-    code: lambda.AssetCode,
-    role: iam.Role,
+    layers: ILayerVersion[],
+    code: AssetCode,
+    role: Role,
     environment?: any,
-    vpc?: ec2.IVpc,
-    securityGroups?: ec2.ISecurityGroup[],
-    accessPoint?: efs.IAccessPoint,
+    vpc?: IVpc,
+    securityGroups?: ISecurityGroup[],
+    accessPoint?: IAccessPoint,
     mountPath?: string
   ) {
     if (!props) throw `EdgeFunction props undefined for ${id}`
 
-    const edgeFunction = new cloudfront.experimental.EdgeFunction(scope, `${id}`, {
+    const edgeFunction = new cf.experimental.EdgeFunction(scope, `${id}`, {
       code: code,
       description: props.description,
       environment: {
         ...environment,
       },
-      filesystem: accessPoint ? lambda.FileSystem.fromEfsAccessPoint(accessPoint, mountPath ?? '/mnt/msg') : undefined,
+      filesystem: accessPoint ? FileSystem.fromEfsAccessPoint(accessPoint, mountPath ?? '/mnt/msg') : undefined,
       functionName: `${props.functionName}-${scope.props.stage}`,
       handler: props.handler ?? 'index.handler',
       layers: layers,
@@ -288,19 +302,19 @@ export class CloudFrontManager {
       runtime: props.runtime ?? scope.props.nodejsRuntime ?? CommonStack.NODEJS_RUNTIME,
       securityGroups: securityGroups,
       stackId: `${id}-stack-id-${scope.props.stage}`,
-      timeout: props.timeoutInSecs ? cdk.Duration.seconds(props.timeoutInSecs) : cdk.Duration.minutes(1),
+      timeout: props.timeoutInSecs ? Duration.seconds(props.timeoutInSecs) : Duration.minutes(1),
       vpc: vpc,
     })
 
     if (props.tags && props.tags.length > 0) {
       props.tags.forEach(tag => {
-        cdk.Tags.of(edgeFunction).add(tag.key, tag.value)
+        Tags.of(edgeFunction).add(tag.key, tag.value)
       })
     }
 
-    utils.createCfnOutput(`${id}-edgeArn`, scope, edgeFunction.edgeArn)
-    utils.createCfnOutput(`${id}-edgeFunctionArn`, scope, edgeFunction.functionArn)
-    utils.createCfnOutput(`${id}-edgeFunctionName`, scope, edgeFunction.functionName)
+    createCfnOutput(`${id}-edgeArn`, scope, edgeFunction.edgeArn)
+    createCfnOutput(`${id}-edgeFunctionArn`, scope, edgeFunction.functionArn)
+    createCfnOutput(`${id}-edgeFunctionName`, scope, edgeFunction.functionName)
 
     return edgeFunction
   }
@@ -320,7 +334,7 @@ export class CloudFrontManager {
     distributionId: string,
     paths?: string
   ) {
-    new cr.AwsCustomResource(scope, `${id}-trigger-codebuild-${new Date().getTime()}`, {
+    new AwsCustomResource(scope, `${id}-trigger-codebuild-${new Date().getTime()}`, {
       onCreate: {
         action: 'startBuild',
         parameters: {
@@ -332,10 +346,10 @@ export class CloudFrontManager {
             paths
           ).projectName,
         },
-        physicalResourceId: cr.PhysicalResourceId.fromResponse('build.id'),
+        physicalResourceId: PhysicalResourceId.fromResponse('build.id'),
         service: 'CodeBuild',
       },
-      policy: cr.AwsCustomResourcePolicy.fromSdkCalls({ resources: cr.AwsCustomResourcePolicy.ANY_RESOURCE }),
+      policy: AwsCustomResourcePolicy.fromSdkCalls({ resources: AwsCustomResourcePolicy.ANY_RESOURCE }),
     })
   }
 
@@ -346,16 +360,16 @@ export class CloudFrontManager {
    * @param props
    */
   public createCloudfrontFunction(id: string, scope: CommonConstruct, props: CloudfrontFunctionProps) {
-    const cloudfrontFunction = new cloudfront.Function(scope, `${id}`, {
-      code: cloudfront.FunctionCode.fromFile({
+    const cloudfrontFunction = new Function(scope, `${id}`, {
+      code: FunctionCode.fromFile({
         filePath: props.functionFilePath,
       }),
       comment: props.comment,
       functionName: `${props.functionName}-${scope.props.stage}`,
     })
 
-    utils.createCfnOutput(`${id}-functionArn`, scope, cloudfrontFunction.functionArn)
-    utils.createCfnOutput(`${id}-functionName`, scope, cloudfrontFunction.functionName)
+    createCfnOutput(`${id}-functionArn`, scope, cloudfrontFunction.functionArn)
+    createCfnOutput(`${id}-functionName`, scope, cloudfrontFunction.functionName)
 
     return cloudfrontFunction
   }

package/src/lib/services/{aws/cloudfront → cloudfront}/types.ts

@@ -1,6 +1,9 @@
-import { TagProps } from '../../../types'
-import * as cf from 'aws-cdk-lib/aws-cloudfront'
-import { CloudFrontWebDistributionProps, FunctionProps } from 'aws-cdk-lib/aws-cloudfront'
+import {
+  DistributionProps as CfDistributionProps,
+  CloudFrontWebDistributionProps,
+  FunctionProps,
+} from 'aws-cdk-lib/aws-cloudfront'
+import { TagProps } from '../../types'
 
 /**
  */
@@ -10,7 +13,7 @@ export interface CloudFrontProps extends CloudFrontWebDistributionProps {
 
 /**
  */
-export interface DistributionProps extends cf.DistributionProps {
+export interface DistributionProps extends CfDistributionProps {
   tags?: TagProps[]
 }
 

package/src/lib/services/{aws/cloudtrail → cloudtrail}/main.ts

@@ -1,8 +1,8 @@
-import * as cloudtrail from 'aws-cdk-lib/aws-cloudtrail'
-import * as logs from 'aws-cdk-lib/aws-logs'
-import * as s3 from 'aws-cdk-lib/aws-s3'
-import * as utils from '../../../utils'
-import { CommonConstruct } from '../../../common'
+import { CfnTrail } from 'aws-cdk-lib/aws-cloudtrail'
+import { CfnLogGroup } from 'aws-cdk-lib/aws-logs'
+import { CfnBucketPolicy, IBucket } from 'aws-cdk-lib/aws-s3'
+import { CommonConstruct } from '../../common'
+import { createCfnOutput } from '../../utils'
 import { CloudTrailProps } from './types'
 
 /**
@@ -43,16 +43,16 @@ export class CloudTrailManager {
     id: string,
     scope: CommonConstruct,
     props: CloudTrailProps,
-    logGroup: logs.CfnLogGroup,
-    dataBucket: s3.IBucket,
-    logBucket: s3.IBucket,
-    logBucketPolicy: s3.CfnBucketPolicy
+    logGroup: CfnLogGroup,
+    dataBucket: IBucket,
+    logBucket: IBucket,
+    logBucketPolicy: CfnBucketPolicy
   ) {
     if (!props) throw `CloudTrail props undefined for ${id}`
 
     const role = scope.iamManager.createRoleForCloudTrail(`${id}Role`, scope, logGroup)
 
-    const cloudTrail = new cloudtrail.CfnTrail(scope, `${id}`, {
+    const cloudTrail = new CfnTrail(scope, `${id}`, {
       cloudWatchLogsLogGroupArn: logGroup.attrArn,
       cloudWatchLogsRoleArn: role.attrArn,
       enableLogFileValidation: props.enableLogFileValidation,
@@ -81,8 +81,8 @@ export class CloudTrailManager {
     cloudTrail.addDependency(logGroup)
     cloudTrail.addDependency(role)
 
-    utils.createCfnOutput(`${id}-trailName`, scope, cloudTrail.trailName)
-    utils.createCfnOutput(`${id}-trailArn`, scope, cloudTrail.attrArn)
+    createCfnOutput(`${id}-trailName`, scope, cloudTrail.trailName)
+    createCfnOutput(`${id}-trailArn`, scope, cloudTrail.attrArn)
 
     return { cloudTrail, cloudTrailRole: role }
   }

package/src/lib/services/{aws/cloudwatch → cloudwatch}/logs.ts

@@ -1,7 +1,7 @@
 import * as cdk from 'aws-cdk-lib'
 import * as logs from 'aws-cdk-lib/aws-logs'
-import * as utils from '../../../utils'
-import { CommonConstruct } from '../../../common'
+import * as utils from '../../utils'
+import { CommonConstruct } from '../../common'
 import { LogProps, MetricFilterProps } from './types'
 
 /**

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

@@ -1,8 +1,8 @@
 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 utils from '../../../utils'
-import { CommonConstruct } from '../../../common'
+import * as utils from '../../utils'
+import { CommonConstruct } from '../../common'
 import {
   AlarmProps,
   AlarmStatusWidgetProps,

package/src/lib/services/{aws/cloudwatch → cloudwatch}/types.ts

@@ -1,6 +1,6 @@
 import * as watch from 'aws-cdk-lib/aws-cloudwatch'
 import * as logs from 'aws-cdk-lib/aws-logs'
-import { TagProps } from '../../../types'
+import { TagProps } from '../../types'
 
 /**
  */

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

@@ -1,6 +1,6 @@
-import * as cdk from 'aws-cdk-lib'
-import * as codebuild from 'aws-cdk-lib/aws-codebuild'
-import { CommonConstruct } from '../../../common'
+import { Duration } from 'aws-cdk-lib'
+import { BuildSpec, ComputeType, LinuxBuildImage, Project } from 'aws-cdk-lib/aws-codebuild'
+import { CommonConstruct } from '../../common'
 
 /**
  * @classdesc Provides operations on AWS Code Build.
@@ -45,8 +45,8 @@ export class CodeBuildManager {
     paths?: string
   ) {
     const invalidationPaths = paths ?? '/*'
-    return new codebuild.Project(scope, `${id}-install-deps-project`, {
-      buildSpec: codebuild.BuildSpec.fromObject({
+    return new Project(scope, `${id}-install-deps-project`, {
+      buildSpec: BuildSpec.fromObject({
         phases: {
           build: {
             commands: [
@@ -57,10 +57,10 @@ export class CodeBuildManager {
         version: '0.1',
       }),
       environment: {
-        buildImage: codebuild.LinuxBuildImage.fromDockerRegistry(
+        buildImage: LinuxBuildImage.fromDockerRegistry(
           this.createImageForCloudfrontInvalidation(id, scope, dockerFilepath).imageUri
         ),
-        computeType: codebuild.ComputeType.SMALL,
+        computeType: ComputeType.SMALL,
         privileged: true,
       },
       logging: {
@@ -72,7 +72,7 @@ export class CodeBuildManager {
         },
       },
       role: scope.iamManager.roleForCloudfrontInvalidation(id, scope),
-      timeout: cdk.Duration.minutes(5),
+      timeout: Duration.minutes(5),
     })
   }
 }