td-client 1.0.8 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8650b4fe6267d1edb91dad045ac0b31f77d0d0e37d776ea5433ec88debfe4b81
-  data.tar.gz: baf35bbd09b187c8f76ee48f68328f23ac09721ddb31641154a97900dc4ac93b
+  metadata.gz: 54f6df5e1e0ea43f4a92e837b1793cf9f217cd643c7cecb831c9191fdb0396ae
+  data.tar.gz: f28643eb1908f7c6e251b75321a50dd87a0419f5f0982c218829e947a15ac04b
 SHA512:
-  metadata.gz: 643dc4c3d7ec6e5e73b506f3b18750a7aeaf73e915890c68ccd7b590f8d539a1fb047f5adbb4652bb0a732f2e8466658be112384d9d57aae1cb72b902b8a4b46
-  data.tar.gz: fbf3228a704dd954299becd06462920f72934674d8cae49ba1db91d169441fe4a079348e33ec8f2e3b08c986b5383fbf476f7161de8711a3677583da1b4b3169
+  metadata.gz: 29eed4ae7f9957391958faaaa9a86ddb64040fbb640deb5922614f95806de48455f94c20602ee39240df16adeae0257a7ff2db4036459e3285ca84b486e54370
+  data.tar.gz: c0de46e029df837aa5decfb1cead811d24bd783444cabd7fe97da114818641f0cd7476756d94f273dbef72f1673856e4b16fda51ae150e5ef840a144aaf67948

data/lib/td/client/api/account.rb

@@ -22,24 +22,5 @@ module Account
     return [account_id, plan, storage_size, guaranteed_cores, maximum_cores, created_at]
   end
 
-  # @param [Fixnum] from
-  # @param [Fixnum] to
-  # @return [Array]
-  def account_core_utilization(from, to)
-    params = { }
-    params['from'] = from.to_s if from
-    params['to'] = to.to_s if to
-    code, body, res = get("/v3/account/core_utilization", params)
-    if code != "200"
-      raise_error("Show account failed", res)
-    end
-    js = checked_json(body, %w[from to interval history])
-    from = Time.parse(js['from']).utc
-    to = Time.parse(js['to']).utc
-    interval = js['interval'].to_i
-    history = js['history']
-    return [from, to, interval, history]
-  end
-
 end
 end

data/lib/td/client/api/job.rb

@@ -126,7 +126,7 @@ module Job
     job_result_download(job_id) do |chunk|
       unpacker.feed_each(chunk) do |row|
         result << row
-      end
+      end unless chunk.empty?
     end
     return result
   end
@@ -163,7 +163,7 @@ module Job
     upkr = MessagePack::Unpacker.new
     # default to decompressing the response since format is fixed to 'msgpack'
     job_result_download(job_id) do |chunk|
-      upkr.feed_each(chunk, &block)
+      upkr.feed_each(chunk, &block) unless chunk.empty?
     end
     nil
   end
@@ -177,9 +177,9 @@ module Job
     upkr = MessagePack::Unpacker.new
     # default to decompressing the response since format is fixed to 'msgpack'
     job_result_download(job_id) do |chunk, total|
-      upkr.feed_each(chunk) {|unpacked|
+      upkr.feed_each(chunk) do |unpacked|
         yield unpacked, total if block_given?
-      }
+      end unless chunk.empty?
     end
     nil
   end

data/lib/td/client/api.rb

@@ -74,6 +74,7 @@ class API
     @retry_post_requests = opts[:retry_post_requests] || false
     @retry_delay = opts[:retry_delay] || 5
     @max_cumul_retry_delay = opts[:max_cumul_retry_delay] || 600
+    @verify = opts[:verify]
 
     case uri.scheme
     when 'http', 'https'
@@ -526,6 +527,14 @@ private
       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
+
     header = {}
     if @apikey
       header['Authorization'] = "TD1 #{apikey}"

data/lib/td/client/version.rb

@@ -1,5 +1,5 @@
 module TreasureData
   class Client
-    VERSION = '1.0.8'
+    VERSION = '2.0.0'
   end
 end

data/lib/td/client.rb

@@ -60,14 +60,6 @@ class Client
     return Account.new(self, account_id, plan, storage, guaranteed_cores, maximum_cores, created_at)
   end
 
-  # @param [Fixnum] from
-  # @param [Fixnum] to
-  # @return [Array] from, to, interval, history
-  def core_utilization(from, to)
-    from, to, interval, history = @api.account_core_utilization(from, to)
-    return from, to, interval, history
-  end
-
   # @return [Array] databases
   def databases
     m = @api.list_databases

data/spec/td/client/account_api_spec.rb

@@ -18,17 +18,4 @@ describe 'Account API' do
     end
   end
 
-  describe 'account_core_utilization' do
-    it 'returns core utilization' do
-      from = '2014-12-01T00:00:00+0900'
-      to = '2015-01-01T00:00:00+0900'
-      stub_api_request(:get, "/v3/account/core_utilization", :query => {'from' => from, 'to' => to}).
-        to_return(:body => {'from' => from, 'to' => to, 'interval' => 1, 'history' => ['dummy']}.to_json)
-      r = api.account_core_utilization(from, to)
-      expect(r[0]).to eq(Time.parse(from))
-      expect(r[1]).to eq(Time.parse(to))
-      expect(r[2]).to eq(1)
-      expect(r[3]).to eq(['dummy'])
-    end
-  end
 end

data/spec/td/client/api_ssl_connection_spec.rb

@@ -37,7 +37,7 @@ describe 'API SSL connection' do
   it 'should fail to connect SSLv3 only server' do
     @server = setup_server(:SSLv3)
     api = API.new(nil, :endpoint => "https://localhost:#{@serverport}", :retry_post_requests => false)
-    api.ssl_ca_file = File.join(DIR, 'ca-all.cert')
+    api.ssl_ca_file = File.join(DIR, 'testRootCA.crt')
     expect {
       begin
         api.delete_database('no_such_database')
@@ -47,10 +47,26 @@ describe 'API SSL connection' do
     }.to raise_error OpenSSL::SSL::SSLError
   end
 
-  it 'should success to connect TLSv1 only server' do
-    @server = setup_server(:TLSv1)
+  it 'should succeed to access to the server with verify false option' do
+    @server = setup_server(:TLSv1_2)
+    api = API.new(nil, :endpoint => "https://localhost:#{@serverport}", :retry_post_requests => false, :verify => false)
+    expect {
+        api.delete_database('no_such_database')
+    }.to raise_error TreasureData::NotFoundError
+  end
+
+  it 'should succeed to access to the server with self signed certificate' 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.delete_database('no_such_database') 
+    }.to raise_error TreasureData::NotFoundError
+  end
+
+  it 'should success to connect TLSv1_2 only server' 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, 'ca-all.cert')
+    api.ssl_ca_file = File.join(DIR, 'testRootCA.crt')
     expect {
       api.delete_database('no_such_database')
     }.to raise_error TreasureData::NotFoundError
@@ -66,9 +82,9 @@ describe 'API SSL connection' do
       :AccessLog => [],
       :DocumentRoot => '.',
       :SSLEnable => true,
-      :SSLCACertificateFile => File.join(DIR, 'ca.cert'),
-      :SSLCertificate => cert('server.cert'),
-      :SSLPrivateKey => key('server.key')
+      :SSLCACertificateFile => File.join(DIR, 'testRootCA.crt'),
+      :SSLCertificate => cert('testServer.crt'),
+      :SSLPrivateKey => key('testServer.key')
     )
     @serverport = @server.config[:Port]
     @server.mount(

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: td-client
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 2.0.0
 platform: ruby
 authors:
 - Treasure Data, Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-04 00:00:00.000000000 Z
+date: 2023-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -212,29 +212,29 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.9
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Treasure Data API library for Ruby
 test_files:
-- spec/td/client_spec.rb
-- spec/td/client_sched_spec.rb
-- spec/td/client/partial_delete_api_spec.rb
+- spec/td/client/account_api_spec.rb
+- spec/td/client/api_error_spec.rb
 - spec/td/client/api_spec.rb
+- spec/td/client/api_ssl_connection_spec.rb
+- spec/td/client/bulk_import_spec.rb
+- spec/td/client/bulk_load_spec.rb
 - spec/td/client/db_api_spec.rb
-- spec/td/client/result_api_spec.rb
 - spec/td/client/export_api_spec.rb
+- spec/td/client/import_api_spec.rb
+- spec/td/client/job_api_spec.rb
+- spec/td/client/model_job_spec.rb
+- spec/td/client/model_schedule_spec.rb
 - spec/td/client/model_schema_spec.rb
-- spec/td/client/api_error_spec.rb
+- spec/td/client/partial_delete_api_spec.rb
+- spec/td/client/result_api_spec.rb
 - spec/td/client/sched_api_spec.rb
+- spec/td/client/server_status_api_spec.rb
 - spec/td/client/table_api_spec.rb
-- spec/td/client/bulk_load_spec.rb
-- spec/td/client/api_ssl_connection_spec.rb
-- spec/td/client/job_api_spec.rb
-- spec/td/client/account_api_spec.rb
 - spec/td/client/user_api_spec.rb
-- spec/td/client/bulk_import_spec.rb
-- spec/td/client/model_schedule_spec.rb
-- spec/td/client/import_api_spec.rb
-- spec/td/client/server_status_api_spec.rb
-- spec/td/client/model_job_spec.rb
+- spec/td/client_sched_spec.rb
+- spec/td/client_spec.rb