td-client 1.0.7 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bfa8466ceb0e2dc014d9222e5bb295d7f9102951828531d993f9d92eb6592457
-  data.tar.gz: 8521a0ec4855d3d266fceabe8bbb7a42fcf52c38bdf4f6d8e8af96cae97add7f
+  metadata.gz: 54f6df5e1e0ea43f4a92e837b1793cf9f217cd643c7cecb831c9191fdb0396ae
+  data.tar.gz: f28643eb1908f7c6e251b75321a50dd87a0419f5f0982c218829e947a15ac04b
 SHA512:
-  metadata.gz: 477518baf02db8ec6f126f847d54b2b9fe5885a4bb3c5d6d07dfb4a8110d997ca4288541260932abd0e69dc56c50dd0ed1d62b5fbd9884cc6be10b31329b8440
-  data.tar.gz: f13066abdba694a7dd28f3fe67efac2c598f25b67f1fa7948dc85b4cdd6d9c476ea12eddd63b3229cb275ba193cb397f3a803a2c6ccc56cf7c08e56498d93e34
+  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/import.rb

@@ -29,9 +29,7 @@ module Import
     if code[0] != ?2
       raise_error("Import failed", res)
     end
-    js = checked_json(body, %w[])
-    time = js['elapsed_time'].to_f
-    return time
+    return true
   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}"
@@ -636,15 +645,27 @@ private
       klass
     else
       case status_code
+      when "400"
+        BadRequestError
+      when "401"
+        AuthError
+      when "403"
+        ForbiddenError
       when "404"
         NotFoundError
+      when "405"
+        MethodNotAllowedError
       when "409"
         message = "#{message}: conflicts_with job:#{error["details"]["conflicts_with"]}" if error["details"] && error["details"]["conflicts_with"]
         AlreadyExistsError
-      when "401"
-        AuthError
-      when "403"
-        ForbiddenError
+      when "415"
+        UnsupportedMediaTypeError
+      when "422"
+        UnprocessableEntityError
+      when "429"
+        TooManyRequestsError
+      when /\A4\d\d\z/
+        ClientError
       else
         message = "#{status_code}: #{message}"
         APIError

data/lib/td/client/api_error.rb

@@ -13,16 +13,32 @@ class APIError < StandardError
   end
 end
 
-# 401 API errors
-class AuthError < APIError
+# 4xx Client Errors
+class ClientError < APIError
 end
 
-# 403 API errors, used for database permissions
-class ForbiddenError < APIError
+# 400 Bad Request
+class BadRequestError < ClientError
 end
 
-# 409 API errors
-class AlreadyExistsError < APIError
+# 401 Unauthorized
+class AuthError < ClientError
+end
+
+# 403 Forbidden, used for database permissions
+class ForbiddenError < ClientError
+end
+
+# 404 Not Found
+class NotFoundError < ClientError
+end
+
+# 405 Method Not Allowed
+class MethodNotAllowedError < ClientError
+end
+
+# 409 Conflict
+class AlreadyExistsError < ClientError
   attr_reader :conflicts_with
   def initialize(error_message = nil, api_backtrace = nil, conflicts_with=nil)
     super(error_message, api_backtrace)
@@ -30,8 +46,16 @@ class AlreadyExistsError < APIError
   end
 end
 
-# 404 API errors
-class NotFoundError < APIError
+# 415 Unsupported Media Type
+class UnsupportedMediaTypeError < ClientError
+end
+
+# 422 Unprocessable Entity
+class UnprocessableEntityError < ClientError
+end
+
+# 429 Too Many Requests
+class TooManyRequestsError < ClientError
 end
 
 end

data/lib/td/client/version.rb

@@ -1,5 +1,5 @@
 module TreasureData
   class Client
-    VERSION = '1.0.7'
+    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,34 +37,54 @@ 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 {
-      api.delete_database('no_such_database')
+      begin
+        api.delete_database('no_such_database')
+      rescue Errno::ECONNRESET
+        raise OpenSSL::SSL::SSLError # When openssl does not support SSLv3, httpclient server will not start. For context: https://github.com/nahi/httpclient/pull/424#issuecomment-731714786
+      end
     }.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
   end
 
-  def setup_server(ssl_version)
+  def setup_server(ssl_version, port = 1000 + rand(1000))
     logger = Logger.new(STDERR)
     logger.level = Logger::Severity::FATAL  # avoid logging SSLError (ERROR level)
     @server = WEBrick::HTTPServer.new(
       :BindAddress => "localhost",
       :Logger => logger,
-      :Port => 0,
+      :Port => port,
       :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(

data/spec/td/client/import_api_spec.rb

@@ -46,9 +46,9 @@ describe 'Import API' do
       end
       stub_request(:put, "https://#{endpoint_import}/v3/table/import_with_id/db/table/unique_id/format").
         with(:body => '12345').
-        to_return(:body => '{"elapsed_time":"1.23"}')
+        to_return(:status => 200)
       File.open(t.path) do |f|
-        expect(api.import('db', 'table', 'format', f, 5, 'unique_id')).to eq(1.23)
+        expect(api.import('db', 'table', 'format', f, 5, 'unique_id')).to eq(true)
       end
     end
 
@@ -59,9 +59,9 @@ describe 'Import API' do
       end
       stub_request(:put, "https://#{endpoint_import}/v3/table/import/db/table/format").
         with(:body => '12345').
-        to_return(:body => '{"elapsed_time":"1.23"}')
+        to_return(:status => 200)
       File.open(t.path) do |f|
-        expect(api.import('db', 'table', 'format', f, 5)).to eq(1.23)
+        expect(api.import('db', 'table', 'format', f, 5)).to eq(true)
       end
     end
 
@@ -72,9 +72,9 @@ describe 'Import API' do
       end
       stub_request(:put, "http://#{endpoint_import_old}/v3/table/import/db/table/format").
         with(:body => '12345').
-        to_return(:body => '{"elapsed_time":"1.23"}')
+        to_return(:status => 200)
       File.open(t.path) do |f|
-        expect(api_old.import('db', 'table', 'format', f, 5)).to eq(1.23)
+        expect(api_old.import('db', 'table', 'format', f, 5)).to eq(true)
       end
     end
 
@@ -85,9 +85,9 @@ describe 'Import API' do
       end
       stub_request(:put, "https://#{endpoint_import}/v3/table/import/db/table/format").
         with(:body => '12345').
-        to_return(:body => '{"elapsed_time":"1.23"}')
+        to_return(:status => 200)
       File.open(t.path) do |f|
-        expect(api_default.import('db', 'table', 'format', f, 5)).to eq 1.23
+        expect(api_default.import('db', 'table', 'format', f, 5)).to eq true
       end
     end
 
@@ -98,9 +98,9 @@ describe 'Import API' do
       end
       stub_request(:put, "http://#{endpoint_import}/v3/table/import/db/table/format").
         with(:body => '12345').
-        to_return(:body => '{"elapsed_time":"1.23"}')
+        to_return(:status => 200)
       File.open(t.path) do |f|
-        expect(api_default_http.import('db', 'table', 'format', f, 5)).to eq 1.23
+        expect(api_default_http.import('db', 'table', 'format', f, 5)).to eq true
       end
     end
 
@@ -111,9 +111,9 @@ describe 'Import API' do
       end
       stub_request(:put, "https://#{endpoint_unknown}/v3/table/import/db/table/format").
         with(:body => '12345').
-        to_return(:body => '{"elapsed_time":"1.23"}')
+        to_return(:status => 200)
       File.open(t.path) do |f|
-        expect(api_unknown_host.import('db', 'table', 'format', f, 5)).to eq 1.23
+        expect(api_unknown_host.import('db', 'table', 'format', f, 5)).to eq true
       end
     end
 
@@ -124,9 +124,9 @@ describe 'Import API' do
       end
       stub_request(:put, "http://#{endpoint_unknown}/v3/table/import/db/table/format").
         with(:body => '12345').
-        to_return(:body => '{"elapsed_time":"1.23"}')
+        to_return(:status => 200)
       File.open(t.path) do |f|
-        expect(api_unknown_host_http.import('db', 'table', 'format', f, 5)).to eq 1.23
+        expect(api_unknown_host_http.import('db', 'table', 'format', f, 5)).to eq true
       end
     end
 

data/spec/td/client/model_job_spec.rb

@@ -140,15 +140,16 @@ describe 'Job Model' do
       end
 
       it 'calls a given block in every wait_interval second' do
-        now = 1_400_000_000
-        allow(self).to receive(:sleep){|arg| now += arg }
-        allow(Process).to receive(:clock_gettime){ now }
+        # Let's try disable stubbing #sleep for now
+        # now = 1_400_000_000
+        # allow(self).to receive(:sleep){|arg| now += arg }
+        # allow(Process).to receive(:clock_gettime){ now }
         expect { |b|
           begin
             thread = Thread.start {
-              job.wait(nil, 2, &b)
+              job.wait(nil, 0.1, &b)
             }
-            sleep 6
+            sleep 0.3
             change_job_status(Job::STATUS_SUCCESS)
             thread.join(1)
             expect(thread).to be_stop

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: td-client
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 2.0.0
 platform: ruby
 authors:
 - Treasure Data, Inc.
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-06-04 00:00:00.000000000 Z
+date: 2023-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -128,6 +128,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: webrick
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Treasure Data API library for Ruby
 email: support@treasure-data.com
 executables: []
@@ -183,7 +197,7 @@ homepage: http://treasuredata.com/
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -198,8 +212,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.0.beta3
-signing_key: 
+rubygems_version: 3.4.10
+signing_key:
 specification_version: 4
 summary: Treasure Data API library for Ruby
 test_files: