@gradientedge/cdk-utils 7.9.1 → 7.11.0

package/dist/src/lib/manager/aws/lambda-manager.d.ts

@@ -66,4 +66,19 @@ export declare class LambdaManager {
      * @param {string?} mountPath
      */
     createEdgeFunction(id: string, scope: common.CommonConstruct, props: types.LambdaEdgeProps, layers: lambda.ILayerVersion[], code: lambda.AssetCode, environment?: any, vpc?: ec2.IVpc, securityGroups?: ec2.ISecurityGroup[], accessPoint?: efs.IAccessPoint, mountPath?: string): cdk.aws_cloudfront.experimental.EdgeFunction;
+    /**
+     * @summary Method to create a lambda function (nodejs) with docker image
+     * @param {string} id scoped id of the resource
+     * @param {common.CommonConstruct} scope scope in which this resource is defined
+     * @param {types.LambdaProps} props
+     * @param {iam.Role | iam.CfnRole} role
+     * @param {lambda.DockerImageCode} code
+     * @param {Map<string, string>?} environment
+     * @param {ec2.IVpc?} vpc
+     * @param {ec2.ISecurityGroup[]?} securityGroups
+     * @param {efs.IAccessPoint?} accessPoint
+     * @param {string?} mountPath
+     * @param {ec2.SubnetSelection?} vpcSubnets
+     */
+    createLambdaDockerFunction(id: string, scope: common.CommonConstruct, props: types.LambdaProps, role: iam.Role | iam.CfnRole, code: lambda.DockerImageCode, environment?: any, vpc?: ec2.IVpc, securityGroups?: ec2.ISecurityGroup[], accessPoint?: efs.IAccessPoint, mountPath?: string, vpcSubnets?: ec2.SubnetSelection): cdk.aws_lambda.DockerImageFunction;
 }

package/dist/src/lib/manager/aws/lambda-manager.js

@@ -29,6 +29,7 @@ const iam = __importStar(require("aws-cdk-lib/aws-iam"));
 const lambda = __importStar(require("aws-cdk-lib/aws-lambda"));
 const utils = __importStar(require("../../utils"));
 const cloudfront_manager_1 = require("./cloudfront-manager");
+const ssm_manager_1 = require("./ssm-manager");
 /**
  * @stability stable
  * @category cdk-utils.lambda-manager
@@ -104,8 +105,10 @@ class LambdaManager {
                 architecture: props.architecture ?? lambda.Architecture.ARM_64,
                 environment: {
                     REGION: scope.props.region,
-                    LAST_MODIFIED_TS: new Date().toISOString(),
                     STAGE: scope.props.stage,
+                    LAST_MODIFIED_TS: props.excludeLastModifiedTimestamp
+                        ? ''
+                        : scope.ssmManager.readStringParameter(`${id}-sm-ts`, scope, `${ssm_manager_1.SsmManager.SECRETS_MODIFIED_TIMESTAMP_PARAM}-${scope.props.stage}`),
                     ...environment,
                 },
                 filesystem: accessPoint
@@ -142,5 +145,59 @@ class LambdaManager {
     createEdgeFunction(id, scope, props, layers, code, environment, vpc, securityGroups, accessPoint, mountPath) {
         return new cloudfront_manager_1.CloudFrontManager().createEdgeFunction(id, scope, props, layers, code, environment, vpc, securityGroups, accessPoint, mountPath);
     }
+    /**
+     * @summary Method to create a lambda function (nodejs) with docker image
+     * @param {string} id scoped id of the resource
+     * @param {common.CommonConstruct} scope scope in which this resource is defined
+     * @param {types.LambdaProps} props
+     * @param {iam.Role | iam.CfnRole} role
+     * @param {lambda.DockerImageCode} code
+     * @param {Map<string, string>?} environment
+     * @param {ec2.IVpc?} vpc
+     * @param {ec2.ISecurityGroup[]?} securityGroups
+     * @param {efs.IAccessPoint?} accessPoint
+     * @param {string?} mountPath
+     * @param {ec2.SubnetSelection?} vpcSubnets
+     */
+    createLambdaDockerFunction(id, scope, props, role, code, environment, vpc, securityGroups, accessPoint, mountPath, vpcSubnets) {
+        if (!props)
+            throw `Lambda props undefined for ${id}`;
+        const functionName = `${props.functionName}-${scope.props.stage}`;
+        let deadLetterQueue;
+        if (props.deadLetterQueueEnabled && props.dlq) {
+            const redriveQueue = scope.sqsManager.createRedriveQueueForLambda(`${id}-rdq`, scope, props);
+            deadLetterQueue = scope.sqsManager.createDeadLetterQueueForLambda(`${id}-dlq`, scope, props, redriveQueue);
+        }
+        const lambdaFunction = new lambda.DockerImageFunction(scope, `${id}`, {
+            ...props,
+            ...{
+                allowPublicSubnet: !!vpc,
+                functionName: functionName,
+                runtime: LambdaManager.NODEJS_RUNTIME,
+                code: code,
+                deadLetterQueue: deadLetterQueue,
+                architecture: props.architecture ?? lambda.Architecture.ARM_64,
+                environment: {
+                    REGION: scope.props.region,
+                    LAST_MODIFIED_TS: new Date().toISOString(),
+                    STAGE: scope.props.stage,
+                    ...environment,
+                },
+                filesystem: accessPoint
+                    ? lambda.FileSystem.fromEfsAccessPoint(accessPoint, mountPath || '/mnt/msg')
+                    : undefined,
+                reservedConcurrentExecutions: props.reservedConcurrentExecutions,
+                role: role instanceof iam.Role ? role : undefined,
+                securityGroups: securityGroups,
+                timeout: props.timeoutInSecs ? cdk.Duration.seconds(props.timeoutInSecs) : cdk.Duration.minutes(1),
+                vpc: vpc,
+                vpcSubnets: vpcSubnets,
+                tracing: props.tracing,
+            },
+        });
+        utils.createCfnOutput(`${id}-lambdaArn`, scope, lambdaFunction.functionArn);
+        utils.createCfnOutput(`${id}-lambdaName`, scope, lambdaFunction.functionName);
+        return lambdaFunction;
+    }
 }
 exports.LambdaManager = LambdaManager;

package/dist/src/lib/manager/aws/ssm-manager.d.ts

@@ -23,6 +23,7 @@ import * as types from '../../types';
  * @see [CDK Systems Manager Module]{@link https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_ssm-readme.html}
  */
 export declare class SsmManager {
+    static SECRETS_MODIFIED_TIMESTAMP_PARAM: string;
     /**
      * Method to write a string parameter to the parameters store
      * @param {string} id scoped id of the resource

package/dist/src/lib/manager/aws/ssm-manager.js

@@ -48,6 +48,7 @@ const utils = __importStar(require("../../utils"));
  * @see [CDK Systems Manager Module]{@link https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_ssm-readme.html}
  */
 class SsmManager {
+    static SECRETS_MODIFIED_TIMESTAMP_PARAM = 'secrets-last-modified-timestamp';
     /**
      * Method to write a string parameter to the parameters store
      * @param {string} id scoped id of the resource

package/dist/src/lib/types/aws/index.d.ts

@@ -596,6 +596,7 @@ export interface LambdaProps extends lambda.FunctionProps {
     dlq?: QueueProps;
     redriveq?: QueueProps;
     timeoutInSecs?: number;
+    excludeLastModifiedTimestamp?: boolean;
 }
 /**
  * @category cdk-utils.lambda-manager

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gradientedge/cdk-utils",
-  "version": "7.9.1",
+  "version": "7.11.0",
   "description": "Utilities for AWS CDK provisioning",
   "main": "dist/index.js",
   "engines": {
@@ -38,7 +38,7 @@
     "prettier": "npx prettier --check \"**/*.{ts,json,md}\"",
     "prettify": "npx prettier --write \"**/*.{ts,json,md}\"",
     "test": "rimraf coverage && npx jest --ci --runInBand",
-    "upgrade": "ncu -u -x lerna",
+    "update:deps": "ncu -u -x lerna",
     "validate": "yarn prettier && yarn test"
   },
   "husky": {
@@ -47,12 +47,12 @@
     }
   },
   "dependencies": {
-    "@types/lodash": "^4.14.190",
-    "@types/node": "^18.11.9",
+    "@types/lodash": "^4.14.191",
+    "@types/node": "^18.11.11",
     "app-root-path": "^3.1.0",
-    "aws-cdk-lib": "^2.52.0",
-    "aws-sdk": "^2.1262.0",
-    "constructs": "^10.1.173",
+    "aws-cdk-lib": "^2.53.0",
+    "aws-sdk": "^2.1268.0",
+    "constructs": "^10.1.181",
     "lodash": "^4.17.21",
     "moment": "^2.29.4",
     "nconf": "^0.12.0",
@@ -61,16 +61,16 @@
   },
   "devDependencies": {
     "@babel/plugin-proposal-class-properties": "^7.18.6",
-    "@types/jest": "^29.2.3",
-    "@typescript-eslint/eslint-plugin": "^5.44.0",
-    "@typescript-eslint/parser": "^5.44.0",
+    "@types/jest": "^29.2.4",
+    "@typescript-eslint/eslint-plugin": "^5.45.1",
+    "@typescript-eslint/parser": "^5.45.1",
     "aws-cdk": "*",
     "babel-eslint": "^10.1.0",
     "better-docs": "^2.7.2",
     "codecov": "^3.8.3",
-    "commitizen": "^4.2.5",
+    "commitizen": "^4.2.6",
     "dotenv": "^16.0.3",
-    "eslint": "^8.28.0",
+    "eslint": "^8.29.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-import": "^2.26.0",
     "husky": "^8.0.2",
@@ -91,7 +91,7 @@
     "typescript": "4.9.3"
   },
   "optionalDependencies": {
-    "@babel/core": "^7.20.2",
+    "@babel/core": "^7.20.5",
     "prop-types": "^15.8.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"

package/src/lib/manager/aws/lambda-manager.ts

@@ -7,6 +7,7 @@ import * as common from '../../common'
 import * as types from '../../types'
 import * as utils from '../../utils'
 import { CloudFrontManager } from './cloudfront-manager'
+import { SsmManager } from './ssm-manager'
 
 /**
  * @stability stable
@@ -103,8 +104,14 @@ export class LambdaManager {
         architecture: props.architecture ?? lambda.Architecture.ARM_64,
         environment: {
           REGION: scope.props.region,
-          LAST_MODIFIED_TS: new Date().toISOString(),
           STAGE: scope.props.stage,
+          LAST_MODIFIED_TS: props.excludeLastModifiedTimestamp
+            ? ''
+            : scope.ssmManager.readStringParameter(
+                `${id}-sm-ts`,
+                scope,
+                `${SsmManager.SECRETS_MODIFIED_TIMESTAMP_PARAM}-${scope.props.stage}`
+              ),
           ...environment,
         },
         filesystem: accessPoint
@@ -166,4 +173,75 @@ export class LambdaManager {
       mountPath
     )
   }
+
+  /**
+   * @summary Method to create a lambda function (nodejs) with docker image
+   * @param {string} id scoped id of the resource
+   * @param {common.CommonConstruct} scope scope in which this resource is defined
+   * @param {types.LambdaProps} props
+   * @param {iam.Role | iam.CfnRole} role
+   * @param {lambda.DockerImageCode} code
+   * @param {Map<string, string>?} environment
+   * @param {ec2.IVpc?} vpc
+   * @param {ec2.ISecurityGroup[]?} securityGroups
+   * @param {efs.IAccessPoint?} accessPoint
+   * @param {string?} mountPath
+   * @param {ec2.SubnetSelection?} vpcSubnets
+   */
+  public createLambdaDockerFunction(
+    id: string,
+    scope: common.CommonConstruct,
+    props: types.LambdaProps,
+    role: iam.Role | iam.CfnRole,
+    code: lambda.DockerImageCode,
+    environment?: any,
+    vpc?: ec2.IVpc,
+    securityGroups?: ec2.ISecurityGroup[],
+    accessPoint?: efs.IAccessPoint,
+    mountPath?: string,
+    vpcSubnets?: ec2.SubnetSelection
+  ) {
+    if (!props) throw `Lambda props undefined for ${id}`
+
+    const functionName = `${props.functionName}-${scope.props.stage}`
+
+    let deadLetterQueue
+    if (props.deadLetterQueueEnabled && props.dlq) {
+      const redriveQueue = scope.sqsManager.createRedriveQueueForLambda(`${id}-rdq`, scope, props)
+      deadLetterQueue = scope.sqsManager.createDeadLetterQueueForLambda(`${id}-dlq`, scope, props, redriveQueue)
+    }
+
+    const lambdaFunction = new lambda.DockerImageFunction(scope, `${id}`, {
+      ...props,
+      ...{
+        allowPublicSubnet: !!vpc,
+        functionName: functionName,
+        runtime: LambdaManager.NODEJS_RUNTIME,
+        code: code,
+        deadLetterQueue: deadLetterQueue,
+        architecture: props.architecture ?? lambda.Architecture.ARM_64,
+        environment: {
+          REGION: scope.props.region,
+          LAST_MODIFIED_TS: new Date().toISOString(),
+          STAGE: scope.props.stage,
+          ...environment,
+        },
+        filesystem: accessPoint
+          ? lambda.FileSystem.fromEfsAccessPoint(accessPoint, mountPath || '/mnt/msg')
+          : undefined,
+        reservedConcurrentExecutions: props.reservedConcurrentExecutions,
+        role: role instanceof iam.Role ? role : undefined,
+        securityGroups: securityGroups,
+        timeout: props.timeoutInSecs ? cdk.Duration.seconds(props.timeoutInSecs) : cdk.Duration.minutes(1),
+        vpc: vpc,
+        vpcSubnets: vpcSubnets,
+        tracing: props.tracing,
+      },
+    })
+
+    utils.createCfnOutput(`${id}-lambdaArn`, scope, lambdaFunction.functionArn)
+    utils.createCfnOutput(`${id}-lambdaName`, scope, lambdaFunction.functionName)
+
+    return lambdaFunction
+  }
 }

package/src/lib/manager/aws/ssm-manager.ts

@@ -25,6 +25,7 @@ import * as utils from '../../utils'
  * @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 {
+  public static SECRETS_MODIFIED_TIMESTAMP_PARAM = 'secrets-last-modified-timestamp'
   /**
    * Method to write a string parameter to the parameters store
    * @param {string} id scoped id of the resource

package/src/lib/types/aws/index.ts

@@ -634,6 +634,7 @@ export interface LambdaProps extends lambda.FunctionProps {
   dlq?: QueueProps
   redriveq?: QueueProps
   timeoutInSecs?: number
+  excludeLastModifiedTimestamp?: boolean
 }
 
 /**