convection 0.0.1 → 0.2.1

data/lib/convection/model/template/resource/aws_auto_scaling_auto_scaling_group.rb

@@ -0,0 +1,39 @@
+require_relative '../resource'
+
+module Convection
+  module Model
+    class Template
+      class Resource
+        ##
+        # AWS::AutoScaling::AutoScalingGroup
+        ##
+        class AutoScalingGroup < Resource
+          include Model::Mixin::Taggable
+
+          type 'AWS::AutoScaling::AutoScalingGroup'
+          property :availability_zone, 'AvailabilityZones', :array
+          property :cooldown, 'Cooldown'
+          property :desired_capacity, 'DesiredCapacity'
+          property :health_check_grace_period, 'HealthCheckGracePeriod'
+          property :health_check_type, 'HealthCheckType'
+          property :instance_id, 'InstanceId'
+          property :launch_configuration_name, 'LaunchConfigurationName'
+          property :load_balancer_name, 'LoadBalancerNames', :array
+          property :max_size, 'MaxSize'
+          property :metrics_collection, 'MetricsCollection', :array
+          property :min_size, 'MinSize'
+          property :notification_configuration, 'NotificationConfiguration'
+          property :placement_group, 'PlacementGroup'
+          property :termination_policie, 'TerminationPolicies', :array
+          property :vpc_zone_identifier, 'VPCZoneIdentifier', :array
+
+          def render(*args)
+            super.tap do |resource|
+              render_tags(resource)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/convection/model/template/resource/aws_auto_scaling_launch_configuration.rb

@@ -0,0 +1,30 @@
+require_relative '../resource'
+
+module Convection
+  module Model
+    class Template
+      class Resource
+        ##
+        # AWS::AutoScaling::LaunchConfiguration
+        ##
+        class LaunchConfiguration < Resource
+          type 'AWS::AutoScaling::LaunchConfiguration'
+          property :associate_public_ip_address, 'AssociatePublicIpAddress'
+          property :block_device_mappings, 'BlockDeviceMappings', :array
+          property :ebs_optimized, 'EbsOptimized'
+          property :iam_instanceProfile, 'IamInstanceProfile'
+          property :image_id, 'ImageId'
+          property :instance_id, 'InstanceId'
+          property :instance_monitoring, 'InstanceMonitoring'
+          property :instance_type, 'InstanceType'
+          property :kernel_id, 'KernelId'
+          property :key_name, 'KeyName'
+          property :ram_diskId, 'RamDiskId'
+          property :security_group, 'SecurityGroups', :array
+          property :spot_price, 'SpotPrice'
+          property :user_data, 'UserData'
+        end
+      end
+    end
+  end
+end

data/lib/convection/model/template/resource/aws_auto_scaling_scaling_policy.rb

@@ -0,0 +1,20 @@
+require_relative '../resource'
+
+module Convection
+  module Model
+    class Template
+      class Resource
+        ##
+        # AWS::AutoScaling::ScalingPolicy
+        ##
+        class ScalingPolicy < Resource
+          type 'AWS::AutoScaling::ScalingPolicy'
+          property :adjustment_type, 'AdjustmentType'
+          property :auto_scaling_group_name, 'AutoScalingGroupName'
+          property :cooldown, 'Cooldown'
+          property :scaling_adjustment, 'ScalingAdjustment'
+        end
+      end
+    end
+  end
+end

data/lib/convection/model/template/resource/aws_cloud_watch_alarm.rb

@@ -0,0 +1,31 @@
+require_relative '../resource'
+
+module Convection
+  module Model
+    class Template
+      class Resource
+        ##
+        # AWS::CloudWatch::Alarm
+        ##
+        class CloudWatchAlarm < Resource
+          type 'AWS::CloudWatch::Alarm'
+          property :actions_enabled, 'ActionsEnabled', :default => true
+          property :alarm_action, 'AlarmActions', :type => :list
+          property :alarm_description, 'AlarmDescription'
+          property :alarm_name, 'AlarmName'
+          property :comparison_operator, 'ComparisonOperator'
+          property :dimension, 'Dimensions', :type => :list
+          property :evaluation_periods, 'EvaluationPeriods'
+          property :insufficient_data_action, 'InsufficientDataActions', :type => :list
+          property :metric_name, 'MetricName'
+          property :namespace, 'Namespace'
+          property :ok_action, 'OKActions', :type => :list
+          property :period, 'Period'
+          property :statistic, 'Statistic'
+          property :threshold, 'Threshold'
+          property :unit, 'Unit'
+        end
+      end
+    end
+  end
+end

data/lib/convection/model/template/resource/aws_ec2_instance.rb

@@ -10,40 +10,16 @@ module Convection
         class EC2Instance < Resource
           include Model::Mixin::Taggable
 
-          def initialize(*args)
-            super
-
-            type 'AWS::EC2::Instance'
-            @properties['SecurityGroupIds'] = []
-          end
-
-          def availability_zone(value)
-            property('AvailabilityZone', value)
-          end
-
-          def image_id(value)
-            property('ImageId', value)
-          end
-
-          def instance_type(value)
-            property('InstanceType', value)
-          end
-
-          def key_name(value)
-            property('KeyName', value)
-          end
-
-          def security_group(value)
-            @properties['SecurityGroupIds'] << value
-          end
-
-          def subnet(value)
-            property('SubnetId', value)
-          end
-
-          def user_data(value)
-            property('UserData', value)
-          end
+          type 'AWS::EC2::Instance'
+          property :availability_zone, 'AvailabilityZone'
+          property :image_id, 'ImageId'
+          property :instance_type, 'InstanceType'
+          property :instance_profile, 'IamInstanceProfile'
+          property :key_name, 'KeyName'
+          property :subnet, 'SubnetId'
+          property :user_data, 'UserData'
+          property :security_group, 'SecurityGroupIds', :type => :list
+          property :src_dst_checks, 'SourceDestCheck'
 
           def render(*args)
             super.tap do |resource|
@@ -54,16 +30,4 @@ module Convection
       end
     end
   end
-
-  module DSL
-    ## Add DSL method to template namespace
-    module Template
-      def ec2_instance(name, &block)
-        r = Model::Template::Resource::EC2Instance.new(name, self)
-
-        r.instance_exec(&block) if block
-        resources[name] = r
-      end
-    end
-  end
 end

data/lib/convection/model/template/resource/aws_ec2_internet_gateway.rb

@@ -2,22 +2,15 @@ require_relative '../resource'
 
 module Convection
   module DSL
-    ## Add DSL method to template namespace
     module Template
-      def ec2_internet_gateway(name, &block)
-        r = Model::Template::Resource::EC2InternetGateway.new(name, self)
-
-        r.instance_exec(&block) if block
-        resources[name] = r
-      end
-
       module Resource
         ##
         # Add DSL for VPCGatewayAttachment
+        ##
         module EC2InternetGateway
           def attach_to_vpc(vpc, &block)
             a = Model::Template::Resource::EC2VPCGatewayAttachment.new("#{ name }VPCAttachment#{ vpc.name }", self)
-            a.vpc_id(vpc)
+            a.vpc(vpc)
             a.internet_gateway(self)
 
             a.instance_exec(&block) if block
@@ -37,11 +30,7 @@ module Convection
         class EC2InternetGateway < Resource
           include Model::Mixin::Taggable
           include DSL::Template::Resource::EC2InternetGateway
-
-          def initialize(*args)
-            super
-            type 'AWS::EC2::InternetGateway'
-          end
+          type 'AWS::EC2::InternetGateway'
 
           def render(*args)
             super.tap do |resource|

data/lib/convection/model/template/resource/aws_ec2_network_acl.rb

@@ -0,0 +1,45 @@
+require_relative '../resource'
+
+module Convection
+  module DSL
+    module Template
+      module Resource
+        ##
+        # Add DSL helpers to EC2NetworkACL
+        ##
+        module EC2NetworkACL
+          def entry(name, &block)
+            acl_entry = Model::Template::Resource::EC2NetworkACLEntry.new("#{ self.name }Entry#{ name }", @template)
+            acl_entry.acl(self)
+
+            acl_entry.instance_exec(&block) if block
+            @template.resources[acl_entry.name] = acl_entry
+          end
+        end
+      end
+    end
+  end
+
+  module Model
+    class Template
+      class Resource
+        ##
+        # AWS::EC2::NetworkACL
+        ##
+        class EC2NetworkACL < Resource
+          include DSL::Template::Resource::EC2NetworkACL
+          include Model::Mixin::Taggable
+
+          type 'AWS::EC2::NetworkAcl'
+          property :vpc, 'VpcId'
+
+          def render(*args)
+            super.tap do |resource|
+              render_tags(resource)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/convection/model/template/resource/aws_ec2_network_acl_entry.rb

@@ -0,0 +1,27 @@
+require_relative '../resource'
+
+module Convection
+  module Model
+    class Template
+      class Resource
+        ##
+        # AWS::EC2::NetworkACL
+        ##
+        class EC2NetworkACLEntry < Resource
+          extend Mixin::CIDRBlock
+          extend Mixin::Protocol
+
+          type 'AWS::EC2::NetworkAclEntry'
+          property :acl, 'NetworkAclId'
+          property :action, 'RuleAction'
+          property :number, 'RuleNumber'
+          property :egress, 'Egress'
+          property :icmp, 'Icmp'
+          property :range, 'PortRange'
+          cidr_property :network, 'CidrBlock'
+          protocol_property :protocol, 'Protocol'
+        end
+      end
+    end
+  end
+end

data/lib/convection/model/template/resource/aws_ec2_route.rb

@@ -8,48 +8,15 @@ module Convection
         # AWS::EC2::Route
         ##
         class EC2Route < Resource
-          def initialize(*args)
-            super
-            type 'AWS::EC2::Route'
-          end
-
-          def route_table_id(value)
-            property('RouteTableId', value)
-          end
-
-          def destination(value)
-            property('DestinationCidrBlock', value)
-          end
-
-          def gateway(value)
-            property('GatewayId', value)
-          end
-
-          def instance(value)
-            property('InstanceId', value)
-          end
-
-          def interface(value)
-            property('NetworkInterfaceId', value)
-          end
-
-          def peer(value)
-            property('VpcPeeringConnectionId', value)
-          end
+          type 'AWS::EC2::Route'
+          property :route_table_id, 'RouteTableId'
+          property :destination, 'DestinationCidrBlock'
+          property :gateway, 'GatewayId'
+          property :instance, 'InstanceId'
+          property :interface, 'NetworkInterfaceId'
+          property :peer, 'VpcPeeringConnectionId'
         end
       end
     end
   end
-
-  module DSL
-    ## Add DSL method to template namespace
-    module Template
-      def ec2_route(name, &block)
-        r = Model::Template::Resource::EC2Route.new(name, self)
-
-        r.instance_exec(&block) if block
-        resources[name] = r
-      end
-    end
-  end
 end

data/lib/convection/model/template/resource/aws_ec2_route_table.rb

@@ -1,17 +1,8 @@
 require_relative '../resource'
 
 module Convection
-
   module DSL
-    ## Add DSL method to template namespace
     module Template
-      def ec2_route_table(name, &block)
-        r = Model::Template::Resource::EC2RouteTable.new(name, self)
-
-        r.instance_exec(&block) if block
-        resources[name] = r
-      end
-
       module Resource
         ##
         # DSL For routes
@@ -39,14 +30,8 @@ module Convection
           include DSL::Template::Resource::EC2RouteTable
           include Model::Mixin::Taggable
 
-          def initialize(*args)
-            super
-            type 'AWS::EC2::RouteTable'
-          end
-
-          def vpc_id(value)
-            property('VpcId', value)
-          end
+          type 'AWS::EC2::RouteTable'
+          property :vpc, 'VpcId'
 
           def render(*args)
             super.tap do |resource|

data/lib/convection/model/template/resource/aws_ec2_security_group.rb

@@ -2,32 +2,31 @@ require_relative '../resource'
 
 module Convection
   module DSL
-    ## Add DSL method to template namespace
     module Template
-      def ec2_security_group(name, &block)
-        r = Model::Template::Resource::EC2SecurityGroup.new(name, self)
-
-        r.instance_exec(&block) if block
-        resources[name] = r
-      end
-
       module Resource
         ##
         # DSL For EC2SecurityGroup rules
         ##
         module EC2SecurityGroup
-          def ingress_rule(&block)
-            r = Model::Template::Resource::EC2SecurityGroup::Rule.new("#{ name }IngressGroupRule", @template)
-            r.instance_exec(&block) if block
-
-            security_group_ingress << r
+          def ingress_rule(protocol = nil, port = nil, source = nil, &block)
+            rule = Model::Template::Resource::EC2SecurityGroup::Rule.new("#{ name }IngressGroupRule", @template)
+            rule.protocol = protocol unless protocol.nil?
+            rule.from = port unless port.nil?
+            rule.to = port unless port.nil?
+            rule.source = source unless source.nil?
+
+            rule.instance_exec(&block) if block
+            security_group_ingress << rule
           end
 
-          def egress_rule(&block)
-            r = Model::Template::Resource::EC2SecurityGroup::Rule.new("#{ name }EgressGroupRule", @template)
-            r.instance_exec(&block) if block
+          def egress_rule(protocol = nil, port = nil, &block)
+            rule = Model::Template::Resource::EC2SecurityGroup::Rule.new("#{ name }EgressGroupRule", @template)
+            rule.protocol = protocol unless protocol.nil?
+            rule.from = port unless port.nil?
+            rule.to = port unless port.nil?
 
-            security_group_egress << r
+            rule.instance_exec(&block) if block
+            security_group_egress << rule
           end
         end
       end
@@ -55,41 +54,36 @@ module Convection
             attribute :to
             attribute :protocol
 
-            attribute :cidr_ip
+            attribute :source
             attribute :destination_group
             attribute :source_group
             attribute :source_group_owner
 
             def render
               {
-                'IpProtocol' => protocol,
+                'IpProtocol' => Mixin::Protocol.lookup(protocol),
                 'FromPort' => from,
                 'ToPort' => to
               }.tap do |rule|
-                rule['CidrIp'] = cidr_ip unless cidr_ip.nil?
+                rule['CidrIp'] = source unless source.nil?
                 rule['DestinationSecurityGroupId'] = destination_group unless destination_group.nil?
                 rule['SourceSecurityGroupId'] = source_group unless source_group.nil?
-                rule['SourceSecurityGroupOwnerId'] = source_group_owner unless source_group.nil?
+                rule['SourceSecurityGroupOwnerId'] = source_group_owner unless source_group_owner.nil?
               end
             end
           end
 
+          type 'AWS::EC2::SecurityGroup'
+          property :description, 'GroupDescription'
+          property :vpc, 'VpcId'
+
           def initialize(*args)
             super
 
-            type 'AWS::EC2::SecurityGroup'
             @security_group_ingress = []
             @security_group_egress = []
           end
 
-          def description(value)
-            property('GroupDescription', value)
-          end
-
-          def vpc_id(value)
-            property('VpcId', value)
-          end
-
           def render(*args)
             super.tap do |resource|
               resource['Properties']['SecurityGroupIngress'] = security_group_ingress.map(&:render)