cfndsl 0.0.16 → 0.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 7b265f1255b48223c012215b895145a7d520249c
+  data.tar.gz: ca61f61cda439daec8d124369f5d5f28f9b31c80
+SHA512:
+  metadata.gz: f0df157ea4421e9b3d8426f65d7f30fa57ae27ebf372bcda3699507001b36429b4cfb752096ce95c0add85055f357338478a230a5028ecdcadd4361c5717432e
+  data.tar.gz: 48e9633475ed557c62380ff07c0277fb904ad3f63743daaeaeaf2e333b47335e2070e72c472ed782a692a2fd78cc00b313704bb59ed1626f78e2576dc705c7d7

data/lib/cfndsl.rb

@@ -6,25 +6,25 @@ require 'cfndsl/RefCheck'
 require 'cfndsl/JSONable'
 require 'cfndsl/Types'
 require 'cfndsl/Properties'
+require 'cfndsl/UpdatePolicy'
+require 'cfndsl/Conditions'
 require 'cfndsl/Mappings'
 require 'cfndsl/Resources'
 require 'cfndsl/Metadata'
 require 'cfndsl/Parameters'
 require 'cfndsl/Outputs'
-require 'cfndsl/CloudFormationTemplate'  
+require 'cfndsl/CloudFormationTemplate'
 
 def CloudFormation(&block)
   x = CfnDsl::CloudFormationTemplate.new
   x.declare(&block)
   invalid_references = x.checkRefs()
   if( invalid_references ) then
-    puts invalid_references.join("\n");
-    exit(-1)
+    abort invalid_references.join("\n")
   elsif( CfnDsl::Errors.errors? ) then
-    CfnDsl::Errors.report
+    abort CfnDsl::Errors.errors.join("\n")
   else
     x.generateOutput
   end
 end
 
-

data/lib/cfndsl/CloudFormationTemplate.rb

@@ -1,26 +1,28 @@
 require 'cfndsl/JSONable'
 require 'cfndsl/names'
 
-module CfnDsl  
-  class CloudFormationTemplate < JSONable 
+module CfnDsl
+  class CloudFormationTemplate < JSONable
     ##
     # Handles the overall template object
     dsl_attr_setter :AWSTemplateFormatVersion, :Description
-    dsl_content_object :Parameter, :Output, :Resource, :Mapping
-    
+    dsl_content_object :Condition, :Parameter, :Output, :Resource, :Mapping
+
     def initialize
       @AWSTemplateFormatVersion = "2010-09-09"
     end
-    
-    def generateOutput() 
+
+    def generateOutput()
       puts self.to_json  # uncomment for pretty printing # {:space => ' ', :indent => '  ', :object_nl => "\n", :array_nl => "\n" }
     end
 
-    @@globalRefs = { 
-       "AWS::NotificationARNs" => 1, 
+    @@globalRefs = {
+       "AWS::NotificationARNs" => 1,
        "AWS::Region" => 1,
        "AWS::StackId" => 1,
-       "AWS::StackName" => 1
+       "AWS::StackName" => 1,
+       "AWS::AccountId" => 1,
+       "AWS::NoValue" => 1
     }
 
     def isValidRef( ref, origin=nil)
@@ -30,15 +32,15 @@ module CfnDsl
       return true if @@globalRefs.has_key?( ref )
 
       return true if @Parameters && @Parameters.has_key?( ref )
-      
+
       if( @Resources.has_key?( ref ) ) then
-          return !origin || !@_ResourceRefs || !@_ResourceRefs[ref] || !@_ResourceRefs[ref].has_key?(origin)             
+          return !origin || !@_ResourceRefs || !@_ResourceRefs[ref] || !@_ResourceRefs[ref].has_key?(origin)
       end
 
       return false
     end
 
-    def checkRefs() 
+    def checkRefs()
       invalids = []
       @_ResourceRefs = {}
       if(@Resources)  then
@@ -62,10 +64,10 @@ module CfnDsl
           end
         end
       end
-      return invalids.length>0 ? invalids : nil 
+      return invalids.length>0 ? invalids : nil
     end
 
-    
+
     names = {}
     nametypes = {}
     CfnDsl::Types::AWS_Types["Resources"].each_pair do |name, type|
@@ -77,11 +79,11 @@ module CfnDsl
         if( ptype.instance_of? String )
           create_klass = CfnDsl::Types.const_get( ptype );
 
-          klass.class_eval do 
+          klass.class_eval do
             CfnDsl::methodNames(pname) do |method|
               define_method(method) do |*values, &block|
                 if( values.length <1 ) then
-                  values.push create_klass.new 
+                  values.push create_klass.new
                 end
                 @Properties ||= {}
                 @Properties[pname] ||= CfnDsl::PropertyDefinition.new( *values )
@@ -124,7 +126,7 @@ module CfnDsl
 
       end
       parts = name.split "::"
-      while( parts.length > 0) 
+      while( parts.length > 0)
         abreve_name = parts.join "_"
         if( names.has_key? abreve_name ) then
           # this only happens if there is an ambiguity
@@ -138,7 +140,7 @@ module CfnDsl
 
 
     end
-    
+
     #Define property setter methods for each of the unambiguous type names
     names.each_pair do |typename,type|
       if(type) then

data/lib/cfndsl/Conditions.rb

@@ -0,0 +1,19 @@
+require 'cfndsl/JSONable'
+
+module CfnDsl
+  class ConditionDefinition < JSONable
+    #
+    # Handles condition objects
+    #
+    # Usage:
+    #     Condition :ConditionName, FnEqual(Ref(:ParameterName), 'helloworld')
+
+    def initialize(value)
+      @value = value
+    end
+
+    def to_json(*a)
+      @value.to_json(*a)
+    end
+  end
+end

data/lib/cfndsl/Errors.rb

@@ -1,8 +1,8 @@
 module CfnDsl
   module Errors
     @@errors = []
-    
-    def self.error( err, idx=nil ) 
+
+    def self.error( err, idx=nil )
       if(idx.nil?) then
         @@errors.push ( err + "\n" + caller.join("\n") + "\n" )
       else
@@ -11,19 +11,17 @@ module CfnDsl
         else
           err_loc = caller[idx]
         end
-        
+
         @@errors.push ( err_loc + " " + err + "\n" )
       end
     end
-    
+
     def self.clear()
       @@errors = []
     end
 
-    def self.report() 
-      @@errors.each do |err|
-        puts err
-      end
+    def self.errors()
+      @@errors
     end
 
     def self.errors?()

data/lib/cfndsl/JSONable.rb

@@ -6,64 +6,106 @@ module CfnDsl
     ##
     # These functions are available anywhere inside
     # a block for a JSONable object.
-    def Ref(value) 
+    def Ref(value)
       ##
       # Equivalent to the CloudFormation template built in function Ref
       RefDefinition.new(value)
     end
-        
+
     def FnBase64( value )
       ##
       # Equivalent to the CloudFormation template built in function Fn::Base64
       Fn.new("Base64", value);
     end
-    
+
     def FnFindInMap( map, key, value)
       ##
       # Equivalent to the CloudFormation template built in function Fn::FindInMap
       Fn.new("FindInMap", [map,key,value] )
-    end	
-    
+    end
+
     def FnGetAtt(logicalResource, attribute)
       ##
       # Equivalent to the CloudFormation template built in function Fn::GetAtt
-      Fn.new( "GetAtt", [logicalResource, attribute], [logicalResource] )
+      Fn.new( "GetAtt", [logicalResource, attribute] )
     end
-    
+
     def FnGetAZs(region)
       ##
       # Equivalent to the CloudFormation template built in function Fn::GetAZs
       Fn.new("GetAZs", region)
     end
-    
+
     def FnJoin(string, array)
       ##
       # Equivalent to the CloudFormation template built in function Fn::Join
       Fn.new("Join", [ string, array] )
     end
 
+    def FnAnd(array)
+      ##
+      # Equivalent to the CloudFormation template built in function Fn::And
+      if !array || array.count < 2 || array.count > 10
+        raise 'The array passed to Fn::And must have at least 2 elements and no more than 10'
+      end
+      Fn.new("And", array)
+    end
+
+    def FnEquals(value1, value2)
+      ##
+      # Equivalent to the Cloudformation template built in function Fn::Equals
+      Fn.new("Equals", [value1, value2])
+    end
+
+    def FnIf(conditionName, trueValue, falseValue)
+      ##
+      # Equivalent to the Cloudformation template built in function Fn::If
+      Fn.new("If", [conditionName, trueValue, falseValue])
+    end
+
+    def FnNot(value)
+      ##
+      # Equivalent to the Cloudformation template built in function Fn::Not
+      Fn.new("Not", value)
+    end
+
+    def FnOr(array)
+      ##
+      # Equivalent to the CloudFormation template built in function Fn::Or
+      if !array || array.count < 2 || array.count > 10
+        raise 'The array passed to Fn::Or must have at least 2 elements and no more than 10'
+      end
+      Fn.new("Or", array)
+    end
+
+    def FnSelect(index, array)
+      ##
+      # Equivalent to the CloudFormation template built in function Fn::Select
+      Fn.new("Select", [ index, array] )
+    end
+
     def FnFormat(string, *arguments)
       ##
       # Usage
       #  FnFormat( "This is a %0. It is 100%% %1","test", "effective")
       # or
-      #  FnFormat( "This is a %{test}. It is 100%% %{effective}, 
-      #            :test=>"test", 
+      #  FnFormat( "This is a %{test}. It is 100%% %{effective},
+      #            :test=>"test",
       #            :effective=>"effective")
       #
       # These will each generate a call to Fn::Join that when
       # evaluated will produce the string "This is a test. It is 100%
       # effective."
       #
-      # Think of this as %0,%1, etc in the format string being replaced by the 
+      # Think of this as %0,%1, etc in the format string being replaced by the
       # corresponding arguments given after the format string. '%%' is replaced
-      # by the '%' character. 
-      # 
+      # by the '%' character.
+      #
       # The actual Fn::Join call corresponding to the above FnFormat call would be
       # {"Fn::Join": ["",["This is a ","test",". It is 100","%"," ","effective"]]}
       #
       # If no arguments are given, or if a hash is given and the format
-      # variable name does not exist in the hash, it is used as a Ref 
+      # variable name does not exist in the hash, it is used as a Ref
       # to an existing resource or parameter.
       #
       array = [];
@@ -77,7 +119,7 @@ module CfnDsl
           elsif( $3 ) then
             array.push hash[ $4 ] || hash[ $4.to_sym ] || Ref( $4 )
           end
-        end  
+        end
       else
         string.scan( /(.*?)(%(%|\d+)|\z)/m ) do |x,y|
           array.push $1 if $1 && $1 != ""
@@ -86,7 +128,7 @@ module CfnDsl
           elsif( $3 ) then
             array.push arguments[ $3.to_i ]
           end
-        end  
+        end
       end
       Fn.new("Join", ["", array])
     end
@@ -94,7 +136,7 @@ module CfnDsl
 
   class JSONable
     ##
-    # This is the base class for just about everything useful in the 
+    # This is the base class for just about everything useful in the
     # DSL. It knows how to turn DSL Objects into the corresponding
     # json, and it lets you create new built in function objects
     # from inside the context of a dsl object.
@@ -112,7 +154,7 @@ module CfnDsl
       hash = {}
       self.instance_variables.each do |var|
         name = var[1..-1]
-        
+
         if( name =~ /^__/ ) then
           # if a variable starts with double underscore, strip one off
           name = name[1..-1]
@@ -120,7 +162,7 @@ module CfnDsl
           # Hide variables that start with single underscore
           name = nil
         end
-          
+
         hash[name] = self.instance_variable_get var if name
       end
       hash.to_json(*a)
@@ -134,17 +176,17 @@ module CfnDsl
       self.instance_eval &block if block_given?
     end
 
-    def method_missing(meth,*args,&block) 
+    def method_missing(meth,*args,&block)
       if(args) then
         arg = "(" + args.inspect[1..-2] + ")"
-      else 
+      else
         arg = ""
       end
       CfnDsl::Errors.error( "Undefined symbol: #{meth}#{arg}", 1 )
     end
   end
 
-    
+
   class Fn < JSONable
     ##
     # Handles all of the Fn:: objects
@@ -153,7 +195,7 @@ module CfnDsl
       @argument = argument
       @_refs = refs
     end
-    
+
     def to_json(*a)
       hash = {}
       hash["Fn::#{@function}"] = @argument
@@ -172,7 +214,7 @@ module CfnDsl
   class RefDefinition < JSONable
     ##
     # Handles the Ref objects
-    def initialize( value ) 
+    def initialize( value )
       @Ref = value
     end
 
@@ -180,5 +222,5 @@ module CfnDsl
       [@Ref]
     end
   end
-  
+
 end

data/lib/cfndsl/Outputs.rb

@@ -1,11 +1,11 @@
 require 'cfndsl/JSONable'
 
-module CfnDsl  
+module CfnDsl
   class OutputDefinition < JSONable
     ##
     # Handles Output objects
-    dsl_attr_setter :Value, :Description
-    
+    dsl_attr_setter :Value, :Description, :Condition
+
     def initialize( value=nil)
       @Value = value if value
     end

data/lib/cfndsl/Plurals.rb

@@ -8,9 +8,12 @@ module CfnDsl
       "Metadata" => "Metadata", 
       "Property" => "Properties",
       "Policy" => "Policies",
+      "PolicyDocument" => "PolicyDocument",
+      "AssumeRolePolicyDocument" => "AssumeRolePolicyDocument",
       "SecurityGroupIngress" => "SecurityGroupIngress",
       "SecurityGroupEgress" => "SecurityGroupEgress",
-      "DBSecurityGroupIngress" => "DBSecurityGroupIngress"
+      "DBSecurityGroupIngress" => "DBSecurityGroupIngress",
+      "UpdatePolicy" => "UpdatePolicy"
     }
     
     @@singles = {}

data/lib/cfndsl/Resources.rb

@@ -1,13 +1,14 @@
 require 'cfndsl/JSONable'
 require 'cfndsl/Metadata'
 require 'cfndsl/Properties'
+require 'cfndsl/UpdatePolicy'
 
-module CfnDsl  
+module CfnDsl
   class ResourceDefinition < JSONable
     ##
     # Handles Resource objects
-    dsl_attr_setter :Type, :DependsOn, :DeletionPolicy
-    dsl_content_object :Property, :Metadata
+    dsl_attr_setter :Type, :DependsOn, :DeletionPolicy, :Condition
+    dsl_content_object :Property, :Metadata, :UpdatePolicy
 
     def addTag(name, value, propagate=nil)
       self.send(:Tag) {
@@ -27,7 +28,7 @@ module CfnDsl
         end
 
         if( @DependsOn.instance_of?(String) ) then
-          refs.push @DependsOn 
+          refs.push @DependsOn
         end
       end
       refs

data/lib/cfndsl/UpdatePolicy.rb

@@ -0,0 +1,29 @@
+require 'cfndsl/JSONable'
+
+module CfnDsl  
+  class UpdatePolicyDefinition < JSONable
+    ##
+    # Handles autoscaling group update policy objects for Resources
+    #
+    # Usage
+    #   Resource("aaa") {
+    #     UpdatePolicy("AutoScalingRollingUpdate", {    
+    #       "MinInstancesInService" => "1",
+    #       "MaxBatchSize" => "1",
+    #       "PauseTime" => "PT12M5S"
+    #     })
+    #   }
+    #
+    def initialize(value) 
+      @value = value;
+    end
+
+    def value
+      return @value
+    end
+    
+    def to_json(*a) 
+      @value.to_json(*a)
+    end
+  end
+end

data/lib/cfndsl/aws_types.yaml

@@ -1,5 +1,7 @@
 Resources:
   "AWS::AutoScaling::AutoScalingGroup" :
+   UpdatePolicy:
+    AutoScalingRollingUpdate: JSON
    Properties:
     AvailabilityZones: [ String ]
     Cooldown: String
@@ -7,7 +9,7 @@ Resources:
     HealthCheckGracePeriod: Integer
     HealthCheckType: String
     LaunchConfigurationName: String
-    LoadBalancers: [ String ]
+    LoadBalancerNames: [ String ]
     MaxSize: Integer
     MinSize: Integer
     NotificationConfiguration: String
@@ -15,21 +17,32 @@ Resources:
     VPCZoneIdentifier: [ String ]
   "AWS::AutoScaling::LaunchConfiguration" :
     Properties:
+     AssociatePublicIpAddress: Boolean
      BlockDeviceMappings: [ BlockDeviceMapping ]
      ImageId: String
+     InstanceMonitoring: Boolean
      InstanceType: String
      KernelId: String
      KeyName: String
      RamDiskId: String
      SecurityGroups: [ String ]
      UserData: String
-  "AWS::Autoscaling::ScalingPolicy" :
+  "AWS::AutoScaling::ScalingPolicy" :
    Properties:
     AdjustmentType: String
     AutoScalingGroupName: String
     Cooldown: String
     ScalingAdjustment: String
-  "AWS::Autoscaling::Trigger" :
+  "AWS::AutoScaling::ScheduledAction" :
+   Properties:
+    AutoScalingGroupName: String
+    DesiredCapacity: Integer
+    EndTime: String
+    MaxSize: Integer
+    MinSize: Integer
+    Recurrence: String
+    StartTime: String
+  "AWS::AutoScaling::Trigger" :
    Properties:
     Dimensions: [ MetricDimension ]
     MetricName: String
@@ -93,11 +106,13 @@ Resources:
    Properties:
     AvailabilityZone: String
     DisableApiTermination: String
+    IamInstanceProfile: String
     ImageId: String
     InstanceType: String
     KernelId: String
     KeyName: String
     Monitoring: String
+    NetworkInterfaces: JSON
     PlacementGroupName: String
     PrivateIpAddress: String
     RamDiskId: String
@@ -143,7 +158,7 @@ Resources:
     DestinationSecurityGroupId: String
     FromPort: Number
     ToPort: Number
-  "AWS::EC2::SecurityGroupIngress":
+  "AWS::EC2::SecurityGroupIngress" :
    Properties:
     GroupName: String
     GroupId: String
@@ -206,7 +221,7 @@ Resources:
   "AWS::ElastiCache::SecurityGroup" :
    Properties:
     Decription: String
-  "AWS::ElastiCache::SecurityGrouIngress" :
+  "AWS::ElastiCache::SecurityGroupIngress" :
    Properties:
     CacheSecurityGroupName: String
     EC2SecurityGroupName: String
@@ -227,11 +242,13 @@ Resources:
   "AWS::ElasticLoadBalancing::LoadBalancer" :
    Properties:
     AvailabilityZones: [String]
+    CrossZone: Boolean
     HealthCheck: HealthCheck
     Instances: [String]
     Listeners: [ Listener ]
     AppCookieStickinessPolicy: AppCookieStickinessPolicy
     LBCookieStickinessPolicy:  LBCookieStickinessPolicy
+    Scheme: String
     SecurityGroups: [ String ]
     Subnets: [ String ]
    Attributes:
@@ -253,15 +270,28 @@ Resources:
     Policies: [ IAMEmbeddedPolicy ]
    Attributes:
     Arn : String
+  "AWS::IAM::InstanceProfile" :
+   Properties:
+    Path: String
+    Roles: [ String ]
+   Attributes:
+    Arn : String    
   "AWS::IAM::Policy" :
    Properties:
     PolicyName: String
-    PolocyDocument: JSON
+    PolicyDocument: JSON
     Groups: [ String ]
     Users: [ String ]
+  "AWS::IAM::Role" :
+   Properties:
+    AssumeRolePolicyDocument: JSON
+    Path: String
+    Policies: [ IAMEmbeddedPolicy ]
+   Attributes:
+    Arn : String    
   "AWS::IAM::UserToGroupAddition" :
    Properties:
-    Group: String
+    GroupName: String
     Users: [String]
   "AWS::IAM::User" :
    Properties:
@@ -475,8 +505,3 @@ Types:
  IAMEmbeddedPolicy:
   PolicyDocument: JSON
   PolicyName: String
-
- 
-  
- 
- 

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cfndsl
 version: !ruby/object:Gem::Version
-  version: 0.0.16
-  prerelease: 
+  version: 0.1.0
 platform: ruby
 authors:
 - Chris Howe
@@ -10,7 +9,35 @@ autorequire:
 bindir: bin
 cert_chain: []
 date: 2013-05-16 00:00:00.000000000 Z
-dependencies: []
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: DSL for creating AWS Cloudformation templates
 email: chris@howeville.com
 executables:
@@ -25,6 +52,7 @@ files:
 - lib/cfndsl/RefCheck.rb
 - lib/cfndsl/Types.rb
 - lib/cfndsl/Properties.rb
+- lib/cfndsl/Conditions.rb
 - lib/cfndsl/Mappings.rb
 - lib/cfndsl/Resources.rb
 - lib/cfndsl/Metadata.rb
@@ -34,29 +62,29 @@ files:
 - lib/cfndsl/Plurals.rb
 - lib/cfndsl/names.rb
 - lib/cfndsl/CloudFormationTemplate.rb
+- lib/cfndsl/UpdatePolicy.rb
 - bin/cfndsl
-homepage: https://github.com/howech/cfndsl
+homepage: https://github.com/stevenjack/cfndsl
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: AWS Cloudformation DSL
 test_files: []