feat: support custom cache parameter group (#12)

Author: michaelwittig

README.md

@@ -34,6 +34,7 @@ Resources:
         SnapshotName: '' # optional
         NumShards: '1' # optional
         NumReplicas: '1' # optional
+        CacheParameterGroupName: '' # optional
       TemplateURL: './node_modules/@cfn-modules/elasticache-redis/module.yml'
 ```
 
@@ -149,6 +150,13 @@ none
       <td>no</td>
       <td>[0-5]</td>
     </tr>
+    <tr>
+      <td>CacheParameterGroupName</td>
+      <td>Name of a cache parameter group</td>
+      <td></td>
+      <td>no</td>
+      <td></td>
+    </tr>
   </tbody>
 </table>
 

module.yml

@@ -82,13 +82,19 @@ Parameters:
     Default: 1
     MinValue: 0
     MaxValue: 5
+  CacheParameterGroupName:
+    Description: 'Optional name of a cache parameter group.'
+    Type: 'String'
+    Default: ''
 Conditions:
   HasAlertingModule: !Not [!Equals [!Ref AlertingModule, '']]
   HasBastionModule: !Not [!Equals [!Ref BastionModule, '']]
   HasKmsKeyModule: !Not [!Equals [!Ref KmsKeyModule, '']]
   HasAuthToken: !Not [!Equals [!Ref AuthToken, '']]
   HasSnapshotName: !Not [!Equals [!Ref SnapshotName, '']]
   HasAutomaticFailoverEnabled: !Not [!Equals [!Ref NumReplicas, 0]]
+  HasCacheParameterGroupName: !Not [!Equals [!Ref CacheParameterGroupName, '']]
+  HasNotCacheParameterGroupName: !Not [!Condition HasCacheParameterGroupName]
 Mappings:
   EngineVersionMap:
     '5.0.5':
@@ -101,6 +107,7 @@ Mappings:
       CacheParameterGroupFamily: 'redis6.x'
 Resources:
   CacheParameterGroup:
+    Condition: HasNotCacheParameterGroupName
     Type: 'AWS::ElastiCache::ParameterGroup'
     Properties:
       CacheParameterGroupFamily: !FindInMap [EngineVersionMap, !Ref EngineVersion, CacheParameterGroupFamily]
@@ -140,7 +147,7 @@ Resources:
       AuthToken: !If [HasAuthToken, !Ref AuthToken, !Ref 'AWS::NoValue']
       AutomaticFailoverEnabled: !If [HasAutomaticFailoverEnabled, true, false]
       CacheNodeType: !Ref CacheNodeType
-      CacheParameterGroupName: !Ref CacheParameterGroup
+      CacheParameterGroupName: !If [HasCacheParameterGroupName, !Ref CacheParameterGroupName, !Ref CacheParameterGroup]
       CacheSubnetGroupName: !Ref CacheSubnetGroupName
       Engine: redis
       EngineVersion: !Ref EngineVersion
@@ -313,7 +320,7 @@ Outputs:
   ModuleId:
     Value: 'elasticache-redis'
   ModuleVersion:
-    Value: '1.0.1'
+    Value: '1.1.0'
   StackName:
     Value: !Ref 'AWS::StackName'
   Name:

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cfn-modules/elasticache-redis",
-  "version": "1.0.1",
+  "version": "1.1.0",
   "description": "ElastiCache redis cluster with secure firewall configuration, encryption, multi AZ, backup enabled, and alerting",
   "author": "Michael Wittig <[email protected]>",
   "license": "Apache-2.0",

test/cacheParameterGroupName.js

@@ -0,0 +1,13 @@
+const test = require('ava');
+const cfntest = require('@cfn-modules/test');
+
+test.serial('cacheParameterGroupName', async t => {
+  const stackName = cfntest.stackName();
+  try {
+    t.log(await cfntest.createStack(`${__dirname}/cacheParameterGroupName.yml`, stackName, {}));
+    // what could we test here?
+  } finally {
+    t.log(await cfntest.deleteStack(stackName));
+    t.pass();
+  }
+});

test/cacheParameterGroupName.yml

@@ -0,0 +1,35 @@
+---
+AWSTemplateFormatVersion: '2010-09-09'
+Description: 'cfn-modules test'
+Resources:
+  Vpc:
+    Type: 'AWS::CloudFormation::Stack'
+    Properties:
+      Parameters:
+        S3Endpoint: 'false' # speed up the test
+        DynamoDBEndpoint: 'false' # speed up the test
+        FlowLog: 'false' # speed up the test
+        NatGateways: 'false' # speed up the test
+      TemplateURL: './node_modules/@cfn-modules/vpc/module.yml'
+  ClientSg:
+    Type: 'AWS::CloudFormation::Stack'
+    Properties:
+      Parameters:
+        VpcModule: !GetAtt 'Vpc.Outputs.StackName'
+      TemplateURL: './node_modules/@cfn-modules/client-sg/module.yml'
+  CacheParameterGroup:
+    Type: 'AWS::ElastiCache::ParameterGroup'
+    Properties:
+      CacheParameterGroupFamily: 'redis6.x'
+      Description: !Ref 'AWS::StackName'
+      Properties:
+        'maxmemory-policy': 'noeviction'
+  Cache:
+    Type: 'AWS::CloudFormation::Stack'
+    Properties:
+      Parameters:
+        VpcModule: !GetAtt 'Vpc.Outputs.StackName'
+        ClientSgModule: !GetAtt 'ClientSg.Outputs.StackName'
+        EngineVersion: '6.2'
+        CacheParameterGroupName: !Ref CacheParameterGroup
+      TemplateURL: './node_modules/@cfn-modules/elasticache-redis/module.yml'