td-client 3.0.1 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d819fbd1d3b7e9d4e5178cf7474bc0f1522cd7414352d0b39e41d6d9f61d8ac7
-  data.tar.gz: 75ba42da56495d37fcd7b104f5ea6b7e4e6c5121a15c7ce15e66275a31041d65
+  metadata.gz: ef9f30fcd1a3c1fc0259050e8399d0ecc9d2a76d43bbac155c2b2bf9f4e60508
+  data.tar.gz: 07b8bf3489b7d821920665b8b650682de5a2ae6dd939a5c831347e51fc529fed
 SHA512:
-  metadata.gz: d63996ea096f981a64ae24f6439a246789537502a48db5d16203742fdd53210c627e573351f91603947928418087798580e664e399eb03258e8a8ae131d87004
-  data.tar.gz: a6de4e323a137ebc909f7c5e0de7195e39095b19cccd1640c1e4b0235cadbed3240c4a2828de266758033b70000db5fc06c81d995c6f3fed2a6b60cd3096b95e
+  metadata.gz: e910086e65eacab239b44408a7ce487e2414d18f3ad2050c94e3a20861cec7a5effa07ed20912d36422326bb536d4925133e555721839f6327bff1e68cccf2ac
+  data.tar.gz: cd85f7ae18e079074315e46975ba4afdb3e9f0f48b0beda6e86617a9acc62bd21a90040f63666e5833c651681e632000b699a66f24e8fb8cd313d537db6429ac

data/lib/td/client/api.rb

@@ -239,9 +239,11 @@ class API
     io.string
   end
 
-  # @param [String] ssl_ca_file
+  # @param [String, nil] ssl_ca_file nil restores HTTPClient's default CA source
   def ssl_ca_file=(ssl_ca_file)
     @ssl_ca_file = ssl_ca_file
+    @api.reset_all
+    @api = api_client("#{@ssl ? 'https' : 'http'}://#{@host}:#{@port}")
   end
 
 private
@@ -517,21 +519,7 @@ private
   def new_client(opts = {})
     client = HTTPClient.new(@http_proxy, @user_agent)
     client.connect_timeout = @connect_timeout
-
-    if @ssl
-      client.ssl_config.add_trust_ca(ssl_ca_file)
-      client.ssl_config.verify_mode = OpenSSL::SSL::VERIFY_PEER
-      # Disable SSLv3 connection in favor of POODLE Attack protection
-      client.ssl_config.options |= OpenSSL::SSL::OP_NO_SSLv3
-    end
-
-    # allow users to use their own custom ca
-    # or disable verification
-    if @verify == false
-      client.ssl_config.verify_mode = OpenSSL::SSL::VERIFY_NONE
-    elsif @verify.is_a? String
-      client.ssl_config.add_trust_ca(@verify)
-    end
+    configure_ssl(client)
 
     header = {}
     if @apikey
@@ -553,11 +541,28 @@ private
     client.connect_timeout = @connect_timeout
     client.send_timeout = @send_timeout
     client.receive_timeout = @read_timeout
+    configure_ssl(client)
     client.transparent_gzip_decompression = true
     client.debug_dev = STDOUT unless ENV['TD_CLIENT_DEBUG'].nil?
     client
   end
 
+  def configure_ssl(client)
+    if @ssl
+      # Leave CA selection to HTTPClient unless the caller supplies a CA file.
+      ca_file = ssl_ca_file
+      client.ssl_config.add_trust_ca(ca_file) if ca_file
+      # Disable SSLv3 connection in favor of POODLE Attack protection
+      client.ssl_config.options |= OpenSSL::SSL::OP_NO_SSLv3
+    end
+
+    if @verify == false
+      client.ssl_config.verify_mode = OpenSSL::SSL::VERIFY_NONE
+    elsif @verify.is_a? String
+      client.ssl_config.add_trust_ca(@verify)
+    end
+  end
+
   def api(opt = {:retry_request => true}, &block)
     retry_request = opt[:retry_request]
     # up to 7 retries with exponential (base 2) back-off starting at 'retry_delay'
@@ -606,7 +611,7 @@ private
   end
 
   def ssl_ca_file
-    @ssl_ca_file ||= File.join(File.dirname(__FILE__), '..', '..', '..', 'data', 'ca-bundle.crt')
+    @ssl_ca_file
   end
 
   # @param [response] res

data/lib/td/client/version.rb

@@ -1,5 +1,5 @@
 module TreasureData
   class Client
-    VERSION = '3.0.1'
+    VERSION = '3.1.0'
   end
 end

data/spec/td/client/api_ssl_connection_spec.rb

@@ -72,6 +72,28 @@ describe 'API SSL connection' do
     }.to raise_error TreasureData::NotFoundError
   end
 
+  it 'should use ssl_ca_file for bulk load requests' do
+    @server = setup_server(:TLSv1_2)
+    api = API.new(nil, :endpoint => "https://localhost:#{@serverport}", :retry_post_requests => false)
+    api.ssl_ca_file = File.join(DIR, 'testRootCA.crt')
+
+    expect(api.bulk_load_list).to eq([])
+  end
+
+  it 'should apply verify false to bulk load requests' do
+    @server = setup_server(:TLSv1_2)
+    api = API.new(nil, :endpoint => "https://localhost:#{@serverport}", :retry_post_requests => false, :verify => false)
+
+    expect(api.bulk_load_list).to eq([])
+  end
+
+  it 'should use the verify CA file for bulk load requests' do
+    @server = setup_server(:TLSv1_2)
+    api = API.new(nil, :endpoint => "https://localhost:#{@serverport}", :retry_post_requests => false, :verify => File.join(DIR, 'testRootCA.crt'))
+
+    expect(api.bulk_load_list).to eq([])
+  end
+
   def setup_server(ssl_version, port = 1000 + rand(1000))
     logger = Logger.new(STDERR)
     logger.level = Logger::Severity::FATAL  # avoid logging SSLError (ERROR level)
@@ -91,6 +113,10 @@ describe 'API SSL connection' do
       '/hello',
       WEBrick::HTTPServlet::ProcHandler.new(method(:do_hello).to_proc)
     )
+    @server.mount_proc('/v3/bulk_loads') do |_req, res|
+      res['content-type'] = 'application/json'
+      res.body = '[]'
+    end
     @server.ssl_context.ssl_version = ssl_version
     @server_thread = start_server_thread(@server)
     return @server

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: td-client
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.1.0
 platform: ruby
 authors:
 - Treasure Data, Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-09-11 00:00:00.000000000 Z
+date: 2026-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -36,14 +36,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: 2.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: 2.10.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -162,7 +162,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- data/ca-bundle.crt
 - lib/td-client.rb
 - lib/td/client.rb
 - lib/td/client/api.rb