baidubce-sdk 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fcf25bb36811b26a3d31ee13e740ddab94214d91
-  data.tar.gz: 56d9ab32198c87d3121ef9aec564047a24e157d6
+  metadata.gz: 37ee3d088dfe300d2c4bc59ede9c3295460349d7
+  data.tar.gz: 9c7fcf154a0f0a51b6b4a731e1ab2193e8247f04
 SHA512:
-  metadata.gz: 6b4caffe3a7384402d7ea0fcf203c638aaee588d5ab4e5a2b21f168babcf792c9e7ccaaef9c055612df048261662296a8a4739da016594e2a61da216589e45fb
-  data.tar.gz: 79e634982aab61ba9f75b8bda7af86d5b2d5a4cde6c28b8edfd502a887726b2bb7ea1e30a0b1e2156be9b3b71e030b1ef65756c7c86ff0f1bda60b70f7a7e3b9
+  metadata.gz: 7eaa2b1a43bab2af6d5355cb24bf37d2ada15a10db184364a65f1c6ddab3f5a58ef1dddae0851c08f400f9c163b5c39a33058a0805c7582f9e865cb11490eba7
+  data.tar.gz: 70c5c1e51449b504d1a8a05b21dd1f5e2fb3f7831ce2713f48a83f4633814cb056d74384328229534bd8d0563933a3dda94f2a79d984218fca1b68df0d89a10d

data/.gitignore

@@ -1,12 +1,2 @@
-/.bundle/
-/.yardoc
-/Gemfile.lock
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
-
-# rspec failure tracking
-.rspec_status
+output
+.svn

data/lib/baidubce/bce_client_configuration.rb

@@ -25,7 +25,8 @@ module Baidubce
 
     class BceClientConfiguration
         attr_accessor :credentials, :endpoint, :protocol, :region, :open_timeout_in_millis,
-                      :read_timeout_in_millis, :send_buf_size, :recv_buf_size, :retry_policy
+                      :read_timeout_in_millis, :send_buf_size, :recv_buf_size, :retry_policy,
+                      :cname_enabled, :backup_endpoint
 
         def initialize(credentials,
                        endpoint,
@@ -41,6 +42,8 @@ module Baidubce
             @send_buf_size = options['send_buf_size'] || DEFAULT_SEND_BUF_SIZE
             @recv_buf_size = options['recv_buf_size'] || DEFAULT_RECV_BUF_SIZE
             @retry_policy = options['retry_policy'] || BackOffRetryPolicy.new
+            @cname_enabled = options['cname_enabled'] || false
+            @backup_endpoint = options['backup_endpoint']
         end
 
     end

data/lib/baidubce/bce_constants.rb

@@ -17,4 +17,5 @@ module Baidubce
     DEFAULT_SERVICE_DOMAIN = 'baidubce.com'
     DEFAULT_ENCODING = 'UTF-8'
 
+    SOCKET_ERROR_CODE = -100
 end

data/lib/baidubce/http/base_http_client.rb

@@ -32,7 +32,8 @@ module Baidubce
 
             include Log
             # Send request to BCE services.
-            def send_request(config, signer, http_method, path, params, headers, body, save_path=nil, &block)
+            def send_request(config, signer, http_method, path, params, headers, body,
+                             save_path=nil, use_backup_endpoint=false, &block)
                 headers[USER_AGENT] = sprintf(
                     'bce-sdk-ruby/%s/%s/%s',
                     VERSION,
@@ -42,7 +43,7 @@ module Baidubce
 
                 should_get_new_date = headers.has_key?(BCE_DATE) ? false : true
 
-                url, headers[HOST] = Utils.parse_url_host(config)
+                url, headers[HOST] = Utils.parse_url_host(config, use_backup_endpoint)
                 url += Utils.url_encode_except_slash(path)
                 query_str = Utils.get_canonical_querystring(params, false)
                 url += "?#{query_str}" unless query_str.to_s.empty?
@@ -90,6 +91,13 @@ module Baidubce
                             logger.debug("Response headers: #{resp.headers.to_s}")
                             return resp.body, resp.headers
                         end
+                    rescue SocketError => err
+                            if config.retry_policy.should_retry(SOCKET_ERROR_CODE, retries_attempted)
+                                delay_in_millis = config.retry_policy.get_delay_before_next_retry_in_millis(retries_attempted)
+                                sleep(delay_in_millis / 1000.0)
+                            else
+                                raise BceClientException.new("SocketError: #{err}")
+                            end
                     rescue BceHttpException, RestClient::ExceptionWithResponse => err
                         logger.debug("ExceptionWithResponse: #{err.http_code}, #{err.http_body}, #{err.http_headers}, #{err.message}")
                         if config.retry_policy.should_retry(err.http_code, retries_attempted)
@@ -117,7 +125,8 @@ module Baidubce
             def set_content_length_header(headers, body, &block)
                 unless block_given?
                     if body.to_s.empty?
-                        headers[CONTENT_LENGTH] = 0
+                        # headers[CONTENT_LENGTH] = 0
+                        headers.delete(CONTENT_LENGTH)
                     elsif body.instance_of?(String)
                         body = body.encode('UTF-8') if body.encoding.name != 'UTF-8'
                         headers[CONTENT_LENGTH] = body.bytesize

data/lib/baidubce/http/http_constants.rb

@@ -98,5 +98,6 @@ module Baidubce
         # STS HTTP Headers
 
         STS_SECURITY_TOKEN = "x-bce-security-token"
+
     end
 end

data/lib/baidubce/retry_policy.rb

@@ -68,6 +68,12 @@ module Baidubce
                 logger.debug('Retry for request timeout.')
                 return true
             end
+            # retry for SocketError
+            if http_code == SOCKET_ERROR_CODE
+                logger.debug('Retry for request SocketError.')
+                return true
+            end
+
             if http_code >= 500 && http_code != 501
                 logger.debug('Retry for server error.')
                 return true
@@ -82,6 +88,7 @@ module Baidubce
             return @max_delay_in_millis if delay_in_millis > @max_delay_in_millis
             return delay_in_millis
         end
+
     end
 
 end

data/lib/baidubce/services/bos/bos_client.rb

@@ -251,8 +251,10 @@ module Baidubce
 
                 path = Utils.append_uri("/", key)
                 url, headers[HOST] = Utils.parse_url_host(@config)
-                url.insert(url.index('/') + 2, bucket_name + '.')
-                headers[HOST] = bucket_name + '.' + headers[HOST]
+                unless @config.cname_enabled || Utils.is_cname_like_host(@config.endpoint)
+                    url.insert(url.index('/') + 2, bucket_name + '.')
+                    headers[HOST] = bucket_name + '.' + headers[HOST]
+                end
                 params[AUTHORIZATION.downcase] = @signer.sign(@config.credentials,
                                                                     GET,
                                                                     path,
@@ -421,10 +423,38 @@ module Baidubce
             end
 
             def send_request(http_method, bucket_name="", params={}, key="", headers={}, body="", save_path=nil, return_body=false, &block)
-                path = Utils.append_uri("/", bucket_name, key)
-                body, headers = @http_client.send_request(@config, @signer, http_method, path, params, headers, body, save_path, &block)
+                if @config.cname_enabled || Utils.is_cname_like_host(@config.endpoint)
+                    path = Utils.append_uri("/", key)
+                else
+                    path = Utils.append_uri("/", bucket_name, key)
+                end
+
+                begin
+                    resp_body, resp_headers = @http_client.send_request(@config, @signer, http_method, path, params,
+                                                          headers, body, save_path, false, &block)
+                rescue BceClientException, BceServerException => err
+                    # retry backup endpoint
+                    if err.is_a?(BceClientException) || (err.is_a?(BceServerException) && (err.status_code.nil? ||
+                        err.status_code == 408 || (err.status_code >= 500 && err.status_code != 501)))
+                        unless @config.backup_endpoint.to_s.empty?
+                            if @config.cname_enabled || Utils.is_cname_like_host(@config.backup_endpoint)
+                                path = Utils.append_uri("/", key)
+                            else
+                                path = Utils.append_uri("/", bucket_name, key)
+                            end
+
+                            resp_body, resp_headers = @http_client.send_request(@config, @signer, http_method, path, params,
+                                                          headers, body, save_path, true, &block)
+                        else
+                            raise err
+                        end
+                    else
+                        raise err
+                    end
+                end
+
                 # Generate result from headers and body
-                Utils.generate_response(headers, body, return_body)
+                Utils.generate_response(resp_headers, resp_body, return_body)
             end
 
             def get_range_header_dict(range)

data/lib/baidubce/utils/utils.rb

@@ -23,9 +23,14 @@ module Baidubce
 
     class Utils
 
+        DEFAULT_CNAME_LIKE_LIST = [".cdn.bcebos.com"]
+
         # parse protocol, host, port from endpoint in config.
-        def self.parse_url_host(config)
+        def self.parse_url_host(config, use_backup_endpoint=false)
             endpoint = config.endpoint
+            if use_backup_endpoint
+                endpoint = config.backup_endpoint
+            end
             unless endpoint.include?"://"
                 protocol = config.protocol.downcase
                 raise "Invalid protocol #{protocol}." if protocol != "http" && protocol != 'https'
@@ -91,7 +96,7 @@ module Baidubce
 
         def self.generate_response(headers, body, return_body)
             return body if return_body
-            return generate_headers(headers) if body.empty?
+            return generate_headers(headers) if body.to_s.empty?
             ret = JSON.parse(body)
             return ret
             rescue JSON::ParserError
@@ -119,6 +124,13 @@ module Baidubce
             resp_headers
         end
 
+        def self.is_cname_like_host(host)
+            DEFAULT_CNAME_LIKE_LIST.each do |suffix|
+                return true if host.to_s.downcase.end_with?(suffix)
+            end
+            return false
+        end
+
     end
 
 end

data/lib/baidubce/version.rb

@@ -2,6 +2,6 @@
 
 module Baidubce
 
-    VERSION = "0.9.0"
+    VERSION = "0.9.1"
 
 end

data/samples/baidubce/bos_sample.rb

@@ -274,7 +274,7 @@ demo "set/get/delete object acl" do
     client.delete_object_acl(bucket_name, key)
 end
 
-# create a 18MB file for multi upload
+# create a 18MB file for multi upload.
 multi_file = "multi_upload.txt"
 
 demo "multi-upload" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: baidubce-sdk
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - xiaoyong
 autorequire: 
 bindir: lib/baidubce
 cert_chain: []
-date: 2018-05-22 00:00:00.000000000 Z
+date: 2020-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -120,8 +120,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ".rspec"
-- ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE

data/.rspec

@@ -1,2 +0,0 @@
---format documentation
---color

data/.travis.yml

@@ -1,5 +0,0 @@
-sudo: false
-language: ruby
-rvm:
-  - 2.0.0
-before_install: gem install bundler -v 1.15.4