fog-aws 3.5.0 → 3.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73a9d19f946bb407c513b64ef5faf8cc7102ed783a1a05c392b4f43766b99f6b
-  data.tar.gz: ba260726e0bd0b767ca080c3f6856363af18ea55b50a5e455d6696d3bf1d277b
+  metadata.gz: 1e5ec1bf418676b65d208530359ea42646043759948957785d93f49766803490
+  data.tar.gz: d01633914ad453baeeb3b5da1eaa21880276f4a534a3dd00d28c20cd0c9c1b4f
 SHA512:
-  metadata.gz: d525b506e1c9735eea0abeffac0f895c04723a27d6f077d3f0f8cbf613c52f08b1c1888e55cd4b91d2a37fa969bd0ab7061504ce7295c16de48e63b9edc43290
-  data.tar.gz: af7d2744fe5af2fb1ffc9814409e6c6e960cb0902d367454f7dd0e96979fb10278aa881dfc628808cb92445558802f3b9d002d028aed14d40a5be1eab5881fa5
+  metadata.gz: a1bf1567ddbcaff60e4cf8041586807f055fc28a1d010a373d7038fa1eb83ab84feb42e2595ebeef5b8508fa61ea6a76e9ad22592d0be0ba865b3908ab8633b8
+  data.tar.gz: 145c2544d2a240f66dd7e85385509812e12b475fccbbb33563321db519584ed18eb35bb9509ddaef2a397ac545578d5f9ebe6202cb4c19fdaa0122cb5267a351

data/CHANGELOG.md

@@ -1,5 +1,28 @@
 # Change Log
 
+## [Unreleased](https://github.com/fog/fog-aws/tree/HEAD)
+
+[Full Changelog](https://github.com/fog/fog-aws/compare/v3.5.0...HEAD)
+
+**Merged pull requests:**
+
+- Fixed issue with InvocationType header for AWS Lambda [\#524](https://github.com/fog/fog-aws/pull/524) ([GarrisonD](https://github.com/GarrisonD))
+- Add support for generating tree hash tests by adding unaligned parts. [\#521](https://github.com/fog/fog-aws/pull/521) ([hkmaly](https://github.com/hkmaly))
+
+## [v3.5.0](https://github.com/fog/fog-aws/tree/v3.5.0) (2019-04-25)
+[Full Changelog](https://github.com/fog/fog-aws/compare/v3.4.0...v3.5.0)
+
+**Closed issues:**
+
+- Missing AWS region: EU \(Stockholm\) eu-north-1 [\#514](https://github.com/fog/fog-aws/issues/514)
+- Support for AWS fargate [\#510](https://github.com/fog/fog-aws/issues/510)
+
+**Merged pull requests:**
+
+- Add AWS Stockholm region [\#515](https://github.com/fog/fog-aws/pull/515) ([fred-secludit](https://github.com/fred-secludit))
+- Enhance/handle ELBv2 api version [\#512](https://github.com/fog/fog-aws/pull/512) ([KevinLoiseau](https://github.com/KevinLoiseau))
+- Enhance/add attribute db subnet group for db instance [\#511](https://github.com/fog/fog-aws/pull/511) ([KevinLoiseau](https://github.com/KevinLoiseau))
+
 ## [v3.4.0](https://github.com/fog/fog-aws/tree/v3.4.0) (2019-03-11)
 [Full Changelog](https://github.com/fog/fog-aws/compare/v3.3.0...v3.4.0)
 
@@ -184,7 +207,6 @@
 - Fog::AWS::IAM::Error: InvalidAction =\> Could not find operation "ReplaceIamInstanceProfileAssociation" for version 2010-05-08 [\#368](https://github.com/fog/fog-aws/issues/368)
 - Multipart upload fails on empty files [\#364](https://github.com/fog/fog-aws/issues/364)
 - The action `ModifyVolume` is not valid for this web service. [\#363](https://github.com/fog/fog-aws/issues/363)
-- Tag instances upon creation of new instance [\#359](https://github.com/fog/fog-aws/issues/359)
 - Cache/read local amazon data [\#354](https://github.com/fog/fog-aws/issues/354)
 
 **Merged pull requests:**
@@ -783,4 +805,4 @@
 ## [fog-brightbox_v0.0.1](https://github.com/fog/fog-aws/tree/fog-brightbox_v0.0.1) (2014-02-19)
 
 
-\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

data/lib/fog/aws/compute.rb

@@ -454,7 +454,7 @@ module Fog
 
         def tagged_resources(resources)
           Array(resources).map do |resource_id|
-            if match = resource_id.match(/^(\w+)-[a-z0-9]{8}/i)
+            if match = resource_id.match(/^(\w+)-[a-z0-9]{8,17}/i)
               id = match.captures.first
             else
               raise(Fog::Service::NotFound.new("Unknown resource id #{resource_id}"))

data/lib/fog/aws/glacier.rb

@@ -39,52 +39,114 @@ module Fog
           new.add_part(body)
         end
 
-        def reduce_digests(digests)
-          while digests.length > 1
-            digests = digests.each_slice(2).map do |pair|
-              if pair.length == 2
-                OpenSSL::Digest::SHA256.digest(pair[0]+pair[1])
-              else
-                pair.first
-              end
+        def initialize
+          @last_chunk_digest = nil	# Digest OBJECT for last chunk (Digest::SHA256)
+          @last_chunk_digest_temp = nil	# Digest VALUE for last chunk
+          @last_chunk_length = 0	# Length of last chunk, always smaller than 1MB.
+          @digest_stack = []
+          # First position on stack corresponds to 1MB, second 2MB, third 4MB, fourt 8MB and so on.
+          # In any time, the size of all already added parts is equal to sum of all existing (non-nil)
+          # positions multiplied by that number, plus last_chunk_length for the remainder smaller than
+          # one megabyte. So, if last_chunk_length is half megabyte, stack[0] is filled, stack[1] and 
+          # stack[2] empty and stack[3] filled, the size is 0.5MB + 1x1MB + 0x2MB + 0x4MB + 1x8MB = 9.5MB.
+        end
+
+        def update_digest_stack(digest, stack)
+          stack.each_with_index{|s,i|
+            if s
+              digest = Digest::SHA256.digest(s + digest)
+              stack[i] = nil
+            else
+              stack[i] = digest # Update this position with value obtained in previous run of cycle.
+              digest = nil
+              break
             end
-          end
-          digests.first
+          }
+          stack << digest if digest
         end
 
-        def initialize
-          @digests = []
+        def reduce_digest_stack(digest, stack)
+          stack.each_with_index{|s,i|
+            unless digest
+              digest = stack[i]
+              next
+            end
+            if stack[i]
+              digest = Digest::SHA256.digest(stack[i] + digest)
+            end
+          }
+          digest
         end
 
         def add_part(bytes)
           part = self.digest_for_part(bytes)
-          @digests << part
           part.unpack('H*').first
         end
 
-        def digest_for_part(body)
-          chunk_count = [body.bytesize / MEGABYTE + (body.bytesize % MEGABYTE > 0 ? 1 : 0), 1].max
+        def prepare_body_for_slice(body)
           if body.respond_to? :byteslice
-            digests_for_part = chunk_count.times.map {|chunk_index| OpenSSL::Digest::SHA256.digest(body.byteslice(chunk_index * MEGABYTE, MEGABYTE))}
+            r = yield(body, :byteslice)
           else
             if body.respond_to? :encoding
               old_encoding = body.encoding
               body.force_encoding('BINARY')
             end
-            digests_for_part = chunk_count.times.map {|chunk_index| OpenSSL::Digest::SHA256.digest(body.slice(chunk_index * MEGABYTE, MEGABYTE))}
+            r = yield(body, :slice)
             if body.respond_to? :encoding
               body.force_encoding(old_encoding)
             end
           end
-          reduce_digests(digests_for_part)
+          r
         end
 
-        def hexdigest
-          digest.unpack('H*').first
+        def digest_for_part(body)
+          part_stack = []
+          part_temp = nil
+          body_size = body.bytesize
+          prepare_body_for_slice(body) {|body, slice|
+            start_offset = 0
+            if @last_chunk_length != 0
+              start_offset = MEGABYTE - @last_chunk_length
+              @last_chunk_hash.update(body.send(slice, 0, start_offset))
+              hash = @last_chunk_hash.digest
+              @last_chunk_digest_temp = hash
+              if body_size > start_offset
+                @last_chunk_length = 0
+                @last_chunk_hash = nil
+                @last_chunk_digest_temp = nil
+                update_digest_stack(hash, @digest_stack)
+              else
+                part_temp = hash
+                @last_chunk_digest_temp = hash
+                @last_chunk_length += body_size
+                next
+              end
+            end
+            whole_chunk_count = (body_size - start_offset) / MEGABYTE
+            whole_chunk_count.times.each {|chunk_index|
+              hash = Digest::SHA256.digest(body.send(slice, start_offset + chunk_index * MEGABYTE, MEGABYTE))
+              update_digest_stack(hash, part_stack)
+              update_digest_stack(hash, @digest_stack)
+            }
+            rest_size = body_size - start_offset - whole_chunk_count * MEGABYTE
+            if rest_size > 0 || whole_chunk_count == 0
+              @last_chunk_hash = Digest::SHA256.new
+              @last_chunk_length = rest_size
+              @last_chunk_hash.update(body.send(slice, start_offset + whole_chunk_count * MEGABYTE, rest_size))
+              hash = @last_chunk_hash.digest
+              @last_chunk_digest_temp = hash
+              part_temp = hash
+            end
+          }
+          reduce_digest_stack(part_temp, part_stack)
         end
 
         def digest
-          reduce_digests(@digests)
+          reduce_digest_stack(@last_chunk_digest_temp, @digest_stack)
+        end
+
+        def hexdigest
+          digest.unpack('H*').first
         end
       end
 

data/lib/fog/aws/requests/lambda/invoke.rb

@@ -20,8 +20,8 @@ module Fog
             headers['X-Amz-Client-Context'] =
               Base64::encode64(Fog::JSON.encode(client_context))
           end
-          if client_type = params.delete('InvocationType')
-            headers['X-Amz-Client-Type'] = client_type
+          if invocation_type = params.delete('InvocationType')
+            headers['X-Amz-Invocation-Type'] = invocation_type
           end
           if log_type = params.delete('LogType')
             headers['X-Amz-Log-Type'] = log_type
@@ -51,12 +51,12 @@ module Fog
             raise Fog::AWS::Lambda::Error, message
           end
 
-          client_context = params.delete('ClientContext')
-          client_type    = params.delete('InvocationType')
-          log_type       = params.delete('LogType')
-          payload        = params.delete('Payload')
+          client_context  = params.delete('ClientContext')
+          invocation_type = params.delete('InvocationType')
+          log_type        = params.delete('LogType')
+          payload         = params.delete('Payload')
 
-          if (client_context || client_type || log_type)
+          if (client_context || invocation_type || log_type)
             message = "invoke parameters handling are not yet mocked [light_black](#{caller.first})[/]"
             Fog::Logger.warning message
             Fog::Mock.not_implemented

data/lib/fog/aws/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module AWS
-    VERSION = "3.5.0"
+    VERSION = "3.5.1"
   end
 end

data/tests/requests/glacier/tree_hash_tests.rb

@@ -59,4 +59,33 @@ Shindo.tests('AWS::Glacier | glacier tree hash calcuation', ['aws']) do
 
   end
 
+  # Aligned is used in general sense of https://en.wikipedia.org/wiki/Data_structure_alignment
+  # except we are not dealing with data in memory, but with parts in "virtual" space of whole file.
+  # Tests for https://github.com/fog/fog-aws/issues/520 and https://github.com/fog/fog-aws/issues/521
+  tests('multipart with unaligned parts') do
+    tree_hash = Fog::AWS::Glacier::TreeHash.new
+    part = ('x' * 512*1024)
+    returns(Fog::AWS::Glacier::TreeHash.digest(part)) { tree_hash.add_part part }
+
+    # At this point, we have 0.5MB in tree_hash. That means that the next part we add will not be aligned,
+    # because it will start on 0.5MB which is not 1MB boundary.
+    part2 = ('x' * 512*1024) + ('y'*1024*1024) + ('z'* 512*1024)
+    returns(Fog::AWS::Glacier::TreeHash.digest(part + part2)) { tree_hash.add_part part2 ; tree_hash.hexdigest }
+
+    # Here we are adding another 1.5MB to tree_hash which has size of 3.5MB. Again, 3.5MB is not on 1MB boundary,
+    # so this is another unaligned part. It does test different part of code, though.
+    tree_hash.add_part('z'* 512*1024 + 't'*1024*1024)
+
+    expected = OpenSSL::Digest::SHA256.hexdigest(
+                 OpenSSL::Digest::SHA256.digest(
+                    OpenSSL::Digest::SHA256.digest('x' * 1024*1024) + OpenSSL::Digest::SHA256.digest('y' * 1024*1024)
+                 ) +
+                 OpenSSL::Digest::SHA256.digest(
+                   OpenSSL::Digest::SHA256.digest('z' * 1024*1024) + OpenSSL::Digest::SHA256.digest('t' * 1024*1024)
+                 )
+               )
+    returns(expected) { tree_hash.hexdigest}
+
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-aws
 version: !ruby/object:Gem::Version
-  version: 3.5.0
+  version: 3.5.1
 platform: ruby
 authors:
 - Josh Lane
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-25 00:00:00.000000000 Z
+date: 2019-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler