@gradientedge/cdk-utils 8.118.0 → 8.120.0

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

@@ -1,11 +1,11 @@
-import * as cdk from 'aws-cdk-lib'
-import * as ec2 from 'aws-cdk-lib/aws-ec2'
-import * as elasticache from 'aws-cdk-lib/aws-elasticache'
-import * as iam from 'aws-cdk-lib/aws-iam'
+import { Fn } from 'aws-cdk-lib'
+import { ISecurityGroup, IVpc, Peer, Port, SecurityGroup } from 'aws-cdk-lib/aws-ec2'
+import { CfnReplicationGroup } from 'aws-cdk-lib/aws-elasticache'
+import { ManagedPolicy } from 'aws-cdk-lib/aws-iam'
 import { Construct } from 'constructs'
 import { RestApiLambda } from '..'
+import { createCfnOutput } from '../../utils'
 import { RestApiLambdaWithCacheProps } from './types'
-import * as utils from '../../utils'
 
 /**
  * @classdesc Provides a construct to create and deploy a RestApi API as Lambda with Caching
@@ -30,9 +30,9 @@ export abstract class RestApiLambdaWithCache extends RestApiLambda {
   id: string
 
   /* restApiLambda resources */
-  restApivpc: ec2.IVpc
-  restApiCache: elasticache.CfnReplicationGroup
-  restApiSecurityGroup: ec2.ISecurityGroup
+  restApivpc: IVpc
+  restApiCache: CfnReplicationGroup
+  restApiSecurityGroup: ISecurityGroup
   restApiSecurityGroupExportName: string
 
   protected constructor(parent: Construct, id: string, props: RestApiLambdaWithCacheProps) {
@@ -65,20 +65,20 @@ export abstract class RestApiLambdaWithCache extends RestApiLambda {
    */
   protected resolveSecurityGroup() {
     if (this.props.securityGroupExportName) {
-      this.restApiSecurityGroup = ec2.SecurityGroup.fromSecurityGroupId(
+      this.restApiSecurityGroup = SecurityGroup.fromSecurityGroupId(
         this,
         `${this.id}-security-group`,
-        cdk.Fn.importValue(this.props.securityGroupExportName)
+        Fn.importValue(this.props.securityGroupExportName)
       )
     } else {
-      this.restApiSecurityGroup = new ec2.SecurityGroup(this, `${this.id}-security-group-${this.props.stage}`, {
+      this.restApiSecurityGroup = new SecurityGroup(this, `${this.id}-security-group-${this.props.stage}`, {
         securityGroupName: `${this.id}-security-group-${this.props.stage}`,
         vpc: this.restApivpc,
       })
 
-      this.restApiSecurityGroup.addIngressRule(ec2.Peer.anyIpv4(), ec2.Port.allTraffic(), 'All Traffic')
+      this.restApiSecurityGroup.addIngressRule(Peer.anyIpv4(), Port.allTraffic(), 'All Traffic')
 
-      utils.createCfnOutput(`${this.id}-security-group-id`, this, this.restApiSecurityGroup.securityGroupId)
+      createCfnOutput(`${this.id}-security-group-id`, this, this.restApiSecurityGroup.securityGroupId)
     }
   }
 
@@ -118,7 +118,7 @@ export abstract class RestApiLambdaWithCache extends RestApiLambda {
     super.createLambdaRole()
 
     this.restApiLambdaRole.addManagedPolicy(
-      iam.ManagedPolicy.fromAwsManagedPolicyName('service-role/AWSLambdaVPCAccessExecutionRole')
+      ManagedPolicy.fromAwsManagedPolicyName('service-role/AWSLambdaVPCAccessExecutionRole')
     )
   }
 

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

@@ -1,20 +1,40 @@
-import * as _ from 'lodash'
-import * as cdk from 'aws-cdk-lib'
-import * as certificateManager 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 ecs from 'aws-cdk-lib/aws-ecs'
-import * as ecsPatterns from 'aws-cdk-lib/aws-ecs-patterns'
-import * as elb from 'aws-cdk-lib/aws-elasticloadbalancingv2'
-import * as iam from 'aws-cdk-lib/aws-iam'
-import * as logs from 'aws-cdk-lib/aws-logs'
-import * as route53 from 'aws-cdk-lib/aws-route53'
-import * as s3 from 'aws-cdk-lib/aws-s3'
-import * as efs from 'aws-cdk-lib/aws-efs'
+import { Duration } from 'aws-cdk-lib'
+import { ICertificate } from 'aws-cdk-lib/aws-certificatemanager'
+import {
+  CachePolicy,
+  Distribution,
+  FunctionAssociation,
+  FunctionEventType,
+  IFunction,
+  OriginProtocolPolicy,
+  OriginRequestPolicy,
+  ResponseHeadersPolicy,
+} from 'aws-cdk-lib/aws-cloudfront'
+import { HttpOrigin } from 'aws-cdk-lib/aws-cloudfront-origins'
+import { IVpc } from 'aws-cdk-lib/aws-ec2'
+import {
+  AssetImage,
+  Cluster,
+  ContainerImage,
+  FargateService,
+  FargateTaskDefinition,
+  LogDriver,
+} from 'aws-cdk-lib/aws-ecs'
+import { ApplicationLoadBalancedFargateService } from 'aws-cdk-lib/aws-ecs-patterns'
+import { FileSystem } from 'aws-cdk-lib/aws-efs'
+import {
+  ApplicationListener,
+  ApplicationLoadBalancer,
+  ApplicationTargetGroup,
+} from 'aws-cdk-lib/aws-elasticloadbalancingv2'
+import { PolicyDocument, PolicyStatement, Role } from 'aws-cdk-lib/aws-iam'
+import { LogGroup } from 'aws-cdk-lib/aws-logs'
+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 { SiteWithEcsBackendProps, SiteResponseHeadersPolicyProps, SiteCachePolicyProps } from './types'
+import { SiteCachePolicyProps, SiteResponseHeadersPolicyProps, SiteWithEcsBackendProps } from './types'
 
 /**
  * @classdesc Provides a construct to create and deploy a site hosted with an clustered ECS/ELB backend
@@ -37,35 +57,35 @@ export class SiteWithEcsBackend extends CommonConstruct {
   id: string
 
   /* site resources */
-  siteHostedZone: route53.IHostedZone
-  siteCertificate: certificateManager.ICertificate
-  siteRegionalCertificate: certificateManager.ICertificate
-  siteEcsPolicy: iam.PolicyDocument
-  siteEcsRole: iam.Role
+  siteHostedZone: IHostedZone
+  siteCertificate: ICertificate
+  siteRegionalCertificate: ICertificate
+  siteEcsPolicy: PolicyDocument
+  siteEcsRole: Role
   siteEcsEnvironment: { [key: string]: string }
-  siteVpc: ec2.IVpc
+  siteVpc: IVpc
   siteSecrets: any
-  siteEcsCluster: ecs.Cluster
-  siteEcsLogGroup: logs.LogGroup
+  siteEcsCluster: Cluster
+  siteEcsLogGroup: LogGroup
   siteEcsBuildArgs: any = {}
-  siteEcsContainerImage: ecs.AssetImage
-  siteEcsService: ecs.FargateService
-  siteEcsTaskDefinition: ecs.FargateTaskDefinition
-  siteEcsListener: elb.ApplicationListener
-  siteEcsLoadBalancer: elb.ApplicationLoadBalancer
-  siteEcsTargetGroup: elb.ApplicationTargetGroup
-  siteFileSystem: efs.FileSystem
-  siteLogBucket: s3.IBucket
-  siteOrigin: origins.HttpOrigin
-  siteDistribution: cloudfront.Distribution
+  siteEcsContainerImage: AssetImage
+  siteEcsService: FargateService
+  siteEcsTaskDefinition: FargateTaskDefinition
+  siteEcsListener: ApplicationListener
+  siteEcsLoadBalancer: ApplicationLoadBalancer
+  siteEcsTargetGroup: ApplicationTargetGroup
+  siteFileSystem: FileSystem
+  siteLogBucket: IBucket
+  siteOrigin: HttpOrigin
+  siteDistribution: Distribution
   siteInternalDomainName: string
   siteExternalDomainName: string
   siteDomainNames: string[]
-  siteCloudfrontFunction: cloudfront.Function
-  siteFunctionAssociations: cloudfront.FunctionAssociation[]
-  siteOriginRequestPolicy: cloudfront.OriginRequestPolicy
-  siteOriginResponseHeadersPolicy?: cloudfront.ResponseHeadersPolicy
-  siteCachePolicy: cloudfront.CachePolicy
+  siteCloudfrontFunction: IFunction
+  siteFunctionAssociations: FunctionAssociation[]
+  siteOriginRequestPolicy: OriginRequestPolicy
+  siteOriginResponseHeadersPolicy?: ResponseHeadersPolicy
+  siteCachePolicy: CachePolicy
 
   constructor(parent: Construct, id: string, props: SiteWithEcsBackendProps) {
     super(parent, id, props)
@@ -203,7 +223,7 @@ export class SiteWithEcsBackend extends CommonConstruct {
    * @summary Method to create iam policy for ECS Task
    */
   protected createEcsPolicy() {
-    this.siteEcsPolicy = new iam.PolicyDocument({
+    this.siteEcsPolicy = new PolicyDocument({
       statements: [this.iamManager.statementForCreateAnyLogStream()],
     })
   }
@@ -256,16 +276,16 @@ export class SiteWithEcsBackend extends CommonConstruct {
    * Method to create container image for ECS task
    */
   protected createEcsContainerImage() {
-    this.siteEcsContainerImage = ecs.ContainerImage.fromAsset(this.props.siteEcsContainerImagePath, {
+    this.siteEcsContainerImage = ContainerImage.fromAsset(this.props.siteEcsContainerImagePath, {
       buildArgs: this.siteEcsBuildArgs,
     })
   }
 
   /**
-   * Method to create Application Loadbalanced ECS Fargate Service
+   * Method to create Application Load balanced ECS Fargate Service
    */
   protected createEcsService() {
-    const fargateService = new ecsPatterns.ApplicationLoadBalancedFargateService(this, `${this.id}-ecs-service`, {
+    const fargateService = new ApplicationLoadBalancedFargateService(this, `${this.id}-ecs-service`, {
       assignPublicIp: true,
       certificate: this.siteRegionalCertificate,
       cluster: this.siteEcsCluster,
@@ -274,7 +294,7 @@ export class SiteWithEcsBackend extends CommonConstruct {
       domainName: this.siteInternalDomainName,
       domainZone: this.siteHostedZone,
       enableECSManagedTags: true,
-      healthCheckGracePeriod: cdk.Duration.seconds(60),
+      healthCheckGracePeriod: Duration.seconds(60),
       listenerPort: this.props.siteTask.listenerPort,
       loadBalancerName: this.props.siteTask.loadBalancerName
         ? `${this.props.siteTask.loadBalancerName}-${this.props.stage}`
@@ -290,7 +310,7 @@ export class SiteWithEcsBackend extends CommonConstruct {
         environment: this.siteEcsEnvironment,
         executionRole: this.siteEcsRole,
         image: this.siteEcsContainerImage,
-        logDriver: ecs.LogDriver.awsLogs({
+        logDriver: LogDriver.awsLogs({
           logGroup: this.siteEcsLogGroup,
           logRetention: this.props.siteTask.logging?.logRetention,
           multilinePattern: this.props.siteTask.logging?.multilinePattern,
@@ -307,11 +327,11 @@ export class SiteWithEcsBackend extends CommonConstruct {
         healthyGrpcCodes: this.props.siteHealthCheck.healthyGrpcCodes,
         healthyHttpCodes: this.props.siteHealthCheck.healthyHttpCodes,
         healthyThresholdCount: this.props.siteHealthCheck.healthyThresholdCount,
-        interval: cdk.Duration.seconds(this.props.siteHealthCheck.intervalInSecs),
+        interval: Duration.seconds(this.props.siteHealthCheck.intervalInSecs),
         path: this.props.siteHealthCheck.path ?? '/',
         port: this.props.siteHealthCheck.port,
         protocol: this.props.siteHealthCheck.protocol,
-        timeout: cdk.Duration.seconds(this.props.siteHealthCheck.timeoutInSecs),
+        timeout: Duration.seconds(this.props.siteHealthCheck.timeoutInSecs),
         unhealthyThresholdCount: this.props.siteHealthCheck.unhealthyThresholdCount,
       })
     }
@@ -370,7 +390,7 @@ export class SiteWithEcsBackend extends CommonConstruct {
 
       /* add EFS permissions to ECS Role */
       this.siteEcsRole.addToPolicy(
-        new iam.PolicyStatement(this.iamManager.statementForWriteEfs([this.siteFileSystem.fileSystemArn]))
+        new PolicyStatement(this.iamManager.statementForWriteEfs([this.siteFileSystem.fileSystemArn]))
       )
 
       /* add the efs volume to ecs task definition */
@@ -411,17 +431,16 @@ export class SiteWithEcsBackend extends CommonConstruct {
   }
 
   protected createSiteCachePolicy(id: string, siteCachePolicy: SiteCachePolicyProps) {
-    return new cloudfront.CachePolicy(this, `${id}`, {
+    return new CachePolicy(this, `${id}`, {
       cachePolicyName: `${this.id}-${siteCachePolicy.cachePolicyName}`,
       comment: `Policy for ${this.id}-distribution - ${this.props.stage} stage`,
-      defaultTtl: cdk.Duration.seconds(siteCachePolicy.defaultTtlInSeconds),
-      minTtl: cdk.Duration.seconds(siteCachePolicy.minTtlInSeconds),
-      maxTtl: cdk.Duration.seconds(siteCachePolicy.maxTtlInSeconds),
-      enableAcceptEncodingGzip: siteCachePolicy.enableAcceptEncodingGzip,
+      cookieBehavior: siteCachePolicy.cookieBehavior,
       enableAcceptEncodingBrotli: siteCachePolicy.enableAcceptEncodingBrotli,
-      queryStringBehavior: siteCachePolicy.queryStringBehavior,
+      enableAcceptEncodingGzip: siteCachePolicy.enableAcceptEncodingGzip,
       headerBehavior: siteCachePolicy.headerBehavior,
-      cookieBehavior: siteCachePolicy.cookieBehavior,
+      maxTtl: Duration.seconds(siteCachePolicy.maxTtlInSeconds),
+      minTtl: Duration.seconds(siteCachePolicy.minTtlInSeconds),
+      queryStringBehavior: siteCachePolicy.queryStringBehavior,
     })
   }
 
@@ -435,7 +454,7 @@ export class SiteWithEcsBackend extends CommonConstruct {
 
   protected createSiteOriginRequestPolicy() {
     if (!this.props.siteOriginRequestPolicy) return
-    this.siteOriginRequestPolicy = new cloudfront.OriginRequestPolicy(this, `${this.id}-sorp`, {
+    this.siteOriginRequestPolicy = new OriginRequestPolicy(this, `${this.id}-sorp`, {
       comment: `Request Policy for ${this.id}-distribution - ${this.props.stage} stage`,
       cookieBehavior: this.props.siteOriginRequestPolicy.cookieBehavior,
       headerBehavior: this.props.siteOriginRequestPolicy.headerBehavior,
@@ -450,7 +469,7 @@ export class SiteWithEcsBackend extends CommonConstruct {
 
   protected createResponseHeaderPolicy(props: SiteResponseHeadersPolicyProps) {
     if (!props) return undefined
-    return new cloudfront.ResponseHeadersPolicy(this, `${this.id}-${props.type}-srhp`, {
+    return new ResponseHeadersPolicy(this, `${this.id}-${props.type}-srhp`, {
       ...props,
       comment: `Response Header Policy for ${props.type} for ${this.id}-distribution - ${this.props.stage} stage`,
       responseHeadersPolicyName: `${this.id}-${props.type}-response`,
@@ -458,7 +477,7 @@ export class SiteWithEcsBackend extends CommonConstruct {
         ...props.securityHeadersBehavior,
         strictTransportSecurity: {
           ...props.securityHeadersBehavior?.strictTransportSecurity,
-          accessControlMaxAge: cdk.Duration.seconds(
+          accessControlMaxAge: Duration.seconds(
             props.securityHeadersBehavior?.strictTransportSecurity?.accessControlMaxAgeInSeconds
           ),
         },
@@ -475,10 +494,10 @@ export class SiteWithEcsBackend extends CommonConstruct {
   }
 
   protected createSiteOrigin() {
-    this.siteOrigin = new origins.HttpOrigin(this.siteInternalDomainName, {
+    this.siteOrigin = new HttpOrigin(this.siteInternalDomainName, {
       httpPort: this.props.siteTask.listenerPort,
       originId: `${this.id}-server`,
-      protocolPolicy: cloudfront.OriginProtocolPolicy.HTTPS_ONLY,
+      protocolPolicy: OriginProtocolPolicy.HTTPS_ONLY,
     })
   }
 
@@ -502,7 +521,7 @@ export class SiteWithEcsBackend extends CommonConstruct {
     if (this.props.siteCloudfrontFunctionProps) {
       this.siteFunctionAssociations = [
         {
-          eventType: cloudfront.FunctionEventType.VIEWER_REQUEST,
+          eventType: FunctionEventType.VIEWER_REQUEST,
           function: this.siteCloudfrontFunction,
         },
       ]

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

@@ -1,7 +1,7 @@
-import { CommonConstruct } from '../../common'
+import { IBucket } from 'aws-cdk-lib/aws-s3'
+import { BucketDeployment } from 'aws-cdk-lib/aws-s3-deployment'
 import { Construct } from 'constructs'
-import * as s3 from 'aws-cdk-lib/aws-s3'
-import * as s3deploy from 'aws-cdk-lib/aws-s3-deployment'
+import { CommonConstruct } from '../../common'
 import { StaticAssetDeploymentProps } from './types'
 
 /**
@@ -25,7 +25,7 @@ export class StaticAssetDeployment extends CommonConstruct {
   id: string
 
   /* construct resources */
-  staticAssetBucket: s3.IBucket
+  staticAssetBucket: IBucket
 
   constructor(parent: Construct, id: string, props: StaticAssetDeploymentProps) {
     super(parent, id, props)
@@ -49,10 +49,10 @@ export class StaticAssetDeployment extends CommonConstruct {
   }
 
   /**
-   * @summary Deploy the static assests into the static asset bucket
+   * @summary Deploy the static assets into the static asset bucket
    */
   protected deployStaticAssets() {
-    new s3deploy.BucketDeployment(this, `${this.id}-static-deployment`, {
+    new BucketDeployment(this, `${this.id}-static-deployment`, {
       ...this.props.staticAssetDeployment,
       destinationBucket: this.staticAssetBucket,
       sources: this.props.staticAssetSources,

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

@@ -1,8 +1,14 @@
-import * as certificateManager 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 route53 from 'aws-cdk-lib/aws-route53'
-import * as s3 from 'aws-cdk-lib/aws-s3'
+import { ICertificate } from 'aws-cdk-lib/aws-certificatemanager'
+import {
+  FunctionAssociation,
+  FunctionEventType,
+  IDistribution,
+  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'
@@ -28,16 +34,16 @@ export class StaticSite extends CommonConstruct {
   id: string
 
   /* static site resources */
-  siteHostedZone: route53.IHostedZone
-  siteCertificate: certificateManager.ICertificate
-  siteARecord: route53.ARecord
-  siteBucket: s3.IBucket
-  siteOrigin: origins.S3Origin
-  siteDistribution: cloudfront.IDistribution
-  siteLogBucket: s3.IBucket
-  siteOriginAccessIdentity: cloudfront.OriginAccessIdentity
-  siteCloudfrontFunction: cloudfront.Function
-  siteFunctionAssociations: cloudfront.FunctionAssociation[]
+  siteHostedZone: IHostedZone
+  siteCertificate: ICertificate
+  siteARecord: ARecord
+  siteBucket: IBucket
+  siteOrigin: S3Origin
+  siteDistribution: IDistribution
+  siteLogBucket: IBucket
+  siteOriginAccessIdentity: OriginAccessIdentity
+  siteCloudfrontFunction: IFunction
+  siteFunctionAssociations: FunctionAssociation[]
 
   constructor(parent: Construct, id: string, props: StaticSiteProps) {
     super(parent, id, props)
@@ -113,7 +119,7 @@ export class StaticSite extends CommonConstruct {
   }
 
   protected createSiteOrigin() {
-    this.siteOrigin = new origins.S3Origin(this.siteBucket)
+    this.siteOrigin = new S3Origin(this.siteBucket)
   }
 
   /**
@@ -136,7 +142,7 @@ export class StaticSite extends CommonConstruct {
     if (this.props.siteCloudfrontFunctionProps) {
       this.siteFunctionAssociations = [
         {
-          eventType: cloudfront.FunctionEventType.VIEWER_REQUEST,
+          eventType: FunctionEventType.VIEWER_REQUEST,
           function: this.siteCloudfrontFunction,
         },
       ]

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

@@ -1,10 +1,21 @@
-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 utils from '../../../utils'
-import * as cdk from 'aws-cdk-lib'
+import { Tags } from 'aws-cdk-lib'
+import {
+  Cors,
+  Deployment,
+  DomainName,
+  EndpointType,
+  IAuthorizer,
+  IResource,
+  IRestApi,
+  Integration,
+  LambdaRestApi,
+  SecurityPolicy,
+} from 'aws-cdk-lib/aws-apigateway'
+import { ICertificate } from 'aws-cdk-lib/aws-certificatemanager'
+import { IFunction } from 'aws-cdk-lib/aws-lambda'
+import { CommonConstruct } from '../../common'
+import { createCfnOutput } from '../../utils'
 import { LambdaRestApiProps } from './types'
-import { CommonConstruct } from '../../../common'
 
 /**
  * @classdesc Provides operations on AWS API Gateway.
@@ -14,7 +25,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
  *     const lambdaFunction = this.lambdaManager.createLambdaFunction('MyFunction', this, role, layers, code)
@@ -31,14 +42,9 @@ export class ApiManager {
    * @param props lambda rest restApi props
    * @param lambdaFunction
    */
-  public createLambdaRestApi(
-    id: string,
-    scope: CommonConstruct,
-    props: LambdaRestApiProps,
-    lambdaFunction: lambda.IFunction
-  ) {
+  public createLambdaRestApi(id: string, scope: CommonConstruct, props: LambdaRestApiProps, lambdaFunction: IFunction) {
     if (!props) throw `Api props undefined for ${id}`
-    const api = new apig.LambdaRestApi(scope, `${id}`, {
+    const api = new LambdaRestApi(scope, `${id}`, {
       binaryMediaTypes: props.binaryMediaTypes,
       cloudWatchRole: props.cloudWatchRole || false,
       defaultCorsPreflightOptions: props.defaultCorsPreflightOptions,
@@ -63,7 +69,7 @@ export class ApiManager {
       },
       domainName: props.domainName,
       endpointConfiguration: {
-        types: props.endpointConfiguration?.types || [apig.EndpointType.REGIONAL],
+        types: props.endpointConfiguration?.types || [EndpointType.REGIONAL],
         vpcEndpoints: props.endpointConfiguration?.vpcEndpoints,
       },
       endpointTypes: props.endpointTypes,
@@ -79,12 +85,12 @@ export class ApiManager {
 
     if (props.tags && props.tags.length > 0) {
       props.tags.forEach(tag => {
-        cdk.Tags.of(api).add(tag.key, tag.value)
+        Tags.of(api).add(tag.key, tag.value)
       })
     }
 
-    utils.createCfnOutput(`${id}-restApiId`, scope, api.restApiId)
-    utils.createCfnOutput(`${id}-restApiName`, scope, api.restApiName)
+    createCfnOutput(`${id}-restApiId`, scope, api.restApiId)
+    createCfnOutput(`${id}-restApiName`, scope, api.restApiName)
 
     return api
   }
@@ -96,15 +102,15 @@ export class ApiManager {
    * @param domainName the domain name to use
    * @param certificate the certificate used for custom restApi domain
    */
-  public createApiDomain(id: string, scope: CommonConstruct, domainName: string, certificate: acm.ICertificate) {
-    const apiDomain = new apig.DomainName(scope, `${id}`, {
+  public createApiDomain(id: string, scope: CommonConstruct, domainName: string, certificate: ICertificate) {
+    const apiDomain = new DomainName(scope, `${id}`, {
       certificate: certificate,
       domainName: domainName,
-      endpointType: scope.isProductionStage() ? apig.EndpointType.EDGE : apig.EndpointType.REGIONAL,
-      securityPolicy: apig.SecurityPolicy.TLS_1_2,
+      endpointType: scope.isProductionStage() ? EndpointType.EDGE : EndpointType.REGIONAL,
+      securityPolicy: SecurityPolicy.TLS_1_2,
     })
 
-    utils.createCfnOutput(`${id}-customDomainName`, scope, apiDomain.domainName)
+    createCfnOutput(`${id}-customDomainName`, scope, apiDomain.domainName)
 
     return apiDomain
   }
@@ -127,24 +133,24 @@ export class ApiManager {
   public createApiResource(
     id: string,
     scope: CommonConstruct,
-    parent: apig.IResource,
+    parent: IResource,
     path: string,
-    integration: apig.Integration,
+    integration: Integration,
     addProxy: boolean,
-    authorizer?: apig.IAuthorizer,
+    authorizer?: IAuthorizer,
     allowedOrigins?: string[],
     allowedMethods?: string[],
     allowedHeaders?: string[],
     methodRequestParameters?: { [param: string]: boolean },
-    proxyIntegration?: apig.Integration
+    proxyIntegration?: Integration
   ) {
-    const methods = allowedMethods ?? apig.Cors.ALL_METHODS
+    const methods = allowedMethods ?? Cors.ALL_METHODS
     const resource = parent.addResource(path, {
       defaultCorsPreflightOptions: {
         allowCredentials: true,
-        allowHeaders: allowedHeaders ?? apig.Cors.DEFAULT_HEADERS,
+        allowHeaders: allowedHeaders ?? Cors.DEFAULT_HEADERS,
         allowMethods: [...methods, 'OPTIONS'],
-        allowOrigins: allowedOrigins ?? apig.Cors.ALL_ORIGINS,
+        allowOrigins: allowedOrigins ?? Cors.ALL_ORIGINS,
       },
     })
     methods.forEach(method =>
@@ -153,15 +159,15 @@ export class ApiManager {
         requestParameters: methodRequestParameters,
       })
     )
-    utils.createCfnOutput(`${id}-${path}ResourceId`, scope, resource.resourceId)
+    createCfnOutput(`${id}-${path}ResourceId`, scope, resource.resourceId)
 
     if (addProxy) {
       const resourceProxy = resource.addResource(`{${path}+}`, {
         defaultCorsPreflightOptions: {
           allowCredentials: true,
-          allowHeaders: allowedHeaders ?? apig.Cors.DEFAULT_HEADERS,
+          allowHeaders: allowedHeaders ?? Cors.DEFAULT_HEADERS,
           allowMethods: [...methods, 'OPTIONS'],
-          allowOrigins: allowedOrigins ?? apig.Cors.ALL_ORIGINS,
+          allowOrigins: allowedOrigins ?? Cors.ALL_ORIGINS,
         },
       })
       methods.forEach(method =>
@@ -170,7 +176,7 @@ export class ApiManager {
           requestParameters: methodRequestParameters,
         })
       )
-      utils.createCfnOutput(`${id}-${path}ProxyResourceId`, scope, resourceProxy.resourceId)
+      createCfnOutput(`${id}-${path}ProxyResourceId`, scope, resourceProxy.resourceId)
     }
 
     return resource
@@ -182,8 +188,8 @@ export class ApiManager {
    * @param scope
    * @param restApi
    */
-  public createApiDeployment(id: string, scope: CommonConstruct, restApi: apig.IRestApi) {
-    new apig.Deployment(scope, `${id}`, {
+  public createApiDeployment(id: string, scope: CommonConstruct, restApi: IRestApi) {
+    new Deployment(scope, `${id}`, {
       api: restApi,
       retainDeployments: false,
     })

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

@@ -0,0 +1,8 @@
+import { LambdaRestApiProps as LambdaRestApigProps } from 'aws-cdk-lib/aws-apigateway'
+import { TagProps } from '../../types'
+
+/**
+ */
+export interface LambdaRestApiProps extends LambdaRestApigProps {
+  tags?: TagProps[]
+}