@gradientedge/cdk-utils 8.13.0 → 8.15.0

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

@@ -52,9 +52,10 @@ export declare class ApiManager {
      * @param {string[]?} allowedOrigins
      * @param {string[]?} allowedMethods
      * @param {string[]?} allowedHeaders
-     * @param {{}?} requestParameters
+     * @param {{}?} methodRequestParameters
+     * @param {apig.Integration} proxyIntegration
      */
-    createApiResource(id: string, scope: common.CommonConstruct, parent: apig.IResource, path: string, integration: apig.Integration, addProxy: boolean, authorizer?: apig.IAuthorizer, allowedOrigins?: string[], allowedMethods?: string[], allowedHeaders?: string[], methodRequestParameters?: {}): apig.Resource;
+    createApiResource(id: string, scope: common.CommonConstruct, parent: apig.IResource, path: string, integration: apig.Integration, addProxy: boolean, authorizer?: apig.IAuthorizer, allowedOrigins?: string[], allowedMethods?: string[], allowedHeaders?: string[], methodRequestParameters?: {}, proxyIntegration?: apig.Integration): apig.Resource;
     /**
      * @summary Method to create an api deployment
      * @param {string} id

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

@@ -128,9 +128,10 @@ class ApiManager {
      * @param {string[]?} allowedOrigins
      * @param {string[]?} allowedMethods
      * @param {string[]?} allowedHeaders
-     * @param {{}?} requestParameters
+     * @param {{}?} methodRequestParameters
+     * @param {apig.Integration} proxyIntegration
      */
-    createApiResource(id, scope, parent, path, integration, addProxy, authorizer, allowedOrigins, allowedMethods, allowedHeaders, methodRequestParameters) {
+    createApiResource(id, scope, parent, path, integration, addProxy, authorizer, allowedOrigins, allowedMethods, allowedHeaders, methodRequestParameters, proxyIntegration) {
         const methods = allowedMethods ?? apig.Cors.ALL_METHODS;
         const resource = parent.addResource(path, {
             defaultCorsPreflightOptions: {
@@ -151,7 +152,10 @@ class ApiManager {
                     allowCredentials: true,
                 },
             });
-            methods.forEach(method => resourceProxy.addMethod(method, integration, { authorizer, requestParameters: methodRequestParameters }));
+            methods.forEach(method => resourceProxy.addMethod(method, proxyIntegration ?? integration, {
+                authorizer,
+                requestParameters: methodRequestParameters,
+            }));
             utils.createCfnOutput(`${id}-${path}ProxyResourceId`, scope, resourceProxy.resourceId);
         }
         return resource;

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

@@ -180,8 +180,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

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

@@ -172,8 +172,8 @@ class SfnManager {
                 outputPath: props.outputPath,
                 resultPath: props.resultPath,
                 resultSelector: props.resultSelector,
-                timeout: props.timeout,
-                heartbeat: props.heartbeat,
+                taskTimeout: props.taskTimeout,
+                heartbeatTimeout: props.heartbeatTimeout,
                 integrationPattern: props.integrationPattern,
                 expressionAttributeNames: props.expressionAttributeNames,
                 projectionExpression: props.projectionExpression,
@@ -209,8 +209,8 @@ class SfnManager {
                 outputPath: props.outputPath,
                 resultPath: props.resultPath,
                 resultSelector: props.resultSelector,
-                timeout: props.timeout,
-                heartbeat: props.heartbeat,
+                taskTimeout: props.taskTimeout,
+                heartbeatTimeout: props.heartbeatTimeout,
                 integrationPattern: props.integrationPattern,
                 conditionExpression: props.conditionExpression,
                 expressionAttributeNames: props.expressionAttributeNames,
@@ -248,12 +248,12 @@ class SfnManager {
                 conditionExpression: props.conditionExpression,
                 expressionAttributeNames: props.expressionAttributeNames,
                 expressionAttributeValues: props.expressionAttributeValues,
-                heartbeat: props.heartbeat,
+                taskTimeout: props.taskTimeout,
+                heartbeatTimeout: props.heartbeatTimeout,
                 inputPath: props.inputPath,
                 outputPath: props.outputPath,
                 resultPath: props.resultPath,
                 resultSelector: props.resultSelector,
-                timeout: props.timeout,
                 integrationPattern: props.integrationPattern,
                 returnConsumedCapacity: props.returnConsumedCapacity,
                 returnItemCollectionMetrics: props.returnItemCollectionMetrics,
@@ -293,8 +293,8 @@ class SfnManager {
                 outputPath: props.outputPath,
                 resultPath: props.resultPath,
                 resultSelector: props.resultSelector,
-                timeout: props.timeout,
-                heartbeat: props.heartbeat,
+                taskTimeout: props.taskTimeout,
+                heartbeatTimeout: props.heartbeatTimeout,
                 integrationPattern: props.integrationPattern,
                 comment: `DynamoDB PutItem step for ${props.name} - ${scope.props.stage} stage`,
             },

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

@@ -225,10 +225,10 @@ export interface SfnStateMachineProps extends sfn.StateMachineProps {
  * @subcategory Types
  */
 export interface LambdaEnvironment {
-    CACHE_REDIS_HOST?: string;
-    CACHE_REDIS_PORT?: string;
     NODE_ENV: string;
     LOG_LEVEL: string;
+    REGION?: string;
+    STAGE?: string;
     TZ: string;
 }
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gradientedge/cdk-utils",
-  "version": "8.13.0",
+  "version": "8.15.0",
   "description": "Utilities for AWS CDK provisioning",
   "main": "dist/index.js",
   "engines": {
@@ -50,9 +50,9 @@
     "@types/lodash": "^4.14.191",
     "@types/node": "^18.11.18",
     "app-root-path": "^3.1.0",
-    "aws-cdk-lib": "^2.63.0",
-    "aws-sdk": "^2.1307.0",
-    "constructs": "^10.1.237",
+    "aws-cdk-lib": "^2.63.1",
+    "aws-sdk": "^2.1309.0",
+    "constructs": "^10.1.240",
     "lodash": "^4.17.21",
     "moment": "^2.29.4",
     "nconf": "^0.12.0",

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

@@ -116,7 +116,8 @@ export class ApiManager {
    * @param {string[]?} allowedOrigins
    * @param {string[]?} allowedMethods
    * @param {string[]?} allowedHeaders
-   * @param {{}?} requestParameters
+   * @param {{}?} methodRequestParameters
+   * @param {apig.Integration} proxyIntegration
    */
   public createApiResource(
     id: string,
@@ -129,7 +130,8 @@ export class ApiManager {
     allowedOrigins?: string[],
     allowedMethods?: string[],
     allowedHeaders?: string[],
-    methodRequestParameters?: {}
+    methodRequestParameters?: {},
+    proxyIntegration?: apig.Integration
   ) {
     const methods = allowedMethods ?? apig.Cors.ALL_METHODS
     const resource = parent.addResource(path, {
@@ -155,7 +157,10 @@ export class ApiManager {
         },
       })
       methods.forEach(method =>
-        resourceProxy.addMethod(method, integration, { authorizer, requestParameters: methodRequestParameters })
+        resourceProxy.addMethod(method, proxyIntegration ?? integration, {
+          authorizer,
+          requestParameters: methodRequestParameters,
+        })
       )
       utils.createCfnOutput(`${id}-${path}ProxyResourceId`, scope, resourceProxy.resourceId)
     }

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

@@ -223,8 +223,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

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

@@ -165,8 +165,8 @@ export class SfnManager {
         outputPath: props.outputPath,
         resultPath: props.resultPath,
         resultSelector: props.resultSelector,
-        timeout: props.timeout,
-        heartbeat: props.heartbeat,
+        taskTimeout: props.taskTimeout,
+        heartbeatTimeout: props.heartbeatTimeout,
         integrationPattern: props.integrationPattern,
         expressionAttributeNames: props.expressionAttributeNames,
         projectionExpression: props.projectionExpression,
@@ -212,8 +212,8 @@ export class SfnManager {
         outputPath: props.outputPath,
         resultPath: props.resultPath,
         resultSelector: props.resultSelector,
-        timeout: props.timeout,
-        heartbeat: props.heartbeat,
+        taskTimeout: props.taskTimeout,
+        heartbeatTimeout: props.heartbeatTimeout,
         integrationPattern: props.integrationPattern,
         conditionExpression: props.conditionExpression,
         expressionAttributeNames: props.expressionAttributeNames,
@@ -261,12 +261,12 @@ export class SfnManager {
         conditionExpression: props.conditionExpression,
         expressionAttributeNames: props.expressionAttributeNames,
         expressionAttributeValues: props.expressionAttributeValues,
-        heartbeat: props.heartbeat,
+        taskTimeout: props.taskTimeout,
+        heartbeatTimeout: props.heartbeatTimeout,
         inputPath: props.inputPath,
         outputPath: props.outputPath,
         resultPath: props.resultPath,
         resultSelector: props.resultSelector,
-        timeout: props.timeout,
         integrationPattern: props.integrationPattern,
         returnConsumedCapacity: props.returnConsumedCapacity,
         returnItemCollectionMetrics: props.returnItemCollectionMetrics,
@@ -314,8 +314,8 @@ export class SfnManager {
         outputPath: props.outputPath,
         resultPath: props.resultPath,
         resultSelector: props.resultSelector,
-        timeout: props.timeout,
-        heartbeat: props.heartbeat,
+        taskTimeout: props.taskTimeout,
+        heartbeatTimeout: props.heartbeatTimeout,
         integrationPattern: props.integrationPattern,
         comment: `DynamoDB PutItem step for ${props.name} - ${scope.props.stage} stage`,
       },

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

@@ -244,10 +244,10 @@ export interface SfnStateMachineProps extends sfn.StateMachineProps {}
  * @subcategory Types
  */
 export interface LambdaEnvironment {
-  CACHE_REDIS_HOST?: string
-  CACHE_REDIS_PORT?: string
   NODE_ENV: string
   LOG_LEVEL: string
+  REGION?: string
+  STAGE?: string
   TZ: string
 }