cfndsl 0.2.2 → 0.2.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjQxMWU0YTZhNjg1ZGRlNzYwYTZhZWJjOWJhMDkwYmYxN2U4MWFmOQ==
+    YjUyZmQ3NTFiZGNjN2YyODBhMGMwZmVkNWU1MDI1MzYzMTg2YzRlNA==
   data.tar.gz: !binary |-
-    ZTk2MjdlMGI3YWUzZjFkMTYzZTYwZTA1ZjNlZTJjNjMyMDY5YWM5OQ==
+    MDQyZmE0ZjVmY2M5YmE0YzZmNTQwNTIzNTE3ZmI1NDE5Y2M4ZGE5ZQ==
 SHA512:
   metadata.gz: !binary |-
-    YWQ1MWMzNGYyN2RjNmM1OGM4YjkxMTcxODJiMTBkMWIzZDhlYTUzOGJjZmMw
-    MThmZmI4OTQ5YTQ3MjQ5M2JiMjZlNjU3NjMzYmMyZTYxYzc4M2ViODI5ZDFi
-    MWYzNzRjNzMzYjNiODk1ZGRkMDg1OWM5MTkzNzgwYTU1Y2FmMzY=
+    ZThkYjJiNGI5YjE3YTQzNmQ1MzMxNDQ3YzYzMWRhZGRmNTliMmJkZTA2YTMx
+    ZTI1NjcxYWJkZWYxOTI4ZWU0NjVhMzc3NThiOWQzODZlMzdlZjI3NWM5Njg0
+    YWM0YzFiNzRmOGYyNzUwOGI2Y2QzNGE4MDA1ZWU2MmRjZGVjN2E=
   data.tar.gz: !binary |-
-    YmRmZGIxYWY0ZjFlMTI4ZGJlN2Y3ZDY1MGRmYzliZDI3MDIwZDBhYTY3ZTQx
-    NWRkZTkxNzY4MGRjMjcxMDI2NjA5MmIxNmQ5MzIwN2ZlMGEwNWM2NWQ0Njc3
-    ODcxNTM4YTRkN2QxY2JkNmQ1MzlkZWRkNTMxMjQ2YjgxMDQwM2U=
+    Y2E0YWUyOWMzNTM2ODkwODE1ZWMxN2YwZjQ0MzgzNTlkNzI3NjRiNTc2Y2Jm
+    YzRiNDhhZjgzMjIwOWJjNDZmZGE5MjUwY2NiMDZmZTFmYTFjMDNkNzNiOWI1
+    YmJiZTM1MDNiYmRlZjJmYTM1OWY4MjUyNTllZDg0NWRiZTU4MGE=

data/lib/cfndsl/aws_types.yaml

@@ -33,6 +33,15 @@ Resources:
      SecurityGroups: [ String ]
      SpotPrice: String
      UserData: String
+  "AWS::AutoScaling::LifecycleHook" :
+   Properties:
+    AutoScalingGroupName : String
+    DefaultResult : String
+    HeartbeatTimeout : Integer
+    LifecycleTransition : String
+    NotificationMetadata : String
+    NotificationTargetARN : String
+    RoleARN : String
   "AWS::AutoScaling::ScalingPolicy" :
    Properties:
     AdjustmentType: String
@@ -284,6 +293,37 @@ Resources:
     InternetGatewayId: String
     VpcId: String
     VpnGatewayId: String
+  "AWS::EC2::VPCPeeringConnection" :
+   Properties:
+    PeerVpcId : String
+    Tags : [ EC2Tag ]
+    VpcId : String
+  "AWS::EC2::VPNGateway" :
+   Properties:
+    Type : String
+    Tags : [ EC2Tag ]
+  "AWS::EC2::VPNGatewayConnection" :
+   Properties:
+    Type : String
+    CustomerGatewayId : String
+    StaticRoutesOnly : Boolean
+    Tags : [ EC2Tag ]
+    VpnGatewayId : String
+  "AWS::EC2::VPNConnection" :
+   Properties:
+    Type : String
+    CustomerGatewayId : String
+    StaticRoutesOnly : Boolean
+    Tags : [ EC2Tag ]
+    VpnGatewayId : String
+  "AWS::EC2::VPNConnectionRoute" :
+   Properties:
+    DestinationCidrBlock : String
+    VpnConnectionId : String
+  "AWS::EC2::VPNGatewayRoutePropagation" :
+   Properties:
+    RouteTableIds : [ String ]
+    VpnGatewayId : String
   "AWS::ElastiCache::CacheCluster" :
    Properties:
     AutoMinorVersionUpgrade: Boolean

data/lib/cfndsl/version.rb

@@ -1,3 +1,3 @@
 module CfnDsl
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/sample/vpc-with-vpn-example.rb

@@ -0,0 +1,97 @@
+require 'cfndsl'
+
+CloudFormation {
+  Description "Creates an AWS VPC with a couple of subnets."
+
+  Parameter("VPNAddress") {
+    Type "String"
+    Description "IP Address range for your existing infrastructure"
+    MinLength "9"
+    MaxLength "18"
+    AllowedPattern "(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})/(\\d{1,2})"
+    ConstraintDescription "must be a valid IP CIDR range of the form x.x.x.x/x."
+  }
+
+  Parameter("RouterIPAddress") {
+    Type "String"
+    Description "IP Address of your VPN device"
+    MinLength "7"
+    MaxLength "15"
+    AllowedPattern "(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})"
+    ConstraintDescription "must be a valid IP address of the form x.x.x.x"    
+  }
+
+  VPC(:VPC) {
+    EnableDnsSupport true
+    EnableDnsHostnames true
+    CidrBlock "10.1.0.0/16"
+    addTag("Name", "Test VPC")
+  }
+
+  InternetGateway(:InternetGateway) {
+    addTag("Name", "Test VPC Gateway")
+  }
+
+  VPCGatewayAttachment(:GatewayToInternet) {
+    VpcId Ref(:VPC)
+    InternetGatewayId  Ref(:InternetGateway)
+  }
+
+  10.times do |i|
+    subnet = "subnet#{i}"
+    route_table = subnet + "RouteTable"
+    route_table_assoc = route_table + "Assoc"
+
+    Subnet(subnet) {
+      VpcId Ref(:VPC)
+      CidrBlock "10.1.#{i}.0/24"
+      addTag("Name", "test vpc #{subnet}")
+    }
+
+    RouteTable(route_table) {
+      VpcId Ref(:VPC)
+      addTag("Name", route_table)
+    }
+
+    SubnetRouteTableAssociation(route_table_assoc) {
+      SubnetId Ref(subnet)
+      RouteTableId Ref(route_table)
+    }
+
+    Route(subnet + "GatewayRoute" ) {
+      DependsOn :GatewayToInternet
+      RouteTableId Ref(route_table)
+      DestinationCidrBlock "0.0.0.0/0"
+      GatewayId Ref(:InternetGateway)
+    }
+  end
+
+  VPNGateway(:VirtualPrivateNetworkGateway) {
+    Type "ipsec.1"
+    addTag("Name", "Test VPN Gateway")
+  }
+
+  VPCGatewayAttachment(:VPNGatewayAttachment) {
+    VpcId Ref(:VPC)
+    VpnGatewayId Ref(:VirtualPrivateNetworkGateway)
+  }
+
+  CustomerGateway(:CustomerVPNGateway) {
+    Type "ipsec.1"
+    BgpAsn "65000"
+    IpAddress Ref("RouterIPAddress")
+    addTag("Name", "Test Customer VPN Gateway")
+  }
+
+  VPNConnection(:VPNConnection) {
+    Type "ipsec.1"
+    StaticRoutesOnly "true"
+    CustomerGatewayId Ref(:CustomerVPNGateway)
+    VpnGatewayId Ref(:VirtualPrivateNetworkGateway)
+  }
+
+  VPNConnectionRoute(:VPNConnectionRoute) {
+    VpnConnectionId Ref(:VPNConnection)
+    DestinationCidrBlock Ref("VPNAddress")
+  }
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cfndsl
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Steven Jack
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-10 00:00:00.000000000 Z
+date: 2015-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,6 +72,7 @@ files:
 - sample/t1.rb
 - sample/t1.yaml
 - sample/vpc-example.rb
+- sample/vpc-with-vpn-example.rb
 - spec/cfndsl_spec.rb
 - spec/fixtures/heattest.rb
 - spec/fixtures/test.rb