cfhighlander 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f21fd5ed213981ccad9e067ac5ddef3d514bf7b2068502b2af1a7a95b9884718
-  data.tar.gz: 9828daf82341fe563f88828ef00346395575ef29fd405c53093caf1c0cb02c14
+  metadata.gz: 152c69286789dce8eda5ae3cee32f40be1db507e3bafee8daf3bf70283425ea9
+  data.tar.gz: 8bd56c2f7bb9ec443de17abc8076df3e5890373139fd211679e2dc2d0f25d5dc
 SHA512:
-  metadata.gz: 7bec060a285e620fab51464acd4c3dc8c4cc0376867abe9711affead8f2b02c13038c3e305e4e6b1ffa7a690d62e8450c3c04d1a125d9b7e8753c38a9f8537de
-  data.tar.gz: d1e47a92493c6c2c72a92a342025ea666dbebfd23fc49b9335c532a12fd96dadcf12e9f08dfd61a14417213db52ea7478e68f554a88363869d0a31e37866d4ee
+  metadata.gz: 52068fd9dfb6aa59f506afc83f50298eccb6fd23a4be68a1862ae53a1515bf0c28abd881b5fb38aaea229eb5447bf12bf9159ab3763e4eb2eb53e3885c36cd50
+  data.tar.gz: 34839cbc644eb091a0b1f8bda5f236ba0f388393852c62c6e20a9549e904b91ace3ba6b5c9a0ec6b019f16d55d0085d5612051a2c7d1195d08129394824d16aa

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.3.1
+  version: 0.3.2
 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