@gradientedge/cdk-utils 8.118.0 → 8.120.0

package/src/lib/services/index.ts

@@ -1 +1,28 @@
-export * from './aws'
+export * from './api-gateway'
+export * from './appconfig'
+export * from './certificate-manager'
+export * from './cloudfront'
+export * from './cloudtrail'
+export * from './cloudwatch'
+export * from './codebuild'
+export * from './constants'
+export * from './dynamodb'
+export * from './elastic-container-registry'
+export * from './elastic-container-service'
+export * from './elastic-file-system'
+export * from './elastic-kubernetes-service'
+export * from './elasticache'
+export * from './eventbridge'
+export * from './evidently'
+export * from './identity-access-management'
+export * from './key-management-service'
+export * from './lambda'
+export * from './route53'
+export * from './secrets-manager'
+export * from './simple-notification-service'
+export * from './simple-queue-service'
+export * from './simple-storage-service'
+export * from './step-function'
+export * from './systems-manager'
+export * from './virtual-private-cloud'
+export * from './web-application-firewall'

package/src/lib/services/{aws/key-management-service → key-management-service}/main.ts

@@ -1,6 +1,6 @@
-import * as kms from 'aws-cdk-lib/aws-kms'
-import * as utils from '../../../utils'
-import { CommonConstruct } from '../../../common'
+import { Key } from 'aws-cdk-lib/aws-kms'
+import { CommonConstruct } from '../../common'
+import { createCfnOutput } from '../../utils'
 import { KmsKeyProps } from './types'
 
 /**
@@ -29,7 +29,7 @@ export class KmsManager {
   public createKey(id: string, scope: CommonConstruct, props: KmsKeyProps) {
     if (!props) throw `KMS Key props undefined for ${id}`
 
-    const key = new kms.Key(scope, `${id}`, {
+    const key = new Key(scope, `${id}`, {
       admins: props.admins,
       alias: `${props.alias}-${scope.props.stage}`,
       description: props.description,
@@ -42,8 +42,8 @@ export class KmsManager {
       removalPolicy: props.removalPolicy,
     })
 
-    utils.createCfnOutput(`${id}-keyId`, scope, key.keyId)
-    utils.createCfnOutput(`${id}-keyArn`, scope, key.keyArn)
+    createCfnOutput(`${id}-keyId`, scope, key.keyId)
+    createCfnOutput(`${id}-keyArn`, scope, key.keyArn)
 
     return key
   }

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

@@ -1,25 +1,35 @@
-import * as cdk from 'aws-cdk-lib'
-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 { IVersion } from 'aws-cdk-lib/aws-lambda'
-import * as eventSources from 'aws-cdk-lib/aws-lambda-event-sources'
-import * as utils from '../../../utils'
-import { CommonConstruct, CommonStack } from '../../../common'
-import { LambdaAliasProps, LambdaEdgeProps, LambdaProps } from './types'
+import { Duration, Tags } from 'aws-cdk-lib'
+import { ISecurityGroup, IVpc, SubnetSelection } from 'aws-cdk-lib/aws-ec2'
+import { IAccessPoint } from 'aws-cdk-lib/aws-efs'
+import { CfnRole, Role } from 'aws-cdk-lib/aws-iam'
+import {
+  Alias,
+  Architecture,
+  AssetCode,
+  DockerImageCode,
+  DockerImageFunction,
+  FileSystem,
+  Function,
+  ILayerVersion,
+  IVersion,
+  LayerVersion,
+} from 'aws-cdk-lib/aws-lambda'
+import { SqsEventSource } from 'aws-cdk-lib/aws-lambda-event-sources'
+import { CommonConstruct, CommonStack } from '../../common'
+import { createCfnOutput } from '../../utils'
 import { CloudFrontManager } from '../cloudfront'
 import { SsmManager } from '../systems-manager'
+import { LambdaAliasProps, LambdaEdgeProps, LambdaProps } from './types'
 
 /**
- * @classdesc Provides operations on AWS Lambda.
+ * @classdesc Provides operations on AWS Lambda
  * - 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.lambdaManager.createLambdaFunction('MyFunction', this, role, layers, code)
@@ -34,15 +44,15 @@ export class LambdaManager {
    * @param scope scope in which this resource is defined
    * @param code
    */
-  public createLambdaLayer(id: string, scope: CommonConstruct, code: lambda.AssetCode) {
-    const lambdaLayer = new lambda.LayerVersion(scope, `${id}`, {
+  public createLambdaLayer(id: string, scope: CommonConstruct, code: AssetCode) {
+    const lambdaLayer = new LayerVersion(scope, `${id}`, {
       code: code,
       compatibleRuntimes: [scope.props.nodejsRuntime ?? CommonStack.NODEJS_RUNTIME],
       description: `${id}`,
       layerVersionName: `${id}-${scope.props.stage}`,
     })
 
-    utils.createCfnOutput(`${id}-lambdaLayerArn`, scope, lambdaLayer.layerVersionArn)
+    createCfnOutput(`${id}-lambdaLayerArn`, scope, lambdaLayer.layerVersionArn)
 
     return lambdaLayer
   }
@@ -67,16 +77,16 @@ export class LambdaManager {
     id: string,
     scope: CommonConstruct,
     props: LambdaProps,
-    role: iam.Role | iam.CfnRole,
-    layers: lambda.ILayerVersion[],
-    code: lambda.AssetCode,
+    role: Role | CfnRole,
+    layers: ILayerVersion[],
+    code: AssetCode,
     handler?: string,
     environment?: any,
-    vpc?: ec2.IVpc,
-    securityGroups?: ec2.ISecurityGroup[],
-    accessPoint?: efs.IAccessPoint,
+    vpc?: IVpc,
+    securityGroups?: ISecurityGroup[],
+    accessPoint?: IAccessPoint,
     mountPath?: string,
-    vpcSubnets?: ec2.SubnetSelection
+    vpcSubnets?: SubnetSelection
   ) {
     if (!props) throw `Lambda props undefined for ${id}`
 
@@ -88,11 +98,11 @@ export class LambdaManager {
       deadLetterQueue = scope.sqsManager.createDeadLetterQueueForLambda(`${id}-dlq`, scope, props, redriveQueue)
     }
 
-    const lambdaFunction = new lambda.Function(scope, `${id}`, {
+    const lambdaFunction = new Function(scope, `${id}`, {
       ...props,
       ...{
         allowPublicSubnet: !!vpc,
-        architecture: props.architecture ?? lambda.Architecture.ARM_64,
+        architecture: props.architecture ?? Architecture.ARM_64,
         code: code,
         deadLetterQueue: deadLetterQueue,
         environment: {
@@ -107,9 +117,7 @@ export class LambdaManager {
           STAGE: scope.props.stage,
           ...environment,
         },
-        filesystem: accessPoint
-          ? lambda.FileSystem.fromEfsAccessPoint(accessPoint, mountPath || '/mnt/msg')
-          : undefined,
+        filesystem: accessPoint ? FileSystem.fromEfsAccessPoint(accessPoint, mountPath || '/mnt/msg') : undefined,
         functionName: functionName,
         handler: handler || 'index.lambda_handler',
         insightsVersion: props.insightsVersion,
@@ -117,10 +125,10 @@ export class LambdaManager {
         logRetention: scope.props.logRetention ?? props.logRetention,
         reservedConcurrentExecutions:
           props.reservedConcurrentExecutions ?? scope.props.defaultReservedLambdaConcurrentExecutions,
-        role: role instanceof iam.Role ? role : undefined,
+        role: role instanceof Role ? role : undefined,
         runtime: props.runtime ?? scope.props.nodejsRuntime ?? CommonStack.NODEJS_RUNTIME,
         securityGroups: securityGroups,
-        timeout: props.timeoutInSecs ? cdk.Duration.seconds(props.timeoutInSecs) : cdk.Duration.minutes(15),
+        timeout: props.timeoutInSecs ? Duration.seconds(props.timeoutInSecs) : Duration.minutes(15),
         tracing: scope.props.defaultTracing ?? props.tracing,
         vpc,
         vpcSubnets,
@@ -129,7 +137,7 @@ export class LambdaManager {
 
     if (lambdaFunction.deadLetterQueue && props.dlq?.retriesEnabled) {
       lambdaFunction.addEventSource(
-        new eventSources.SqsEventSource(lambdaFunction.deadLetterQueue, {
+        new SqsEventSource(lambdaFunction.deadLetterQueue, {
           batchSize: props.dlq.retryBatchSize ?? 1,
           reportBatchItemFailures: true,
         })
@@ -140,8 +148,8 @@ export class LambdaManager {
       props.lambdaAliases.forEach(alias => {
         const aliasId = alias.id ?? `${id}-${alias.aliasName}`
         const functionAlias = this.createLambdaFunctionAlias(`${aliasId}`, scope, alias, lambdaFunction.currentVersion)
-        utils.createCfnOutput(`${id}-${alias.aliasName}AliasArn`, scope, functionAlias.functionArn)
-        utils.createCfnOutput(`${id}-${alias.aliasName}AliasName`, scope, functionAlias.aliasName)
+        createCfnOutput(`${id}-${alias.aliasName}AliasArn`, scope, functionAlias.functionArn)
+        createCfnOutput(`${id}-${alias.aliasName}AliasName`, scope, functionAlias.aliasName)
 
         if (alias.provisionedConcurrency) {
           const functionAutoScaling = functionAlias.addAutoScaling(alias.provisionedConcurrency)
@@ -154,12 +162,12 @@ export class LambdaManager {
 
     if (props.tags && props.tags.length > 0) {
       props.tags.forEach(tag => {
-        cdk.Tags.of(lambdaFunction).add(tag.key, tag.value)
+        Tags.of(lambdaFunction).add(tag.key, tag.value)
       })
     }
 
-    utils.createCfnOutput(`${id}-lambdaArn`, scope, lambdaFunction.functionArn)
-    utils.createCfnOutput(`${id}-lambdaName`, scope, lambdaFunction.functionName)
+    createCfnOutput(`${id}-lambdaArn`, scope, lambdaFunction.functionArn)
+    createCfnOutput(`${id}-lambdaName`, scope, lambdaFunction.functionName)
 
     return lambdaFunction
   }
@@ -182,13 +190,13 @@ export class LambdaManager {
     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
   ) {
     return new CloudFrontManager().createEdgeFunction(
@@ -224,14 +232,14 @@ export class LambdaManager {
     id: string,
     scope: CommonConstruct,
     props: LambdaProps,
-    role: iam.Role | iam.CfnRole,
-    code: lambda.DockerImageCode,
+    role: Role | CfnRole,
+    code: DockerImageCode,
     environment?: any,
-    vpc?: ec2.IVpc,
-    securityGroups?: ec2.ISecurityGroup[],
-    accessPoint?: efs.IAccessPoint,
+    vpc?: IVpc,
+    securityGroups?: ISecurityGroup[],
+    accessPoint?: IAccessPoint,
     mountPath?: string,
-    vpcSubnets?: ec2.SubnetSelection
+    vpcSubnets?: SubnetSelection
   ) {
     if (!props) throw `Lambda props undefined for ${id}`
 
@@ -243,11 +251,11 @@ export class LambdaManager {
       deadLetterQueue = scope.sqsManager.createDeadLetterQueueForLambda(`${id}-dlq`, scope, props, redriveQueue)
     }
 
-    const lambdaFunction = new lambda.DockerImageFunction(scope, `${id}`, {
+    const lambdaFunction = new DockerImageFunction(scope, `${id}`, {
       ...props,
       ...{
         allowPublicSubnet: !!vpc,
-        architecture: props.architecture ?? lambda.Architecture.ARM_64,
+        architecture: props.architecture ?? Architecture.ARM_64,
         code: code,
         deadLetterQueue: deadLetterQueue,
         environment: {
@@ -262,17 +270,15 @@ export class LambdaManager {
           STAGE: scope.props.stage,
           ...environment,
         },
-        filesystem: accessPoint
-          ? lambda.FileSystem.fromEfsAccessPoint(accessPoint, mountPath || '/mnt/msg')
-          : undefined,
+        filesystem: accessPoint ? FileSystem.fromEfsAccessPoint(accessPoint, mountPath || '/mnt/msg') : undefined,
         functionName: functionName,
         insightsVersion: props.insightsVersion,
         logRetention: scope.props.logRetention ?? props.logRetention,
         reservedConcurrentExecutions: props.reservedConcurrentExecutions,
-        role: role instanceof iam.Role ? role : undefined,
+        role: role instanceof Role ? role : undefined,
         runtime: props.runtime ?? scope.props.nodejsRuntime ?? CommonStack.NODEJS_RUNTIME,
         securityGroups: securityGroups,
-        timeout: props.timeoutInSecs ? cdk.Duration.seconds(props.timeoutInSecs) : cdk.Duration.minutes(1),
+        timeout: props.timeoutInSecs ? Duration.seconds(props.timeoutInSecs) : Duration.minutes(1),
         tracing: props.tracing,
         vpc,
         vpcSubnets,
@@ -281,15 +287,15 @@ export class LambdaManager {
 
     if (lambdaFunction.deadLetterQueue && props.dlq?.retriesEnabled) {
       lambdaFunction.addEventSource(
-        new eventSources.SqsEventSource(lambdaFunction.deadLetterQueue, {
+        new SqsEventSource(lambdaFunction.deadLetterQueue, {
           batchSize: props.dlq.retryBatchSize ?? 1,
           reportBatchItemFailures: true,
         })
       )
     }
 
-    utils.createCfnOutput(`${id}-lambdaArn`, scope, lambdaFunction.functionArn)
-    utils.createCfnOutput(`${id}-lambdaName`, scope, lambdaFunction.functionName)
+    createCfnOutput(`${id}-lambdaArn`, scope, lambdaFunction.functionArn)
+    createCfnOutput(`${id}-lambdaName`, scope, lambdaFunction.functionName)
 
     return lambdaFunction
   }
@@ -309,7 +315,7 @@ export class LambdaManager {
   ) {
     if (!props) throw `Lambda Alias props undefined for ${id}`
 
-    const lambdaFunctionAlias = new lambda.Alias(scope, `${id}`, {
+    const lambdaFunctionAlias = new Alias(scope, `${id}`, {
       ...props,
       ...{
         additionalVersions: props.additionalVersions,
@@ -324,8 +330,8 @@ export class LambdaManager {
       },
     })
 
-    utils.createCfnOutput(`${id}-lambdaAliasName`, scope, lambdaFunctionAlias.functionArn)
-    utils.createCfnOutput(`${id}-lambdaAliasArn`, scope, lambdaFunctionAlias.functionName)
+    createCfnOutput(`${id}-lambdaAliasName`, scope, lambdaFunctionAlias.functionArn)
+    createCfnOutput(`${id}-lambdaAliasArn`, scope, lambdaFunctionAlias.functionName)
 
     return lambdaFunctionAlias
   }

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

@@ -1,5 +1,5 @@
 import { AliasProps, FunctionProps } from 'aws-cdk-lib/aws-lambda'
-import { TagProps } from '../../../types'
+import { TagProps } from '../../types'
 import { EdgeFunctionProps } from 'aws-cdk-lib/aws-cloudfront/lib/experimental'
 import { QueueProps } from '../simple-queue-service'
 

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

@@ -1,13 +1,13 @@
-import * as apig from 'aws-cdk-lib/aws-apigateway'
-import * as cloudfront from 'aws-cdk-lib/aws-cloudfront'
-import * as route53 from 'aws-cdk-lib/aws-route53'
-import * as route53Targets from 'aws-cdk-lib/aws-route53-targets'
-import * as utils from '../../../utils'
-import { CommonConstruct } from '../../../common'
+import { DomainName } from 'aws-cdk-lib/aws-apigateway'
+import { IDistribution } from 'aws-cdk-lib/aws-cloudfront'
+import { ARecord, HostedZone, IHostedZone, RecordTarget } from 'aws-cdk-lib/aws-route53'
+import { ApiGatewayDomain, CloudFrontTarget } from 'aws-cdk-lib/aws-route53-targets'
+import { CommonConstruct } from '../../common'
+import { createCfnOutput } from '../../utils'
 import { Route53Props } from './types'
 
 /**
- * @classdesc Provides operations on AWS Route53.
+ * @classdesc Provides operations on AWS Route53
  * - 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
@@ -30,23 +30,23 @@ export class Route53Manager {
    * @param props
    */
   public createHostedZone(id: string, scope: CommonConstruct, props: Route53Props) {
-    let hostedZone: route53.IHostedZone
+    let hostedZone: IHostedZone
 
     if (!props) throw `Route53 props undefined for ${id}`
 
     if (props.useExistingHostedZone) {
-      hostedZone = route53.HostedZone.fromLookup(scope, `${id}`, {
+      hostedZone = HostedZone.fromLookup(scope, `${id}`, {
         domainName: scope.props.domainName,
       })
     } else {
-      hostedZone = new route53.HostedZone(scope, `${id}`, {
+      hostedZone = new HostedZone(scope, `${id}`, {
         comment: `Hosted zone for ${scope.props.domainName}`,
         zoneName: scope.props.domainName,
       })
     }
 
-    utils.createCfnOutput(`${id}-hostedZoneId`, scope, hostedZone.hostedZoneId)
-    utils.createCfnOutput(`${id}-hostedZoneArn`, scope, hostedZone.hostedZoneArn)
+    createCfnOutput(`${id}-hostedZoneId`, scope, hostedZone.hostedZoneId)
+    createCfnOutput(`${id}-hostedZoneArn`, scope, hostedZone.hostedZoneArn)
 
     return hostedZone
   }
@@ -62,21 +62,21 @@ export class Route53Manager {
     scope: CommonConstruct,
     useExistingHostedZone: boolean
   ) {
-    let hostedZone: route53.IHostedZone
+    let hostedZone: IHostedZone
 
     if (useExistingHostedZone) {
-      hostedZone = route53.HostedZone.fromLookup(scope, `${id}`, {
+      hostedZone = HostedZone.fromLookup(scope, `${id}`, {
         domainName: scope.fullyQualifiedDomainName,
       })
     } else {
-      hostedZone = new route53.HostedZone(scope, `${id}`, {
+      hostedZone = new HostedZone(scope, `${id}`, {
         comment: `Hosted zone for ${scope.fullyQualifiedDomainName}`,
         zoneName: scope.fullyQualifiedDomainName,
       })
     }
 
-    utils.createCfnOutput(`${id}-hostedZoneId`, scope, hostedZone.hostedZoneId)
-    utils.createCfnOutput(`${id}-hostedZoneArn`, scope, hostedZone.hostedZoneArn)
+    createCfnOutput(`${id}-hostedZoneId`, scope, hostedZone.hostedZoneId)
+    createCfnOutput(`${id}-hostedZoneArn`, scope, hostedZone.hostedZoneArn)
 
     return hostedZone
   }
@@ -93,24 +93,24 @@ export class Route53Manager {
   public createCloudFrontTargetARecord(
     id: string,
     scope: CommonConstruct,
-    distribution?: cloudfront.IDistribution,
-    hostedZone?: route53.IHostedZone,
+    distribution?: IDistribution,
+    hostedZone?: IHostedZone,
     recordName?: string,
     skipStageFromRecord?: boolean
   ) {
     if (!distribution) throw `Distribution undefined for ${id}`
     if (!hostedZone) throw `HostedZone undefined for ${id}`
 
-    const aRecord = new route53.ARecord(scope, `${id}`, {
+    const aRecord = new ARecord(scope, `${id}`, {
       recordName:
         (recordName && scope.isProductionStage()) || skipStageFromRecord
           ? `${recordName}`
           : `${recordName}-${scope.props.stage}`,
-      target: route53.RecordTarget.fromAlias(new route53Targets.CloudFrontTarget(distribution)),
+      target: RecordTarget.fromAlias(new CloudFrontTarget(distribution)),
       zone: hostedZone,
     })
 
-    utils.createCfnOutput(`${id}-aRecordDomainName`, scope, aRecord.domainName)
+    createCfnOutput(`${id}-aRecordDomainName`, scope, aRecord.domainName)
 
     return aRecord
   }
@@ -126,20 +126,20 @@ export class Route53Manager {
   public createCloudFrontTargetARecordV2(
     id: string,
     scope: CommonConstruct,
-    distribution?: cloudfront.IDistribution,
-    hostedZone?: route53.IHostedZone,
+    distribution?: IDistribution,
+    hostedZone?: IHostedZone,
     recordName?: string
   ) {
     if (!distribution) throw `Distribution undefined for ${id}`
     if (!hostedZone) throw `HostedZone undefined for ${id}`
 
-    const aRecord = new route53.ARecord(scope, `${id}`, {
+    const aRecord = new ARecord(scope, `${id}`, {
       recordName: recordName,
-      target: route53.RecordTarget.fromAlias(new route53Targets.CloudFrontTarget(distribution)),
+      target: RecordTarget.fromAlias(new CloudFrontTarget(distribution)),
       zone: hostedZone,
     })
 
-    utils.createCfnOutput(`${id}-aRecordDomainName`, scope, aRecord.domainName)
+    createCfnOutput(`${id}-aRecordDomainName`, scope, aRecord.domainName)
 
     return aRecord
   }
@@ -157,8 +157,8 @@ export class Route53Manager {
     id: string,
     scope: CommonConstruct,
     recordName: string,
-    apiDomain: apig.DomainName,
-    hostedZone: route53.IHostedZone,
+    apiDomain: DomainName,
+    hostedZone: IHostedZone,
     skipStageFromRecord?: boolean
   ) {
     let apiRecordName = ''
@@ -166,13 +166,13 @@ export class Route53Manager {
       apiRecordName =
         scope.isProductionStage() || skipStageFromRecord ? `${recordName}` : `${recordName}-${scope.props.stage}`
 
-    const apiARecord = new route53.ARecord(scope, `${id}`, {
+    const apiARecord = new ARecord(scope, `${id}`, {
       recordName: apiRecordName,
-      target: route53.RecordTarget.fromAlias(new route53Targets.ApiGatewayDomain(apiDomain)),
+      target: RecordTarget.fromAlias(new ApiGatewayDomain(apiDomain)),
       zone: hostedZone,
     })
 
-    utils.createCfnOutput(`${id}-a-record-domain-name`, scope, apiARecord.domainName)
+    createCfnOutput(`${id}-a-record-domain-name`, scope, apiARecord.domainName)
 
     return apiARecord
   }

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

@@ -1,8 +1,8 @@
 import { GetSecretValueCommand, SecretsManagerClient } from '@aws-sdk/client-secrets-manager'
-import * as cdk from 'aws-cdk-lib'
-import * as secretsManager from 'aws-cdk-lib/aws-secretsmanager'
-import * as utils from '../../../utils'
-import { CommonConstruct } from '../../../common'
+import { Fn } from 'aws-cdk-lib'
+import { Secret, SecretProps } from 'aws-cdk-lib/aws-secretsmanager'
+import { CommonConstruct } from '../../common'
+import { createCfnOutput, determineCredentials } from '../../utils'
 
 /**
  * @classdesc Provides operations on AWS Secrets Manager.
@@ -12,10 +12,10 @@ 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.secretsManager.loadSecret('MySecretName', 'eu-west-1')
+ *     this.loadSecret('MySecretName', 'eu-west-1')
  *   }
  * }
  * @see [CDK Secrets Manager Module]{@link https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_secretsmanager-readme.html}
@@ -27,14 +27,14 @@ export class SecretsManager {
    * @param scope scope in which this resource is defined
    * @param props the secret properties
    */
-  public createSecret(id: string, scope: CommonConstruct, props: secretsManager.SecretProps) {
-    const secret = new secretsManager.Secret(scope, `${id}`, {
+  public createSecret(id: string, scope: CommonConstruct, props: SecretProps) {
+    const secret = new Secret(scope, `${id}`, {
       ...props,
       secretName: `${props.secretName}-${scope.props.stage}`,
     })
 
-    utils.createCfnOutput(`${id}-secretName`, scope, secret.secretName)
-    utils.createCfnOutput(`${id}-secretArn`, scope, secret.secretArn)
+    createCfnOutput(`${id}-secretName`, scope, secret.secretName)
+    createCfnOutput(`${id}-secretArn`, scope, secret.secretArn)
 
     return secret
   }
@@ -47,11 +47,7 @@ export class SecretsManager {
    * @param exportName
    */
   public retrieveSecretFromSecretsManager(id: string, scope: CommonConstruct, stackName: string, exportName: string) {
-    return secretsManager.Secret.fromSecretNameV2(
-      scope,
-      `${id}`,
-      cdk.Fn.importValue(`${stackName}-${scope.props.stage}-${exportName}`)
-    )
+    return Secret.fromSecretNameV2(scope, `${id}`, Fn.importValue(`${stackName}-${scope.props.stage}-${exportName}`))
   }
 
   /**
@@ -62,7 +58,7 @@ export class SecretsManager {
    */
   public async resolveSecretValue(region: string, secretId: string, secretKey: string) {
     const client = new SecretsManagerClient({
-      credentials: utils.determineCredentials(),
+      credentials: determineCredentials(),
       region: region,
     })
     const command = new GetSecretValueCommand({

package/src/lib/services/{aws/simple-notification-service → simple-notification-service}/main.ts

@@ -1,8 +1,8 @@
-import * as lambda from 'aws-cdk-lib/aws-lambda'
-import * as sns from 'aws-cdk-lib/aws-sns'
-import * as subs from 'aws-cdk-lib/aws-sns-subscriptions'
-import * as utils from '../../../utils'
-import { CommonConstruct } from '../../../common'
+import { IFunction } from 'aws-cdk-lib/aws-lambda'
+import { Topic } from 'aws-cdk-lib/aws-sns'
+import { EmailSubscription, LambdaSubscription } from 'aws-cdk-lib/aws-sns-subscriptions'
+import { CommonConstruct } from '../../common'
+import { createCfnOutput } from '../../utils'
 import { SubscriptionProps } from './types'
 
 /**
@@ -37,18 +37,18 @@ export class SnsManager {
   ) {
     if (!props) throw `Subscription props undefined for ${id}`
 
-    const topic = new sns.Topic(scope, id, {
+    const topic = new Topic(scope, id, {
       displayName: `${props.topicName}-${scope.props.stage}`,
       fifo: props.fifo,
       topicName: `${props.topicName}-${scope.props.stage}`,
     })
 
     if (emails && emails.length > 0) {
-      emails.forEach((email: string) => topic.addSubscription(new subs.EmailSubscription(email)))
+      emails.forEach((email: string) => topic.addSubscription(new EmailSubscription(email)))
     }
 
-    utils.createCfnOutput(`${id}-subscriptionArn`, scope, topic.topicArn)
-    utils.createCfnOutput(`${id}-subscriptionName`, scope, topic.topicName)
+    createCfnOutput(`${id}-subscriptionArn`, scope, topic.topicArn)
+    createCfnOutput(`${id}-subscriptionName`, scope, topic.topicName)
 
     return topic
   }
@@ -64,20 +64,20 @@ export class SnsManager {
     id: string,
     scope: CommonConstruct,
     props: SubscriptionProps,
-    lambdaFunction: lambda.IFunction
+    lambdaFunction: IFunction
   ) {
     if (!props) throw `Subscription props undefined for ${id}`
 
-    const topic = new sns.Topic(scope, id, {
+    const topic = new Topic(scope, id, {
       displayName: `${props.topicName}-${scope.props.stage}`,
       fifo: props.fifo,
       topicName: `${props.topicName}-${scope.props.stage}`,
     })
 
-    topic.addSubscription(new subs.LambdaSubscription(lambdaFunction))
+    topic.addSubscription(new LambdaSubscription(lambdaFunction))
 
-    utils.createCfnOutput(`${id}-subscriptionArn`, scope, topic.topicArn)
-    utils.createCfnOutput(`${id}-subscriptionName`, scope, topic.topicName)
+    createCfnOutput(`${id}-subscriptionArn`, scope, topic.topicArn)
+    createCfnOutput(`${id}-subscriptionName`, scope, topic.topicName)
 
     return topic
   }