@gradientedge/cdk-utils 9.83.0 → 9.85.0

package/src/lib/aws/construct/piped-event-handler/index.ts

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

package/src/lib/aws/construct/piped-event-handler/main.ts

@@ -2,8 +2,8 @@ import { SqsQueue } from 'aws-cdk-lib/aws-events-targets'
 import { IQueue } from 'aws-cdk-lib/aws-sqs'
 import { Construct } from 'constructs'
 import _ from 'lodash'
-import { EventHandler } from '../event-handler'
-import { PipedEventHandlerProps } from './types'
+import { EventHandler } from '../event-handler/index.js'
+import { PipedEventHandlerProps } from './types.js'
 
 /**
  * @classdesc Provides a construct to create and deploy an EventBridge Piped Event Handler

package/src/lib/aws/construct/piped-event-handler/types.ts

@@ -1,6 +1,6 @@
 import { QueueProps } from 'aws-cdk-lib/aws-sqs'
-import { SqsToLambdaPipeProps, SqsToSfnPipeProps } from '../../services'
-import { EventHandlerProps } from '../event-handler'
+import { SqsToLambdaPipeProps, SqsToSfnPipeProps } from '../../services/index.js'
+import { EventHandlerProps } from '../event-handler/index.js'
 
 export interface PipedEventHandlerProps extends EventHandlerProps {
   pipedDlq: QueueProps

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

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

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

@@ -6,8 +6,8 @@ import { IHostedZone } from 'aws-cdk-lib/aws-route53'
 import { ISecret } from 'aws-cdk-lib/aws-secretsmanager'
 import { Construct } from 'constructs'
 import _ from 'lodash'
-import { CommonConstruct } from '../../common'
-import { RestApiLambdaEnvironment, RestApiLambdaProps } from './types'
+import { CommonConstruct } from '../../common/index.js'
+import { RestApiLambdaEnvironment, RestApiLambdaProps } from './types.js'
 
 /**
  * @classdesc Provides a construct to create and deploy a RestApi as Lambda

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

@@ -1,5 +1,5 @@
-import { AcmProps, LambdaEnvironment, LambdaProps, LambdaRestApiProps } from '../../services'
-import { CommonStackProps } from '../../common'
+import { AcmProps, LambdaEnvironment, LambdaProps, LambdaRestApiProps } from '../../services/index.js'
+import { CommonStackProps } from '../../common/index.js'
 import { AssetCode } from 'aws-cdk-lib/aws-lambda'
 
 /**

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

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

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

@@ -4,9 +4,9 @@ import { CfnReplicationGroup } from 'aws-cdk-lib/aws-elasticache'
 import { ManagedPolicy } from 'aws-cdk-lib/aws-iam'
 import { Construct } from 'constructs'
 import _ from 'lodash'
-import { RestApiLambda } from '..'
-import { createCfnOutput } from '../../utils'
-import { RestApiLambdaWithCacheProps } from './types'
+import { createCfnOutput } from '../../utils/index.js'
+import { RestApiLambdaWithCacheProps } from './types.js'
+import { RestApiLambda } from '../rest-api-lambda/index.js'
 
 /**
  * @classdesc Provides a construct to create and deploy a RestApi API as Lambda with Caching

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

@@ -1,5 +1,5 @@
-import { RestApiLambdaProps } from '../rest-api-lambda'
-import { ReplicatedElastiCacheProps, VpcProps } from '../../services'
+import { RestApiLambdaProps } from '../rest-api-lambda/index.js'
+import { ReplicatedElastiCacheProps, VpcProps } from '../../services/index.js'
 
 /**
  */

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

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

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

@@ -33,8 +33,8 @@ import { IHostedZone } from 'aws-cdk-lib/aws-route53'
 import { IBucket } from 'aws-cdk-lib/aws-s3'
 import { Construct } from 'constructs'
 import _ from 'lodash'
-import { CommonConstruct } from '../../common'
-import { SiteCachePolicyProps, SiteResponseHeadersPolicyProps, SiteWithEcsBackendProps } from './types'
+import { CommonConstruct } from '../../common/index.js'
+import { SiteCachePolicyProps, SiteResponseHeadersPolicyProps, SiteWithEcsBackendProps } from './types.js'
 
 /**
  * @classdesc Provides a construct to create and deploy a site hosted with an clustered ECS/ELB backend

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

@@ -1,4 +1,4 @@
-import { CommonStackProps } from '../../common'
+import { CommonStackProps } from '../../common/index.js'
 import {
   AcmProps,
   CloudfrontFunctionProps,
@@ -10,7 +10,7 @@ import {
   HealthCheck,
   LogProps,
   S3BucketProps,
-} from '../../services'
+} from '../../services/index.js'
 import { VpcProps } from 'aws-cdk-lib/aws-ec2'
 import {
   OriginRequestPolicyProps,
@@ -19,7 +19,7 @@ import {
   ResponseHeadersPolicyProps,
   CachePolicyProps,
 } from 'aws-cdk-lib/aws-cloudfront'
-import { SiteResponseHeaderPolicyType } from './constants'
+import { SiteResponseHeaderPolicyType } from './constants.js'
 
 /**
  */

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

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

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

@@ -18,13 +18,13 @@ import { IBucket } from 'aws-cdk-lib/aws-s3'
 import { BucketDeployment } from 'aws-cdk-lib/aws-s3-deployment'
 import { Construct } from 'constructs'
 import _ from 'lodash'
-import { CommonConstruct } from '../../common'
-import { LAMBDA_ALIAS_NAME_CURRENT } from './constants'
+import { CommonConstruct } from '../../common/index.js'
+import { LAMBDA_ALIAS_NAME_CURRENT } from './constants.js'
 import {
   SiteWithLambdaBackendCachePolicyProps,
   SiteWithLambdaBackendProps,
   SiteWithLambdaBackendResponseHeadersPolicyProps,
-} from './types'
+} from './types.js'
 
 /**
  * @classdesc Provides a construct to create and deploy a site hosted with an clustered ECS/ELB backend

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

@@ -5,7 +5,7 @@ import {
   ResponseHeadersStrictTransportSecurity,
   ResponseSecurityHeadersBehavior,
 } from 'aws-cdk-lib/aws-cloudfront'
-import { CommonStackProps } from '../../common'
+import { CommonStackProps } from '../../common/index.js'
 import {
   AcmProps,
   CloudfrontFunctionProps,
@@ -13,8 +13,8 @@ import {
   LambdaProps,
   LogProps,
   S3BucketProps,
-} from '../../services'
-import { SiteWithLambdaBackendResponseHeaderPolicyType } from './constants'
+} from '../../services/index.js'
+import { SiteWithLambdaBackendResponseHeaderPolicyType } from './constants.js'
 
 /**
  */
@@ -43,8 +43,7 @@ export interface SiteWithLambdaBackendProps extends CommonStackProps {
   useExistingVpc: boolean
 }
 
-export interface SiteWithLambdaBackendResponseHeadersStrictTransportSecurity
-  extends ResponseHeadersStrictTransportSecurity {
+export interface SiteWithLambdaBackendResponseHeadersStrictTransportSecurity extends ResponseHeadersStrictTransportSecurity {
   accessControlMaxAgeInSeconds: number
 }
 

package/src/lib/aws/construct/static-asset-deployment/index.ts

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

package/src/lib/aws/construct/static-asset-deployment/main.ts

@@ -4,8 +4,8 @@ import { IDistribution, DistributionAttributes } from 'aws-cdk-lib/aws-cloudfron
 import { Construct } from 'constructs'
 import { BucketDeployment, Source, BucketDeploymentProps, ISource } from 'aws-cdk-lib/aws-s3-deployment'
 import _ from 'lodash'
-import { CommonConstruct } from '../../common'
-import { StaticAssetDeploymentProps } from './types'
+import { CommonConstruct } from '../../common/index.js'
+import { StaticAssetDeploymentProps } from './types.js'
 import appRoot from 'app-root-path'
 import path from 'path'
 

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

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

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

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

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

@@ -6,12 +6,11 @@ import {
   IFunction,
   OriginAccessIdentity,
 } from 'aws-cdk-lib/aws-cloudfront'
-import { S3Origin } from 'aws-cdk-lib/aws-cloudfront-origins'
 import { ARecord, IHostedZone } from 'aws-cdk-lib/aws-route53'
 import { IBucket } from 'aws-cdk-lib/aws-s3'
 import { Construct } from 'constructs'
-import { CommonConstruct } from '../../common'
-import { StaticSiteProps } from './types'
+import { CommonConstruct } from '../../common/index.js'
+import { StaticSiteProps } from './types.js'
 
 /**
  * @classdesc Provides a construct to create and deploy a s3 hosted static site
@@ -38,7 +37,6 @@ export class StaticSite extends CommonConstruct {
   siteCertificate: ICertificate
   siteARecord: ARecord
   siteBucket: IBucket
-  siteOrigin: S3Origin
   siteDistribution: IDistribution
   siteLogBucket: IBucket
   siteOriginAccessIdentity: OriginAccessIdentity
@@ -60,7 +58,6 @@ export class StaticSite extends CommonConstruct {
     this.resolveCertificate()
     this.createSiteLogBucket()
     this.createSiteBucket()
-    this.createSiteOrigin()
     this.createSiteCloudfrontFunction()
     this.resolveSiteFunctionAssociations()
     this.createSiteOriginAccessIdentity()
@@ -118,10 +115,6 @@ export class StaticSite extends CommonConstruct {
     this.siteBucket = this.s3Manager.createS3Bucket(`${this.id}-site`, this, this.props.siteBucket)
   }
 
-  protected createSiteOrigin() {
-    this.siteOrigin = new S3Origin(this.siteBucket)
-  }
-
   /**
    * @summary Method to create a site cloudfront function
    */
@@ -164,7 +157,6 @@ export class StaticSite extends CommonConstruct {
       `${this.id}-distribution`,
       this,
       this.props.siteDistribution,
-      this.siteOrigin,
       this.siteBucket,
       this.siteLogBucket,
       this.siteOriginAccessIdentity,

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

@@ -1,5 +1,5 @@
-import { CommonStackProps } from '../../common'
-import { AcmProps, CloudfrontFunctionProps, DistributionProps, S3BucketProps } from '../../services'
+import { CommonStackProps } from '../../common/index.js'
+import { AcmProps, CloudfrontFunctionProps, DistributionProps, S3BucketProps } from '../../services/index.js'
 import { ISource } from 'aws-cdk-lib/aws-s3-deployment'
 
 /**

package/src/lib/aws/index.ts

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

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

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

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

@@ -16,9 +16,9 @@ import {
 import { ICertificate } from 'aws-cdk-lib/aws-certificatemanager'
 import { IFunction } from 'aws-cdk-lib/aws-lambda'
 import _ from 'lodash'
-import { CommonConstruct } from '../../common'
-import { createCfnOutput } from '../../utils'
-import { LambdaRestApiProps } from './types'
+import { CommonConstruct } from '../../common/index.js'
+import { createCfnOutput } from '../../utils/index.js'
+import { LambdaRestApiProps } from './types.js'
 
 /**
  * @classdesc Provides operations on AWS API Gateway.

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

@@ -1,6 +1,6 @@
 import { LambdaRestApiProps as LambdaRestApigProps, RestApiProps } from 'aws-cdk-lib/aws-apigateway'
-import { ResourceNameFormatterProps } from '../../common'
-import { TagProps } from '../../types'
+import { ResourceNameFormatterProps } from '../../common/index.js'
+import { TagProps } from '../../types/index.js'
 
 /**
  */

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

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

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

@@ -6,11 +6,11 @@ import {
   DeploymentStrategy,
   RolloutStrategy,
 } from 'aws-cdk-lib/aws-appconfig'
-import { CommonConstruct } from '../../common'
-import { createCfnOutput } from '../../utils'
-import { Architecture } from '../constants'
-import { ArnsByRegionForArm64, ArnsByRegionForX86_64 } from './constants'
-import { AppConfigProps } from './types'
+import { CommonConstruct } from '../../common/index.js'
+import { createCfnOutput } from '../../utils/index.js'
+import { Architecture } from '../constants.js'
+import { ArnsByRegionForArm64, ArnsByRegionForX86_64 } from './constants.js'
+import { AppConfigProps } from './types.js'
 
 /**
  * @classdesc Provides operations on AWS

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

@@ -2,11 +2,9 @@ import {
   CfnApplicationProps,
   CfnConfigurationProfileProps,
   CfnDeploymentProps,
-  CfnDeploymentStrategyProps,
   CfnEnvironmentProps,
   DeploymentStrategyProps,
 } from 'aws-cdk-lib/aws-appconfig'
-import { ResourceNameFormatterProps } from '../../common'
 
 /**
  *

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

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

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

@@ -1,9 +1,9 @@
 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/index.js'
+import { createCfnOutput } from '../../utils/index.js'
+import { AcmProps } from './types.js'
 
 /**
  * @classdesc Provides operations on AWS Certificates.

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

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

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

@@ -1,34 +1,31 @@
-import { Duration, Tags } from 'aws-cdk-lib'
+import { Duration, RemovalPolicy, Tags } from 'aws-cdk-lib'
 import { ICertificate } from 'aws-cdk-lib/aws-certificatemanager'
 import * as cf from 'aws-cdk-lib/aws-cloudfront'
 import {
-  IDistribution,
-  DistributionAttributes,
-  CloudFrontWebDistribution,
   Distribution,
+  DistributionAttributes,
   Function,
   FunctionAssociation,
   FunctionCode,
   HttpVersion,
-  IResponseHeadersPolicy,
+  IDistribution,
+  IResponseHeadersPolicyRef,
   OriginAccessIdentity,
   PriceClass,
-  SSLMethod,
   SecurityPolicyProtocol,
-  ViewerCertificate,
 } from 'aws-cdk-lib/aws-cloudfront'
-import { HttpOrigin, S3Origin } from 'aws-cdk-lib/aws-cloudfront-origins'
+import { HttpOrigin, S3BucketOrigin } 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'
 import _ from 'lodash'
+import { CommonConstruct, CommonStack } from '../../common/index.js'
+import { createCfnOutput } from '../../utils/index.js'
+import { LambdaEdgeProps } from '../lambda/index.js'
+import { CloudfrontFunctionProps, DistributionProps } from './types.js'
 
 /**
  * @classdesc Provides operations on AWS
@@ -63,75 +60,11 @@ export class CloudFrontManager {
     return oai
   }
 
-  /**
-   * @summary Method to create a cloudfront distribution
-   * @param id scoped id of the resource
-   * @param scope scope in which this resource is defined
-   * @param props distribution properties
-   * @param siteBucket
-   * @param logBucket
-   * @param oai
-   * @param certificate
-   * @param aliases
-   */
-  public createCloudFrontDistribution(
-    id: string,
-    scope: CommonConstruct,
-    props: CloudFrontProps,
-    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 CloudFrontWebDistribution(scope, `${id}`, {
-      ...props,
-      comment: `${id} - ${scope.props.stage} stage`,
-      enabled: props.enabled ?? true,
-      httpVersion: props.httpVersion ?? HttpVersion.HTTP2,
-      loggingConfig: {
-        bucket: logBucket,
-        prefix: 'cloudfront/',
-      },
-      originConfigs: [
-        {
-          behaviors: [{ isDefaultBehavior: true }],
-          s3OriginSource: {
-            originAccessIdentity: oai,
-            s3BucketSource: siteBucket,
-          },
-        },
-      ],
-      priceClass: props.priceClass ?? PriceClass.PRICE_CLASS_ALL,
-      viewerCertificate: ViewerCertificate.fromAcmCertificate(certificate, {
-        aliases: aliases,
-        securityPolicy: SecurityPolicyProtocol.TLS_V1_2_2021,
-        sslMethod: SSLMethod.SNI,
-      }),
-    })
-
-    if (props.tags && !_.isEmpty(props.tags)) {
-      _.forEach(props.tags, tag => {
-        Tags.of(distribution).add(tag.key, tag.value)
-      })
-    }
-
-    createCfnOutput(`${id}-distributionId`, scope, distribution.distributionId)
-    createCfnOutput(`${id}-distributionDomainName`, scope, distribution.distributionDomainName)
-
-    return distribution
-  }
-
   /**
    * Method to create a CloudFront distribution with S3 Origin
    * @param id scoped id of the resource
    * @param scope scope in which this resource is defined
    * @param props distribution properties
-   * @param origin
    * @param siteBucket
    * @param logBucket
    * @param oai
@@ -143,7 +76,6 @@ export class CloudFrontManager {
     id: string,
     scope: CommonConstruct,
     props: DistributionProps,
-    origin: S3Origin,
     siteBucket: IBucket,
     logBucket?: IBucket,
     oai?: OriginAccessIdentity,
@@ -158,7 +90,7 @@ export class CloudFrontManager {
       defaultBehavior: {
         ...props.defaultBehavior,
         functionAssociations: defaultFunctionAssociations ?? undefined,
-        origin,
+        origin: S3BucketOrigin.withOriginAccessIdentity(siteBucket, { originAccessIdentity: oai }),
       },
       domainNames: aliases,
       enableLogging: props.enableLogging ?? true,
@@ -204,7 +136,7 @@ export class CloudFrontManager {
     logBucket?: IBucket,
     certificate?: ICertificate,
     defaultFunctionAssociations?: FunctionAssociation[],
-    responseHeadersPolicy?: IResponseHeadersPolicy
+    responseHeadersPolicy?: IResponseHeadersPolicyRef
   ) {
     const distribution = new Distribution(scope, `${id}`, {
       additionalBehaviors: props.additionalBehaviors,
@@ -277,6 +209,10 @@ export class CloudFrontManager {
     if (!props) throw `EdgeFunction props undefined for ${id}`
     if (!props.functionName) throw `EdgeFunction functionName undefined for ${id}`
 
+    const functionName = scope.resourceNameFormatter.format(
+      props.functionName,
+      scope.props.resourceNameOptions?.cloudfront
+    )
     const edgeFunction = new cf.experimental.EdgeFunction(scope, `${id}`, {
       code: code,
       description: props.description,
@@ -284,10 +220,14 @@ export class CloudFrontManager {
         ...environment,
       },
       filesystem: accessPoint ? FileSystem.fromEfsAccessPoint(accessPoint, mountPath ?? '/mnt/msg') : undefined,
-      functionName: scope.resourceNameFormatter.format(props.functionName, scope.props.resourceNameOptions?.cloudfront),
+      functionName,
       handler: props.handler ?? 'index.handler',
       layers: layers,
-      logRetention: props.logRetention,
+      logGroup: scope.logManager.createLogGroup(`${id}-log-group`, scope, {
+        logGroupName: functionName,
+        removalPolicy: RemovalPolicy.DESTROY,
+        retention: scope.props.logRetention,
+      }),
       memorySize: props.memorySize,
       reservedConcurrentExecutions: props.reservedConcurrentExecutions,
       role: role,

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

@@ -1,16 +1,5 @@
-import {
-  DistributionProps as CfDistributionProps,
-  CloudFrontWebDistributionProps,
-  FunctionProps,
-} from 'aws-cdk-lib/aws-cloudfront'
-import { ResourceNameFormatterProps } from '../../common'
-import { TagProps } from '../../types'
-
-/**
- */
-export interface CloudFrontProps extends CloudFrontWebDistributionProps {
-  tags?: TagProps[]
-}
+import { DistributionProps as CfDistributionProps, FunctionProps } from 'aws-cdk-lib/aws-cloudfront'
+import { TagProps } from '../../types/index.js'
 
 /**
  */

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

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

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

@@ -1,9 +1,9 @@
 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'
+import { CommonConstruct } from '../../common/index.js'
+import { createCfnOutput } from '../../utils/index.js'
+import { CloudTrailProps } from './types.js'
 
 /**
  * @classdesc Provides operations on AWS CloudTrail.

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

@@ -1,5 +1,4 @@
 import { CfnTrailProps } from 'aws-cdk-lib/aws-cloudtrail'
-import { ResourceNameFormatterProps } from '../../common'
 
 /**
  */

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

@@ -1,3 +1,3 @@
-export * from './logs'
-export * from './main'
-export * from './types'
+export * from './logs.js'
+export * from './main.js'
+export * from './types.js'

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

@@ -1,9 +1,9 @@
 import * as cdk from 'aws-cdk-lib'
 import * as logs from 'aws-cdk-lib/aws-logs'
 import _ from 'lodash'
-import { CommonConstruct } from '../../common'
-import * as utils from '../../utils'
-import { LogProps, MetricFilterProps } from './types'
+import { CommonConstruct } from '../../common/index.js'
+import * as utils from '../../utils/index.js'
+import { LogProps, MetricFilterProps } from './types.js'
 
 /**
  * @classdesc Provides operations on AWS CloudWatch.