Merge pull request #12 from theonestack/feature/snaphot-support

Feature - snapshot support

Author: aaronwalker

.rspec

@@ -0,0 +1 @@
+--require spec_helper

redis.cfhighlander.rb

@@ -15,13 +15,11 @@
 
     ComponentParam 'DnsDomain'
 
-    if snapshot_restore_type.eql?('native')
-      ComponentParam 'SnapshotName',
-        description: 'The name of a snapshot from which to restore data into the new replication group'
-    elsif snapshot_restore_type.eql?('s3')
-      ComponentParam 'SnapshotArns', type: 'CommaDelimitedList',
+    ComponentParam 'SnapshotName', '',
+      description: 'The name of a snapshot from which to restore data into the new replication group'
+
+      ComponentParam 'SnapshotArns', '',
         description: 'A list of ARNs that uniquely identify the Redis RDB snapshot files stored in S3'
-    end if defined? snapshot_restore_type
 
     ComponentParam 'SnapshotRetentionLimit',
       description: 'The number of days for which ElastiCache retains automatic snapshots before deleting them.'

redis.cfndsl.rb

@@ -79,6 +79,8 @@
   automatic_failover = external_parameters.fetch(:automatic_failover, true)
 
   Condition('DataTieringEnabled', FnEquals(Ref(:DataTieringEnabled), 'true'))
+  Condition('NoSnapshotNamEnabled', FnEquals(Ref(:SnapshotName), ''))
+  Condition('NoSnapshotArnsEnabled', FnEquals(Ref(:SnapshotArns), ''))
 
   engine = external_parameters.fetch(:engine, 'redis')
 
@@ -111,14 +113,8 @@
       NumCacheClusters Ref(:NumCacheClusters)
     end 
 
-    snapshot_restore_type = external_parameters.fetch(:snapshot_restore_type, nil)
-
-    if snapshot_restore_type.eql?('native')
-      SnapshotName Ref(:SnapshotName)
-    elsif snapshot_restore_type.eql?('s3')
-      SnapshotArns Ref(:SnapshotArns)
-    end unless snapshot_restore_type.nil?
-
+    SnapshotName FnIf('NoSnapshotNamEnabled', Ref('AWS::NoValue'), Ref(:SnapshotName))
+    SnapshotArns FnIf('NoSnapshotArnsEnabled', Ref('AWS::NoValue'), FnSplit(",", Ref(:SnapshotArns)))
     SnapshotRetentionLimit Ref(:SnapshotRetentionLimit)
 
     SnapshotWindow snapshot_window unless snapshot_window.nil?

spec/cache-cluster_spec.rb

@@ -4,7 +4,7 @@
 
   context 'cftest' do
     it 'compiles test' do
-      expect(system("cfhighlander cftest --tests tests/cache-cluster.test.yaml")).to be_truthy
+      expect(system("cfhighlander cftest #{@validate} --tests tests/cache-cluster.test.yaml")).to be_truthy
     end
   end
 
@@ -27,6 +27,8 @@
         "NumCacheClusters" => {"Ref"=>"NumCacheClusters"},
         "ReplicationGroupDescription" => {"Fn::Sub"=>"${EnvironmentName}-redis"},
         "SecurityGroupIds" => [{"Ref"=>"SecurityGroupRedis"}],
+        "SnapshotArns" => {"Fn::If" => ["NoSnapshotArnsEnabled", {"Ref" => "AWS::NoValue"}, {"Fn::Split" => [",", {"Ref" => "SnapshotArns"}]}]},
+        "SnapshotName" => {"Fn::If" => ["NoSnapshotNamEnabled", {"Ref" => "AWS::NoValue"}, {"Ref" => "SnapshotName"}]},
         "SnapshotRetentionLimit" => {"Ref"=>"SnapshotRetentionLimit"},
         "Tags" => [
           {"Key"=>"Name", "Value"=>{"Fn::Sub"=>"${EnvironmentName}-redis"}},

spec/clustered_spec.rb

@@ -4,7 +4,7 @@
 
   context 'cftest' do
     it 'compiles test' do
-      expect(system("cfhighlander cftest --tests tests/clustered.test.yaml")).to be_truthy
+      expect(system("cfhighlander cftest #{@validate} --tests tests/clustered.test.yaml")).to be_truthy
     end
   end
 
@@ -30,6 +30,8 @@
         "ReplicasPerNodeGroup" => {"Ref"=>"ReplicasPerNodeGroup"},
         "ReplicationGroupDescription" => {"Fn::Sub"=>"${EnvironmentName}-redis"},
         "SecurityGroupIds" => [{"Ref"=>"SecurityGroupRedis"}],
+        "SnapshotArns" => {"Fn::If" => ["NoSnapshotArnsEnabled", {"Ref" => "AWS::NoValue"}, {"Fn::Split" => [",", {"Ref" => "SnapshotArns"}]}]},
+        "SnapshotName" => {"Fn::If" => ["NoSnapshotNamEnabled", {"Ref" => "AWS::NoValue"}, {"Ref" => "SnapshotName"}]},
         "SnapshotRetentionLimit" => {"Ref"=>"SnapshotRetentionLimit"},
         "SnapshotWindow" => "00:30-02:30",
         "Tags" => [

spec/default_spec.rb

@@ -4,7 +4,7 @@
 
   context 'cftest' do
     it 'compiles test' do
-      expect(system("cfhighlander cftest --tests tests/default.test.yaml")).to be_truthy
+      expect(system("cfhighlander cftest #{@validate} --tests tests/default.test.yaml")).to be_truthy
     end
   end
 
@@ -28,6 +28,8 @@
         "ReplicasPerNodeGroup" => {"Ref"=>"ReplicasPerNodeGroup"},
         "ReplicationGroupDescription" => {"Fn::Sub"=>"${EnvironmentName}-redis"},
         "SecurityGroupIds" => [{"Ref"=>"SecurityGroupRedis"}],
+        "SnapshotArns" => {"Fn::If" => ["NoSnapshotArnsEnabled", {"Ref" => "AWS::NoValue"}, {"Fn::Split" => [",", {"Ref" => "SnapshotArns"}]}]},
+        "SnapshotName" => {"Fn::If" => ["NoSnapshotNamEnabled", {"Ref" => "AWS::NoValue"}, {"Ref" => "SnapshotName"}]},
         "SnapshotRetentionLimit" => {"Ref"=>"SnapshotRetentionLimit"},
         "Tags" => [
           {"Key"=>"Name", "Value"=>{"Fn::Sub"=>"${EnvironmentName}-redis"}},

spec/node-group_spec.rb

@@ -4,7 +4,7 @@
 
   context 'cftest' do
     it 'compiles test' do
-      expect(system("cfhighlander cftest --tests tests/node-group.test.yaml")).to be_truthy
+      expect(system("cfhighlander cftest #{@validate} --tests tests/node-group.test.yaml")).to be_truthy
     end
   end
 
@@ -28,6 +28,8 @@
         "ReplicasPerNodeGroup" => {"Ref"=>"ReplicasPerNodeGroup"},
         "ReplicationGroupDescription" => {"Fn::Sub"=>"${EnvironmentName}-redis"},
         "SecurityGroupIds" => [{"Ref"=>"SecurityGroupRedis"}],
+        "SnapshotArns" => {"Fn::If" => ["NoSnapshotArnsEnabled", {"Ref" => "AWS::NoValue"}, {"Fn::Split" => [",", {"Ref" => "SnapshotArns"}]}]},
+        "SnapshotName" => {"Fn::If" => ["NoSnapshotNamEnabled", {"Ref" => "AWS::NoValue"}, {"Ref" => "SnapshotName"}]},
         "SnapshotRetentionLimit" => {"Ref"=>"SnapshotRetentionLimit"},
         "Tags" => [
           {"Key"=>"Name", "Value"=>{"Fn::Sub"=>"${EnvironmentName}-redis"}},

spec/non-clustered_spec.rb

@@ -4,7 +4,7 @@
 
   context 'cftest' do
     it 'compiles test' do
-      expect(system("cfhighlander cftest --tests tests/non-clustered.test.yaml")).to be_truthy
+      expect(system("cfhighlander cftest #{@validate} --tests tests/non-clustered.test.yaml")).to be_truthy
     end
   end
 
@@ -28,6 +28,8 @@
         "ReplicasPerNodeGroup" => {"Ref"=>"ReplicasPerNodeGroup"},
         "ReplicationGroupDescription" => {"Fn::Sub"=>"${EnvironmentName}-redis"},
         "SecurityGroupIds" => [{"Ref"=>"SecurityGroupRedis"}],
+        "SnapshotArns" => {"Fn::If" => ["NoSnapshotArnsEnabled", {"Ref" => "AWS::NoValue"}, {"Fn::Split" => [",", {"Ref" => "SnapshotArns"}]}]},
+        "SnapshotName" => {"Fn::If" => ["NoSnapshotNamEnabled", {"Ref" => "AWS::NoValue"}, {"Ref" => "SnapshotName"}]},
         "SnapshotRetentionLimit" => {"Ref"=>"SnapshotRetentionLimit"},
         "Tags" => [
           {"Key"=>"Name", "Value"=>{"Fn::Sub"=>"${EnvironmentName}-redis"}},