Merge pull request #69 from adamfokken/subnet-az-optional

AvailabilityZone is optional for Subnet
Bayer-Group · Mar 1, 2016 · 6c30178 · 6c30178
2 parents fd76417 + 278938e
commit 6c30178
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 8 deletions.
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
@@ -483,7 +483,7 @@ object `AWS::EC2::SecurityGroupIngress` extends DefaultJsonProtocol {
 case class `AWS::EC2::Subnet`(
   name:                String,
   VpcId:               Token[ResourceRef[`AWS::EC2::VPC`]],
-  AvailabilityZone:    Token[String],
+  AvailabilityZone:    Option[Token[String]] = None,
   CidrBlock:           Token[CidrBlock],
   Tags:                Seq[AmazonTag],
   MapPublicIpOnLaunch: Option[Token[Boolean]] = None,

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
@@ -213,6 +213,16 @@ trait Subnet extends AvailabilityZone with Outputs {
 
   def subnet(visibility: String, ordinal: Int, vpc: Token[ResourceRef[`AWS::EC2::VPC`]], az: Token[String],
     cidr: Token[CidrBlock], tagger: (String, String) => Seq[AmazonTag]) =
+    `AWS::EC2::Subnet`(
+      ucFirst(visibility.take(3)) + "Subnet" + ordinal,
+      VpcId = vpc,
+      AvailabilityZone = Some(az),
+      CidrBlock = cidr,
+      Tags = tagger(visibility.take(3).toLowerCase + "subnet" + ordinal, visibility)
+    )
+
+  def subnet(visibility: String, ordinal: Int, vpc: Token[ResourceRef[`AWS::EC2::VPC`]], az: Option[Token[String]] =  None,
+             cidr: Token[CidrBlock], tagger: (String, String) => Seq[AmazonTag]) =
     `AWS::EC2::Subnet`(
       ucFirst(visibility.take(3)) + "Subnet" + ordinal,
       VpcId = vpc,

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
@@ -576,7 +576,7 @@ object StaxTemplate {
   val pubSubnet1 = `AWS::EC2::Subnet`(
     "PubSubnet1",
     VpcId = ResourceRef(vpcResource),
-    AvailabilityZone = "us-east-1a",
+    AvailabilityZone = Some("us-east-1a"),
     CidrBlock = ParameterRef(publicSubnet1Param),
     MapPublicIpOnLaunch = Some(true),
     Tags = standardTags("pubsubnet1", "Public")
@@ -585,23 +585,23 @@ object StaxTemplate {
   val priSubnet1 = `AWS::EC2::Subnet`(
     "PriSubnet1",
     VpcId = ResourceRef(vpcResource),
-    AvailabilityZone = "us-east-1a",
+    AvailabilityZone = Some("us-east-1a"),
     CidrBlock = `Fn::Select`(StringBackedInt(0), ParameterRef(privateSubnetsParam)),
     Tags = standardTags("prisubnet1", "Private")
   )
 
   val pubSubnet2 = `AWS::EC2::Subnet`(
     "PubSubnet2",
     VpcId = ResourceRef(vpcResource),
-    AvailabilityZone = "us-east-1b",
+    AvailabilityZone = Some("us-east-1b"),
     CidrBlock = ParameterRef(publicSubnet2Param),
     Tags = standardTags("pubsubnet2", "Public")
   )
 
   val priSubnet2 = `AWS::EC2::Subnet`(
     "PriSubnet2",
     VpcId = ResourceRef(vpcResource),
-    AvailabilityZone = "us-east-1b",
+    AvailabilityZone = Some("us-east-1b"),
     CidrBlock = `Fn::Select`(StringBackedInt(1), ParameterRef(privateSubnetsParam)),
     Tags = standardTags("prisubnet2", "Private")
   )

diff --git a/src/test/scala/com/monsanto/arch/cloudformation/model/ResourceRef_UT.scala b/src/test/scala/com/monsanto/arch/cloudformation/model/ResourceRef_UT.scala
@@ -25,15 +25,15 @@ class ResourceRef_UT extends FunSpec with Matchers {
       val DBPriSubnet1Resource = `AWS::EC2::Subnet`(
         "DBPriSubnet1",
         VpcId = vpcToken,
-        AvailabilityZone = "us-east-1a",
+        AvailabilityZone = Some("us-east-1a"),
         CidrBlock = ParameterRef(privateDBSubnet1CidrParam),
         Tags = Seq[AmazonTag]()
       )
 
       val DBPriSubnet2Resource = `AWS::EC2::Subnet`(
         "DBPriSubnet2",
         VpcId = vpcToken,
-        AvailabilityZone = "us-east-1b",
+        AvailabilityZone = Some("us-east-1b"),
         CidrBlock = ParameterRef(privateDBSubnet1CidrParam),
         Tags = Seq[AmazonTag]()
       )

diff --git a/src/test/scala/com/monsanto/arch/cloudformation/model/resource/RDS_UT.scala b/src/test/scala/com/monsanto/arch/cloudformation/model/resource/RDS_UT.scala
@@ -14,7 +14,7 @@ class RDS_UT extends FunSpec with Matchers {
     val dbSubnet = `AWS::EC2::Subnet`(
       name             = "Subnet",
       VpcId            = ResourceRef(vpc),
-      AvailabilityZone = "us-east-1a",
+      AvailabilityZone = Some("us-east-1a"),
       CidrBlock        = CidrBlock(10, 10, 10, 10, 24),
       Tags             = Seq()
     )