fog-aws 0.9.3 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0361bb136f825209f65c1e570b023e6f2b74d865
-  data.tar.gz: 043f9727f53b0c68c6648bac38bf35bb13354590
+  metadata.gz: 77eaa59f1f6bf9034200ca58a0927a7da17cbf33
+  data.tar.gz: 39ba1b65e37c525620fe03f5794113f17215a2e7
 SHA512:
-  metadata.gz: 89aa0ad3aadc59b08fd8e5969cefc1b4afa9cc04297836406139fdb47ecb2aa2c2ea6a3e330bca0de37942c46c01d23467a402df2e1a961084d838858af3bb30
-  data.tar.gz: 2f5414ddd22a1a99bcfc16b0deb5aef69f632ee4e04b754a7693d412f2b226a1cea3c0bcd7e40533560a3b89d2b2f9879ab2f86c3c1faeb00d0b235b4746bba1
+  metadata.gz: 92b1b41b56eb738ccd414a8829897c37c4d5a0bcfaeec4b45f4df24cf2d2ae63cf8616ccd9af9afc43cb910a220360d68ac6e7cb3f9138a545a953a4b29864cf
+  data.tar.gz: c8b7b3d026f41cfac0f3f7746465cc48d60cd7287e39c10c3dc61ca03fa58051a8c8ec5d84e0adf7ae96ae76a126a195f12d5f89e569a7e9a39c79b202be2d09

data/CHANGELOG.md

@@ -2,7 +2,21 @@
 
 ## [Unreleased](https://github.com/fog/fog-aws/tree/HEAD)
 
-[Full Changelog](https://github.com/fog/fog-aws/compare/v0.9.2...HEAD)
+[Full Changelog](https://github.com/fog/fog-aws/compare/v0.9.3...HEAD)
+
+**Closed issues:**
+
+- S3: retry on 503 Service Unavailable [\#265](https://github.com/fog/fog-aws/issues/265)
+- Digest::Base Error [\#261](https://github.com/fog/fog-aws/issues/261)
+
+**Merged pull requests:**
+
+- Updated Region 'Mumbai' ap-south-1  [\#267](https://github.com/fog/fog-aws/pull/267) ([chanakyacool](https://github.com/chanakyacool))
+- Replaces usage of Digest with OpenSSL::Digest  [\#266](https://github.com/fog/fog-aws/pull/266) ([esthervillars](https://github.com/esthervillars))
+- AWS DNS - support newer DNS hosted zone IDs for dualstack ELBs [\#263](https://github.com/fog/fog-aws/pull/263) ([mattheworiordan](https://github.com/mattheworiordan))
+
+## [v0.9.3](https://github.com/fog/fog-aws/tree/v0.9.3) (2016-06-20)
+[Full Changelog](https://github.com/fog/fog-aws/compare/v0.9.2...v0.9.3)
 
 **Closed issues:**
 

data/lib/fog/aws.rb

@@ -224,7 +224,7 @@ module Fog
     end
 
     def self.regions
-      @regions ||= ['ap-northeast-1', 'ap-northeast-2', 'ap-southeast-1', 'ap-southeast-2', 'eu-central-1', 'eu-west-1', 'us-east-1', 'us-west-1', 'us-west-2', 'sa-east-1', 'cn-north-1', 'us-gov-west-1']
+      @regions ||= ['ap-northeast-1', 'ap-northeast-2', 'ap-southeast-1', 'ap-southeast-2', 'eu-central-1', 'eu-west-1', 'us-east-1', 'us-west-1', 'us-west-2', 'sa-east-1', 'cn-north-1', 'us-gov-west-1', 'ap-south-1']
     end
 
     def self.validate_region!(region, host=nil)

data/lib/fog/aws/glacier.rb

@@ -43,7 +43,7 @@ module Fog
           while digests.length > 1
             digests = digests.each_slice(2).map do |pair|
               if pair.length == 2
-                Digest::SHA256.digest(pair[0]+pair[1])
+                OpenSSL::Digest::SHA256.digest(pair[0]+pair[1])
               else
                 pair.first
               end
@@ -65,13 +65,13 @@ module Fog
         def digest_for_part(body)
           chunk_count = [body.bytesize / MEGABYTE + (body.bytesize % MEGABYTE > 0 ? 1 : 0), 1].max
           if body.respond_to? :byteslice
-            digests_for_part = chunk_count.times.map {|chunk_index| Digest::SHA256.digest(body.byteslice(chunk_index * MEGABYTE, MEGABYTE))}
+            digests_for_part = chunk_count.times.map {|chunk_index| OpenSSL::Digest::SHA256.digest(body.byteslice(chunk_index * MEGABYTE, MEGABYTE))}
           else
             if body.respond_to? :encoding
               old_encoding = body.encoding
               body.force_encoding('BINARY')
             end
-            digests_for_part = chunk_count.times.map {|chunk_index| Digest::SHA256.digest(body.slice(chunk_index * MEGABYTE, MEGABYTE))}
+            digests_for_part = chunk_count.times.map {|chunk_index| OpenSSL::Digest::SHA256.digest(body.slice(chunk_index * MEGABYTE, MEGABYTE))}
             if body.respond_to? :encoding
               body.force_encoding(old_encoding)
             end

data/lib/fog/aws/models/storage/file.rb

@@ -289,7 +289,7 @@ module Fog
         end
 
         def part_headers(chunk, options)
-          md5 = Base64.encode64(Digest::MD5.digest(chunk)).strip
+          md5 = Base64.encode64(OpenSSL::Digest::MD5.digest(chunk)).strip
           encryption_keys = encryption_customer_key_headers.keys
           encryption_headers = options.select { |key| encryption_keys.include?(key) }
           { 'Content-MD5' => md5 }.merge(encryption_headers)
@@ -299,7 +299,7 @@ module Fog
           {
             'x-amz-server-side-encryption-customer-algorithm' => encryption,
             'x-amz-server-side-encryption-customer-key' => Base64.encode64(encryption_key.to_s).chomp!,
-            'x-amz-server-side-encryption-customer-key-md5' => Base64.encode64(Digest::MD5.digest(encryption_key.to_s)).chomp!
+            'x-amz-server-side-encryption-customer-key-md5' => Base64.encode64(OpenSSL::Digest::MD5.digest(encryption_key.to_s)).chomp!
           }
         end
       end

data/lib/fog/aws/requests/compute/describe_availability_zones.rb

@@ -77,6 +77,9 @@ module Fog
 
             {"messageSet" => [], "regionName" => "ap-southeast-2", "zoneName" => "ap-southeast-2a", "zoneState" => "available"},
             {"messageSet" => [], "regionName" => "ap-southeast-2", "zoneName" => "ap-southeast-2b", "zoneState" => "available"},
+
+            {"messageSet" => [], "regionName" => "ap-south-1", "zoneName" => "ap-south-1a", "zoneState" => "available"},
+            {"messageSet" => [], "regionName" => "ap-south-1", "zoneName" => "ap-south-1b", "zoneState" => "available"},
           ]
 
           availability_zone_info = all_zones.select { |zoneinfo| zoneinfo["regionName"] == @region }

data/lib/fog/aws/requests/dns/change_resource_record_sets.rb

@@ -3,7 +3,13 @@ module Fog
     class AWS
 
       def self.hosted_zone_for_alias_target(dns_name)
-        Hash[elb_hosted_zone_mapping.select { |k, _|
+        hosted_zones = if dns_name.match(/^dualstack\./)
+          elb_dualstack_hosted_zone_mapping
+        else
+          elb_hosted_zone_mapping
+        end
+
+        Hash[hosted_zones.select { |k, _|
           dns_name =~ /\A.+\.#{k}\.elb\.amazonaws\.com\.?\z/
         }].values.last
       end
@@ -22,6 +28,21 @@ module Fog
         }
       end
 
+      # See https://forums.aws.amazon.com/message.jspa?messageID=612414
+      def self.elb_dualstack_hosted_zone_mapping
+        @elb_dualstack_hosted_zone_mapping ||= {
+          "ap-northeast-1" => "Z14GRHDCWA56QT",
+          "ap-southeast-1" => "Z1LMS91P8CMLE5",
+          "ap-southeast-2" => "Z1GM3OXH4ZPM65",
+          "eu-central-1"   => "Z215JYRZR1TBD5",
+          "eu-west-1"      => "Z32O12XQLNTSW2",
+          "sa-east-1"      => "Z2P70J7HTTTPLU",
+          "us-east-1"      => "Z35SXDOTRQ7X7K",
+          "us-west-1"      => "Z368ELLRRE2KJ0",
+          "us-west-2"      => "Z1H1FL5HABSF5",
+        }
+      end
+
       # Returns the xml request for a given changeset
       def self.change_resource_record_sets_data(zone_id, change_batch, version, options = {})
         # AWS methods return zone_ids that looks like '/hostedzone/id'.  Let the caller either use

data/lib/fog/aws/requests/glacier/create_archive.rb

@@ -22,7 +22,7 @@ module Fog
 
           headers = {
             'Content-Length' => body.bytesize.to_s,
-            'x-amz-content-sha256' => Digest::SHA256.hexdigest(body),
+            'x-amz-content-sha256' => OpenSSL::Digest::SHA256.hexdigest(body),
             'x-amz-sha256-tree-hash' => Fog::AWS::Glacier::TreeHash.digest(body)
           }
           headers['x-amz-archive-description'] = Fog::AWS.escape(options['description']) if options['description']

data/lib/fog/aws/requests/glacier/upload_part.rb

@@ -25,7 +25,7 @@ module Fog
           headers = {
             'Content-Length' => body.bytesize.to_s,
             'Content-Range' => "bytes #{offset}-#{offset+body.bytesize-1}/*",
-            'x-amz-content-sha256' => Digest::SHA256.hexdigest(body),
+            'x-amz-content-sha256' => OpenSSL::Digest::SHA256.hexdigest(body),
             'x-amz-sha256-tree-hash' => hash
           }
 

data/lib/fog/aws/requests/sqs/send_message.rb

@@ -32,7 +32,7 @@ module Fog
 
               now        = Time.now
               message_id = Fog::AWS::Mock.sqs_message_id
-              md5        = Digest::MD5.hexdigest(message)
+              md5        = OpenSSL::Digest::MD5.hexdigest(message)
 
               queue[:messages][message_id] = {
                 'MessageId'  => message_id,

data/lib/fog/aws/requests/storage/delete_multiple_objects.rb

@@ -47,7 +47,7 @@ module Fog
           data << "</Delete>"
 
           headers['Content-Length'] = data.length
-          headers['Content-MD5'] = Base64.encode64(Digest::MD5.digest(data)).
+          headers['Content-MD5'] = Base64.encode64(OpenSSL::Digest::MD5.digest(data)).
                                    gsub("\n", '')
 
           request({

data/lib/fog/aws/requests/storage/post_object_restore.rb

@@ -22,7 +22,7 @@ module Fog
           data = '<RestoreRequest xmlns="http://s3.amazonaws.com/doc/2006-3-01"><Days>' + days.to_s + '</Days></RestoreRequest>'
 
           headers = {}
-          headers['Content-MD5'] = Base64.encode64(Digest::MD5.digest(data)).strip
+          headers['Content-MD5'] = Base64.encode64(OpenSSL::Digest::MD5.digest(data)).strip
           headers['Content-Type'] = 'application/xml'
           headers['Date'] = Fog::Time.now.to_date_header
 

data/lib/fog/aws/requests/storage/put_bucket_acl.rb

@@ -37,7 +37,7 @@ module Fog
             headers['x-amz-acl'] = acl
           end
 
-          headers['Content-MD5'] = Base64.encode64(Digest::MD5.digest(data)).strip
+          headers['Content-MD5'] = Base64.encode64(OpenSSL::Digest::MD5.digest(data)).strip
           headers['Content-Type'] = 'application/json'
           headers['Date'] = Fog::Time.now.to_date_header
 

data/lib/fog/aws/requests/storage/put_bucket_cors.rb

@@ -22,7 +22,7 @@ module Fog
           data = Fog::Storage::AWS.hash_to_cors(cors)
 
           headers = {}
-          headers['Content-MD5'] = Base64.encode64(Digest::MD5.digest(data)).strip
+          headers['Content-MD5'] = Base64.encode64(OpenSSL::Digest::MD5.digest(data)).strip
           headers['Content-Type'] = 'application/json'
           headers['Date'] = Fog::Time.now.to_date_header
 

data/lib/fog/aws/requests/storage/put_bucket_lifecycle.rb

@@ -86,7 +86,7 @@ module Fog
           request({
                     :body     => body,
                     :expects  => 200,
-                    :headers  => {'Content-MD5' => Base64.encode64(Digest::MD5.digest(body)).chomp!,
+                    :headers  => {'Content-MD5' => Base64.encode64(OpenSSL::Digest::MD5.digest(body)).chomp!,
                       'Content-Type' => 'application/xml'},
                     :bucket_name => bucket_name,
                     :method   => 'PUT',

data/lib/fog/aws/requests/storage/put_bucket_notification.rb

@@ -54,7 +54,7 @@ module Fog
           request({
             :body     => body,
             :expects  => 200,
-            :headers  => {'Content-MD5' => Base64.encode64(Digest::MD5.digest(body)).chomp!,
+            :headers  => {'Content-MD5' => Base64.encode64(OpenSSL::Digest::MD5.digest(body)).chomp!,
               'Content-Type' => 'application/xml'},
             :bucket_name => bucket_name,
             :method   => 'PUT',

data/lib/fog/aws/requests/storage/put_bucket_tagging.rb

@@ -27,7 +27,7 @@ DATA
           request({
             :body     => data,
             :expects  => 204,
-            :headers  => {'Content-MD5' => Base64.encode64(Digest::MD5.digest(data)).chomp!, 'Content-Type' => 'application/xml'},
+            :headers  => {'Content-MD5' => Base64.encode64(OpenSSL::Digest::MD5.digest(data)).chomp!, 'Content-Type' => 'application/xml'},
             :bucket_name => bucket_name,
             :method   => 'PUT',
             :query    => {'tagging' => nil}

data/lib/fog/aws/requests/storage/put_object_acl.rb

@@ -45,7 +45,7 @@ module Fog
             headers['x-amz-acl'] = acl
           end
 
-          headers['Content-MD5'] = Base64.encode64(Digest::MD5.digest(data)).strip
+          headers['Content-MD5'] = Base64.encode64(OpenSSL::Digest::MD5.digest(data)).strip
           headers['Content-Type'] = 'application/json'
           headers['Date'] = Fog::Time.now.to_date_header
 

data/lib/fog/aws/requests/storage/shared_mock_methods.rb

@@ -50,7 +50,7 @@ module Fog
           object = {
             :body             => body,
             'Content-Type'    => options['Content-Type'],
-            'ETag'            => Digest::MD5.hexdigest(body),
+            'ETag'            => OpenSSL::Digest::MD5.hexdigest(body),
             'Key'             => object_name,
             'Last-Modified'   => Fog::Time.now.to_date_header,
             'Content-Length'  => options['Content-Length'],

data/lib/fog/aws/signaturev4.rb

@@ -40,7 +40,7 @@ module Fog
 #{canonical_query_string(params[:query])}
 #{canonical_headers(params[:headers])}
 #{signed_headers(params[:headers])}
-#{body_sha || Digest::SHA256.hexdigest(params[:body] || '')}
+#{body_sha || OpenSSL::Digest::SHA256.hexdigest(params[:body] || '')}
 DATA
         canonical_request.chop!
 
@@ -48,7 +48,7 @@ DATA
 #{ALGORITHM}
 #{date.to_iso8601_basic}
 #{credential_scope(date)}
-#{Digest::SHA256.hexdigest(canonical_request)}
+#{OpenSSL::Digest::SHA256.hexdigest(canonical_request)}
 DATA
 
         string_to_sign.chop!

data/lib/fog/aws/storage.rb

@@ -585,7 +585,7 @@ module Fog
               params[:headers]['x-amz-content-sha256'] = 'STREAMING-AWS4-HMAC-SHA256-PAYLOAD'
               params[:headers]['x-amz-decoded-content-length'] = params[:headers].delete 'Content-Length'
             else
-              params[:headers]['x-amz-content-sha256'] ||= Digest::SHA256.hexdigest(params[:body] || '')
+              params[:headers]['x-amz-content-sha256'] ||= OpenSSL::Digest::SHA256.hexdigest(params[:body] || '')
             end
             signature_components = @signer.signature_components(params, date, params[:headers]['x-amz-content-sha256'])
             params[:headers]['Authorization'] = @signer.components_to_header(signature_components)
@@ -692,8 +692,8 @@ AWS4-HMAC-SHA256-PAYLOAD
 #{date.to_iso8601_basic}
 #{signer.credential_scope(date)}
 #{previous_signature}
-#{Digest::SHA256.hexdigest('')}
-#{Digest::SHA256.hexdigest(data)}
+#{OpenSSL::Digest::SHA256.hexdigest('')}
+#{OpenSSL::Digest::SHA256.hexdigest(data)}
 DATA
             hmac = signer.derived_hmac(date)
             hmac.sign(string_to_sign.strip).unpack('H*').first

data/lib/fog/aws/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module AWS
-    VERSION = "0.9.3"
+    VERSION = "0.9.4"
   end
 end

data/tests/models/storage/file_tests.rb

@@ -99,7 +99,7 @@ Shindo.tests("Storage[:aws] | file", ["aws"]) do
       @directory.files.get('multipart-encrypted-upload',
         'x-amz-server-side-encryption-customer-algorithm' => 'AES256',
         'x-amz-server-side-encryption-customer-key' => Base64.encode64(encryption_key).chomp!,
-        'x-amz-server-side-encryption-customer-key-MD5' => Base64.encode64(Digest::MD5.digest(encryption_key.to_s)).chomp!
+        'x-amz-server-side-encryption-customer-key-MD5' => Base64.encode64(OpenSSL::Digest::MD5.digest(encryption_key.to_s)).chomp!
       ).body == "x" * 6*1024**2
     end
 

data/tests/requests/glacier/tree_hash_tests.rb

@@ -1,27 +1,27 @@
 Shindo.tests('AWS::Glacier | glacier tree hash calcuation', ['aws']) do
 
   tests('tree_hash(single part < 1MB)') do
-    returns(Digest::SHA256.hexdigest('')) { Fog::AWS::Glacier::TreeHash.digest('')}
+    returns(OpenSSL::Digest::SHA256.hexdigest('')) { Fog::AWS::Glacier::TreeHash.digest('')}
   end
 
   tests('tree_hash(multibyte characters)') do
     body = ("\xC2\xA1" * 1024*1024)
     body.force_encoding('UTF-8') if body.respond_to? :encoding
 
-    expected = Digest::SHA256.hexdigest(
-                Digest::SHA256.digest("\xC2\xA1" * 1024*512) + Digest::SHA256.digest("\xC2\xA1" * 1024*512)
+    expected = OpenSSL::Digest::SHA256.hexdigest(
+                OpenSSL::Digest::SHA256.digest("\xC2\xA1" * 1024*512) + OpenSSL::Digest::SHA256.digest("\xC2\xA1" * 1024*512)
               )
     returns(expected) { Fog::AWS::Glacier::TreeHash.digest(body)}
   end
 
   tests('tree_hash(power of 2 number of parts)') do
     body = ('x' * 1024*1024) + ('y'*1024*1024) + ('z'*1024*1024) + ('t'*1024*1024)
-    expected = Digest::SHA256.hexdigest(
-                 Digest::SHA256.digest(
-                    Digest::SHA256.digest('x' * 1024*1024) + Digest::SHA256.digest('y' * 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)
                  ) +
-                 Digest::SHA256.digest(
-                   Digest::SHA256.digest('z' * 1024*1024) + Digest::SHA256.digest('t' * 1024*1024)
+                 OpenSSL::Digest::SHA256.digest(
+                   OpenSSL::Digest::SHA256.digest('z' * 1024*1024) + OpenSSL::Digest::SHA256.digest('t' * 1024*1024)
                  )
                )
 
@@ -30,11 +30,11 @@ Shindo.tests('AWS::Glacier | glacier tree hash calcuation', ['aws']) do
 
   tests('tree_hash(non power of 2 number of parts)') do
     body = ('x' * 1024*1024) + ('y'*1024*1024) + ('z'*1024*1024)
-    expected = Digest::SHA256.hexdigest(
-                 Digest::SHA256.digest(
-                    Digest::SHA256.digest('x' * 1024*1024) + Digest::SHA256.digest('y' * 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)
                  ) +
-                 Digest::SHA256.digest('z' * 1024*1024)
+                 OpenSSL::Digest::SHA256.digest('z' * 1024*1024)
                )
 
     returns(expected) { Fog::AWS::Glacier::TreeHash.digest(body)}
@@ -47,12 +47,12 @@ Shindo.tests('AWS::Glacier | glacier tree hash calcuation', ['aws']) do
 
     tree_hash.add_part('z'* 1024*1024 + 't'*1024*1024)
 
-    expected = Digest::SHA256.hexdigest(
-                 Digest::SHA256.digest(
-                    Digest::SHA256.digest('x' * 1024*1024) + Digest::SHA256.digest('y' * 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)
                  ) +
-                 Digest::SHA256.digest(
-                   Digest::SHA256.digest('z' * 1024*1024) + Digest::SHA256.digest('t' * 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}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-aws
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors:
 - Josh Lane
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-20 00:00:00.000000000 Z
+date: 2016-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler