convection 0.2.16 → 0.2.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f32f84317e07800f0022642fd1eae90ad88df71d
-  data.tar.gz: b2db570b8e3a24f2449c1c3c4b42f15f5e0aaf06
+  metadata.gz: 1526744195f5e97a7ee8c08588b4f5280a2d5842
+  data.tar.gz: 29eecb89170267324e2597cd3186747dd307fa78
 SHA512:
-  metadata.gz: 8f699ed14a2c99f6c418a7f0e310b836443332c273d95ec6b0133b05b7ae85970a0ba0ae1b660b29ae931f41bb913d9d45eb766997d04062294b9fc5ee11e2e9
-  data.tar.gz: 191c84293f1bdc3c39cf768613933b57dad072b354f0c83ff1034a2e0f6ee61e14da5ae2a559a325b6364bbd50de169e345c99659d2738707c61e8877d51faf5
+  metadata.gz: c227b72a4a70ca8f6428d154396e3b26490341c10f7f923a787d40a18c9b15515f1047395c30ddfd4c48fc58283329761a40d95564c8d360e208fb2d2ec29755
+  data.tar.gz: 32ad69eb4049ddecf9dfbf3ff4972f64ea7e10250c889fe93fd4b5178a752c8582286915b1473f920163f519107b721fc1f86544c3b98a0c780a7f7d981e1d51

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

@@ -0,0 +1,38 @@
+require_relative '../resource'
+
+module Convection
+  module Model
+    class Template
+      class Resource
+        ##
+        # AWS::Lambda::Function
+        ##
+        class Lambda < Resource
+          type 'AWS::Lambda::Function'
+          property :function_code, 'Code'
+          property :description, 'Description'
+          property :handler, 'Handler'
+          property :memory_size, 'MemorySize'
+          property :runtime, 'Runtime', :equal_to => ['nodejs', 'nodejs4.3', 'java8', 'python2.7']
+          property :timeout, 'Timeout'
+          property :role, 'Role'
+          property :vpc_cfg, 'VpcConfig'
+
+          # Add code block
+          def code(&block)
+            function_code = ResourceProperty::LambdaFunctionCode.new(self)
+            function_code.instance_exec(&block) if block
+            properties['Code'].set(function_code)
+          end
+
+          # Add vpc_config block
+          def vpc_config(&block)
+            vpc_cfg = ResourceProperty::LambdaVpcConfig.new(self)
+            vpc_cfg.instance_exec(&block) if block
+            properties['VpcConfig'].set(vpc_cfg)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,15 @@
+require_relative '../resource_property'
+
+module Convection
+  module Model
+    class Template
+      class ResourceProperty
+        # Represents an {http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-function-code.html}
+        class LambdaFunctionCode < ResourceProperty
+          property :s3_bucket, 'S3Bucket'
+          property :s3_key, 'S3Key'
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,15 @@
+require_relative '../resource_property'
+
+module Convection
+  module Model
+    class Template
+      class ResourceProperty
+        # Represents an {http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-function-vpcconfig.html}
+        class LambdaVpcConfig < ResourceProperty
+          property :security_groups, 'SecurityGroupIds', :type => :list
+          property :subnets, 'SubnetIds', :type => :list
+        end
+      end
+    end
+  end
+end

data/test/convection/model/test_lambdas.rb

@@ -0,0 +1,53 @@
+require 'test_helper'
+require 'json'
+require 'pp'
+
+class TestLambdas < Minitest::Test
+  def setup
+    @template = ::Convection.template do
+      description 'Conditions Test Template'
+
+      lambda_function 'TestLambda' do
+        description 'Test description'
+        handler 'index.handler'
+        runtime 'nodejs'
+        role 'arn:aws:x:y:z'
+
+        code do
+          s3_bucket 'testbucket'
+          s3_key 'testkey'
+        end
+
+        vpc_config do
+          security_groups %w(group1 group2)
+          subnets %w(subnet1a subnet1b)
+        end
+      end
+    end
+  end
+
+  def from_json
+    JSON.parse(@template.to_json)
+  end
+
+  def test_lambda
+    json = from_json['Resources']['TestLambda']['Properties']
+
+    code = json['Code']
+    assert_equal 'testbucket', code['S3Bucket']
+    assert_equal 'testkey', code['S3Key']
+
+    assert_equal 'arn:aws:x:y:z', json['Role']
+
+    vpc = json['VpcConfig']
+    refute vpc.nil?, 'VpcConfig not present in generated template'
+
+    secgroups = vpc['SecurityGroupIds']
+    assert secgroups.is_a?(Array), 'SecurityGroupIds is not an array'
+    assert_equal 2, secgroups.size
+
+    subnets = vpc['SubnetIds']
+    assert subnets.is_a?(Array), 'SubnetIds is not an array'
+    assert_equal 2, subnets.size
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: convection
 version: !ruby/object:Gem::Version
-  version: 0.2.16
+  version: 0.2.17
 platform: ruby
 authors:
 - John Manero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-14 00:00:00.000000000 Z
+date: 2016-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -168,6 +168,7 @@ files:
 - lib/convection/model/template/resource/aws_iam_role.rb
 - 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_logs_loggroup.rb
 - lib/convection/model/template/resource/aws_rds_db_instance.rb
 - lib/convection/model/template/resource/aws_rds_db_parameter_group.rb
@@ -198,9 +199,12 @@ 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_lambda_function_code.rb
+- lib/convection/model/template/resource_property/aws_lambda_vpc_config.rb
 - lib/convection/version.rb
 - test/convection/model/test_conditions.rb
 - test/convection/model/test_elasticache.rb
+- test/convection/model/test_lambdas.rb
 - test/convection/model/test_loggroups.rb
 - test/convection/model/test_rds.rb
 - test/convection/model/test_template.rb
@@ -233,6 +237,7 @@ summary: A fully generic, modular DSL for AWS CloudFormation
 test_files:
 - test/convection/model/test_conditions.rb
 - test/convection/model/test_elasticache.rb
+- test/convection/model/test_lambdas.rb
 - test/convection/model/test_loggroups.rb
 - test/convection/model/test_rds.rb
 - test/convection/model/test_template.rb