cfhighlander 0.4.0.alpha.1531716185 → 0.4.0.alpha.1531788388

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 95035851d92d8fcf3dde0d86b107498f9fdedd264e7e4a2f5a0c0dda39950886
-  data.tar.gz: 139556f3126d5e2597595e99b44fdb1dabd6d9effc9c677d3bdafa8dfffbdb44
+  metadata.gz: e8e8316247f2be44ddfde98f0b9351e40f70f0de71c524dbb117ee9415f52ea1
+  data.tar.gz: 0ded6c180e4c9c4d2d0c13d0cd01a7846d9689d47475707cfcb25bc1e9e733ee
 SHA512:
-  metadata.gz: abe71d4fff57e2741ef021260d77a6468c155084152ae9656196ec02808e4fb109cb0b8fa141b6c2e6df1f8903da80bea4ac32abb1d0b03cf4333cb182b3c37c
-  data.tar.gz: 0aaf15811dc21e3799fd505b13c4aa6c47f99b0bdc29807c939317f9690402a28f66398537e7a8517239e9b34b18da4e9396308fbf139408c7f2594ff88a2f7c
+  metadata.gz: d4de59d1674875f67e77f8fc827c70e7d08d2716a2b279595184c65ce4b455a7b6b7412734b7d7dba1551f655c5985945948c83a6cec1756ea014684c8bdeb21
+  data.tar.gz: aae4733933c3f855a0dde064805bc17cd490406058b67f82a93d789bcc9178a594bc034dcfeae414e971e1098c1c53f57a4c383fcc23ed99cc5611fdd98607c6

data/cfndsl_ext/lambda_helper.rb

@@ -61,6 +61,9 @@ def render_lambda_functions(cfndsl, lambdas, lambda_metadata, distribution)
           FunctionName(Ref(name))
           Action('lambda:InvokeFunction')
           Principal(source['principal'])
+          if source.key? 'source_arn'
+            SourceArn source['source_arn']
+          end
         end
         i += 1
       end

data/lib/cfhighlander.compiler.rb

@@ -271,14 +271,25 @@ module Cfhighlander
             end
           else
             # zip local code
-            zip_options = ''
-            full_path = "#{@component_dir}/lambdas/#{lambda_config['code']}"
+            component = @component
+            component_dir = component.template.template_location
+            full_path = "#{component_dir}/lambdas/#{lambda_config['code']}"
+
+            until (File.exist? full_path or component_dir.nil?)
+              parent_exists = (not component.extended_component.nil?)
+              component = component.extended_component if parent_exists
+              component_dir = component.template.template_location if parent_exists
+              full_path = "#{component_dir}/lambdas/#{lambda_config['code']}" if parent_exists
+              component_dir = nil unless parent_exists
+            end
+            if component_dir.nil?
+              STDERR.puts "ERROR: Could not find source code directory for lambda function #{name} in component #{@component.name}"
+              exit -9
+            end
 
             # lambda source can be either path to file or directory within that file
             # optionally, lambda source code
             lambda_source_dir = File.dirname(full_path)
-            lambda_source_file = File.basename(full_path)
-            lambda_source_file = '.' if Pathname.new(full_path).directory?
             lambda_source_dir = full_path if Pathname.new(full_path).directory?
 
             # executing package command can generate files. We DO NOT want this file in source directory,

data/lib/cfhighlander.model.component.rb

@@ -174,7 +174,7 @@ module Cfhighlander
         if not @parent_template.nil?
           extended_component = @factory.loadComponentFromTemplate(@parent_template)
           extended_component.is_parent_component = true
-          extended_component.load()
+          extended_component.load(@config)
 
           @config = extended_component.config.extend(@config)
           @mappings = extended_component.mappings.extend(@mappings)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cfhighlander
 version: !ruby/object:Gem::Version
-  version: 0.4.0.alpha.1531716185
+  version: 0.4.0.alpha.1531788388
 platform: ruby
 authors:
 - Nikola Tosic
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-16 00:00:00.000000000 Z
+date: 2018-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline