convection 0.0.1 → 0.2.1

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

@@ -0,0 +1,25 @@
+require_relative '../resource'
+
+module Convection
+  module Model
+    class Template
+      class Resource
+        ##
+        # AWS::EC2::SecurityGroup
+        ##
+        class EC2SecurityGroupIngres < Resource
+          extend Mixin::Protocol
+
+          type 'AWS::EC2::SecurityGroupIngress'
+          property :address, 'CidrIp'
+          property :parent, 'GroupId'
+          property :from, 'FromPort'
+          property :to, 'ToPort'
+          protocol_property :protocol, 'IpProtocol'
+          property :source_group, 'SourceSecurityGroupId'
+          property :source_owner, 'SourceSecurityGroupOwnerId'
+        end
+      end
+    end
+  end
+end

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

@@ -2,28 +2,29 @@ require_relative '../resource'
 require_relative 'aws_ec2_subnet_route_table_association'
 
 module Convection
-
   module DSL
-    ## Add DSL method to template namespace
     module Template
-      def ec2_subnet(name, &block)
-        r = Model::Template::Resource::EC2Subnet.new(name, self)
-
-        r.instance_exec(&block) if block
-        resources[name] = r
-      end
-
       module Resource
         ##
         # Add DSL for RouteTableAssocaition
+        ##
         module EC2Subnet
-          def associate_route_table(table, &block)
-            r = Model::Template::Resource::EC2SubnetRouteTableAssociation.new("#{ name }RouteTableAssociation#{ table.name }", @tamplate)
-            r.route_table(table.reference)
-            r.subnet(reference)
+          def route_table(table, &block)
+            assoc = Model::Template::Resource::EC2SubnetRouteTableAssociation.new("#{ name }RouteTableAssociation#{ table.name }", template)
+            assoc.route_table(table)
+            assoc.subnet(self)
 
-            r.instance_exec(&block) if block
-            @template.resources[r.name] = r
+            assoc.instance_exec(&block) if block
+            @template.resources[assoc.name] = assoc
+          end
+
+          def acl(acl_entity, &block)
+            assoc = Model::Template::Resource::EC2SubnetNetworkACLAssociation.new("#{ name }ACLAssociation#{ acl_entity.name }", template)
+            assoc.acl(acl_entity)
+            assoc.subnet(self)
+
+            assoc.instance_exec(&block) if block
+            @template.resources[assoc.name] = assoc
           end
         end
       end
@@ -38,21 +39,13 @@ module Convection
         ##
         class EC2Subnet < Resource
           include DSL::Template::Resource::EC2Subnet
-          include Model::Mixin::CIDRBlock
           include Model::Mixin::Taggable
+          extend Mixin::CIDRBlock
 
-          def initialize(*args)
-            super
-            type 'AWS::EC2::Subnet'
-          end
-
-          def availability_zone(value)
-            property('AvailabilityZone', value)
-          end
-
-          def vpc_id(value)
-            property('VpcId', value)
-          end
+          type 'AWS::EC2::Subnet'
+          property :availability_zone, 'AvailabilityZone'
+          property :vpc, 'VpcId'
+          cidr_property :network, 'CidrBlock'
 
           def render(*args)
             super.tap do |resource|

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

@@ -0,0 +1,18 @@
+require_relative '../resource'
+
+module Convection
+  module Model
+    class Template
+      class Resource
+        ##
+        # AWS::EC2::SubnetRouteTableAssociation
+        ##
+        class EC2SubnetNetworkACLAssociation < Resource
+          type 'AWS::EC2::SubnetNetworkAclAssociation'
+          property :acl, 'NetworkAclId'
+          property :subnet, 'SubnetId'
+        end
+      end
+    end
+  end
+end

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

@@ -8,32 +8,11 @@ module Convection
         # AWS::EC2::SubnetRouteTableAssociation
         ##
         class EC2SubnetRouteTableAssociation < Resource
-          def initialize(*args)
-            super
-            type 'AWS::EC2::SubnetRouteTableAssociation'
-          end
-
-          def route_table(value)
-            property('RouteTableId', value)
-          end
-
-          def subnet(value)
-            property('SubnetId', value)
-          end
+          type 'AWS::EC2::SubnetRouteTableAssociation'
+          property :route_table, 'RouteTableId'
+          property :subnet, 'SubnetId'
         end
       end
     end
   end
-
-  module DSL
-    ## Add DSL method to template namespace
-    module Template
-      def ec2_subnet_route_table_association(name, &block)
-        r = Model::Template::Resource::EC2SubnetRouteTableAssociation.new(name, self)
-
-        r.instance_exec(&block) if block
-        resources[name] = r
-      end
-    end
-  end
 end

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

@@ -2,23 +2,14 @@ require_relative '../resource'
 
 module Convection
   module DSL
-    ## Add DSL method to template namespace
     module Template
-      def ec2_vpc(name, &block)
-        r = Model::Template::Resource::EC2VPC.new(name, self)
-
-        r.instance_exec(&block) if block
-        resources[name] = r
-      end
-
       module Resource
         ##
         # DSL For VPC sub-entities
         ##
         module EC2VPC
-          def stack
-            @template.stack
-          end
+          ## Expose other resource DSL handles inside of the VPC closure
+          include DSL::Template::Resource
 
           def add_internet_gateway(&block)
             g = Model::Template::Resource::EC2InternetGateway.new("#{ name }IG", @template)
@@ -32,9 +23,18 @@ module Convection
             @internet_gateway = g
           end
 
+          def add_network_acl(name, &block)
+            network_acl = Model::Template::Resource::EC2NetworkACL.new("#{ self.name }ACL#{ name }", @template)
+            network_acl.vpc(self)
+            network_acl.tag('Name', network_acl.name)
+
+            network_acl.instance_exec(&block) if block
+            @template.resources[network_acl.name] = network_acl
+          end
+
           def add_route_table(name, options = {}, &block)
             route_table = Model::Template::Resource::EC2RouteTable.new("#{ self.name }Table#{ name }", @template)
-            route_table.vpc_id(self)
+            route_table.vpc(self)
             route_table.tag('Name', route_table.name)
 
             route_table.instance_exec(&block) if block
@@ -56,11 +56,11 @@ module Convection
           def add_subnet(name, &block)
             s = Model::Template::Resource::EC2Subnet.new("#{ self.name }Subnet#{ name }", @template)
             s.tag('Name', s.name)
-            s.vpc_id(self)
+            s.vpc(self)
 
             ## Allocate the next available subnet
             @subnet_allocated += 1
-            s.network(@network.subnet(
+            s.network(network.subnet(
               :Bits => @subnet_length,
               :NumSubnets => @subnet_allocated)[@subnet_allocated - 1])
 
@@ -80,30 +80,28 @@ module Convection
         ##
         class EC2VPC < Resource
           include DSL::Template::Resource::EC2VPC
-          include Model::Mixin::CIDRBlock
-          include Model::Mixin::Taggable
+          include Mixin::Taggable
+          extend Mixin::CIDRBlock
 
+          type 'AWS::EC2::VPC'
           attribute :subnet_length
+          property :instance_tenancy, 'InstanceTenancy'
+          cidr_property :network, 'CidrBlock'
 
           def initialize(*args)
             super
 
-            type 'AWS::EC2::VPC'
             @subnet_allocated = 0
             @subnet_length = 24
 
             @internet_gateway = nil
           end
 
-          def enable_dns(value)
+          def enable_dns(value = true)
             property('EnableDnsSupport', value)
             property('EnableDnsHostnames', value)
           end
 
-          def instance_tenancy(value)
-            property('InstanceTenancy', value)
-          end
-
           def render(*args)
             super.tap do |resource|
               render_tags(resource)

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

@@ -8,36 +8,12 @@ module Convection
         # AWS::EC2::VPCGatewayAttachment
         ##
         class EC2VPCGatewayAttachment < Resource
-          def initialize(*args)
-            super
-            type 'AWS::EC2::VPCGatewayAttachment'
-          end
-
-          def vpc_id(value)
-            property('VpcId', value)
-          end
-
-          def internet_gateway(value)
-            property('InternetGatewayId', value)
-          end
-
-          def vpn_gateway(value)
-            property('VpnGatewayId', value)
-          end
+          type 'AWS::EC2::VPCGatewayAttachment'
+          property :vpc, 'VpcId'
+          property :internet_gateway, 'InternetGatewayId'
+          property :vpn_gateway, 'VpnGatewayId'
         end
       end
     end
   end
-
-  module DSL
-    ## Add DSL method to template namespace
-    module Template
-      def ec2_vpc_gateway_attachment(name, &block)
-        r = Model::Template::Resource::EC2VPCGatewayAttachment.new(name, self)
-
-        r.instance_exec(&block) if block
-        resources[name] = r
-      end
-    end
-  end
 end

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

@@ -0,0 +1,24 @@
+require_relative '../resource'
+
+module Convection
+  module Model
+    class Template
+      class Resource
+        ##
+        # AWS::ElastiCache::CacheCluster
+        ##
+        class ElastiCacheCluster < Resource
+          type 'AWS::ElastiCache::CacheCluster', :elasticache_cache_cluster
+          property :auto_minor_version_upgrade, 'AutoMinorVersionUpgrade'
+          property :cache_node_type, 'CacheNodeType'
+          property :cache_security_group_names, 'CacheSecurityGroupNames'
+          property :cache_parameter_group_name, 'CacheParameterGroupName'
+          property :cluster_name, 'ClusterName'
+          property :engine, 'Engine'
+          property :engine_version, 'EngineVersion'
+          property :num_cache_nodes, 'NumCacheNodes'
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,19 @@
+require_relative '../resource'
+
+module Convection
+  module Model
+    class Template
+      class Resource
+        ##
+        # AWS::ElastiCache::ParameterGroup
+        ##
+        class ElastiCacheParameterGroup < Resource
+          type 'AWS::ElastiCache::ParameterGroup', :elasticache_parameter_group
+          property :cache_parameter_group_family, 'CacheParameterGroupFamily'
+          property :description, 'Description'
+          property :parameter, 'Properties', :type => :hash
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,17 @@
+require_relative '../resource'
+
+module Convection
+  module Model
+    class Template
+      class Resource
+        ##
+        # AWS::ElastiCache::SecurityGroup
+        ##
+        class ElastiCacheSecurityGroup < Resource
+          type 'AWS::ElastiCache::SecurityGroup', :elasticache_security_group
+          property :description, 'Description'
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,19 @@
+require_relative '../resource'
+
+module Convection
+  module Model
+    class Template
+      class Resource
+        ##
+        # AWS::ElastiCache::SecurityGroupIngress
+        ##
+        class ElastiCacheSecurityGroupIngress < Resource
+          type 'AWS::ElastiCache::SecurityGroupIngress', :elasticache_security_group_ingress
+          property :cache_security_group_name, 'CacheSecurityGroupName'
+          property :ec2_security_group_name, 'EC2SecurityGroupName'
+          property :ec2_security_group_owner_id, 'EC2SecurityGroupOwnerId'
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,39 @@
+require_relative '../resource'
+
+module Convection
+  module Model
+    class Template
+      class Resource
+        ##
+        # AWS::ElasticLoadBalancing::LoadBalancer
+        ##
+        class ELB < Resource
+          include Model::Mixin::Taggable
+
+          type 'AWS::ElasticLoadBalancing::LoadBalancer', :elb
+          property :access_logging_policy, 'AccessLoggingPolicy'
+          property :app_cookie_stickiness_policy, 'AppCookieStickinessPolicy', :type => :list
+          property :lb_cookie_stickiness_policy, 'LBCookieStickinessPolicy', :type => :list
+          property :availability_zone, 'AvailabilityZones', :type => :list
+          property :connection_draining_policy, 'ConnectionDrainingPolicy'
+          property :connection_settings, 'ConnectionSettings'
+          property :cross_zone, 'CrossZone'
+          property :health_check, 'HealthCheck'
+          property :instance, 'Instances', :type => :list
+          property :load_balancer_name, 'LoadBalancerName'
+          property :listener, 'Listeners', :type => :list
+          property :policy, 'Policies', :type => :list
+          property :scheme, 'Scheme'
+          property :security_group, 'SecurityGroups', :type => :list
+          property :subnet, 'Subnets', :type => :list
+
+          def render(*args)
+            super.tap do |resource|
+              render_tags(resource)
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,19 @@
+require_relative '../resource'
+
+module Convection
+  module Model
+    class Template
+      class Resource
+        ##
+        # AWS::IAM::AccessKey
+        ##
+        class IAMAccessKey < Resource
+          type 'AWS::IAM::AccessKey'
+          property :serial, 'Serial', :default => 0
+          property :status, 'Status', :default => 'Active'
+          property :user_name, 'UserName'
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,18 @@
+require_relative '../resource'
+
+module Convection
+  module Model
+    class Template
+      class Resource
+        ##
+        # AWS::IAM::Group
+        ##
+        class IAMGroup < Resource
+          type 'AWS::IAM::Group'
+          property :path, 'Path'
+          property :policy, 'Policies', :type => :list
+        end
+      end
+    end
+  end
+end