@gradientedge/cdk-utils 8.88.0 → 8.90.0

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

@@ -0,0 +1,57 @@
+import { AliasProps, FunctionProps } from 'aws-cdk-lib/aws-lambda'
+import { TagProps } from '../../../types'
+import { EdgeFunctionProps } from 'aws-cdk-lib/aws-cloudfront/lib/experimental'
+import { QueueProps } from '../simple-queue-service'
+
+/**
+ * @category cdk-utils.lambda-manager
+ * @subcategory Properties
+ */
+export interface ProvisionedConcurrencyProps {
+  minCapacity: number
+  maxCapacity: number
+  utilizationTarget: number
+}
+
+/**
+ * @category cdk-utils.lambda-manager
+ * @subcategory Properties
+ */
+export interface LambdaProps extends FunctionProps {
+  dlq?: QueueProps
+  redriveq?: QueueProps
+  timeoutInSecs?: number
+  excludeLastModifiedTimestamp?: boolean
+  tags?: TagProps[]
+  lambdaAliases?: LambdaAliasProps[]
+}
+
+/**
+ * @category cdk-utils.lambda-manager
+ * @subcategory Properties
+ */
+export interface LambdaAliasProps extends AliasProps {
+  id?: string
+  provisionedConcurrency?: ProvisionedConcurrencyProps
+}
+
+/**
+ * @category cdk-utils.lambda-manager
+ * @subcategory Properties
+ */
+export interface LambdaEdgeProps extends EdgeFunctionProps {
+  timeoutInSecs?: number
+  tags?: TagProps[]
+}
+
+/**
+ * @category cdk-utils.lambda-manager
+ * @subcategory Types
+ */
+export interface LambdaEnvironment {
+  NODE_ENV: string
+  LOG_LEVEL: string
+  REGION?: string
+  STAGE?: string
+  TZ: string
+}

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

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

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

@@ -2,21 +2,21 @@ 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 common from '../../common'
-import * as types from '../../types'
-import * as utils from '../../utils'
+import * as utils from '../../../utils'
+import { CommonConstruct } from '../../../common'
+import { Route53Props } from './types'
 
 /**
  * @stability stable
  * @category cdk-utils.route53-manager
  * @subcategory Construct
  * @classdesc Provides operations on AWS Route53.
- * - A new instance of this class is injected into {@link common.CommonConstruct} constructor.
- * - If a custom construct extends {@link common.CommonConstruct}, an instance is available within the context.
+ * - A new instance of this class is injected into {@link CommonConstruct} constructor.
+ * - If a custom construct extends {@link CommonConstruct}, an instance is available within the context.
  * @example
- * import * as common from '@gradientedge/cdk-utils'
+ * import { CommonConstruct } from '@gradientedge/cdk-utils'
  *
- * class CustomConstruct extends common.common.CommonConstruct {
+ * class CustomConstruct extends CommonConstruct {
  *   constructor(parent: cdk.Construct, id: string, props: common.CommonStackProps) {
  *     super(parent, id, props)
  *     this.props = props
@@ -30,10 +30,10 @@ export class Route53Manager {
   /**
    * @summary Method to create a hosted zone
    * @param {string} id scoped id of the resource
-   * @param {common.CommonConstruct} scope scope in which this resource is defined
-   * @param {types.Route53Props} props
+   * @param {CommonConstruct} scope scope in which this resource is defined
+   * @param {Route53Props} props
    */
-  public createHostedZone(id: string, scope: common.CommonConstruct, props: types.Route53Props) {
+  public createHostedZone(id: string, scope: CommonConstruct, props: Route53Props) {
     let hostedZone: route53.IHostedZone
 
     if (!props) throw `Route53 props undefined for ${id}`
@@ -58,12 +58,12 @@ export class Route53Manager {
   /**
    * @summary Method to create/lookup a hosted zone
    * @param {string} id scoped id of the resource
-   * @param {common.CommonConstruct} scope scope in which this resource is defined
+   * @param {CommonConstruct} scope scope in which this resource is defined
    * @param useExistingHostedZone Flag to indicate whether to lookup vs create new hosted zone
    */
   public withHostedZoneFromFullyQualifiedDomainName(
     id: string,
-    scope: common.CommonConstruct,
+    scope: CommonConstruct,
     useExistingHostedZone: boolean
   ) {
     let hostedZone: route53.IHostedZone
@@ -88,7 +88,7 @@ export class Route53Manager {
   /**
    * @summary Method to create a-record for cloudfront target
    * @param {string} id scoped id of the resource
-   * @param {common.CommonConstruct} scope scope in which this resource is defined
+   * @param {CommonConstruct} scope scope in which this resource is defined
    * @param {cloudfront.IDistribution} distribution
    * @param {route53.IHostedZone} hostedZone
    * @param {string} recordName
@@ -96,7 +96,7 @@ export class Route53Manager {
    */
   public createCloudFrontTargetARecord(
     id: string,
-    scope: common.CommonConstruct,
+    scope: CommonConstruct,
     distribution?: cloudfront.IDistribution,
     hostedZone?: route53.IHostedZone,
     recordName?: string,
@@ -122,14 +122,14 @@ export class Route53Manager {
   /**
    * @summary Method to create a-record for cloudfront target
    * @param {string} id scoped id of the resource
-   * @param {common.CommonConstruct} scope scope in which this resource is defined
+   * @param {CommonConstruct} scope scope in which this resource is defined
    * @param {cloudfront.IDistribution} distribution
    * @param {route53.IHostedZone} hostedZone
    * @param {string} recordName
    */
   public createCloudFrontTargetARecordV2(
     id: string,
-    scope: common.CommonConstruct,
+    scope: CommonConstruct,
     distribution?: cloudfront.IDistribution,
     hostedZone?: route53.IHostedZone,
     recordName?: string
@@ -151,7 +151,7 @@ export class Route53Manager {
   /**
    * @summary Method to create a-record for restApi gateway target
    * @param {string} id scoped id of the resource
-   * @param {common.CommonConstruct} scope scope in which this resource is defined
+   * @param {CommonConstruct} scope scope in which this resource is defined
    * @param recordName
    * @param apiDomain
    * @param hostedZone
@@ -159,7 +159,7 @@ export class Route53Manager {
    */
   public createApiGatewayARecord(
     id: string,
-    scope: common.CommonConstruct,
+    scope: CommonConstruct,
     recordName: string,
     apiDomain: apig.DomainName,
     hostedZone: route53.IHostedZone,

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

@@ -0,0 +1,9 @@
+import { HostedZoneProps } from 'aws-cdk-lib/aws-route53'
+
+/**
+ * @category cdk-utils.route53-manager
+ * @subcategory Properties
+ */
+export interface Route53Props extends HostedZoneProps {
+  useExistingHostedZone?: boolean
+}

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

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

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

@@ -1,20 +1,20 @@
 import { SecretsManager as SM } from '@aws-sdk/client-secrets-manager'
 import * as cdk from 'aws-cdk-lib'
 import * as secretsManager from 'aws-cdk-lib/aws-secretsmanager'
-import * as common from '../../common'
-import * as utils from '../../utils'
+import * as utils from '../../../utils'
+import { CommonConstruct } from '../../../common'
 
 /**
  * @stability experimental
  * @category cdk-utils.secrets-manager
  * @subcategory Construct
  * @classdesc Provides operations on AWS Secrets Manager.
- * - A new instance of this class is injected into {@link common.CommonConstruct} constructor.
- * - If a custom construct extends {@link common.CommonConstruct}, an instance is available within the context.
+ * - A new instance of this class is injected into {@link CommonConstruct} constructor.
+ * - If a custom construct extends {@link CommonConstruct}, an instance is available within the context.
  * @example
- * import * as common from '@gradientedge/cdk-utils'
+ * import { CommonConstruct } from '@gradientedge/cdk-utils'
  *
- * class CustomConstruct extends common.common.CommonConstruct {
+ * class CustomConstruct extends CommonConstruct {
  *   constructor(parent: cdk.Construct, id: string, props: common.CommonStackProps) {
  *     super(parent, id, props)
  *     this.props = props
@@ -69,12 +69,7 @@ export class SecretsManager {
    * @param stackName
    * @param exportName
    */
-  public retrieveSecretFromSecretsManager(
-    id: string,
-    scope: common.CommonConstruct,
-    stackName: string,
-    exportName: string
-  ) {
+  public retrieveSecretFromSecretsManager(id: string, scope: CommonConstruct, stackName: string, exportName: string) {
     return secretsManager.Secret.fromSecretNameV2(
       scope,
       `${id}`,
@@ -85,10 +80,10 @@ export class SecretsManager {
   /**
    * @summary Method to create a secret
    * @param {string} id scoped id of the resource
-   * @param {common.CommonConstruct} scope scope in which this resource is defined
+   * @param {CommonConstruct} scope scope in which this resource is defined
    * @param {secretsManager.SecretProps} props the secret properties
    */
-  public createSecret(id: string, scope: common.CommonConstruct, props: secretsManager.SecretProps) {
+  public createSecret(id: string, scope: CommonConstruct, props: secretsManager.SecretProps) {
     const secret = new secretsManager.Secret(scope, `${id}`, {
       ...props,
       secretName: `${props.secretName}-${scope.props.stage}`,

package/src/lib/services/aws/simple-notification-service/index.ts

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

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

@@ -1,25 +1,25 @@
 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 common from '../../common'
-import * as types from '../../types'
-import * as utils from '../../utils'
+import * as utils from '../../../utils'
+import { CommonConstruct } from '../../../common'
+import { SubscriptionProps } from './types'
 
 /**
  * @stability stable
  * @category cdk-utils.sns-manager
  * @subcategory Construct
  * @classdesc Provides operations on AWS Simple Notification Service.
- * - A new instance of this class is injected into {@link common.CommonConstruct} constructor.
- * - If a custom construct extends {@link common.CommonConstruct}, an instance is available within the context.
+ * - A new instance of this class is injected into {@link CommonConstruct} constructor.
+ * - If a custom construct extends {@link CommonConstruct}, an instance is available within the context.
  * @example
- * import * as common from '@gradientedge/cdk-utils'
+ * import { CommonConstruct } from '@gradientedge/cdk-utils'
  *
- * class CustomConstruct extends common.common.CommonConstruct {
+ * class CustomConstruct extends CommonConstruct {
  *   constructor(parent: cdk.Construct, id: string, props: common.CommonStackProps) {
  *     super(parent, id, props)
  *     this.props = props
- *     this.snsManager.createEmailNotificationService('MySns', 'eu-west-1', ['test@example.com'])
+ *     this.snsManager.createEmailNotificationService('MySns', 'eu-west-1', ["test@example.com"])
  *   }
  * }
  *
@@ -29,14 +29,14 @@ export class SnsManager {
   /**
    * @summary Method to create an email notification service
    * @param {string} id scoped id of the resource
-   * @param {common.CommonConstruct} scope scope in which this resource is defined
-   * @param {types.SubscriptionProps} props
+   * @param {CommonConstruct} scope scope in which this resource is defined
+   * @param {SubscriptionProps} props
    * @param {string[]} emails
    */
   public createEmailNotificationService(
     id: string,
-    scope: common.CommonConstruct,
-    props: types.SubscriptionProps,
+    scope: CommonConstruct,
+    props: SubscriptionProps,
     emails: string[]
   ) {
     if (!props) throw `Subscription props undefined for ${id}`
@@ -60,14 +60,14 @@ export class SnsManager {
   /**
    * @summary Method to create a lambda notification service
    * @param {string} id scoped id of the resource
-   * @param {common.CommonConstruct} scope scope in which this resource is defined
-   * @param {types.SubscriptionProps} props
+   * @param {CommonConstruct} scope scope in which this resource is defined
+   * @param {SubscriptionProps} props
    * @param {lambda.IFunction} lambdaFunction
    */
   public createLambdaNotificationService(
     id: string,
-    scope: common.CommonConstruct,
-    props: types.SubscriptionProps,
+    scope: CommonConstruct,
+    props: SubscriptionProps,
     lambdaFunction: lambda.IFunction
   ) {
     if (!props) throw `Subscription props undefined for ${id}`

package/src/lib/services/aws/simple-notification-service/types.ts

@@ -0,0 +1,7 @@
+import { TopicProps } from 'aws-cdk-lib/aws-sns'
+
+/**
+ * @category cdk-utils.sns-manager
+ * @subcategory Properties
+ */
+export interface SubscriptionProps extends TopicProps {}

package/src/lib/services/aws/simple-queue-service/index.ts

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

package/src/lib/{manager/aws/sqs-manager.ts → services/aws/simple-queue-service/main.ts}

@@ -1,20 +1,21 @@
 import * as cdk from 'aws-cdk-lib'
 import * as sqs from 'aws-cdk-lib/aws-sqs'
-import * as common from '../../common'
-import * as types from '../../types'
-import * as utils from '../../utils'
+import * as utils from '../../../utils'
+import { CommonConstruct } from '../../../common'
+import { QueueProps } from './types'
+import { LambdaProps } from '../lambda'
 
 /**
  * @stability stable
  * @category cdk-utils.sqs-manager
  * @subcategory Construct
  * @classdesc Provides operations on AWS Simple Queue Service.
- * - A new instance of this class is injected into {@link common.CommonConstruct} constructor.
- * - If a custom construct extends {@link common.CommonConstruct}, an instance is available within the context.
+ * - A new instance of this class is injected into {@link CommonConstruct} constructor.
+ * - If a custom construct extends {@link CommonConstruct}, an instance is available within the context.
  * @example
- * import * as common from '@gradientedge/cdk-utils'
+ * import { CommonConstruct } from '@gradientedge/cdk-utils'
  *
- * class CustomConstruct extends common.common.CommonConstruct {
+ * class CustomConstruct extends CommonConstruct {
  *   constructor(parent: cdk.Construct, id: string, props: common.CommonStackProps) {
  *     super(parent, id, props)
  *     this.props = props
@@ -28,11 +29,11 @@ export class SqsManager {
   /**
    * @summary Method to create a lambda queue service
    * @param {string} id scoped id of the resource
-   * @param {common.CommonConstruct} scope scope in which this resource is defined
-   * @param {types.QueueProps} props
+   * @param {CommonConstruct} scope scope in which this resource is defined
+   * @param {QueueProps} props
    * @param {sqs.IQueue} deadLetterQueue
    */
-  public createQueue(id: string, scope: common.CommonConstruct, props: types.QueueProps, deadLetterQueue?: sqs.IQueue) {
+  public createQueue(id: string, scope: CommonConstruct, props: QueueProps, deadLetterQueue?: sqs.IQueue) {
     if (!props) throw `Queue props undefined for ${id}`
 
     const queue = new sqs.Queue(scope, id, {
@@ -78,10 +79,10 @@ export class SqsManager {
   /**
    * @summary Method to create a redrive queue for a lambda function
    * @param {string} id scoped id of the resource
-   * @param {common.CommonConstruct} scope scope in which this resource is defined
-   * @param {types.LambdaProps} props the lambda properties
+   * @param {CommonConstruct} scope scope in which this resource is defined
+   * @param {LambdaProps} props the lambda properties
    */
-  public createRedriveQueueForLambda(id: string, scope: common.CommonConstruct, props: types.LambdaProps) {
+  public createRedriveQueueForLambda(id: string, scope: CommonConstruct, props: LambdaProps) {
     return this.createQueue(`${id}`, scope, {
       ...props.redriveq,
       queueName: props.redriveq?.fifo
@@ -93,14 +94,14 @@ export class SqsManager {
   /**
    * @summary Method to create a dead letter queue for a lambda function
    * @param {string} id scoped id of the resource
-   * @param {common.CommonConstruct} scope scope in which this resource is defined
-   * @param {types.LambdaProps} props the lambda properties
+   * @param {CommonConstruct} scope scope in which this resource is defined
+   * @param {LambdaProps} props the lambda properties
    * @param {sqs.IQueue} deadLetterQueue
    */
   public createDeadLetterQueueForLambda(
     id: string,
-    scope: common.CommonConstruct,
-    props: types.LambdaProps,
+    scope: CommonConstruct,
+    props: LambdaProps,
     deadLetterQueue: sqs.IQueue
   ) {
     let queueProps

package/src/lib/services/aws/simple-queue-service/types.ts

@@ -0,0 +1,18 @@
+import * as sqs from 'aws-cdk-lib/aws-sqs'
+import { TagProps } from '../../../types'
+
+/**
+ * @category cdk-utils.sqs-manager
+ * @subcategory Properties
+ */
+export interface QueueProps extends sqs.QueueProps {
+  maxReceiveCount?: number
+  visibilityTimeoutInSecs?: number
+  receiveMessageWaitTimeInSecs?: number
+  dataKeyReuseInSecs?: number
+  deliveryDelayInSecs?: number
+  retentionInDays?: number
+  tags?: TagProps[]
+  retriesEnabled?: boolean
+  retryBatchSize?: number
+}

package/src/lib/services/aws/simple-storage-service/index.ts

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

package/src/lib/{manager/aws/s3-manager.ts → services/aws/simple-storage-service/main.ts}

@@ -3,21 +3,21 @@ import * as cloudfront from 'aws-cdk-lib/aws-cloudfront'
 import * as iam from 'aws-cdk-lib/aws-iam'
 import * as s3 from 'aws-cdk-lib/aws-s3'
 import * as s3deploy from 'aws-cdk-lib/aws-s3-deployment'
-import * as common from '../../common'
-import * as types from '../../types'
-import * as utils from '../../utils'
+import * as utils from '../../../utils'
+import { LifecycleRule, S3BucketProps } from './types'
+import { CommonConstruct } from '../../../common'
 
 /**
  * @stability stable
  * @category cdk-utils.s3-manager
  * @subcategory Construct
  * @classdesc Provides operations on AWS S3.
- * - A new instance of this class is injected into {@link common.CommonConstruct} constructor.
- * - If a custom construct extends {@link common.CommonConstruct}, an instance is available within the context.
+ * - A new instance of this class is injected into {@link CommonConstruct} constructor.
+ * - If a custom construct extends {@link CommonConstruct}, an instance is available within the context.
  * @example
- * import * as common from '@gradientedge/cdk-utils'
+ * import { CommonConstruct } from '@gradientedge/cdk-utils'
  *
- * class CustomConstruct extends common.common.CommonConstruct {
+ * class CustomConstruct extends CommonConstruct {
  *   constructor(parent: cdk.Construct, id: string, props: common.CommonStackProps) {
  *     super(parent, id, props)
  *     this.props = props
@@ -30,13 +30,13 @@ import * as utils from '../../utils'
 export class S3Manager {
   /**
    * @summary Method to determine S3 Bucket lifecycle properties
-   * @param {types.S3BucketProps} props bucket properties
+   * @param {S3BucketProps} props bucket properties
    * @private
    */
-  protected determineBucketLifecycleRules(props: types.S3BucketProps) {
+  protected determineBucketLifecycleRules(props: S3BucketProps) {
     if (!props.lifecycleRules) return undefined
 
-    const bucketLifecycleRules: types.LifecycleRule[] = []
+    const bucketLifecycleRules: LifecycleRule[] = []
     props.lifecycleRules.forEach(lifecycleRule => {
       bucketLifecycleRules.push({
         id: lifecycleRule.id,
@@ -60,21 +60,21 @@ export class S3Manager {
 
   /**
    * @summary Method to determine the bucket name using account and region
-   * @param {common.CommonConstruct} scope scope in which this resource is defined
+   * @param {CommonConstruct} scope scope in which this resource is defined
    * @param {string} bucketName the bucket name
    * @protected
    */
-  protected static determineBucketNameByAccountAndRegion(scope: common.CommonConstruct, bucketName: string) {
+  protected static determineBucketNameByAccountAndRegion(scope: CommonConstruct, bucketName: string) {
     return `${bucketName}-${cdk.Stack.of(scope).account}-${scope.props.region}-${scope.props.stage}`
   }
 
   /**
    * @summary Method to determine the bucket name using domain name
-   * @param {common.CommonConstruct} scope scope in which this resource is defined
+   * @param {CommonConstruct} scope scope in which this resource is defined
    * @param {string} bucketName the bucket name
    * @protected
    */
-  protected static determineBucketNameByDomainName(scope: common.CommonConstruct, bucketName: string) {
+  protected static determineBucketNameByDomainName(scope: CommonConstruct, bucketName: string) {
     return scope.isProductionStage()
       ? `${bucketName}.${scope.fullyQualifiedDomainName}`
       : `${bucketName}-${scope.props.stage}.${scope.fullyQualifiedDomainName}`
@@ -82,24 +82,23 @@ export class S3Manager {
 
   /**
    * @summary Method to determine the bucket name
-   * @param {common.CommonConstruct} scope scope in which this resource is defined
+   * @param {CommonConstruct} scope scope in which this resource is defined
    * @param {string} bucketName the bucket name
    * @private
    */
-  public static determineBucketName(scope: common.CommonConstruct, bucketName: string) {
-    const sanitisedBucketName = scope.props.excludeDomainNameForBuckets
+  public static determineBucketName(scope: CommonConstruct, bucketName: string) {
+    return scope.props.excludeDomainNameForBuckets
       ? S3Manager.determineBucketNameByAccountAndRegion(scope, bucketName)
       : S3Manager.determineBucketNameByDomainName(scope, bucketName)
-    return sanitisedBucketName
   }
 
   /**
    * @summary Method to create a s3 bucket
    * @param {string} id scoped id of the resource
-   * @param {common.CommonConstruct} scope scope in which this resource is defined
-   * @param {types.S3BucketProps} props bucket properties
+   * @param {CommonConstruct} scope scope in which this resource is defined
+   * @param {S3BucketProps} props bucket properties
    */
-  public createS3Bucket(id: string, scope: common.CommonConstruct, props: types.S3BucketProps) {
+  public createS3Bucket(id: string, scope: CommonConstruct, props: S3BucketProps) {
     if (!props) throw `S3 props undefined for ${id}`
 
     let bucket: s3.IBucket
@@ -159,10 +158,10 @@ export class S3Manager {
   /**
    * @summary Method to create an iam bucket policy for cloudtrail
    * @param {string} id scoped id of the resource
-   * @param {common.CommonConstruct} scope scope in which this resource is defined
+   * @param {CommonConstruct} scope scope in which this resource is defined
    * @param {s3.IBucket} bucket
    */
-  public createBucketPolicyForCloudTrail(id: string, scope: common.CommonConstruct, bucket: s3.IBucket) {
+  public createBucketPolicyForCloudTrail(id: string, scope: CommonConstruct, bucket: s3.IBucket) {
     const bucketPolicyDocument = new iam.PolicyDocument({
       statements: [
         new iam.PolicyStatement({
@@ -191,7 +190,7 @@ export class S3Manager {
   /**
    * @summary Method to create a s3 bucket deployment
    * @param {string} id scoped id of the resource
-   * @param {common.CommonConstruct} scope scope in which this resource is defined
+   * @param {CommonConstruct} scope scope in which this resource is defined
    * @param {s3.IBucket} siteBucket
    * @param {cloudfront.IDistribution} distribution
    * @param {s3deploy.ISource[]} sources
@@ -200,7 +199,7 @@ export class S3Manager {
    */
   public doBucketDeployment(
     id: string,
-    scope: common.CommonConstruct,
+    scope: CommonConstruct,
     siteBucket: s3.IBucket,
     distribution: cloudfront.IDistribution,
     sources: s3deploy.ISource[],
@@ -222,11 +221,11 @@ export class S3Manager {
   /**
    *
    * @param {string} id scoped id of the resource
-   * @param {common.CommonConstruct} scope scope in which this resource is defined
+   * @param {CommonConstruct} scope scope in which this resource is defined
    * @param {s3.IBucket} bucket bucket to create the folders in
    * @param {string[]} folders list of folder names to be created in the bucket
    */
-  public createBucketFolders(id: string, scope: common.CommonConstruct, bucket: s3.IBucket, folders: string[]) {
+  public createBucketFolders(id: string, scope: CommonConstruct, bucket: s3.IBucket, folders: string[]) {
     if (!folders || folders.length == 0) {
       throw `Folder unspecified for ${id}`
     }

package/src/lib/services/aws/simple-storage-service/types.ts

@@ -0,0 +1,34 @@
+import { TagProps } from '../../../types'
+import * as s3 from 'aws-cdk-lib/aws-s3'
+import * as s3deploy from 'aws-cdk-lib/aws-s3-deployment'
+
+/**
+ * @category cdk-utils.s3-manager
+ * @subcategory Properties
+ */
+export interface LifecycleRule extends s3.LifecycleRule {
+  expirationInDays?: number
+  noncurrentVersionExpirationInDays?: number
+}
+
+/**
+ * @category cdk-utils.s3-manager
+ * @subcategory Properties
+ */
+export interface BucketDeploymentProps extends s3deploy.BucketDeploymentProps {
+  expirationInDays?: number
+  noncurrentVersionExpirationInDays?: number
+}
+
+/**
+ * @category cdk-utils.s3-manager
+ * @subcategory Properties
+ */
+export interface S3BucketProps extends s3.BucketProps {
+  enableEventBridge?: boolean
+  lifecycleRules?: LifecycleRule[]
+  bucketName: string
+  logBucketName?: string
+  existingBucket?: boolean
+  tags?: TagProps[]
+}

package/src/lib/services/aws/step-function/index.ts

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