merging and fixing a bug with io1 snapshots

Bayer-Group · Nov 4, 2016 · 524ed81 · 524ed81
1 parent b108ca4
commit 524ed81
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/main/scala/com/monsanto/arch/cloudformation/model/resource/ElastiCache.scala b/src/main/scala/com/monsanto/arch/cloudformation/model/resource/ElastiCache.scala
@@ -113,17 +113,17 @@ object `AWS::ElastiCache::CacheCluster` extends DefaultJsonProtocol {
       val obj = JsObject(
         "CacheNodeType"               ->  e.CacheNodeType.toJson,
         "Engine"                      ->  e.Engine.toJson,
-        "NumCacheNodes "              ->  e.NumCacheNodes.toJson,
+        "NumCacheNodes"               ->  e.NumCacheNodes.toJson,
         "AutoMinorVersionUpgrade"     ->  e.AutoMinorVersionUpgrade.toJson,
         "AZMode"                      ->  e.AZMode.toJson,
         "CacheParameterGroupName"     ->  e.CacheParameterGroupName.toJson,
         "CacheSecurityGroupNames"     ->  e.CacheSecurityGroupNames.toJson,
         "CacheSubnetGroupName"        ->  e.CacheSubnetGroupName.toJson,
         "ClusterName"                 ->  e.ClusterName.toJson,
-        "EngineVersion "              ->  e.EngineVersion.toJson,
-        "NotificationTopicArn "       ->  e.NotificationTopicArn.toJson,
+        "EngineVersion"               ->  e.EngineVersion.toJson,
+        "NotificationTopicArn"        ->  e.NotificationTopicArn.toJson,
         "Port"                        ->  e.Port.toJson,
-        "PreferredAvailabilityZone "  ->  e.PreferredAvailabilityZone.toJson,
+        "PreferredAvailabilityZone"   ->  e.PreferredAvailabilityZone.toJson,
         "PreferredAvailabilityZones"  ->  e.PreferredAvailabilityZones.toJson,
         "PreferredMaintenanceWindow"  ->  e.PreferredMaintenanceWindow.toJson,
         "SnapshotArns"                ->  e.SnapshotArns.toJson,

diff --git a/src/test/scala/com/monsanto/arch/cloudformation/model/resource/ElastiCache_UT.scala b/src/test/scala/com/monsanto/arch/cloudformation/model/resource/ElastiCache_UT.scala
@@ -71,14 +71,14 @@ class ElastiCache_UT extends FunSpec with Matchers {
     val cacheName = "cache"
     val cache = `AWS::ElastiCache::CacheCluster`(
       name = cacheName,
-      ClusterName = "fakeCluster",
+      ClusterName = Some("fakeCluster"),
       CacheNodeType = "cache.t1.micro",
-      CacheSubnetGroupName = cacheSubnetGroup,
+      CacheSubnetGroupName = Some(cacheSubnetGroup),
       VpcSecurityGroupIds = Some(
         Seq(`Fn::Join`("", Seq(`Fn::GetAtt`(Seq(cacheSg.name, "GroupId")))))
       ),
-      Engine = "redis",
-      NumCacheNodes = "1"
+      Engine = ElastiCacheEngine.redis,
+      NumCacheNodes = StringBackedInt(1)
     )
 
     it("should create a valid new ElastiCache instance") {