Merge pull request #50 from guoshimin/privateip

Adding PrivateIpAddress attribute for Instance.
Bayer-Group · Jan 19, 2016 · 3637442 · 3637442
2 parents fdfa246 + 4d3df8c
commit 3637442
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/src/main/scala/com/monsanto/arch/cloudformation/model/resource/EC2.scala b/src/main/scala/com/monsanto/arch/cloudformation/model/resource/EC2.scala
@@ -65,14 +65,15 @@ case class `AWS::EC2::Instance`(
   UserData:               Option[`Fn::Base64`] = None,
   Monitoring:             Option[Boolean] = None,
   Volumes:                Option[Seq[EC2MountPoint]] = None,
+  PrivateIpAddress:       Option[Token[IPAddress]] = None,
   DisableApiTermination:  Option[String] = None,
   override val Condition: Option[ConditionRef] = None,
   override val DependsOn: Option[Seq[String]] = None
 ) extends Resource[`AWS::EC2::Instance`]{
   def when(newCondition: Option[ConditionRef] = Condition) = copy(Condition = newCondition)
 }
 object `AWS::EC2::Instance` extends DefaultJsonProtocol {
-  implicit val format: JsonFormat[`AWS::EC2::Instance`] = jsonFormat16(`AWS::EC2::Instance`.apply)
+  implicit val format: JsonFormat[`AWS::EC2::Instance`] = jsonFormat17(`AWS::EC2::Instance`.apply)
 }
 
 case class `AWS::EC2::InternetGateway`(name: String, Tags: Seq[AmazonTag],

diff --git a/src/test/resources/cloudformation-template-vpc-example.json b/src/test/resources/cloudformation-template-vpc-example.json
@@ -1289,6 +1289,7 @@
         },
         "SourceDestCheck":"false",
         "DisableApiTermination":"false",
+        "PrivateIpAddress":"1.2.3.4",
         "ImageId":{
           "Fn::FindInMap":[
             "AWSNATAMI",
@@ -1409,6 +1410,7 @@
         },
         "SourceDestCheck":"false",
         "DisableApiTermination":"false",
+        "PrivateIpAddress":"1.2.3.4",
         "ImageId":{
           "Fn::FindInMap":[
             "AWSNATAMI",

diff --git a/src/test/scala/com/monsanto/arch/cloudformation/model/CloudFormation_AT.scala b/src/test/scala/com/monsanto/arch/cloudformation/model/CloudFormation_AT.scala
@@ -624,6 +624,7 @@ object StaxTemplate {
       SecurityGroupIds = Seq( ResourceRef(natSecGroupResource) ),
       Tags = standardTagsNoNetwork("nat" + number),
       DisableApiTermination = Some("false"),
+      PrivateIpAddress = Some(IPAddress(1, 2, 3, 4)),
       UserData = Some(`Fn::Base64`(
         `Fn::Join`("",
           Seq[Token[String]](