convection 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6497eb27ff049e412ce12d11c770f9b3ca8ecca5
-  data.tar.gz: 51819a3f47c0920fb701cdadec9300c44d456f74
+  metadata.gz: 6c43337ad64fde014850460e19d630469be23340
+  data.tar.gz: 93a64a9d5793c8e021b6a1fc0278a782dff927e2
 SHA512:
-  metadata.gz: 1ee6826c5e24d9a14ea055073114ea7237f4836ee3c96fc2f4b73daff785eed6b1aff7b02eb0067600df8cad03f88b53b252684279e65a360a529fbeeb09a72c
-  data.tar.gz: 8c5d71b1705904b34e387416b42cccbdd013380841b6959320c53f3fd3ecbe6c89178d984c99fc8adb084365b0b0a90356e71c145eb8ae21bb68fe97f7a96284
+  metadata.gz: d0e1c0cc824507129f1ea6e6e3d364e8b77c9dddf76c7b98e29882ea2b4c548e22d74d59a9b1ab91fb49788715fa48628ce767effb5dd3fda5e9311da9570ca6
+  data.tar.gz: 4a1ba0c7feceb96a37e61e3299e9dad8e3fcf33fcfb0ffc16acc482ef0615033f819f861e1938d1bfdced82bbae19a03d1f1ddabb55351e9dc2aba24e30b3abc

data/lib/convection/model/template.rb

@@ -351,4 +351,5 @@ require_relative 'template/parameter'
 require_relative 'template/mapping'
 require_relative 'template/condition'
 require_relative 'template/resource'
+require_relative 'template/resource_property'
 require_relative 'template/output'

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

@@ -20,6 +20,16 @@ module Convection
           property :user_data, 'UserData'
           property :security_group, 'SecurityGroupIds', :type => :list
           property :src_dst_checks, 'SourceDestCheck'
+          property :disable_api_termination, 'DisableApiTermination'
+          property :network_interfaces, 'NetworkInterfaces', :type => :list
+
+          # Append a network interface to network_interfaces
+          def network_interface(&block)
+            interface = ResourceProperty::EC2NetworkInterface.new(self)
+            interface.instance_exec(&block) if block
+            interface.device_index = network_interfaces.count.to_s
+            network_interfaces << interface
+          end
 
           def render(*args)
             super.tap do |resource|

data/lib/convection/model/template/resource_property.rb

@@ -0,0 +1,62 @@
+module Convection
+  module Model
+    class Template
+      # Base class for {http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-product-property-reference.html Resource Property Types}
+      class ResourceProperty
+        class << self
+          def properties
+            @properties ||= {}
+          end
+
+          def property(accesor, property_name, options = {})
+            properties[accesor] = Resource::Property.create(accesor, property_name, options)
+            properties[accesor].attach(self)
+          end
+
+          def attach_method(name, &block)
+            define_method(name, &block)
+          end
+        end
+
+        include DSL::Helpers
+
+        ##
+        # Resource Property Instance Methods
+        ##
+        attr_reader :template
+        attr_reader :properties
+        attr_reader :exist
+        alias_method :exist?, :exist
+
+        def initialize(parent)
+          @template = parent.template
+          @exist = false
+
+          ## Instantiate properties
+          @properties = Model::Collection.new
+          resource = self
+          resource.class.properties.each do |_, property|
+            @properties[property.property_name] = property.instance(resource)
+          end
+        end
+
+        def property(key, *value)
+          return properties[key].value if value.empty?
+
+          ## Define a property instance on the fly
+          properties[key] = ScalarPropertyInstance.new(self) unless properties.include?(key)
+          properties[key].set(*value)
+        end
+
+        def render
+          properties.map(true, &:render)
+        end
+      end
+    end
+  end
+end
+
+## Require all resource properties
+Dir.glob(File.expand_path('../resource_property/*.rb', __FILE__)) do |r|
+  require_relative r
+end

data/lib/convection/model/template/resource_property/aws_ec2_network_interface.rb

@@ -0,0 +1,23 @@
+require_relative '../resource_property'
+
+module Convection
+  module Model
+    class Template
+      class ResourceProperty
+        # Represents an {http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-network-iface-embedded.html
+        # EC2 NetworkInterface Embedded Property Type}
+        class EC2NetworkInterface < ResourceProperty
+          property :associate_public_ip_address, 'AssociatePublicIpAddress'
+          property :delete_on_termination, 'DeleteOnTermination'
+          property :description, 'Description'
+          property :device_index, 'DeviceIndex'
+          property :group_set, 'GroupSet', :type => :list
+          alias_method :security_group, :group_set
+          property :private_ip_address, 'PrivateIpAddress'
+          property :secondary_private_ip_address_count, 'SecondaryPrivateIpAddressCount'
+          property :subnet, 'SubnetId'
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: convection
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - John Manero
@@ -415,6 +415,8 @@ files:
 - lib/convection/model/template/resource/aws_sns_topic_policy.rb
 - lib/convection/model/template/resource/aws_sqs_queue.rb
 - lib/convection/model/template/resource/aws_sqs_queue_policy.rb
+- lib/convection/model/template/resource_property.rb
+- lib/convection/model/template/resource_property/aws_ec2_network_interface.rb
 - lib/convection/version.rb
 - test/convection/model/test_conditions.rb
 - test/convection/model/test_elasticache.rb