cloudformation-tool 1.0.9 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b44f3ef0d04f6c9f0329d1e081a529ce1cfdd3e8b2da7c85be51b224957faae
-  data.tar.gz: d43a5b5968ae31fd7b3969a45a3c09814f91dcbcc6e39e9a6fb3b30444d9a031
+  metadata.gz: 3cabf54063c7c094f182862caac32e359c495e0a8d45bac807b0bef972cc090c
+  data.tar.gz: a46b8080f9d6cdd042d604b70cc189ea41b0a1cb2b77ba77055fa52635e4995c
 SHA512:
-  metadata.gz: 062c2685822c31422a64356af5b2e4197d3436401d94528c0cede97ab94774c565c83da36937fb532c2133fd3a67fa6cb5c7d248b7ad89a622a5f05794e6731c
-  data.tar.gz: 79c31fdf1bc03b52a0864ee4f9cfe325a2036800bae3cae2e473d8b67f7ad64373d2720c0849518c38e3403662dc7129a32312dbb5aecf22e0356770bcb28927
+  metadata.gz: b9d2d2334c8d8b242595523b7fb233b2bba9060b9ba68d8efbc1ee2516bcd5793752898682ce20a00dd7980c0f3b370bd4c82d39ef7c588ea35c2761a71af589
+  data.tar.gz: 57f3ec6288140dc0343b24074b670fb7a7fab1ae179418fc7f70cdb8a88e444c6e294ec919ee58a12f8cd1c67649cd20de987bc2d254e31313356cb630310e29

data/lib/cloud_formation_tool/cloud_formation.rb

@@ -81,6 +81,16 @@ module CloudFormationTool
         return data
       end
     end
+   
+    def embed_includes_future
+      (@data.delete(@data.keys.find{|k| k.start_with? 'Include'}) || []).each do |path|
+        case path
+        when Hash
+        when String
+          embed_included_path path
+        end
+      end
+    end
     
     def embed_includes
       (@data.delete(@data.keys.find{|k| k.start_with? 'Include'}) || []).each do |path|
@@ -169,7 +179,7 @@ module CloudFormationTool
               end
             when 'AWS::Lambda::Function'
               if key == 'Code'
-                LambdaCode.new(val, self).to_cloudformation
+                LambdaCode.new(val, self, data['Runtime']).to_cloudformation
               else
                 load_files(val, restype)
               end

data/lib/cloud_formation_tool/cloud_formation/lambda_code.rb

@@ -7,33 +7,62 @@ module CloudFormationTool
     class LambdaCode
       include Storable
       
-      def initialize(code, tpl)
+      def initialize(code, tpl, runtime = nil)
+        @tpl = tpl
+        @zipfile_safe = runtime.to_s.match(%r{^(nodejs|python)}) != nil
         @data = code
         @data['Url'] = @data.delete 'URL' if @data.key? 'URL' # normalize to CF convention if seeing old key
         if @data.key? 'Url'
-          debug "Trying Lambda code from #{@data['Url']}"
-          @data['Url'] = url = tpl.resolveVal(@data['Url'])
-          return unless url.is_a? String
-          log "Downloading Lambda code from #{url}"
-          if already_in_cache(url)
-            debug "Reusing remote cached object instead of downloading"
-          else
-            res = fetch_from_url(url)
-            @s3_url = URI(upload(make_filename(url.split('.').last), res.body, mime_type: res['content-type'], gzip: false))
-            log "uploaded Lambda function to #{@s3_url}"
-          end
+          handl_url
         elsif @data.key? 'Path'
-          @data['Path'] = path = tpl.resolveVal(@data['Path'])
-          return unless path.is_a? String
-          debug "Reading Lambda code from #{path}"
-          path = if path.start_with? "/" then path else "#{tpl.basedir}/#{path}" end
-          if File.directory?(path)
-            @s3_url = URI(upload(make_filename('zip'), zip_path(path), mime_type: 'application/zip', gzip: false))
-            log "uploaded Lambda function to #{@s3_url}"
-          else # Convert files to ZipFile
-            @data.delete 'Path'
-            @data['ZipFile'] = File.read(path)
+          handle_path
+        end
+      end
+      
+      def handle_url
+        debug "Trying Lambda code from #{@data['Url']}"
+        @data['Url'] = url = @tpl.resolveVal(@data['Url'])
+        return unless url.is_a? String
+        log "Downloading Lambda code from #{url}"
+        if already_in_cache(url)
+          debug "Reusing remote cached object instead of downloading"
+        else
+          res = fetch_from_url(url)
+          @s3_url = URI(upload(make_filename(url.split('.').last), res.body, mime_type: res['content-type'], gzip: false))
+          log "uploaded Lambda function to #{@s3_url}"
+        end
+      end
+      
+      def handle_path
+        @data['Path'] = path = @tpl.resolveVal(@data['Path'])
+        return unless path.is_a? String
+        debug "Reading Lambda code from #{path}"
+        path = if path.start_with? "/" then path else "#{@tpl.basedir}/#{path}" end
+        if File.directory?(path)
+          @s3_url = URI(upload(make_filename('zip'), zip_path(path), mime_type: 'application/zip', gzip: false))
+          log "uploaded Lambda function to #{@s3_url}"
+        else
+          handle_file path
+        end
+      end
+      
+      def handle_file(path)
+        @data.delete 'Path'
+        contents = File.read(path)
+        if contents.size <= 4096 and @zipfile_safe # Convert files to ZipFile
+          @data['ZipFile'] = contents
+        else # upload and hope for the best
+          ext = path.split('.').last
+          ctype = case ext
+          when 'jar'
+            'application/java-archive'
+          when 'zip'
+            'application/zip'
+          else
+            'application/octet-stream'
           end
+          @s3_url = URI(upload(make_filename(ext), contents, mime_type: ctype, gzip: false))
+          log "uploaded Lambda function to #{@s3_url}"
         end
       end
       

data/lib/cloud_formation_tool/version.rb

@@ -1,3 +1,3 @@
 module CloudFormationTool
-  VERSION = '1.0.9'
+  VERSION = '1.1.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudformation-tool
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.1.0
 platform: ruby
 authors:
 - Oded Arbel
@@ -177,7 +177,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: A pre-compiler tool for CloudFormation YAML templates