@gradientedge/cdk-utils 8.28.0 → 8.30.0

package/dist/src/lib/common/stack.d.ts

@@ -18,6 +18,7 @@ import { CommonConstruct } from './construct';
  * }
  */
 export declare class CommonStack extends cdk.Stack {
+    static NODEJS_RUNTIME: cdk.aws_lambda.Runtime;
     construct: CommonConstruct;
     props: CommonStackProps;
     constructor(parent: cdk.App, name: string, props: cdk.StackProps);
@@ -36,6 +37,7 @@ export declare class CommonStack extends cdk.Stack {
         extraContexts: any;
         skipStageForARecords: any;
         logRetention: any;
+        nodejsRuntime: any;
     };
     /**
      * @summary Method to determine extra cdk contexts apart from the main cdk.json

package/dist/src/lib/common/stack.js

@@ -25,6 +25,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CommonStack = void 0;
 const cdk = __importStar(require("aws-cdk-lib"));
+const lambda = __importStar(require("aws-cdk-lib/aws-lambda"));
 const utils_1 = require("../utils");
 const construct_1 = require("./construct");
 const appRoot = require('app-root-path');
@@ -46,6 +47,7 @@ const fs = require('fs');
  * }
  */
 class CommonStack extends cdk.Stack {
+    static NODEJS_RUNTIME = lambda.Runtime.NODEJS_16_X;
     construct;
     props;
     constructor(parent, name, props) {
@@ -74,6 +76,7 @@ class CommonStack extends cdk.Stack {
             extraContexts: this.node.tryGetContext('extraContexts'),
             skipStageForARecords: this.node.tryGetContext('skipStageForARecords'),
             logRetention: this.node.tryGetContext('logRetention'),
+            nodejsRuntime: this.node.tryGetContext('nodejsRuntime') ?? CommonStack.NODEJS_RUNTIME,
         };
     }
     /**

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

@@ -28,8 +28,8 @@ const cdk = __importStar(require("aws-cdk-lib"));
 const cloudfront = __importStar(require("aws-cdk-lib/aws-cloudfront"));
 const lambda = __importStar(require("aws-cdk-lib/aws-lambda"));
 const cr = __importStar(require("aws-cdk-lib/custom-resources"));
+const common_1 = require("../../common");
 const utils = __importStar(require("../../utils"));
-const lambda_manager_1 = require("./lambda-manager");
 /**
  * @stability stable
  * @category cdk-utils.cloudfront-manager
@@ -239,7 +239,7 @@ class CloudFrontManager {
             memorySize: props.memorySize,
             reservedConcurrentExecutions: props.reservedConcurrentExecutions,
             role: role,
-            runtime: props.runtime ?? lambda_manager_1.LambdaManager.NODEJS_RUNTIME,
+            runtime: props.runtime ?? scope.props.nodejsRuntime ?? common_1.CommonStack.NODEJS_RUNTIME,
             securityGroups: securityGroups,
             stackId: `${id}-stack-id-${scope.props.stage}`,
             timeout: props.timeoutInSecs ? cdk.Duration.seconds(props.timeoutInSecs) : cdk.Duration.minutes(1),

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

@@ -26,7 +26,6 @@ import * as types from '../../types';
  * @see [CDK Lambda Module]{@link https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_lambda-readme.html}
  */
 export declare class LambdaManager {
-    static NODEJS_RUNTIME: cdk.aws_lambda.Runtime;
     /**
      * @summary Method to create a lambda layer (nodejs)
      * @param {string} id scoped id of the resource

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

@@ -27,6 +27,7 @@ exports.LambdaManager = void 0;
 const cdk = __importStar(require("aws-cdk-lib"));
 const iam = __importStar(require("aws-cdk-lib/aws-iam"));
 const lambda = __importStar(require("aws-cdk-lib/aws-lambda"));
+const common_1 = require("../../common");
 const utils = __importStar(require("../../utils"));
 const cloudfront_manager_1 = require("./cloudfront-manager");
 const ssm_manager_1 = require("./ssm-manager");
@@ -51,7 +52,6 @@ const ssm_manager_1 = require("./ssm-manager");
  * @see [CDK Lambda Module]{@link https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_lambda-readme.html}
  */
 class LambdaManager {
-    static NODEJS_RUNTIME = lambda.Runtime.NODEJS_16_X;
     /**
      * @summary Method to create a lambda layer (nodejs)
      * @param {string} id scoped id of the resource
@@ -60,7 +60,7 @@ class LambdaManager {
      */
     createLambdaLayer(id, scope, code) {
         const lambdaLayer = new lambda.LayerVersion(scope, `${id}`, {
-            compatibleRuntimes: [LambdaManager.NODEJS_RUNTIME],
+            compatibleRuntimes: [scope.props.nodejsRuntime ?? common_1.CommonStack.NODEJS_RUNTIME],
             code: code,
             description: `${id}`,
             layerVersionName: `${id}-${scope.props.stage}`,
@@ -99,7 +99,7 @@ class LambdaManager {
                 allowPublicSubnet: !!vpc,
                 functionName: functionName,
                 handler: handler || 'index.lambda_handler',
-                runtime: LambdaManager.NODEJS_RUNTIME,
+                runtime: props.runtime ?? scope.props.nodejsRuntime ?? common_1.CommonStack.NODEJS_RUNTIME,
                 code: code,
                 deadLetterQueue: deadLetterQueue,
                 architecture: props.architecture ?? lambda.Architecture.ARM_64,
@@ -176,7 +176,7 @@ class LambdaManager {
             ...{
                 allowPublicSubnet: !!vpc,
                 functionName: functionName,
-                runtime: LambdaManager.NODEJS_RUNTIME,
+                runtime: props.runtime ?? scope.props.nodejsRuntime ?? common_1.CommonStack.NODEJS_RUNTIME,
                 code: code,
                 deadLetterQueue: deadLetterQueue,
                 architecture: props.architecture ?? lambda.Architecture.ARM_64,

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

@@ -1,3 +1,4 @@
+import { SecretsManager as SM } from '@aws-sdk/client-secrets-manager';
 import * as cdk from 'aws-cdk-lib';
 import * as common from '../../common';
 /**
@@ -25,7 +26,7 @@ export declare class SecretsManager {
      *
      * @param {string} region
      */
-    getAwsSecretsManager(region: string): any;
+    getAwsSecretsManager(region: string): SM;
     /**
      * @stability experimental
      * @summary Method to load a secret from secrets manager
@@ -40,11 +41,6 @@ export declare class SecretsManager {
      * @param {string} region
      */
     loadSecrets(secretNames: string, region: string): Promise<{}>;
-    /**
-     * @stability experimental
-     * @summary Method to export secrets from secrets manager to a dot env format
-     */
-    exportToDotEnv(): void;
     /**
      * @stability stable
      * @summary Method to retrieve a secret from secrets manager with a cloudformation export

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

@@ -24,10 +24,9 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SecretsManager = void 0;
+const client_secrets_manager_1 = require("@aws-sdk/client-secrets-manager");
 const cdk = __importStar(require("aws-cdk-lib"));
 const secretsManager = __importStar(require("aws-cdk-lib/aws-secretsmanager"));
-const AWS = require('aws-sdk');
-const fs = require('fs');
 /**
  * @stability experimental
  * @category cdk-utils.secrets-manager
@@ -54,7 +53,7 @@ class SecretsManager {
      * @param {string} region
      */
     getAwsSecretsManager(region) {
-        return new AWS.SecretsManager({ region: region });
+        return new client_secrets_manager_1.SecretsManager({ region: region });
     }
     /**
      * @stability experimental
@@ -64,7 +63,7 @@ class SecretsManager {
      */
     async loadSecret(secretName, region) {
         const secretsManager = this.getAwsSecretsManager(region);
-        const secret = await Promise.all([secretsManager.getSecretValue({ SecretId: secretName }).promise()]);
+        const secret = await Promise.all([secretsManager.getSecretValue({ SecretId: secretName })]);
         return secret ? JSON.parse(secret[0].SecretString) : {};
     }
     /**
@@ -80,31 +79,6 @@ class SecretsManager {
         }
         return secrets;
     }
-    /**
-     * @stability experimental
-     * @summary Method to export secrets from secrets manager to a dot env format
-     */
-    exportToDotEnv() {
-        let nconf = require('nconf');
-        nconf.argv().env();
-        const appRoot = require('app-root-path');
-        if (nconf.get('profile')) {
-            console.log(`Using named aws profile ${nconf.get('profile')}`);
-            AWS.config.credentials = new AWS.SharedIniFileCredentials({ profile: nconf.get('profile') });
-        }
-        const region = nconf.get('region');
-        AWS.config.update({ region: nconf.get('region') });
-        const outFileName = nconf.get('out') ? nconf.get('out') : '.env';
-        this.loadSecret(nconf.get('name'), region).then((secretString) => {
-            if (nconf.get('overwrite')) {
-                fs.writeFileSync(`${appRoot.path}/.env`, '');
-            }
-            Object.keys(secretString).forEach(function (key) {
-                console.log(`Adding environment variable for key: ${key}`);
-                fs.appendFileSync(`${appRoot.path}/${outFileName}`, `${key}=${secretString[key]}\r\n`);
-            });
-        });
-    }
     /**
      * @stability stable
      * @summary Method to retrieve a secret from secrets manager with a cloudformation export

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

@@ -53,6 +53,7 @@ export interface CommonStackProps extends cdk.StackProps {
     stageContextPath?: string;
     skipStageForARecords: boolean;
     logRetention?: logs.RetentionDays;
+    nodejsRuntime?: lambda.Runtime;
 }
 /**
  * @category cdk-utils.site-with-ecs-backend

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gradientedge/cdk-utils",
-  "version": "8.28.0",
+  "version": "8.30.0",
   "description": "Utilities for AWS CDK provisioning",
   "main": "dist/index.js",
   "engines": {
@@ -51,7 +51,7 @@
     "@types/node": "^18.15.3",
     "app-root-path": "^3.1.0",
     "aws-cdk-lib": "^2.69.0",
-    "aws-sdk": "^2.1337.0",
+    "@aws-sdk/client-secrets-manager": "^3.293.0",
     "constructs": "^10.1.280",
     "lodash": "^4.17.21",
     "moment": "^2.29.4",

package/src/lib/common/stack.ts

@@ -1,4 +1,5 @@
 import * as cdk from 'aws-cdk-lib'
+import * as lambda from 'aws-cdk-lib/aws-lambda'
 import { CommonStackProps } from '../types'
 import { isDevStage } from '../utils'
 import { CommonConstruct } from './construct'
@@ -23,6 +24,8 @@ const fs = require('fs')
  * }
  */
 export class CommonStack extends cdk.Stack {
+  public static NODEJS_RUNTIME = lambda.Runtime.NODEJS_16_X
+
   construct: CommonConstruct
   props: CommonStackProps
 
@@ -57,6 +60,7 @@ export class CommonStack extends cdk.Stack {
       extraContexts: this.node.tryGetContext('extraContexts'),
       skipStageForARecords: this.node.tryGetContext('skipStageForARecords'),
       logRetention: this.node.tryGetContext('logRetention'),
+      nodejsRuntime: this.node.tryGetContext('nodejsRuntime') ?? CommonStack.NODEJS_RUNTIME,
     }
   }
 

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

@@ -9,9 +9,9 @@ import * as lambda from 'aws-cdk-lib/aws-lambda'
 import * as s3 from 'aws-cdk-lib/aws-s3'
 import * as cr from 'aws-cdk-lib/custom-resources'
 import * as common from '../../common'
+import { CommonStack } from '../../common'
 import * as types from '../../types'
 import * as utils from '../../utils'
-import { LambdaManager } from './lambda-manager'
 
 /**
  * @stability stable
@@ -272,7 +272,7 @@ export class CloudFrontManager {
       memorySize: props.memorySize,
       reservedConcurrentExecutions: props.reservedConcurrentExecutions,
       role: role,
-      runtime: props.runtime ?? LambdaManager.NODEJS_RUNTIME,
+      runtime: props.runtime ?? scope.props.nodejsRuntime ?? CommonStack.NODEJS_RUNTIME,
       securityGroups: securityGroups,
       stackId: `${id}-stack-id-${scope.props.stage}`,
       timeout: props.timeoutInSecs ? cdk.Duration.seconds(props.timeoutInSecs) : cdk.Duration.minutes(1),

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

@@ -4,6 +4,7 @@ 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 * as common from '../../common'
+import { CommonStack } from '../../common'
 import * as types from '../../types'
 import * as utils from '../../utils'
 import { CloudFrontManager } from './cloudfront-manager'
@@ -30,8 +31,6 @@ import { SsmManager } from './ssm-manager'
  * @see [CDK Lambda Module]{@link https://docs.aws.amazon.com/cdk/api/v2/docs/aws-cdk-lib.aws_lambda-readme.html}
  */
 export class LambdaManager {
-  public static NODEJS_RUNTIME = lambda.Runtime.NODEJS_16_X
-
   /**
    * @summary Method to create a lambda layer (nodejs)
    * @param {string} id scoped id of the resource
@@ -40,7 +39,7 @@ export class LambdaManager {
    */
   public createLambdaLayer(id: string, scope: common.CommonConstruct, code: lambda.AssetCode) {
     const lambdaLayer = new lambda.LayerVersion(scope, `${id}`, {
-      compatibleRuntimes: [LambdaManager.NODEJS_RUNTIME],
+      compatibleRuntimes: [scope.props.nodejsRuntime ?? CommonStack.NODEJS_RUNTIME],
       code: code,
       description: `${id}`,
       layerVersionName: `${id}-${scope.props.stage}`,
@@ -98,7 +97,7 @@ export class LambdaManager {
         allowPublicSubnet: !!vpc,
         functionName: functionName,
         handler: handler || 'index.lambda_handler',
-        runtime: LambdaManager.NODEJS_RUNTIME,
+        runtime: props.runtime ?? scope.props.nodejsRuntime ?? CommonStack.NODEJS_RUNTIME,
         code: code,
         deadLetterQueue: deadLetterQueue,
         architecture: props.architecture ?? lambda.Architecture.ARM_64,
@@ -221,7 +220,7 @@ export class LambdaManager {
       ...{
         allowPublicSubnet: !!vpc,
         functionName: functionName,
-        runtime: LambdaManager.NODEJS_RUNTIME,
+        runtime: props.runtime ?? scope.props.nodejsRuntime ?? CommonStack.NODEJS_RUNTIME,
         code: code,
         deadLetterQueue: deadLetterQueue,
         architecture: props.architecture ?? lambda.Architecture.ARM_64,

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

@@ -1,10 +1,8 @@
+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'
 
-const AWS = require('aws-sdk')
-const fs = require('fs')
-
 /**
  * @stability experimental
  * @category cdk-utils.secrets-manager
@@ -31,7 +29,7 @@ export class SecretsManager {
    * @param {string} region
    */
   public getAwsSecretsManager(region: string) {
-    return new AWS.SecretsManager({ region: region })
+    return new SM({ region: region })
   }
 
   /**
@@ -42,7 +40,7 @@ export class SecretsManager {
    */
   public async loadSecret(secretName: string, region: string) {
     const secretsManager = this.getAwsSecretsManager(region)
-    const secret: any = await Promise.all([secretsManager.getSecretValue({ SecretId: secretName }).promise()])
+    const secret: any = await Promise.all([secretsManager.getSecretValue({ SecretId: secretName })])
 
     return secret ? JSON.parse(secret[0].SecretString) : {}
   }
@@ -62,37 +60,6 @@ export class SecretsManager {
     return secrets
   }
 
-  /**
-   * @stability experimental
-   * @summary Method to export secrets from secrets manager to a dot env format
-   */
-  public exportToDotEnv() {
-    let nconf = require('nconf')
-    nconf.argv().env()
-    const appRoot = require('app-root-path')
-
-    if (nconf.get('profile')) {
-      console.log(`Using named aws profile ${nconf.get('profile')}`)
-      AWS.config.credentials = new AWS.SharedIniFileCredentials({ profile: nconf.get('profile') })
-    }
-
-    const region = nconf.get('region')
-    AWS.config.update({ region: nconf.get('region') })
-
-    const outFileName = nconf.get('out') ? nconf.get('out') : '.env'
-
-    this.loadSecret(nconf.get('name'), region).then((secretString: any) => {
-      if (nconf.get('overwrite')) {
-        fs.writeFileSync(`${appRoot.path}/.env`, '')
-      }
-
-      Object.keys(secretString).forEach(function (key) {
-        console.log(`Adding environment variable for key: ${key}`)
-        fs.appendFileSync(`${appRoot.path}/${outFileName}`, `${key}=${secretString[key]}\r\n`)
-      })
-    })
-  }
-
   /**
    * @stability stable
    * @summary Method to retrieve a secret from secrets manager with a cloudformation export

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

@@ -55,6 +55,7 @@ export interface CommonStackProps extends cdk.StackProps {
   stageContextPath?: string
   skipStageForARecords: boolean
   logRetention?: logs.RetentionDays
+  nodejsRuntime?: lambda.Runtime
 }
 
 /**