@gradientedge/cdk-utils 4.0.14 → 4.2.0

package/src/lib/manager/route53Manager.ts

@@ -20,9 +20,10 @@ import { createCfnOutput } from '../utils'
  *     super(parent, id, props)
  *     this.props = props
  *     this.route53Manager.createHostedZone('MyHostedZone', this)
+ *   }
  * }
  *
- * @see [CDK Route53 Module]{@link https://docs.aws.amazon.com/cdk/api/latest/docs/aws-route53-readme.html}
+ * @see [CDK Route53 Module]{@link https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_route53-readme.html}
  */
 export class Route53Manager {
   /**

package/src/lib/manager/s3Manager.ts

@@ -4,7 +4,7 @@ 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 { CommonConstruct } from '../common/commonConstruct'
-import { S3BucketProps } from '../types'
+import { LifecycleRule, S3BucketProps } from '../types'
 import { createCfnOutput } from '../utils'
 
 /**
@@ -21,11 +21,66 @@ import { createCfnOutput } from '../utils'
  *     super(parent, id, props)
  *     this.props = props
  *     this.s3Manager.createS3Bucket('MyBucket', this)
+ *   }
  * }
  *
- * @see [CDK S3 Module]{@link https://docs.aws.amazon.com/cdk/api/latest/docs/aws-s3-readme.html}
+ * @see [CDK S3 Module]{@link https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_s3-readme.html}
  */
 export class S3Manager {
+  /**
+   * @summary Method to determine S3 Bucket lifecycle properties
+   * @param {S3BucketProps} props bucket properties
+   * @private
+   */
+  protected determineBucketLifecycleRules(props: S3BucketProps) {
+    if (!props.lifecycleRules) return undefined
+
+    const bucketLifecycleRules: LifecycleRule[] = []
+    props.lifecycleRules.forEach(lifecycleRule => {
+      bucketLifecycleRules.push({
+        id: lifecycleRule.id,
+        enabled: lifecycleRule.enabled,
+        abortIncompleteMultipartUploadAfter: lifecycleRule.abortIncompleteMultipartUploadAfter,
+        expirationDate: lifecycleRule.expirationDate,
+        expiration: lifecycleRule.expirationInDays ? cdk.Duration.days(lifecycleRule.expirationInDays) : undefined,
+        noncurrentVersionExpiration: lifecycleRule.noncurrentVersionExpirationInDays
+          ? cdk.Duration.days(lifecycleRule.noncurrentVersionExpirationInDays)
+          : undefined,
+        noncurrentVersionTransitions: lifecycleRule.noncurrentVersionTransitions,
+        transitions: lifecycleRule.transitions,
+        prefix: lifecycleRule.prefix,
+        tagFilters: lifecycleRule.tagFilters,
+        expiredObjectDeleteMarker: lifecycleRule.expiredObjectDeleteMarker,
+      })
+    })
+
+    return bucketLifecycleRules
+  }
+
+  /**
+   * @summary Method to determine the bucket name
+   * @param {CommonConstruct} scope scope in which this resource is defined
+   * @param {S3BucketProps} props bucket properties
+   * @private
+   */
+  protected static determineBucketName(scope: CommonConstruct, props: S3BucketProps) {
+    return scope.isProductionStage()
+      ? `${props.bucketName}.${scope.fullyQualifiedDomainName}`
+      : `${props.bucketName}-${scope.props.stage}.${scope.fullyQualifiedDomainName}`
+  }
+
+  /**
+   * @summary Method to determine the log bucket name
+   * @param {CommonConstruct} scope scope in which this resource is defined
+   * @param {S3BucketProps} props bucket properties
+   * @private
+   */
+  protected static determineLogBucketName(scope: CommonConstruct, props: S3BucketProps) {
+    return scope.isProductionStage()
+      ? `${props.logBucketName}.${scope.fullyQualifiedDomainName}`
+      : `${props.logBucketName}-${scope.props.stage}.${scope.fullyQualifiedDomainName}`
+  }
+
   /**
    * @summary Method to create a s3 bucket
    * @param {string} id scoped id of the resource
@@ -37,18 +92,14 @@ export class S3Manager {
 
     let bucket: s3.IBucket
 
-    const bucketName = scope.isProductionStage()
-      ? `${props.bucketName}.${scope.fullyQualifiedDomainName}`
-      : `${props.bucketName}-${scope.props.stage}.${scope.fullyQualifiedDomainName}`
+    const bucketName = S3Manager.determineBucketName(scope, props)
 
     if (props.existingBucket && props.bucketName) {
       bucket = s3.Bucket.fromBucketName(scope, `${id}`, bucketName)
     } else {
       let logBucket
       if (props.logBucketName) {
-        const logBucketName = scope.isProductionStage()
-          ? `${props.logBucketName}.${scope.fullyQualifiedDomainName}`
-          : `${props.logBucketName}-${scope.props.stage}.${scope.fullyQualifiedDomainName}`
+        const logBucketName = S3Manager.determineLogBucketName(scope, props)
         logBucket = s3.Bucket.fromBucketName(scope, `${id}-logs`, logBucketName)
       }
 
@@ -60,7 +111,7 @@ export class S3Manager {
         cors: props.cors,
         encryption: props.encryption || s3.BucketEncryption.S3_MANAGED,
         encryptionKey: props.encryptionKey,
-        lifecycleRules: props.lifecycleRules,
+        lifecycleRules: this.determineBucketLifecycleRules(props),
         metrics: props.metrics,
         publicReadAccess: props.publicReadAccess,
         removalPolicy: props.removalPolicy || cdk.RemovalPolicy.RETAIN,
@@ -71,6 +122,13 @@ export class S3Manager {
         websiteRoutingRules: props.websiteRoutingRules,
         versioned: props.versioned,
       })
+
+      const cfnBucket = bucket.node.defaultChild as s3.CfnBucket
+      cfnBucket.notificationConfiguration = {
+        eventBridgeConfiguration: {
+          eventBridgeEnabled: props.enableEventBridge ?? false,
+        },
+      }
     }
 
     createCfnOutput(`${id}-bucketName`, scope, bucket.bucketName)

package/src/lib/manager/secretsManager.ts

@@ -18,10 +18,11 @@ const fs = require('fs')
  *   constructor(parent: cdk.Construct, id: string, props: common.CommonStackProps) {
  *     super(parent, id, props)
  *     this.props = props
- *     this.s3Manager.loadSecret('MySecretName', 'eu-west-1')
+ *     this.secretsManager.loadSecret('MySecretName', 'eu-west-1')
+ *   }
  * }
  *
- * @see [CDK Secrets Manager Module]{@link https://docs.aws.amazon.com/cdk/api/latest/docs/aws-secretsmanager-readme.html}
+ * @see [CDK Secrets Manager Module]{@link https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_secretsmanager-readme.html}
  */
 export class SecretsManager {
   /**

package/src/lib/manager/snsManager.ts

@@ -19,9 +19,10 @@ import { createCfnOutput } from '../utils'
  *     super(parent, id, props)
  *     this.props = props
  *     this.snsManager.createEmailNotificationService('MySns', 'eu-west-1', ['test@example.com'])
+ *   }
  * }
  *
- * @see [CDK Simple Notification Service Module]{@link https://docs.aws.amazon.com/cdk/api/latest/docs/aws-sns-readme.html}
+ * @see [CDK Simple Notification Service Module]{@link https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_sns-readme.html}
  */
 export class SnsManager {
   /**

package/src/lib/manager/ssmManager.ts

@@ -18,9 +18,10 @@ import { SSMParameterReaderProps } from '../types'
  *     super(parent, id, props)
  *     this.props = props
  *     this.acmManager.writeStringToParameters('MyParameter', this, ...props)
+ *   }
  * }
  *
- * @see [CDK Systems Manager Module]{@link https://docs.aws.amazon.com/cdk/api/latest/docs/aws-ssm-readme.html}
+ * @see [CDK Systems Manager Module]{@link https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_ssm-readme.html}
  */
 export class SsmManager {
   /**

package/src/lib/manager/vpcManager.ts

@@ -22,9 +22,10 @@ const CommonVpcIdentifier = 'CommonVpc'
  *     super(parent, id, props)
  *     this.props = props
  *     this.vpcManager.createVpc('MyVPC', this)
+ *   }
  * }
  *
- * @see [CDK VPC Module]{@link https://docs.aws.amazon.com/cdk/api/latest/docs/@aws-cdk_aws-ec2.Vpc.html}
+ * @see [CDK VPC Module]{@link https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.@aws-cdk_aws-ec2.Vpc.html}
  */
 export class VpcManager {
   /**

package/src/lib/manager/wafManager.ts

@@ -17,9 +17,10 @@ import { WafIPSetProps, WafWebACLProps } from '../types'
  *     super(parent, id, props)
  *     this.props = props
  *     this.wafManager.createWebAcl('MyWebAcl', this)
+ *   }
  * }
  *
- * @see [CDK WAF Module]{@link https://docs.aws.amazon.com/cdk/api/latest/docs/aws-waf-readme.html}
+ * @see [CDK WAF Module]{@link https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_waf-readme.html}
  */
 export class WafManager {
   /**

package/src/lib/types.ts

@@ -50,6 +50,8 @@ export interface SiteWithEcsBackendProps extends CommonStackProps {
   siteCertificate: AcmProps
   siteCluster: EcsClusterProps
   siteDistribution: DistributionProps
+  siteCloudfrontFunctionProps?: CloudfrontFunctionProps
+  siteFunctionFilePath?: string
   siteEcsContainerImagePath: string
   siteLog: LogProps
   siteLogBucket: S3BucketProps
@@ -69,6 +71,8 @@ export interface StaticSiteProps extends CommonStackProps {
   siteBucket: S3BucketProps
   siteLogBucket: S3BucketProps
   siteDistribution?: DistributionProps
+  siteCloudfrontFunctionProps?: CloudfrontFunctionProps
+  siteFunctionFilePath?: string
   siteSource: s3deploy.ISource
   siteHostedZoneDomainName?: string
   siteRecordName?: string
@@ -131,6 +135,14 @@ export interface SSMParameterReaderProps {
  */
 export interface CloudFrontProps extends cloudfront.CloudFrontWebDistributionProps {}
 
+/**
+ * @category Networking & Content Delivery
+ */
+export interface CloudfrontFunctionProps extends cloudfront.FunctionProps {
+  functionFilePath: string
+  eventType: string
+}
+
 /**
  * @category Networking & Content Delivery
  */
@@ -268,10 +280,17 @@ export interface Route53Props extends route53.HostedZoneProps {
   useExistingHostedZone?: boolean
 }
 
+export interface LifecycleRule extends s3.LifecycleRule {
+  expirationInDays?: number
+  noncurrentVersionExpirationInDays?: number
+}
+
 /**
  * @category Storage
  */
 export interface S3BucketProps extends s3.BucketProps {
+  enableEventBridge?: boolean
+  lifecycleRules?: LifecycleRule[]
   bucketName: string
   logBucketName?: string
   existingBucket?: boolean