cloudformation-tool 0.6.5 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5bce6870ac6673790b3c415e13943639a5af5c4f
-  data.tar.gz: cafabf00b0990298d934a0effe4a42bcc6f57ec9
+  metadata.gz: da07cd386a792f6dee84862962bd5f3bcd9e243a
+  data.tar.gz: d46054b28aa9bbfba9e9f88d22bd93a6b2caeb06
 SHA512:
-  metadata.gz: f95dd5e742825fa0eba2b602e5f84c49a1a80d7018aa22d8515c6e15133eea16db0c00a5cceae6d32eabd081806dc66d0019aff00420e77ae60bcc59559d0808
-  data.tar.gz: 74838f921a39b438ea578c1ce61394604e4643c36ad0a894e3e7b3ac3dc6a847913d326c451910e0468e67ebc133186635a5c9a10ac885ec4a8a071162dc0172
+  metadata.gz: 817e208ec95ef44733bac7ec1d5967d9df51ceadde2b9f8317a4720d759fc4d0dced12e7e133816b2c8896664b7b8f1bf2ddbceb59c60e00dc5f92169c55ab28
+  data.tar.gz: 560890e77e1060c1fa234c633699566ee2885e143f833abd4409d89ea6216352b4f33f6dfae9333b74eb94dfdf8d9f131b9d0e052f33d957780b2fb7343963e3

data/README.md

@@ -188,11 +188,12 @@ write_directory:
 ### Loading Lambda code
 
 When specifying the `Code` property of a `AWS::Lambda::Function` resource, instead of
-specifying the S3 bucket and object key, the field `URL` may be used to specify an HTTP URL
-from which the code is to be uploaded to AWS Lambda. The tool will download the code file from
-the specified URL, upload it to S3 and specify the correct S3 location for CloudFormation.
-
-In the future we plan to add support for specifying `File` to upload from a local file.
+specifying the S3 bucket and object key, either of the following fields may be used:
+  - The field `URL` may be used to specify an HTTP URL	from which the code is to be uploaded to AWS Lambda. The tool 
+    will download the code file from the specified URL, upload it to S3 and specify the correct S3 location for 
+    CloudFormation.
+  - The field `Path` may be used to specify a local file or directory containing the code to be uploaded. 
+    If the path specifies a directory, it will be compressed as a Zip file. 
 
 #### Example:
 

data/lib/cloud_formation_tool/cloud_formation.rb

@@ -163,11 +163,18 @@ module CloudFormationTool
             # Support Lambda Code from arbitrary URLs
             url = resolveVal(val["URL"])
             if url.is_a? String # resolving works
-              LambdaCode.new(url).to_cloudformation
+              LambdaCode.new(url: url).to_cloudformation
             else # resolving didn't work - we probably don't have parameters
               # push it upstream and hope a parent template can resolve it
               val
             end
+          elsif (key == "Code") and (val["Path"])
+            path = resolveVal(val["Path"])
+            if path.is_a? String # resolving works
+              LambdaCode.new(path: "#{@basedir}/#{path}").to_cloudformation
+            else # resolving didn't work - we probably don't have parameters
+              val
+            end
           else 
             load_files(val)
           end

data/lib/cloud_formation_tool/cloud_formation/lambda_code.rb

@@ -1,4 +1,5 @@
 require 'net/http'
+require 'zip'
 
 module CloudFormationTool
   class CloudFormation
@@ -6,15 +7,40 @@ module CloudFormationTool
     class LambdaCode
       include Storable
       
-      def initialize(url)
-        log "Downloading Lambda code from #{url}"
-        res = fetch(url)
-        
-        @s3_url = URI(upload(make_filename(url.split('.').last), res.body, mime_type: res['content-type'], gzip: false))
+      def initialize(url: nil, path: nil)
+        log "Downloading Lambda code from #{url}#{path}"
+        case url
+          when nil
+            @s3_url = if File.directory?(path)
+                        URI(upload(make_filename(path.split('/').last), fetch_from_folder(path), mime_type: 'application/zip',  gzip: false))
+                      else
+                        URI(upload(make_filename(path.split('/').last), File.open(path, "rb").read, gzip: false))
+                      end
+          else
+            res = fetch_from_url(url)
+            @s3_url = URI(upload(make_filename(url.split('.').last), res.body, mime_type: res['content-type'], gzip: false))
+          end
         log "uploaded Lambda function to #{@s3_url}"
       end
       
-      def fetch(uri_str, limit = 10)
+      def fetch_from_folder(path_str)
+        begin
+          temp_file = Tempfile.new("#{path_str.split('/').last}.zip")
+          Zip::ZipOutputStream.open(temp_file) { |zos| }
+          Zip::ZipFile.open(temp_file.path, Zip::ZipFile::CREATE) do |zipfile|
+            Dir[File.join(path_str, '*')].each do |file|
+              zipfile.add(file.sub("#{path_str}/", ''), file)
+            end
+          end
+          zip_data = File.read(temp_file.path)
+        ensure
+          temp_file.close
+          temp_file.unlink
+        end
+        zip_data
+      end
+      
+      def fetch_from_url(uri_str, limit = 10)
         raise ArgumentError, 'too many HTTP redirects' if limit == 0
         response = Net::HTTP.get_response(URI(uri_str))
         case response

data/lib/cloud_formation_tool/version.rb

@@ -1,3 +1,3 @@
 module CloudFormationTool
-  VERSION = '0.6.5'
+  VERSION = '0.7.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudformation-tool
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.7.0
 platform: ruby
 authors:
 - Oded Arbel
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
+- !ruby/object:Gem::Dependency
+  name: zip
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
 description: 
 email: oded.arbel@greenfieldtech.net
 executables:
@@ -103,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: A pre-compiler tool for CloudFormation YAML templates