cfhighlander 0.4.0.alpha.1531791475 → 0.4.0.alpha.1531985380

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f23bce250ee476c3abf51e8fb906fad9c8bc6879c44407a60c3743e74958f861
-  data.tar.gz: 697281f867a0551f8275fd3f679d9b141d988cda2f35b5411df05ad0f8a1e035
+  metadata.gz: 9b1b127f5a658380bc3c38b939b0812378c87cc871ff4bba6842173dcf7bb977
+  data.tar.gz: 64d4ecf0310154bf373ee27b0b702208c566710b02e9a7c30dbdcce5bb56927d
 SHA512:
-  metadata.gz: 74aaa9b9514d93e33574cd2e2c1f1ca7bcbf334e0c7164916f8c73120f84c1fc5df86492b1b48c583cd94406415985aaae2d808effd6b62415284510467e52f8
-  data.tar.gz: 77f9f2780801de2f721c9699d9aa94d6d1d39612ebda33ba5dfa876c3459e778d83f866196ce133997733b2d173812630a8dec93c474de58867b9cbae4b0c9dd
+  metadata.gz: d7116eb1edd2fcf36279df045c919e67cd79637ad6d54b82c398092e95516d6dc74e2fffa5b96c587e45724351ffbdd9ca737c0eb736246ab9cea0d30f084f4b
+  data.tar.gz: b288e065aa468fbe04861f06b4a354af8ead3a8c2581079cd74bcff6a60e686599ae3c54f77f0d6317e4cf792766c19a91f968bbab8eb5a480b781918baa9306

data/lib/cfhighlander.compiler.rb

@@ -248,78 +248,93 @@ module Cfhighlander
           # download file if code remote archive
           puts "Packaging AWS Lambda function #{name}...\n"
           puts "Destination archive is #{full_destination_path}"
-          if lambda_config['code'].include? 'http'
-            md5 = Digest::MD5.new
-            md5.update lambda_config['code']
-            hash = md5.hexdigest
-            cached_location = "#{@workdir}/.cache/lambdas/#{hash}"
-            if cached_downloads.key? lambda_config['code']
-              puts "Using already downloaded archive #{lambda_config['code']}"
-              FileUtils.copy(cached_downloads[lambda_config['code']], full_destination_path)
-            elsif File.file? cached_location
-              puts "Using cached download - '#{cached_location}'"
-              FileUtils.copy(cached_location, full_destination_path)
-            else
-              puts "Downloading file #{lambda_config['code']} ..."
+
+          md5 = Digest::MD5.new
+          md5.update lambda_config['code']
+          hash = md5.hexdigest
+          cached_location = "#{@workdir}/.cache/lambdas/#{hash}"
+          if cached_downloads.key? lambda_config['code']
+            puts "Using already downloaded archive #{lambda_config['code']}"
+            FileUtils.copy(cached_downloads[lambda_config['code']], full_destination_path)
+          elsif File.file? cached_location
+            puts "Using cached download - '#{cached_location}'"
+            FileUtils.copy(cached_location, full_destination_path)
+          else
+            if lambda_config['code'].include? 'http'
+              puts "INFO Downloading lambda #{name} source from #{lambda_config['code']}"
               download = open(lambda_config['code'])
               IO.copy_stream(download, "#{out_folder}/src.zip")
               FileUtils.mkdir_p('.cache/lambdas')
               FileUtils.copy("#{out_folder}/src.zip", cached_location)
               FileUtils.copy("#{out_folder}/src.zip", full_destination_path)
-              puts "Download complete, caching in #{cached_location}"
+              puts "INFO lambda #{name} source cached to #{cached_location}"
               cached_downloads[lambda_config['code']] = cached_location
-            end
-          else
-            # zip local 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_dir = full_path if Pathname.new(full_path).directory?
-
-            # executing package command can generate files. We DO NOT want this file in source directory,
-            # but rather in intermediate directory
-            tmp_source_dir = "#{@workdir}/out/lambdas/tmp/#{name}"
-            FileUtils.rmtree(File.dirname(tmp_source_dir)) if File.exist? tmp_source_dir
-            FileUtils.mkpath(File.dirname(tmp_source_dir))
-            FileUtils.copy_entry(lambda_source_dir, tmp_source_dir)
-            lambda_source_dir = tmp_source_dir
-
-            # Lambda function source code allows pre-processing (e.g. install code dependencies)
-            unless lambda_config['package_cmd'].nil?
-              puts "Following code will be executed to generate lambda function #{name}:\n\n#{lambda_config['package_cmd']}\n\n"
-
-              if @confirm_code_execution
-                exit -7 unless HighLine.agree('Proceed (y/n)?')
+            elsif lambda_config['code'].include? 's3://'
+              parts = lambda_config['code'].split('/')
+              if parts.size < 4
+                STDERR.puts "ERROR: Lambda function source code from s3 should be in s3://bucket/path format"
+                exit -8
+              end
+              bucket = parts[2]
+              key = parts.drop(3).join('/')
+              s3 = Aws::S3::Client.new({ region: s3_bucket_region(bucket) })
+              puts "INFO Downloading lambda #{name} source from #{lambda_config['code']}"
+              s3.get_object({ bucket: bucket, key: key, response_target: cached_location })
+              puts "INFO lambda #{name} source cached to #{cached_location}"
+              FileUtils.copy(cached_location, full_destination_path)
+              cached_downloads[lambda_config['code']] = cached_location
+            else
+              # zip local 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
 
-              package_cmd = "cd #{lambda_source_dir} && #{lambda_config['package_cmd']}"
-              puts 'Processing package command...'
-              package_result = system(package_cmd)
-              unless package_result
-                puts "Error packaging lambda function, following command failed\n\n#{package_cmd}\n\n"
-                exit -4
+              # 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_dir = full_path if Pathname.new(full_path).directory?
+
+              # executing package command can generate files. We DO NOT want this file in source directory,
+              # but rather in intermediate directory
+              tmp_source_dir = "#{@workdir}/out/lambdas/tmp/#{name}"
+              FileUtils.rmtree(File.dirname(tmp_source_dir)) if File.exist? tmp_source_dir
+              FileUtils.mkpath(File.dirname(tmp_source_dir))
+              FileUtils.copy_entry(lambda_source_dir, tmp_source_dir)
+              lambda_source_dir = tmp_source_dir
+
+              # Lambda function source code allows pre-processing (e.g. install code dependencies)
+              unless lambda_config['package_cmd'].nil?
+                puts "Following code will be executed to generate lambda function #{name}:\n\n#{lambda_config['package_cmd']}\n\n"
+
+                if @confirm_code_execution
+                  exit -7 unless HighLine.agree('Proceed (y/n)?')
+                end
+
+                package_cmd = "cd #{lambda_source_dir} && #{lambda_config['package_cmd']}"
+                puts 'Processing package command...'
+                package_result = system(package_cmd)
+                unless package_result
+                  puts "Error packaging lambda function, following command failed\n\n#{package_cmd}\n\n"
+                  exit -4
+                end
               end
-            end
-            File.delete full_destination_path if File.exist? full_destination_path
-            zip_generator = Cfhighlander::Util::ZipFileGenerator.new(lambda_source_dir, full_destination_path)
-            zip_generator.write
+              File.delete full_destination_path if File.exist? full_destination_path
+              zip_generator = Cfhighlander::Util::ZipFileGenerator.new(lambda_source_dir, full_destination_path)
+              zip_generator.write
 
+            end
           end
           # add version information to avoid same package ever deployed 2 times
           Zip::File.open(full_destination_path) do |zipfile|

metadata

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