Updated parameters for nat

Bayer-Group · Jan 13, 2016 · 76b8416 · 76b8416
1 parent 27b2a2a
commit 76b8416
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/main/scala/com/monsanto/arch/cloudformation/model/resource/Custom.scala b/src/main/scala/com/monsanto/arch/cloudformation/model/resource/Custom.scala
@@ -10,12 +10,14 @@ case class `Custom::EC2-NAT-Gateway`(name: String,
                                      ServiceToken: String,
                                      eipAllocationID: Token[String],
                                      subnet: Token[`AWS::EC2::Subnet`],
+                                     routeTable: Token[`AWS::EC2::RouteTable`],
+                                     routeName: Token[String],
                                      override val Condition: Option[ConditionRef] = None,
                                      override val DependsOn: Option[Seq[String]] = None)
           extends Resource[`Custom::EC2-NAT-Gateway`] {
   def when(newCondition: Option[ConditionRef] = Condition) = copy(Condition = newCondition)
 }
 object `Custom::EC2-NAT-Gateway` {
   import spray.json.DefaultJsonProtocol._
-  implicit def format: JsonFormat[`Custom::EC2-NAT-Gateway`] = jsonFormat6(`Custom::EC2-NAT-Gateway`.apply)
+  implicit def format: JsonFormat[`Custom::EC2-NAT-Gateway`] = jsonFormat8(`Custom::EC2-NAT-Gateway`.apply)
 }
diff --git a/src/main/scala/com/monsanto/arch/cloudformation/model/simple/Builders.scala b/src/main/scala/com/monsanto/arch/cloudformation/model/simple/Builders.scala
@@ -99,7 +99,7 @@ trait Instance {
     def withEIPInVPC(
                  name:      String,
                  dependsOn: Option[Seq[String]] = None
-               ) =
+               ) : `AWS::EC2::EIP` =
         `AWS::EC2::EIP`.vpc(
           name       = name,
           InstanceId = Some(ResourceRef(ec2)),
@@ -109,7 +109,7 @@ trait Instance {
     def withEIPInClassic(
                   name:      String,
                   dependsOn: Option[Seq[String]] = None
-                ) =
+                ) : `AWS::EC2::EIP` =
         `AWS::EC2::EIP`.classic(
           name       = name,
           InstanceId = Some(ResourceRef(ec2)),