cfndsl 0.4.4 → 0.5.0.pre

data/sample/s3.rb

@@ -1,9 +1,9 @@
-CloudFormation {
-  S3_Bucket('Bucket') {
+CloudFormation do
+  S3_Bucket('Bucket') do
     BucketName 'MyBucket'
     VersioningConfiguration(Status: 'Enabled')
     NotificationConfiguration(
-      LambdaConfigurations: [ 
+      LambdaConfigurations: [
         {
           Function: 'MyLambdaFunction',
           Event: 'S3:ObjectCreated:*'
@@ -13,13 +13,13 @@ CloudFormation {
           Event: 's3:ObjectRemoved:*'
         }
       ],
-      QueueConfigurations: [ 
+      QueueConfigurations: [
         {
           Queue: 'SQSQueue',
           Event: 'S3:ObjectCreated:*'
         }
       ],
-      TopicConfigurations: [ 
+      TopicConfigurations: [
         {
           Topic: 'SNSTopic',
           Event: 'S3:ObjectCreated:*'
@@ -32,15 +32,15 @@ CloudFormation {
       RoutingRules: [
         {
           RoutingRuleCondition: {
-            HttpErrorCodeReturnedEquals: "404",
-            KeyPrefixEquals: "out1/"
+            HttpErrorCodeReturnedEquals: '404',
+            KeyPrefixEquals: 'out1/'
           },
           RedirectRule: {
-            HostName: "ec2-11-22-333-44.compute-1.amazonaws.com",
-            ReplaceKeyPrefixWith: "report-404/"
+            HostName: 'ec2-11-22-333-44.compute-1.amazonaws.com',
+            ReplaceKeyPrefixWith: 'report-404/'
           }
         }
       ]
     )
-  }
-}
+  end
+end

data/sample/t1.rb

@@ -1,16 +1,14 @@
-CloudFormation {
-
-  DESCRIPTION ||= "default description"
+CloudFormation do
+  DESCRIPTION ||= 'default description'.freeze
   MACHINES ||= 1
 
   Description DESCRIPTION
 
   (1..MACHINES).each do |i|
     name = "machine#{i}"
-    Instance(name) {
-      ImageId "ami-12345678"
-      Type "t1.micro"
-    }
+    Instance(name) do
+      ImageId 'ami-12345678'
+      Type 't1.micro'
+    end
   end
-  
-}
+end

data/sample/vpc_example.rb

@@ -0,0 +1,50 @@
+require 'cfndsl'
+
+CloudFormation do
+  Description 'Creates an AWS VPC with a couple of subnets.'
+
+  VPC(:VPC) do
+    EnableDnsSupport true
+    EnableDnsHostnames true
+    CidrBlock '10.1.0.0/16'
+    addTag('Name', 'Test VPC')
+  end
+
+  InternetGateway(:InternetGateway) do
+    addTag('Name', 'Test VPC Gateway')
+  end
+
+  VPCGatewayAttachment(:GatewayToInternet) do
+    VpcId Ref(:VPC)
+    InternetGatewayId Ref(:InternetGateway)
+  end
+
+  10.times do |i|
+    subnet = "subnet#{i}"
+    route_table = subnet + 'RouteTable'
+    route_table_assoc = route_table + 'Assoc'
+
+    Subnet(subnet) do
+      VpcId Ref(:VPC)
+      CidrBlock "10.1.#{i}.0/24"
+      addTag('Name', "test vpc #{subnet}")
+    end
+
+    RouteTable(route_table) do
+      VpcId Ref(:VPC)
+      addTag('Name', route_table)
+    end
+
+    SubnetRouteTableAssociation(route_table_assoc) do
+      SubnetId Ref(subnet)
+      RouteTableId Ref(route_table)
+    end
+
+    Route(subnet + 'GatewayRoute') do
+      DependsOn :GatewayToInternet
+      RouteTableId Ref(route_table)
+      DestinationCidrBlock '0.0.0.0/0'
+      GatewayId Ref(:InternetGateway)
+    end
+  end
+end

data/sample/vpc_with_vpn_example.rb

@@ -0,0 +1,97 @@
+require 'cfndsl'
+
+CloudFormation do
+  Description 'Creates an AWS VPC with a couple of subnets.'
+
+  Parameter('VPNAddress') do
+    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.'
+  end
+
+  Parameter('RouterIPAddress') do
+    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'
+  end
+
+  VPC(:VPC) do
+    EnableDnsSupport true
+    EnableDnsHostnames true
+    CidrBlock '10.1.0.0/16'
+    addTag('Name', 'Test VPC')
+  end
+
+  InternetGateway(:InternetGateway) do
+    addTag('Name', 'Test VPC Gateway')
+  end
+
+  VPCGatewayAttachment(:GatewayToInternet) do
+    VpcId Ref(:VPC)
+    InternetGatewayId Ref(:InternetGateway)
+  end
+
+  10.times do |i|
+    subnet = "subnet#{i}"
+    route_table = subnet + 'RouteTable'
+    route_table_assoc = route_table + 'Assoc'
+
+    Subnet(subnet) do
+      VpcId Ref(:VPC)
+      CidrBlock "10.1.#{i}.0/24"
+      addTag('Name', "test vpc #{subnet}")
+    end
+
+    RouteTable(route_table) do
+      VpcId Ref(:VPC)
+      addTag('Name', route_table)
+    end
+
+    SubnetRouteTableAssociation(route_table_assoc) do
+      SubnetId Ref(subnet)
+      RouteTableId Ref(route_table)
+    end
+
+    Route(subnet + 'GatewayRoute') do
+      DependsOn :GatewayToInternet
+      RouteTableId Ref(route_table)
+      DestinationCidrBlock '0.0.0.0/0'
+      GatewayId Ref(:InternetGateway)
+    end
+  end
+
+  VPNGateway(:VirtualPrivateNetworkGateway) do
+    Type 'ipsec.1'
+    addTag('Name', 'Test VPN Gateway')
+  end
+
+  VPCGatewayAttachment(:VPNGatewayAttachment) do
+    VpcId Ref(:VPC)
+    VpnGatewayId Ref(:VirtualPrivateNetworkGateway)
+  end
+
+  CustomerGateway(:CustomerVPNGateway) do
+    Type 'ipsec.1'
+    BgpAsn '65000'
+    IpAddress Ref('RouterIPAddress')
+    addTag('Name', 'Test Customer VPN Gateway')
+  end
+
+  VPNConnection(:VPNConnection) do
+    Type 'ipsec.1'
+    StaticRoutesOnly 'true'
+    CustomerGatewayId Ref(:CustomerVPNGateway)
+    VpnGatewayId Ref(:VirtualPrivateNetworkGateway)
+  end
+
+  VPNConnectionRoute(:VPNConnectionRoute) do
+    VpnConnectionId Ref(:VPNConnection)
+    DestinationCidrBlock Ref('VPNAddress')
+  end
+end

data/spec/cfndsl_spec.rb

@@ -1,5 +1,17 @@
 require 'spec_helper'
 
+describe CfnDsl do
+  it 'evaluates a cloud formation' do
+    filename = "#{File.dirname(__FILE__)}/fixtures/test.rb"
+    subject.eval_file_with_extras(filename)
+  end
+
+  it 'evaluates a heat' do
+    filename = "#{File.dirname(__FILE__)}/fixtures/heattest.rb"
+    subject.eval_file_with_extras(filename)
+  end
+end
+
 describe CfnDsl::HeatTemplate do
   it 'honors last-set value for non-array properties' do
     spec = self
@@ -15,7 +27,6 @@ describe CfnDsl::HeatTemplate do
 end
 
 describe CfnDsl::CloudFormationTemplate do
-
   it 'populates an empty template' do
     expect(subject.to_json).to eq('{"AWSTemplateFormatVersion":"2010-09-09"}')
   end
@@ -41,15 +52,15 @@ describe CfnDsl::CloudFormationTemplate do
   end
 
   it 'validates references' do
-    q = subject.Resource('q'){ DependsOn ['r'] }
-    r = subject.Resource('r'){ Property('z', Ref('q')) }
-    q_refs = q.references Hash.new
-    r_refs = r.references Hash.new
+    q = subject.Resource('q') { DependsOn ['r'] }
+    r = subject.Resource('r') { Property('z', Ref('q')) }
+    q_refs = q.build_references({})
+    r_refs = r.build_references({})
     expect(q_refs).to have_key('r')
     expect(q_refs).to_not have_key('q')
     expect(r_refs).to have_key('q')
     expect(r_refs).to_not have_key('r')
-    expect(subject.checkRefs.length).to eq(2)
+    expect(subject.check_refs.length).to eq(2)
   end
 
   it 'is a data-driven language' do
@@ -61,7 +72,7 @@ describe CfnDsl::CloudFormationTemplate do
         SecurityGroup 'two'
         groups = @Properties['SecurityGroups'].value
         spec.expect(id).to spec.eq('aaaaa')
-        spec.expect(groups).to spec.eq(['one', 'two'])
+        spec.expect(groups).to spec.eq(%w(one two))
       end
     end
   end
@@ -76,7 +87,7 @@ describe CfnDsl::CloudFormationTemplate do
       PolicyDocument(a: 7)
     end
 
-    expect(result2).to be_a(CfnDsl::AWSTypes::IAMEmbeddedPolicy)
+    expect(result2).to be_a(CfnDsl::AWS::Types::IAMEmbeddedPolicy)
     expect(user.instance_variable_get('@Properties')['Policies'].value.length).to eq(2)
   end
 
@@ -91,7 +102,7 @@ describe CfnDsl::CloudFormationTemplate do
     ].each do |param|
       ref = subject.Ref param
       expect(ref.to_json).to eq("{\"Ref\":\"#{param}\"}")
-      refs = ref.references({})
+      refs = ref.build_references({})
       expect(refs).to have_key(param)
     end
   end
@@ -115,14 +126,14 @@ describe CfnDsl::CloudFormationTemplate do
     end
 
     it 'FnJoin' do
-      func = subject.FnJoin('A', ['B', 'C'])
+      func = subject.FnJoin('A', %w(B C))
       expect(func.to_json).to eq('{"Fn::Join":["A",["B","C"]]}')
     end
 
     it 'Ref' do
       ref = subject.Ref 'X'
       expect(ref.to_json).to eq('{"Ref":"X"}')
-      refs = ref.references Hash.new
+      refs = ref.build_references({})
       expect(refs).to have_key('X')
     end
 

data/spec/fixtures/heattest.rb

@@ -1,23 +1,22 @@
-Heat {
-  Description "Test"
+Heat do
+  Description 'Test'
 
-  Parameter("One") {
+  Parameter('One') do
     String
-    Default "Test"
+    Default 'Test'
     MaxLength 15
-  }
+  end
 
-  Parameter('Two') {
+  Parameter('Two') do
     String
     Default 'Test'
     MaxLength 15
-  }
-
-  Output(:One, FnBase64(Ref("One")))
+  end
 
-  Server("MyInstance") {
-    flavor "asdfa"
-    image "asdad"    
-  }
+  Output(:One, FnBase64(Ref('One')))
 
-}
+  Server('MyInstance') do
+    flavor 'asdfa'
+    image 'asdad'
+  end
+end

data/spec/fixtures/test.rb

@@ -1,79 +1,82 @@
-CloudFormation {
-
-  TEST ||= "no value set"
+CloudFormation do
+  TEST ||= 'no value set'.freeze
   puts TEST
 
-  Description "Test"
+  Description 'Test'
 
-  Parameter("One") {
+  Parameter('One') do
     String
-    Default "Test"
+    Default 'Test'
     MaxLength 15
-  }
+  end
 
-  Parameter('Two') {
+  Parameter('Two') do
     String
     Default 'Test'
     MaxLength 15
-  }
+  end
 
   # Condition Function examples
   Condition('OneIsTest', FnEquals(Ref('One'), 'Test'))
   Condition('OneIsNotTest', FnNot(FnEquals(Ref('One'), 'Test')))
-  Condition('OneIsTestAndTwoIsTest', FnAnd([
-    FnEquals(Ref('One'), 'Test'),
-    FnNot(FnEquals(Ref('Two'), 'Test')),
-  ]))
+  Condition('OneIsTestAndTwoIsTest',
+            FnAnd(
+              [
+                FnEquals(Ref('One'), 'Test'),
+                FnNot(FnEquals(Ref('Two'), 'Test'))
+              ]))
 
-  Condition('OneIsTestOrTwoIsTest', FnOr([
-    FnEquals(Ref('One'), 'Test'),
-    FnEquals(Ref('Two'), 'Test'),
-  ]))
+  Condition('OneIsTestOrTwoIsTest',
+            FnOr(
+              [
+                FnEquals(Ref('One'), 'Test'),
+                FnEquals(Ref('Two'), 'Test')
+              ]))
 
-  Output(:One, FnBase64(Ref("One")))
+  Output(:One, FnBase64(Ref('One')))
 
-  Resource("MyInstance") {
+  Resource('MyInstance') do
     Condition 'OneIsNotTest'
-    Type "AWS::EC2::Instance"
-    Property("ImageId", "ami-14341342")
-  }
+    Type 'AWS::EC2::Instance'
+    Property('ImageId', 'ami-14341342')
+  end
 
-  LaunchConfiguration("Second") {
+  LaunchConfiguration('Second') do
     Condition 'OneIsNotTest'
-    BlockDeviceMapping {
-      DeviceName "/dev/sda"
-      VirtualName "stuff"
-      Ebs {
-        SnapshotId "asdasdfasdf"
-        VolumeSize Ref("MyInstance")
-      }
-    }
-  }
+    BlockDeviceMapping do
+      DeviceName '/dev/sda'
+      VirtualName 'stuff'
+      Ebs do
+        SnapshotId 'asdasdfasdf'
+        VolumeSize Ref('MyInstance')
+      end
+    end
+  end
 
-  Parameter("ElbSubnets") {
-    Type "CommaDelimitedList"
-    Default "subnet-12345, subnet-54321"
-  }
+  Parameter('ElbSubnets') do
+    Type 'CommaDelimitedList'
+    Default 'subnet-12345, subnet-54321'
+  end
 
-  Resource("ElasticLoadBalancer") {
-    Type "AWS::ElasticLoadBalancing::LoadBalancer"
-    Property("Subnets", [ FnSelect("0", Ref("ElbSubnets")), FnSelect("1", Ref("ElbSubnets")) ] )
-  }
+  Resource('ElasticLoadBalancer') do
+    Type 'AWS::ElasticLoadBalancing::LoadBalancer'
+    Property('Subnets', [FnSelect('0', Ref('ElbSubnets')), FnSelect('1', Ref('ElbSubnets'))])
+  end
 
-  AutoScalingGroup("ASG") { 
-    UpdatePolicy("AutoScalingRollingUpdate", {
-                 "MinInstancesInService" => "1",
-                 "MaxBatchSize"          => "1",
-                 "PauseTime"             => "PT15M"
-                 })
-    AvailabilityZones FnGetAZs("")
-    LaunchConfigurationName Ref("LaunchConfig")
+  AutoScalingGroup('ASG') do
+    UpdatePolicy('AutoScalingRollingUpdate',
+                 'MinInstancesInService' => '1',
+                 'MaxBatchSize'          => '1',
+                 'PauseTime'             => 'PT15M'
+                )
+    AvailabilityZones FnGetAZs('')
+    LaunchConfigurationName Ref('LaunchConfig')
     MinSize 1
     MaxSize FnIf('OneIsTest', 1, 3)
-    LoadBalancerNames Ref("ElasticLoadBalancer")
-  }
+    LoadBalancerNames Ref('ElasticLoadBalancer')
+  end
 
-  LaunchConfiguration("LaunchConfig")
+  LaunchConfiguration('LaunchConfig')
 
-  #UndefinedResource("asddfasdf")
-}
+  # UndefinedResource('asddfasdf')
+end