convection 0.0.1 → 0.2.1

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

@@ -0,0 +1,17 @@
+require_relative '../resource'
+
+module Convection
+  module Model
+    class Template
+      class Resource
+        ##
+        # AWS::Route53::HealthCheck
+        ##
+        class Route53HealthCheck < Resource
+          type 'AWS::Route53::HealthCheck', :route53_healthcheck
+          property :health_check_config, 'HealthCheckConfig'
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,30 @@
+require_relative '../resource'
+
+module Convection
+  module Model
+    class Template
+      class Resource
+        ##
+        # AWS::EC2::Instance
+        ##
+        class Route53RecordSet < Resource
+          type 'AWS::Route53::RecordSet', :route53_recordset
+          property :alias_target, 'AliasTarget'
+          property :comment, 'Comment'
+          property :failover, 'Failover'
+          property :geo_location, 'GeoLocation', :array
+          property :health_check_id, 'HealthCheckId'
+          property :zone, 'HostedZoneId'
+          property :zone_name, 'HostedZoneName'
+          property :record_name, 'Name'
+          property :region, 'Region'
+          property :record, 'ResourceRecords', :array
+          property :set_identifier, 'SetIdentifier'
+          property :ttl, 'TTL'
+          property :record_type, 'Type'
+          property :weight, 'Weight'
+        end
+      end
+    end
+  end
+end

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

@@ -10,38 +10,14 @@ module Convection
         class S3Bucket < Resource
           include Model::Mixin::Taggable
 
-          def initialize(*args)
-            super
-            type 'AWS::S3::Bucket'
-          end
-
-          def access_control(value)
-            property('AccessControl', value)
-          end
-
-          def bucket_name(value)
-            property('BucketName', value)
-          end
-
-          def cors_configuration(value)
-            property('CorsConfiguration', value)
-          end
-
-          def lifecycle_configuration(value)
-            property('LifecycleConfiguration', value)
-          end
-
-          def logging_configuration(value)
-            property('LoggingConfiguration', value) 
-          end
-
-          def notification_configuration(value)
-            property('NotificationConfiguration', value)
-          end
-
-          def version_configuration(value)
-            property('VersionConfiguration', value)
-          end
+          type 'AWS::S3::Bucket'
+          property :bucket_name, 'BucketName'
+          property :access_control, 'AccessControl'
+          property :cors_configurationm, 'CorsConfiguration'
+          property :lifecycle_configuration, 'LifecycleConfiguration'
+          property :logging_configuration, 'LoggingConfiguration'
+          property :notification_configuration, 'NotificationConfiguration'
+          property :version_configuration, 'VersionConfiguration'
 
           def render(*args)
             super.tap do |resource|
@@ -52,16 +28,4 @@ module Convection
       end
     end
   end
-
-  module DSL
-    ## Add DSL method to template namespace
-    module Template
-      def s3_bucket(name, &block)
-        r = Model::Template::Resource::S3Bucket.new(name, self)
-
-        r.instance_exec(&block) if block
-        resources[name] = r
-      end
-    end
-  end
 end

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

@@ -1,3 +1,4 @@
+require 'forwardable'
 require_relative '../resource'
 
 module Convection
@@ -8,33 +9,27 @@ module Convection
         # AWS::S3::BucketPolicy
         ##
         class S3BucketPolicy < Resource
+          extend Forwardable
+
+          type 'AWS::S3::BucketPolicy'
+          property :bucket, 'Bucket'
+          attr_reader :document # , 'PolicyDocument'
+
+          def_delegators :@document, :allow, :id, :version, :statement
+          def_delegator :@document, :name, :policy_name
 
           def initialize(*args)
             super
-            type 'AWS::S3::BucketPolicy'
+            @document = Model::Mixin::Policy.new(:name => false, :template => @template)
           end
 
-          def bucket(value)
-            property('Bucket', value)
-          end
-
-          def policy_document(value)
-            property('PolicyDocument', value)
+          def render
+            super.tap do |r|
+              document.render(r['Properties'])
+            end
           end
         end
       end
     end
   end
-
-  module DSL
-    ## Add DSL method to template namespace
-    module Template
-      def s3_bucket_policy(name, &block)
-        r = Model::Template::Resource::S3BucketPolicy.new(name, self)
-
-        r.instance_exec(&block) if block
-        resources[name] = r
-      end
-    end
-  end
 end

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

@@ -0,0 +1,19 @@
+require_relative '../resource'
+
+module Convection
+  module Model
+    class Template
+      class Resource
+        ##
+        # AWS::SNS::Topic
+        ##
+        class SNSTopic < Resource
+          type 'AWS::SNS::Topic'
+          property :display_name, 'DisplayName'
+          property :subscription, 'Subscription', :type => :list
+          property :topic_name, 'TopicName'
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,31 @@
+require_relative '../resource'
+
+module Convection
+  module Model
+    class Template
+      class Resource
+        ##
+        # AWS::SQS::Queue
+        ##
+        class SQSQueue < Resource
+          include Model::Mixin::Taggable
+
+          type 'AWS::SQS::Queue'
+          property :delay_seconds, 'DelaySeconds'
+          property :maximum_message_size, 'MaximumMessageSize'
+          property :message_retention_period, 'MessageRetentionPeriod'
+          property :queue_name, 'QueueName'
+          property :receive_message_wait_time_seconds, 'ReceiveMessageWaitTimeSeconds'
+          property :redrive_policy, 'RedrivePolicy'
+          property :visibility_timeout, 'VisibilityTimeout'
+
+          def render(*args)
+            super.tap do |resource|
+              render_tags(resource)
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,18 @@
+require_relative '../resource'
+
+module Convection
+  module Model
+    class Template
+      class Resource
+        ##
+        # AWS::SQS::QueuePolicy
+        ##
+        class SQSQueuePolicy < Resource
+          type 'AWS::SQS::QueuePolicy'
+          property :queue, 'Queues', :type => :list
+          property :policy_document, 'PolicyDocument'
+        end
+      end
+    end
+  end
+end

data/test/convection/model/test_conditions.rb

@@ -0,0 +1,121 @@
+require 'test_helper'
+require 'json'
+require 'pp'
+
+class TestConditions < Minitest::Test
+  def setup
+    # Inspired by http://www.unixdaemon.net/cloud/intro-to-cloudformations-conditionals.html
+    @template = ::Convection.template do
+      description 'Conditions Test Template'
+
+      parameter 'DeploymentEnvironment' do
+        type 'String'
+        description 'The environment this stack is being deployed to.'
+        default 'dev'
+
+        allow 'dev'
+        allow 'stage'
+        allow 'prod'
+      end
+
+      condition 'InProd' do
+        fn_equals(fn_ref('DeploymentEnvironment'), 'prod')
+      end
+
+      condition 'NotInProd' do
+        fn_or(
+          fn_equals(fn_ref('DeploymentEnvironment'), 'stage'),
+          fn_equals(fn_ref('DeploymentEnvironment'), 'dev')
+        )
+      end
+
+      resource 'SomeSG' do
+        type 'AWS::EC2::SecurityGroup'
+        condition 'NotInProd'
+      end
+
+      resource 'SQLDB' do
+        type 'AWS::RDS::DBInstance'
+        property 'Iops', fn_if('InProd', '1000', fn_ref('AWS::NoValue'))
+      end
+    end
+  end
+
+  def from_json
+    JSON.parse(@template.to_json)
+  end
+
+  def test_inprod_condition
+    # Expected JSON:
+    # "InProd": { "Fn::Equals" : [ { "Ref" : "DeploymentEnvironment" }, "prod" ] },
+    json = from_json['Conditions']['InProd']
+    func_args = json['Fn::Equals']
+
+    assert func_args.is_a? Array
+    assert_equal 2, func_args.size
+
+    perform_parameter_ref_comparison func_args, 'DeploymentEnvironment', 'prod'
+  end
+
+  def test_notinprod_condition
+    # Expected JSON:
+    # "NotInProd": {
+    #   "Fn::Or" : [
+    #     { "Fn::Equals" : [ { "Ref" : "DeploymentEnvironment"}, "stage" ] },
+    #     { "Fn::Equals" : [ { "Ref" : "DeploymentEnvironment"}, "dev" ] }
+    #   ]
+    #  }
+    json = from_json['Conditions']['NotInProd']
+    func_args = json['Fn::Or']
+
+    assert func_args.is_a? Array
+    assert_equal 2, func_args.size
+
+    subfunc1 = func_args[0]['Fn::Equals'] # check for 'stage'
+    subfunc2 = func_args[1]['Fn::Equals'] # check for 'dev'
+
+    perform_parameter_ref_comparison subfunc1, 'DeploymentEnvironment', 'stage'
+    perform_parameter_ref_comparison subfunc2, 'DeploymentEnvironment', 'dev'
+  end
+
+  def test_resource_uses_condition
+    json = from_json['Resources']['SomeSG']
+
+    assert json.is_a? Hash
+    assert json.key? 'Condition'
+    assert_equal 'NotInProd', json['Condition']
+  end
+
+  def test_property_uses_condition
+    iops_property = from_json['Resources']['SQLDB']['Properties']['Iops']
+    # Expected JSON:
+    # "Iops" : { "Fn::If" : [ "InProd", "1000", { "Ref" : "AWS::NoValue" }
+
+    # Check we have an IF function
+    assert iops_property.is_a? Hash
+    assert_equal 1, iops_property.size
+    assert iops_property.key? 'Fn::If'
+
+    # Check the 3 arguments to the IF function: (condition, true_value, false_value)
+    if_cond = iops_property['Fn::If']
+    assert if_cond.is_a? Array
+    assert_equal 3, if_cond.size
+
+    assert_equal 'InProd', if_cond[0]
+    assert_equal '1000', if_cond[1]
+    assert if_cond[2].is_a? Hash
+    assert_equal 'AWS::NoValue', if_cond[2]['Ref']
+  end
+
+  private
+
+  def perform_parameter_ref_comparison(comparison_array, parameter_name, expected_value)
+    parameter_ref = comparison_array[0]
+    assert parameter_ref.is_a? Hash
+    assert_equal 1, parameter_ref.size
+    assert parameter_ref.key? 'Ref'
+    assert parameter_ref.value? parameter_name
+
+    assert_equal expected_value, comparison_array[1]
+  end
+end

data/test/convection/model/test_elasticache.rb

@@ -0,0 +1,97 @@
+require 'test_helper'
+require 'json'
+require 'pp'
+
+class TestElasticache < Minitest::Test
+  def setup
+    # Inspired by http://www.unixdaemon.net/cloud/intro-to-cloudformations-conditionals.html
+    @template = ::Convection.template do
+      description 'Elasticache Test Template'
+
+      ec2_security_group 'MyEC2SecGroup' do
+        ingress_rule(:tcp, 22, 'my.ip.address')
+      end
+
+      elasticache_security_group 'MyRedisSecGroup' do
+        description 'Redis cache security group'
+      end
+
+      elasticache_security_group_ingress 'MyRedisSecGroupIngress' do
+        cache_security_group_name fn_ref('MyRedisSecGroup')
+        ec2_security_group_name(fn_ref('MyEC2SecGroup'))
+        ec2_security_group_owner_id('123456789012')
+      end
+
+      elasticache_parameter_group 'MyRedisParmGroup' do
+        cache_parameter_group_family 'redis2.8'
+        description 'Redis cache parameter group'
+        parameter 'my_parm_key', 'my_parm_value'
+      end
+
+      elasticache_cache_cluster 'MyRedisCluster' do
+        cluster_name 'demo'
+
+        auto_minor_version_upgrade true
+        cache_node_type 'cache.m3.medium'
+        cache_parameter_group_name fn_ref('MyRedisParmGroup')
+        cache_security_group_names [fn_ref('MyRedisSecGroup')]
+        engine 'redis'
+        engine_version '2.8.6'
+        num_cache_nodes 1
+      end
+    end
+  end
+
+  def from_json
+    JSON.parse(@template.to_json)
+  end
+
+  def test_elasticache_instance
+    json = from_json['Resources']['MyRedisCluster']
+    secgroups = json['Properties']['CacheSecurityGroupNames']
+
+    assert secgroups.is_a? Array
+    assert_equal 1, secgroups.size
+
+    perform_parameter_ref_comparison secgroups, 'MyRedisSecGroup', nil
+  end
+
+  # XXX Which method is correct implementation? @aburke
+  # def test_elasticache_secgroup_ingress
+  #   json = from_json['Resources']['MyRedisSecGroupIngress']
+  #   cachesecgroup = json['Properties']['CacheSecurityGroupName']
+  #
+  #   assert cachesecgroup.is_a? Hash
+  #   assert_equal 1, cachesecgroup.size
+  #   assert cachesecgroup.key? 'Ref'
+  #   assert cachesecgroup.value? 'MyRedisSecGroup'
+  #
+  #   ec2_secgroup = json['Properties']['EC2SecurityGroupName']
+  #   assert ec2_secgroup.is_a? Hash
+  #   assert_equal 1, ec2_secgroup.size
+  #   assert ec2_secgroup.key? 'Ref'
+  #   assert ec2_secgroup.value? 'MyEC2SecGroup'
+  # end
+
+  def test_elasticache_secgroup_ingress
+    json = from_json['Resources']['MyRedisParmGroup']
+    parms = json['Properties']['Properties']
+
+    assert parms.is_a? Hash
+    assert_equal 1, parms.size
+    assert parms.key? 'my_parm_key'
+    assert parms.value? 'my_parm_value'
+  end
+
+  private
+
+  def perform_parameter_ref_comparison(comparison_array, parameter_name, expected_value)
+    parameter_ref = comparison_array[0]
+    assert parameter_ref.is_a? Hash
+    assert_equal 1, parameter_ref.size
+    assert parameter_ref.key? 'Ref'
+    assert parameter_ref.value? parameter_name
+
+    assert_equal expected_value, comparison_array[1]
+  end
+end