blobstore_client 1.3160.0 → 1.3163.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c96da1f12ee676c42c2d4de3d3862da430fe9e13
-  data.tar.gz: 3a571642e5417ada9d4e64d64c42996dfeb1bd06
+  metadata.gz: fcc0dc95c543abb0a4bf9a8f88286162db604d51
+  data.tar.gz: a310c24ace25aac2be5221556bfc93c78c9d70c4
 SHA512:
-  metadata.gz: 7f85bf983c80625a4247d99b463a05edafa9797df65e5b0d9b368b58ea9241d10d27b4e60d29e268df535f34b8dd2c42417020283ed17ac07a0e89db091aa516
-  data.tar.gz: 0cf019d8a6979b15966a178a9b4ce5769ffec61ac581a8fbb35e5443e41c84aa9f6682dad826b72ee7d3be6528fe46af8c61eb44f405dcc7ea8c8977ea236f1c
+  metadata.gz: 280d42e2e5a3dac0cded2c7b8917becdb5f53eb88be7b7f5291d196533437924214b2aec3e2eed0d9e24543ba9f12e91499d226b5f113f0de373f9b0252cc20e
+  data.tar.gz: 191fdb0e46cb7f41ad7790cc0867b50b96cff16af6d446147cf9935e549726a749958896253cd184af7d81913c636bfd4906e29a53165cc26be55ea5cb558d14

data/lib/blobstore_client/s3_blobstore_client.rb

@@ -37,7 +37,8 @@ module Bosh
           ssl_verify_peer:  @options.fetch(:ssl_verify_peer, true),
           credentials_source: @options.fetch(:credentials_source, 'static'),
           access_key_id: @options[:access_key_id],
-          secret_access_key: @options[:secret_access_key]
+          secret_access_key: @options[:secret_access_key],
+          signature_version: @options[:signature_version]
         })
 
         # using S3 without credentials is a special case:
@@ -143,9 +144,16 @@ module Bosh
          @options[:folder] ?  @options[:folder] + '/' + object_id : object_id
       end
 
-      def use_v4_signing?(region)
-        (region == 'eu-central-1' ||
-         region == 'cn-north-1')
+      def use_v4_signing?(options)
+        case options[:signature_version]
+          when '4'
+            true
+          when '2'
+            false
+          else
+            region = options[:region]
+            (region == 'eu-central-1' || region == 'cn-north-1')
+        end
       end
 
       def aws_credentials(credentials_source, access_key_id, secret_access_key)
@@ -185,7 +193,7 @@ module Bosh
           aws_options[:region] = BLANK_REGION
         end
 
-        aws_options[:signature_version] = 's3' unless use_v4_signing?(options[:region])
+        aws_options[:signature_version] = 's3' unless use_v4_signing?(options)
 
         creds = aws_credentials(options[:credentials_source], options[:access_key_id], options[:secret_access_key])
         aws_options.merge!(creds)

data/lib/blobstore_client/version.rb

@@ -1,7 +1,7 @@
 module Bosh
   module Blobstore
     class Client
-      VERSION = '1.3160.0'
+      VERSION = '1.3163.0'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blobstore_client
 version: !ruby/object:Gem::Version
-  version: 1.3160.0
+  version: 1.3163.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-18 00:00:00.000000000 Z
+date: 2015-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-resources
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3160.0
+        version: 1.3163.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3160.0
+        version: 1.3163.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement