From 524ed81fcfbb82fa38f86d70e9de79b1bcf4ee70 Mon Sep 17 00:00:00 2001 From: "T.J. Corrigan" Date: Fri, 4 Nov 2016 16:12:42 -0500 Subject: [PATCH] merging and fixing a bug with io1 snapshots --- .../arch/cloudformation/model/resource/ElastiCache.scala | 8 ++++---- .../cloudformation/model/resource/ElastiCache_UT.scala | 8 ++++---- 2 files changed, 8 insertions(+), 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 index 6c152733..9271bc7d 100644 --- 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 index b1d8e5ab..0ab7b86b 100644 --- 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") {