sfn-lambda 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 687938d6c0855b30342de6b52eb87a837043aabe
-  data.tar.gz: e38d4701d422e4a108a045b9fbeb5c2c8e439a98
+  metadata.gz: 34e8c66fc19d1b07f06a4a99dc65d7f4bc4e33a7
+  data.tar.gz: 27c8d94e336a916720f140a2a1ca353f46fbe5c4
 SHA512:
-  metadata.gz: 5c76cb6f390565b252cbd115de9073cf2033171617c754fd65c2f99e4dca2cd30ce76841cd5dae27f1c15643ff0a2b6e8d2bd014dae45705229b50d06f9325c9
-  data.tar.gz: 3135cd6699333754d1825d00ddc1633e4d702e118ae737e1b6dfbd89f75c42c392d157ee70883fe738b48d300c11833bf8bdb202abf785635da62a82a45886ed
+  metadata.gz: d3289f7ecbd543648780808f02e2cddd4bd5bdf87ee98e8d762a9b6fc7bd9d952975db608f975d003271673f52e99d2141632fa11ba9de6f1e23ba5be7cd84d5
+  data.tar.gz: 058abcd791ff17fc0759285ca68c981490cba18e223cec9899caf64400e5bba75f6af86899c2e1c62a7e6e85b6fd123c261c790f53ff58b4c7990c4aaa1e15b8

data/CHANGELOG.md

@@ -1,2 +1,5 @@
+# v0.1.2
+* Fix property namespaces, function/handler, and include role (#2)
+
 # v0.1.0
 * Initial release

data/README.md

@@ -37,6 +37,7 @@ Now enable the `sfn-lambda` callback in the `.sfn` configuration file:
 Configuration.new do
   ...
   callbacks do
+    require ['sfn-lambda']
     default ['lambda']
   end
   ...
@@ -112,7 +113,7 @@ Using the python example described within the lambda documentation:
 
 we can define our handler code:
 
-* `./lambda/python2.7/my_handler.py`
+* `./lambda/python2.7/my_function.py`
 
 ```python
 def my_handler(event, context):
@@ -129,7 +130,15 @@ the newly created file:
 
 ```ruby
 SparkleFormation.new(:lambda_test) do
-  lambda!(:my_handler)
+  lambda!(:my_function, :handler => :my_handler)
+end
+```
+
+If the handler argument is not specified the default value is 'handler'.
+
+```ruby
+SparkleFormation.new(:lambda_test) do
+  lambda!(:my_function)
 end
 ```
 
@@ -142,8 +151,9 @@ $ sfn print --file lambda_test
     "MyHandlerLambdaFunction": {
       "Type": "AWS::Lambda::Function",
       "Properties": {
-        "Handler": "python2.7",
-        "FunctionName": "my_handler",
+        "Handler": "index.my_handler",
+        "Runtime": "python2.7"
+        "FunctionName": "my_function",
         "ZipFile": "def my_handler(event, context):\n    message = 'Hello {} {}!'.format(event['first_name'], event['last_name'])\n    return {\n        'message' : message\n    }\n\n"
       }
     }
@@ -156,7 +166,7 @@ can be specified within the call:
 
 ```ruby
 SparkleFormation.new(:lambda_test) do
-  lambda!(:my_handler, :runtime => 'python2.7')
+  lambda!(:my_function, :handler => :my_handler, :runtime => 'python2.7')
 end
 ```
 
@@ -165,8 +175,8 @@ custom name can be added as well:
 
 ```ruby
 SparkleFormation.new(:lambda_test) do
-  lambda!(:my_handler, :first, :runtime => 'python2.7')
-  lambda!(:my_handler, :second, :runtime => 'python2.7')
+  lambda!(:my_function, :first, :handler => :my_handler, :runtime => 'python2.7')
+  lambda!(:my_function, :second, :handler => :my_handler, :runtime => 'python2.7')
 end
 ```
 

data/lib/sfn-lambda/inject.rb

@@ -10,8 +10,12 @@ class SparkleFormation
         end
         __t_stringish(fn_name)
         __t_stringish(fn_uniq_name) unless fn_uniq_name.is_a?(::NilClass)
+        fn_handler = 'handler'
         if(fn_opts)
           fn_runtime = fn_opts[:runtime] if fn_opts[:runtime]
+          fn_handler = fn_opts[:handler] if fn_opts[:handler]
+          fn_role    = fn_opts[:role] if fn_opts[:role]
+          fn_function_name = fn_opts[:function_name] if fn_opts[:function_name]
         end
         unless(fn_runtime.is_a?(::NilClass))
           __t_stringish(fn_runtime)
@@ -21,16 +25,19 @@ class SparkleFormation
           [fn_name, fn_uniq_name].compact.map(&:to_s).join('_'),
           :resource_name_suffix => :lambda_function
         )
-        new_fn.properties.handler lookup[:runtime]
-        new_fn.properties.function_name fn_name
+        new_fn.properties.handler fn_handler
+        new_fn.properties.runtime lookup[:runtime]
+        new_fn.properties.function_name fn_function_name || fn_name
         content = ::SfnLambda.control.format_content(lookup)
         if(content[:raw])
-          new_fn.properties.zip_file content[:raw]
+          new_fn.properties.code.zip_file content[:raw]
+          new_fn.properties.handler "index.#{fn_handler}"
+          new_fn.properties.role fn_role
         else
-          new_fn.properties.s3_bucket content[:bucket]
-          new_fn.properties.s3_key content[:key]
+          new_fn.properties.code.s3_bucket content[:bucket]
+          new_fn.properties.code.s3_key content[:key]
           if(content[:version])
-            new_fn.properties.s3_object_version content[:version]
+            new_fn.properties.code.s3_object_version content[:version]
           end
         end
         new_fn

data/lib/sfn-lambda/version.rb

@@ -1,3 +1,3 @@
 module SfnLambda
-  VERSION = Gem::Version.new('0.1.0')
+  VERSION = Gem::Version.new('0.1.2')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sfn-lambda
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-05 00:00:00.000000000 Z
+date: 2017-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sparkle_formation