convection 0.2.20 → 0.2.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f87de219d4fc032f2a8572a29e659c04e0b8d0bf
-  data.tar.gz: 8a41f0823d8b246c7a2b4f899150462b10ba788a
+  metadata.gz: 074ce594bd457dfa3a9174a47b5a9813f7a1d740
+  data.tar.gz: 589968f7d3487cb35d9d0166ab09b3bff11ffdc6
 SHA512:
-  metadata.gz: 6f0b4bb4091881c0d9168c2794e2dc03248cf0581ab4320cc88f46387ce24a48b5a36c5d149dea463c9fc9f97683aff85a38d14af5b68bee527fce5da6e62791
-  data.tar.gz: 15e53fcd02858735b88d9da7b8368b524de8028c147a687e42f719b70505ca2076c921e09e769980d557cafeca55566f275d818b59d179ea69c6b84ba8e77b3e
+  metadata.gz: 094c835c822791ea64c117a8c61e11d42a27d2aa32eecf70525ab26d33384612af68ee20a8c5422a78f3948fd94fa21091a4e9fe894038fb08a8207c23954d36
+  data.tar.gz: eab4ff96aa467afb8113a65cc20cbcbdfe537718041efaa56609d9e0c4b3ad01cb450b0aeaeeb16aceb26717b2ac79d2eff9b96eefc8b264b4cb5a85e7939496

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

@@ -0,0 +1,30 @@
+require_relative '../resource'
+
+module Convection
+  module Model
+    class Template
+      class Resource
+        ##
+        # AWS::Events::Rule
+        ##
+        class EventsRule < Resource
+          type 'AWS::Events::Rule'
+          property :description, 'Description'
+          property :domain, 'Domain'
+          property :event_pattern, 'EventPattern', :type => :hash
+          property :name, 'Name'
+          property :role_arn, 'RoleArn'
+          property :schedule_expression, 'ScheduleExpression'
+          property :state, 'State'
+          property :targets, 'Targets', :type => :array
+
+          def target(&block)
+            target = ResourceProperty::EventsRuleTarget.new(self)
+            target.instance_exec(&block) if block
+            targets << target
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -24,6 +24,16 @@ module Convection
             @template.resources[profile.name] = profile
           end
 
+          ## Add a canned trust policy for any AWS service
+          def trust_service(name, &block)
+            @trust_relationship = Model::Mixin::Policy.new(:name => "trust-#{name}-service", :template => @template)
+            trust_relationship.allow do
+              action 'sts:AssumeRole'
+              principal :Service => "#{name}.amazonaws.com"
+            end
+            trust_relationship.instance_exec(&block) if block
+          end
+
           ## Add a canned trust policy for EC2 instances
           def trust_ec2_instances(&block)
             @trust_relationship = Model::Mixin::Policy.new(:name => 'trust-ec2-instances', :template => @template)

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

@@ -0,0 +1,21 @@
+require_relative '../resource'
+
+module Convection
+  module Model
+    class Template
+      class Resource
+        ##
+        # AWS::Lambda::Permission
+        ##
+        class LambdaPermission < Resource
+          type 'AWS::Lambda::Permission'
+          property :action, 'Action'
+          property :function_name, 'FunctionName'
+          property :principal, 'Principal'
+          property :source_account, 'SourceAccount'
+          property :source_arn, 'SourceArn'
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,18 @@
+require_relative '../resource_property'
+
+module Convection
+  module Model
+    class Template
+      class ResourceProperty
+        # Represents an {http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-target.html
+        # CloudWatch Events Rule Target}
+        class EventsRuleTarget < ResourceProperty
+          property :arn, 'Arn'
+          property :id, 'Id'
+          property :input, 'Input'
+          property :input_path, 'InputPath'
+        end
+      end
+    end
+  end
+end

data/test/convection/model/test_permission.rb

@@ -0,0 +1,31 @@
+require 'test_helper'
+require 'json'
+
+class TestLambdaPermission < Minitest::Test
+  def setup
+    @template = ::Convection.template do
+      description 'Lambda Permission Test Template'
+
+      lambda_permission 'LambdaInvokePermission' do
+        action 'lambda:InvokeFunction'
+        function_name get_att('MyLambdaFunction', 'Arn')
+        principal 's3.amazonaws.com'
+        source_account fn_ref('AWS::AccountId')
+      end
+    end
+  end
+
+  def from_json
+    JSON.parse(@template.to_json)
+  end
+
+  def test_lambda_permission
+    # Expected JSON:
+    json = from_json['Resources']['LambdaInvokePermission']
+    properties = json['Properties']
+
+    assert_equal properties['Action'], 'lambda:InvokeFunction'
+    assert_equal properties['FunctionName'], 'Fn::GetAtt' => %w(MyLambdaFunction Arn)
+    assert_equal properties['SourceAccount'], 'Ref' => 'AWS::AccountId'
+  end
+end

data/test/convection/model/test_trust.rb

@@ -0,0 +1,28 @@
+require 'test_helper'
+require 'json'
+
+class TestTrust < Minitest::Test
+  def setup
+    @template = ::Convection.template do
+      description 'Trust Test Template'
+
+      iam_role 'FooRole' do
+        trust_service 'bar'
+      end
+    end
+  end
+
+  def from_json
+    JSON.parse(@template.to_json)
+  end
+
+  def test_trust
+    json = from_json['Resources']['FooRole']['Properties']
+    doc = json['AssumeRolePolicyDocument']
+    refute doc.nil?, 'No policy document present in JSON'
+    stmt = doc['Statement']
+
+    trust_bar = stmt.any? { |s| s['Principal']['Service'] == 'bar.amazonaws.com' }
+    assert_equal true, trust_bar, 'Expected to find [bar.amazonaws.com] in document'
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: convection
 version: !ruby/object:Gem::Version
-  version: 0.2.20
+  version: 0.2.21
 platform: ruby
 authors:
 - John Manero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-14 00:00:00.000000000 Z
+date: 2016-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -161,6 +161,7 @@ files:
 - lib/convection/model/template/resource/aws_elasticbeanstalk_configurationtemplate.rb
 - lib/convection/model/template/resource/aws_elasticbeanstalk_environment.rb
 - lib/convection/model/template/resource/aws_elb.rb
+- lib/convection/model/template/resource/aws_events_rule.rb
 - lib/convection/model/template/resource/aws_iam_access_key.rb
 - lib/convection/model/template/resource/aws_iam_group.rb
 - lib/convection/model/template/resource/aws_iam_instance_profile.rb
@@ -170,6 +171,7 @@ files:
 - lib/convection/model/template/resource/aws_iam_user.rb
 - lib/convection/model/template/resource/aws_kms_key.rb
 - lib/convection/model/template/resource/aws_lambda_function.rb
+- lib/convection/model/template/resource/aws_lambda_permission.rb
 - lib/convection/model/template/resource/aws_logs_loggroup.rb
 - lib/convection/model/template/resource/aws_rds_db_instance.rb
 - lib/convection/model/template/resource/aws_rds_db_parameter_group.rb
@@ -200,6 +202,7 @@ files:
 - lib/convection/model/template/resource_property/aws_ec2_block_store_block_device.rb
 - lib/convection/model/template/resource_property/aws_ec2_mount_point.rb
 - lib/convection/model/template/resource_property/aws_ec2_network_interface.rb
+- lib/convection/model/template/resource_property/aws_events_rule_target.rb
 - lib/convection/model/template/resource_property/aws_lambda_function_code.rb
 - lib/convection/model/template/resource_property/aws_lambda_vpc_config.rb
 - lib/convection/version.rb
@@ -207,8 +210,10 @@ files:
 - test/convection/model/test_elasticache.rb
 - test/convection/model/test_lambdas.rb
 - test/convection/model/test_loggroups.rb
+- test/convection/model/test_permission.rb
 - test/convection/model/test_rds.rb
 - test/convection/model/test_template.rb
+- test/convection/model/test_trust.rb
 - test/convection/model/test_validation.rb
 - test/convection/model/test_vpc_endpoint.rb
 - test/test_helper.rb
@@ -241,8 +246,10 @@ test_files:
 - test/convection/model/test_elasticache.rb
 - test/convection/model/test_lambdas.rb
 - test/convection/model/test_loggroups.rb
+- test/convection/model/test_permission.rb
 - test/convection/model/test_rds.rb
 - test/convection/model/test_template.rb
+- test/convection/model/test_trust.rb
 - test/convection/model/test_validation.rb
 - test/convection/model/test_vpc_endpoint.rb
 - test/test_helper.rb