@gradientedge/cdk-utils 7.20.0 → 7.22.0

package/dist/src/lib/construct/graphql-api-lambda-with-cache/main.d.ts

@@ -28,7 +28,7 @@ export declare class GraphQLApiLambdaWithCache extends GraphQLApiLambda {
     props: GraphQlApiLambdaWithCacheProps;
     id: string;
     graphQLVpc: ec2.IVpc;
-    graphQLElastiCache: elasticache.CfnCacheCluster;
+    graphQLElastiCache: elasticache.CfnReplicationGroup;
     graphQLSecurityGroup: ec2.ISecurityGroup;
     securityGroupExportName: string;
     constructor(parent: Construct, id: string, props: GraphQlApiLambdaWithCacheProps);

package/dist/src/lib/construct/graphql-api-lambda-with-cache/main.js

@@ -104,7 +104,7 @@ class GraphQLApiLambdaWithCache extends __1.GraphQLApiLambda {
      * @protected
      */
     createElastiCache() {
-        this.graphQLElastiCache = this.elasticacheManager.createElastiCache(`${this.id}-elasticache`, this, this.props.graphQLElastiCache, this.graphQLVpc.privateSubnets.map(subnet => subnet.subnetId), [this.graphQLSecurityGroup.securityGroupId]);
+        this.graphQLElastiCache = this.elasticacheManager.createReplicatedElastiCache(`${this.id}-elasticache`, this, this.props.graphQLElastiCache, this.graphQLVpc.privateSubnets.map(subnet => subnet.subnetId), [this.graphQLSecurityGroup.securityGroupId]);
     }
     /**
      * Create Lambda Role
@@ -120,8 +120,8 @@ class GraphQLApiLambdaWithCache extends __1.GraphQLApiLambda {
      */
     createLambdaEnvironment() {
         this.graphQLApiLambdaEnvironment = {
-            CACHE_REDIS_HOST: `${this.graphQLElastiCache.attrRedisEndpointAddress}`,
-            CACHE_REDIS_PORT: `${this.graphQLElastiCache.attrRedisEndpointPort}`,
+            CACHE_REDIS_HOST: `${this.graphQLElastiCache.attrPrimaryEndPointAddress}`,
+            CACHE_REDIS_PORT: `${this.graphQLElastiCache.attrPrimaryEndPointPort}`,
             NODE_ENV: this.props.nodeEnv,
             LOG_LEVEL: this.props.logLevel,
             TZ: this.props.timezone,

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

@@ -39,4 +39,14 @@ export declare class ElastiCacheManager {
      * @param {string[]} logDeliveryConfigurations
      */
     createElastiCache(id: string, scope: common.CommonConstruct, props: types.ElastiCacheProps, subnetIds: string[], securityGroupIds: string[], logDeliveryConfigurations?: any): elasticache.CfnCacheCluster;
+    /**
+     * @summary Method to create an replicated elasticache resource
+     * @param {string} id scoped id of the resource
+     * @param {common.CommonConstruct} scope scope in which scope resource is defined
+     * @param {types.ReplicatedElastiCacheProps} props
+     * @param {string[]} subnetIds
+     * @param {string[]} securityGroupIds
+     * @param {string[]} logDeliveryConfigurations
+     */
+    createReplicatedElastiCache(id: string, scope: common.CommonConstruct, props: types.ReplicatedElastiCacheProps, subnetIds: string[], securityGroupIds: string[], logDeliveryConfigurations?: any): elasticache.CfnReplicationGroup;
 }

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

@@ -95,10 +95,52 @@ class ElastiCacheManager {
             snapshotWindow: props.snapshotWindow,
             logDeliveryConfigurations: logDeliveryConfigurations,
         });
+        elasticacheCluster.addDependsOn(subnetGroup);
         utils.createCfnOutput(`${id}-clusterName`, scope, elasticacheCluster.clusterName);
         utils.createCfnOutput(`${id}-redisEndpointPort`, scope, elasticacheCluster.attrRedisEndpointPort);
         utils.createCfnOutput(`${id}-redisEndpointAddress`, scope, elasticacheCluster.attrRedisEndpointAddress);
         return elasticacheCluster;
     }
+    /**
+     * @summary Method to create an replicated elasticache resource
+     * @param {string} id scoped id of the resource
+     * @param {common.CommonConstruct} scope scope in which scope resource is defined
+     * @param {types.ReplicatedElastiCacheProps} props
+     * @param {string[]} subnetIds
+     * @param {string[]} securityGroupIds
+     * @param {string[]} logDeliveryConfigurations
+     */
+    createReplicatedElastiCache(id, scope, props, subnetIds, securityGroupIds, logDeliveryConfigurations) {
+        if (!props)
+            throw `ElastiCache props undefined`;
+        const subnetGroup = this.createElastiCacheSubnetGroup(`${id}-subnetGroup`, scope, subnetIds);
+        const elasticacheCluster = new elasticache.CfnReplicationGroup(scope, `${id}`, {
+            replicationGroupDescription: `${id} Redis Replication Cluster`,
+            replicationGroupId: `${id}-${scope.props.stage}`,
+            cacheNodeType: props.cacheNodeType,
+            engine: props.engine,
+            cacheSubnetGroupName: subnetGroup.cacheSubnetGroupName,
+            securityGroupIds: securityGroupIds,
+            numNodeGroups: props.numNodeGroups,
+            replicasPerNodeGroup: props.replicasPerNodeGroup,
+            automaticFailoverEnabled: props.automaticFailoverEnabled,
+            multiAzEnabled: props.multiAzEnabled,
+            cacheParameterGroupName: props.cacheParameterGroupName,
+            cacheSecurityGroupNames: props.cacheSecurityGroupNames,
+            engineVersion: props.engineVersion,
+            globalReplicationGroupId: props.globalReplicationGroupId,
+            logDeliveryConfigurations: props.logDeliveryConfigurations,
+            numCacheClusters: props.numCacheClusters,
+            port: props.port,
+            preferredCacheClusterAZs: props.preferredCacheClusterAZs,
+            preferredMaintenanceWindow: props.preferredMaintenanceWindow,
+            primaryClusterId: props.primaryClusterId,
+            autoMinorVersionUpgrade: props.autoMinorVersionUpgrade,
+        });
+        elasticacheCluster.addDependsOn(subnetGroup);
+        utils.createCfnOutput(`${id}-primaryEndPointPort`, scope, elasticacheCluster.attrPrimaryEndPointPort);
+        utils.createCfnOutput(`${id}-primaryEndPointAddress`, scope, elasticacheCluster.attrPrimaryEndPointAddress);
+        return elasticacheCluster;
+    }
 }
 exports.ElastiCacheManager = ElastiCacheManager;

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

@@ -246,7 +246,7 @@ export interface GraphQlApiLambdaProps extends CommonStackProps {
  */
 export interface GraphQlApiLambdaWithCacheProps extends GraphQlApiLambdaProps {
     graphQLVpc: ec2.VpcProps;
-    graphQLElastiCache: ElastiCacheProps;
+    graphQLElastiCache: ReplicatedElastiCacheProps;
     securityGroupExportName: string;
     useExistingVpc: boolean;
     vpcName?: string;
@@ -673,6 +673,12 @@ export interface WafWebACLProps extends wafv2.CfnWebACLProps {
  */
 export interface ElastiCacheProps extends elasticache.CfnCacheClusterProps {
 }
+/**
+ * @category cdk-utils.elasticache-manager
+ * @category Compute
+ */
+export interface ReplicatedElastiCacheProps extends elasticache.CfnReplicationGroupProps {
+}
 /**
  * @category cdk-utils.sqs-manager
  * @subcategory Properties

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gradientedge/cdk-utils",
-  "version": "7.20.0",
+  "version": "7.22.0",
   "description": "Utilities for AWS CDK provisioning",
   "main": "dist/index.js",
   "engines": {
@@ -48,11 +48,11 @@
   },
   "dependencies": {
     "@types/lodash": "^4.14.191",
-    "@types/node": "^18.11.17",
+    "@types/node": "^18.11.18",
     "app-root-path": "^3.1.0",
-    "aws-cdk-lib": "^2.55.1",
-    "aws-sdk": "^2.1277.0",
-    "constructs": "^10.1.194",
+    "aws-cdk-lib": "^2.58.1",
+    "aws-sdk": "^2.1286.0",
+    "constructs": "^10.1.208",
     "lodash": "^4.17.21",
     "moment": "^2.29.4",
     "nconf": "^0.12.0",
@@ -61,21 +61,21 @@
   },
   "devDependencies": {
     "@babel/plugin-proposal-class-properties": "^7.18.6",
-    "@types/jest": "^29.2.4",
-    "@typescript-eslint/eslint-plugin": "^5.46.1",
-    "@typescript-eslint/parser": "^5.46.1",
+    "@types/jest": "^29.2.5",
+    "@typescript-eslint/eslint-plugin": "^5.48.0",
+    "@typescript-eslint/parser": "^5.48.0",
     "aws-cdk": "*",
     "babel-eslint": "^10.1.0",
     "better-docs": "^2.7.2",
     "codecov": "^3.8.3",
     "commitizen": "^4.2.6",
     "dotenv": "^16.0.3",
-    "eslint": "^8.30.0",
-    "eslint-config-prettier": "^8.5.0",
+    "eslint": "^8.31.0",
+    "eslint-config-prettier": "^8.6.0",
     "eslint-plugin-import": "^2.26.0",
-    "husky": "^8.0.2",
+    "husky": "^8.0.3",
     "jest": "^29.3.1",
-    "jest-extended": "^3.2.0",
+    "jest-extended": "^3.2.1",
     "jest-junit": "^15.0.0",
     "jsdoc": "^4.0.0",
     "jsdoc-babel": "^0.5.0",
@@ -91,7 +91,7 @@
     "typescript": "4.9.4"
   },
   "optionalDependencies": {
-    "@babel/core": "^7.20.5",
+    "@babel/core": "^7.20.7",
     "prop-types": "^15.8.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"

package/src/lib/construct/graphql-api-lambda-with-cache/main.ts

@@ -35,7 +35,7 @@ export class GraphQLApiLambdaWithCache extends GraphQLApiLambda {
 
   /* graphql restApi resources */
   graphQLVpc: ec2.IVpc
-  graphQLElastiCache: elasticache.CfnCacheCluster
+  graphQLElastiCache: elasticache.CfnReplicationGroup
   graphQLSecurityGroup: ec2.ISecurityGroup
   securityGroupExportName: string
 
@@ -93,7 +93,7 @@ export class GraphQLApiLambdaWithCache extends GraphQLApiLambda {
    * @protected
    */
   protected createElastiCache() {
-    this.graphQLElastiCache = this.elasticacheManager.createElastiCache(
+    this.graphQLElastiCache = this.elasticacheManager.createReplicatedElastiCache(
       `${this.id}-elasticache`,
       this,
       this.props.graphQLElastiCache,
@@ -120,8 +120,8 @@ export class GraphQLApiLambdaWithCache extends GraphQLApiLambda {
    */
   protected createLambdaEnvironment() {
     this.graphQLApiLambdaEnvironment = {
-      CACHE_REDIS_HOST: `${this.graphQLElastiCache.attrRedisEndpointAddress}`,
-      CACHE_REDIS_PORT: `${this.graphQLElastiCache.attrRedisEndpointPort}`,
+      CACHE_REDIS_HOST: `${this.graphQLElastiCache.attrPrimaryEndPointAddress}`,
+      CACHE_REDIS_PORT: `${this.graphQLElastiCache.attrPrimaryEndPointPort}`,
       NODE_ENV: this.props.nodeEnv,
       LOG_LEVEL: this.props.logLevel,
       TZ: this.props.timezone,

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

@@ -83,10 +83,65 @@ export class ElastiCacheManager {
       logDeliveryConfigurations: logDeliveryConfigurations,
     })
 
+    elasticacheCluster.addDependsOn(subnetGroup)
+
     utils.createCfnOutput(`${id}-clusterName`, scope, elasticacheCluster.clusterName)
     utils.createCfnOutput(`${id}-redisEndpointPort`, scope, elasticacheCluster.attrRedisEndpointPort)
     utils.createCfnOutput(`${id}-redisEndpointAddress`, scope, elasticacheCluster.attrRedisEndpointAddress)
 
     return elasticacheCluster
   }
+
+  /**
+   * @summary Method to create an replicated elasticache resource
+   * @param {string} id scoped id of the resource
+   * @param {common.CommonConstruct} scope scope in which scope resource is defined
+   * @param {types.ReplicatedElastiCacheProps} props
+   * @param {string[]} subnetIds
+   * @param {string[]} securityGroupIds
+   * @param {string[]} logDeliveryConfigurations
+   */
+  public createReplicatedElastiCache(
+    id: string,
+    scope: common.CommonConstruct,
+    props: types.ReplicatedElastiCacheProps,
+    subnetIds: string[],
+    securityGroupIds: string[],
+    logDeliveryConfigurations?: any
+  ) {
+    if (!props) throw `ElastiCache props undefined`
+
+    const subnetGroup = this.createElastiCacheSubnetGroup(`${id}-subnetGroup`, scope, subnetIds)
+
+    const elasticacheCluster = new elasticache.CfnReplicationGroup(scope, `${id}`, {
+      replicationGroupDescription: `${id} Redis Replication Cluster`,
+      replicationGroupId: `${id}-${scope.props.stage}`,
+      cacheNodeType: props.cacheNodeType,
+      engine: props.engine,
+      cacheSubnetGroupName: subnetGroup.cacheSubnetGroupName,
+      securityGroupIds: securityGroupIds,
+      numNodeGroups: props.numNodeGroups,
+      replicasPerNodeGroup: props.replicasPerNodeGroup,
+      automaticFailoverEnabled: props.automaticFailoverEnabled,
+      multiAzEnabled: props.multiAzEnabled,
+      cacheParameterGroupName: props.cacheParameterGroupName,
+      cacheSecurityGroupNames: props.cacheSecurityGroupNames,
+      engineVersion: props.engineVersion,
+      globalReplicationGroupId: props.globalReplicationGroupId,
+      logDeliveryConfigurations: props.logDeliveryConfigurations,
+      numCacheClusters: props.numCacheClusters,
+      port: props.port,
+      preferredCacheClusterAZs: props.preferredCacheClusterAZs,
+      preferredMaintenanceWindow: props.preferredMaintenanceWindow,
+      primaryClusterId: props.primaryClusterId,
+      autoMinorVersionUpgrade: props.autoMinorVersionUpgrade,
+    })
+
+    elasticacheCluster.addDependsOn(subnetGroup)
+
+    utils.createCfnOutput(`${id}-primaryEndPointPort`, scope, elasticacheCluster.attrPrimaryEndPointPort)
+    utils.createCfnOutput(`${id}-primaryEndPointAddress`, scope, elasticacheCluster.attrPrimaryEndPointAddress)
+
+    return elasticacheCluster
+  }
 }

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

@@ -266,7 +266,7 @@ export interface GraphQlApiLambdaProps extends CommonStackProps {
  */
 export interface GraphQlApiLambdaWithCacheProps extends GraphQlApiLambdaProps {
   graphQLVpc: ec2.VpcProps
-  graphQLElastiCache: ElastiCacheProps
+  graphQLElastiCache: ReplicatedElastiCacheProps
   securityGroupExportName: string
   useExistingVpc: boolean
   vpcName?: string
@@ -716,6 +716,12 @@ export interface WafWebACLProps extends wafv2.CfnWebACLProps {}
  */
 export interface ElastiCacheProps extends elasticache.CfnCacheClusterProps {}
 
+/**
+ * @category cdk-utils.elasticache-manager
+ * @category Compute
+ */
+export interface ReplicatedElastiCacheProps extends elasticache.CfnReplicationGroupProps {}
+
 /**
  * @category cdk-utils.sqs-manager
  * @subcategory Properties