cloudformation-tool 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef4e953cd8194f197b68c1e110dae6f3a81f5c4e2730fe63950d5ac1392f1b02
-  data.tar.gz: 9d5ea95468d689707ec79534281ea14ae51521d3491787e523a1ef0c11c295a8
+  metadata.gz: 83b8efc5704070ab9a788b2a90abd76c5cddf51e001a809b8eb4232404d6a4a1
+  data.tar.gz: 09e63883d8159f6331d06f8b5b4af28888f755134f55972272b53df0bd7fe3e6
 SHA512:
-  metadata.gz: d43ffe6a9b74696f7a96c36a4f25bcc51322bd61f6d72000133ba6ef13720bd9412132c693597d40018b9bfd771038e576a1739e3c0b2e1cf895ecbdfaaaeee1
-  data.tar.gz: 1b6226952862d335bfa9970b8c394e9201548284af96363a39c54c00aac1a6ba946207c2076676c983fbe17c07fef566c23047aec842cc4dd71db6a3f4b7c31d
+  metadata.gz: bbf45c2d3e1e03db1ae3e686e5432175547e00dc92db30ed12bf4bf03c66c2d8be8832cb1e1244a67025379a3918162962a071c67431468ea83795669c7eac58
+  data.tar.gz: 4e6480feac36232936ef892541aa0cd6e528547dab38721b0acb290db1360ee1ebd8f9cadd45f6c02cac43f3701d0298fc45c744175a1dde8ab2ae42bf1ab349

data/lib/cloud_formation_tool/cloud_formation/lambda_code.rb

@@ -15,7 +15,9 @@ module CloudFormationTool
           @data['Url'] = url = tpl.resolveVal(@data['Url'])
           return unless url.is_a? String
           log "Downloading Lambda code from #{url}"
-          unless already_in_cache(url)
+          if already_in_cache(url)
+            log "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}"
@@ -51,27 +53,35 @@ module CloudFormationTool
         end
       end
       
-      def already_in_cache(uri_str, limit = 10)
-        raise ArgumentError, 'too many HTTP redirects' if limit == 0
+      def already_in_cache(uri_str)
+        limit = 10
         url = URI(uri_str)
-        begin
-          Net::HTTP.start(url.host, url.port) do |http|
-            request = Net::HTTP::Get.new(url)
-            http.request(request) do |response|
-              # handle redirects like Github likes to do
-              case response
-                when Net::HTTPSuccess then
-                  check_cached(response['ETag'])
-                when Net::HTTPRedirection then
-                  location = response['location']
-                  log "redirected to #{location}"
-                  already_in_cache(location, limit - 1)
-                else
-                  raise ArgumentError, "Error getting response: #{response}"
+        until url.nil?
+          begin
+            raise ArgumentError, 'too many HTTP redirects' if limit == 0
+            Net::HTTP.start(url.host, url.port, use_ssl: true) do |http|
+              request = Net::HTTP::Get.new(url)
+              http.request(request) do |response|
+                # handle redirects like Github likes to do
+                case response
+                  when Net::HTTPSuccess then
+                    url = nil
+                    http.finish if check_cached(response['ETag'])
+                  when Net::HTTPRedirection then
+                    location = response['location']
+                    log "Cache check redirected to #{location}"
+                    limit = limit - 1
+                    response.body
+                    url = URI(location)
+                  else
+                    log "arg err"
+                    raise ArgumentError, "Error getting response: #{response}"
+                end
               end
             end
+          rescue IOError => e
+            retry unless url.nil?
           end
-        rescue EOFError
         end
         !@s3_url.nil?
       end
@@ -79,9 +89,11 @@ module CloudFormationTool
       def check_cached(etag)
         etag.gsub!(/"/,'') unless etag.nil?
         o = cached_object(etag)
-        unless o.nil?
-          log 'reusing cached object'
-          @s3_url = o.public_url
+        if o.nil?
+          false
+        else
+          @s3_url = URI(o.public_url)
+          true
         end
       end
       

data/lib/cloud_formation_tool/version.rb

@@ -1,3 +1,3 @@
 module CloudFormationTool
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudformation-tool
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Oded Arbel