fluent-plugin-td 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: afbd092911d2cd7dad6fcb41efacf01358796b2e
-  data.tar.gz: f42784d76b7ea099b03da998651e29b699b394f1
+SHA256:
+  metadata.gz: f8e132d9df4dd5ed1344497a0680b12caa75c8d9b6361feef6d36e6d50eef0d2
+  data.tar.gz: 475920dcb5e14528ce9e2c5d5baab44811fa1fcab9b613f22c8212e10e56cf4c
 SHA512:
-  metadata.gz: b178e4d7ceab20eaa84fac77d85d329d0048860c8bed0c8dda2e183e163b0b4115d95a6b0eb6ea4f130f56267e51a8a1d946e0260e92e1ad08b0748376f750f7
-  data.tar.gz: 8166d3de0f882545811ee022666a6114fe2e877d5e67355b31985324bc637fa347af25cc5344f167835063f295d88b17a3b50b72c5b1fde689670c7ed09e1aa9
+  metadata.gz: bf337f321840654a6ace12117b899234bfe9b144756d96f34986381e84eb8a9f4d6d2f970ae9d55a3b49ed4fce6bf3c9d514aaaaa6e44c441f567c75d3238b0a
+  data.tar.gz: 74fc971d23dac8608901ff7bcc9add4c969f20bdf3a293a653f26ebc703e3b951479ac9e98d296f83e222ad3dc8fc0c6636e5a0f1533e4e2fa6397225b7cc79b

data/ChangeLog

@@ -1,3 +1,9 @@
+Release 1.1.0 - 2019/12/18
+
+  * Add api_endpoint and import_endpoint to use proper endpoint for each request.
+    endpoint is now alias of import_endpoint
+
+
 Release 1.0.0 - 2017/11/26
 
   * Use new Plugin API

data/README.rdoc

@@ -5,7 +5,7 @@ Treasure Data's REST APIs.
 
 This plugin relies on the Treasure Data's {Ruby client library}[https://github.com/treasure-data/td-client-ruby] to communicate with the Treasure Data's REST APIs.
 
-For more information, please visit the official {Fluentd TD Output plugin}[http://docs.fluentd.org/articles/http-to-td] page at http://docs.fluentd.org.
+For more information, please visit the official {Fluentd TD Output plugin}[https://docs.fluentd.org/how-to-guides/http-to-td] page at https://docs.fluentd.org.
 
 == Configuration
 
@@ -37,7 +37,7 @@ The configuration options currently supported are:
   *NOTE* 
   
   depending on the access control permissions associated to the API key, a database can or cannot be created if not already available.
-  See the {Treasure Data Access Control documentation}[http://docs.treasuredata.com/articles/access-control] page for details.
+  See the {Treasure Data Access Control documentation}[https://docs.treasuredata.com/articles/access-control] page for details.
   
 +database+::
   Specifies the destination database in the Treasure Data cloud.
@@ -54,12 +54,19 @@ The configuration options currently supported are:
   This parameter is *required* unless the +auto_create_table+ option is used.
   
 +endpoint+::
-  Specifies the Treasure Data's REST API endpoint.
+  Specifies the Treasure Data's REST API endpoint for import requests.
   
   Requires the endpoint as argument.
   
-  If not specified, a default is used; please refer to the {td-client-ruby's :endpoint}[https://github.com/treasure-data/td-client-ruby#endpoint] option for more details.
+  If not specified, a default for import requests is used; please refer to the {td-client-ruby's :endpoint}[https://github.com/treasure-data/td-client-ruby#endpoint] option for more details.
   
++api_endpoint+::
+  Specifies the Treasure Data's REST API endpoint.
+
+  Requires the endpoint as argument.
+
+  If not specified, a default is used; please refer to the {td-client-ruby's :endpoint}[https://github.com/treasure-data/td-client-ruby#endpoint] option for more details.
+
 +use_ssl+::
   Specifies whether to communicate using SSL encryption over HTTPS.
   

data/fluent-plugin-td.gemspec

@@ -10,7 +10,6 @@ Gem::Specification.new do |gem|
   gem.version     = Fluent::Plugin::TreasureDataPlugin::VERSION
   gem.authors     = ["Treasure Data, Inc."]
   gem.email       = "support@treasure-data.com"
-  gem.has_rdoc    = false
   #gem.platform    = Gem::Platform::RUBY
   gem.files       = `git ls-files`.split("\n")
   gem.test_files  = `git ls-files -- {test,spec,features}/*`.split("\n")

data/lib/fluent/plugin/out_tdlog.rb

@@ -22,7 +22,8 @@ module Fluent::Plugin
     config_param :table, :string, :default => nil
     config_param :use_gzip_command, :bool, :default => false
 
-    config_param :endpoint, :string, :default => TreasureData::API::NEW_DEFAULT_ENDPOINT
+    config_param :import_endpoint, :string, :alias => :endpoint, :default => TreasureData::API::DEFAULT_IMPORT_ENDPOINT
+    config_param :api_endpoint, :string, :default => TreasureData::API::DEFAULT_ENDPOINT
     config_param :use_ssl, :bool, :default => true
     config_param :tmpdir, :string, :default => nil
     config_param :http_proxy, :string, :default => nil
@@ -78,11 +79,11 @@ module Fluent::Plugin
       super
 
       client_opts = {
-        :ssl => @use_ssl, :http_proxy => @http_proxy, :user_agent => @user_agent, :endpoint => @endpoint,
+        :ssl => @use_ssl, :http_proxy => @http_proxy, :user_agent => @user_agent,
         :connect_timeout => @connect_timeout, :read_timeout => @read_timeout, :send_timeout => @send_timeout
       }
-      @client = TreasureData::Client.new(@apikey, client_opts)
-
+      @client = TreasureData::Client.new(@apikey, client_opts.merge({:endpoint => @import_endpoint}))
+      @api_client = TreasureData::Client.new(@apikey, client_opts.merge({:endpoint => @api_endpoint}))
       if @key
         if @auto_create_table
           ensure_database_and_table(@database, @table)
@@ -263,10 +264,10 @@ module Fluent::Plugin
     def ensure_database_and_table(database, table)
       log.info "Creating table #{database}.#{table} on TreasureData"
       begin
-        @client.create_log_table(database, table)
+        @api_client.create_log_table(database, table)
       rescue TreasureData::NotFoundError
-        @client.create_database(database)
-        @client.create_log_table(database, table)
+        @api_client.create_database(database)
+        @api_client.create_log_table(database, table)
       rescue TreasureData::AlreadyExistsError
       end
     end

data/lib/fluent/plugin/td_plugin_version.rb

@@ -1,7 +1,7 @@
 module Fluent
   module Plugin
     module TreasureDataPlugin
-      VERSION = '1.0.0'
+      VERSION = '1.1.0'
     end
   end
 end

data/test/plugin/test_out_tdlog.rb

@@ -162,12 +162,11 @@ class TreasureDataLogOutputTest < Test::Unit::TestCase
   end
 
   def test_emit_with_endpoint
-    d = create_driver(DEFAULT_CONFIG + "endpoint foo.bar.baz")
-    opts = {:endpoint => 'foo.bar.baz'}
+    d = create_driver(DEFAULT_CONFIG + "endpoint foo.bar.baz\napi_endpoint boo.bar.baz")
     time, records = stub_seed_values
     database, table = d.instance.instance_variable_get(:@key).split(".", 2)
-    stub_td_table_create_request(database, table, opts)
-    stub_td_import_request(stub_request_body(records, time), database, table, opts)
+    stub_td_table_create_request(database, table, {:endpoint => 'boo.bar.baz'})
+    stub_td_import_request(stub_request_body(records, time), database, table, {:endpoint => 'foo.bar.baz'})
 
     d.run(default_tag: 'test') {
       records.each { |record|
@@ -177,12 +176,11 @@ class TreasureDataLogOutputTest < Test::Unit::TestCase
   end
 
   def test_emit_with_too_many_keys
-    d = create_driver(DEFAULT_CONFIG + "endpoint foo.bar.baz")
-    opts = {:endpoint => 'foo.bar.baz'}
-    time, records = stub_seed_values
+    d = create_driver(DEFAULT_CONFIG)
+    time, _ = stub_seed_values
     database, table = d.instance.instance_variable_get(:@key).split(".", 2)
-    stub_td_table_create_request(database, table, opts)
-    stub_td_import_request(stub_request_body([], time), database, table, opts)
+    stub_td_table_create_request(database, table)
+    stub_td_import_request(stub_request_body([], time), database, table)
 
     d.run(default_tag: 'test') {
       d.feed(time, create_too_many_keys_record)

data/test/test_helper.rb

@@ -59,7 +59,7 @@ class Test::Unit::TestCase
     opts[:use_ssl] = true unless opts.has_key?(:use_ssl)
     schema = opts[:use_ssl] ? 'https' : 'http'
     response = {"database" => database, "table" => table}.to_json
-    endpoint = opts[:endpoint] ? opts[:endpoint] : TreasureData::API::NEW_DEFAULT_ENDPOINT
+    endpoint = opts[:endpoint] ? opts[:endpoint] : TreasureData::API::DEFAULT_ENDPOINT
 
     url = "#{schema}://#{endpoint}/v3/table/create/#{e(database)}/#{e(table)}/log"
     stub_request(:post, url).to_return(:status => 200, :body => response)
@@ -70,7 +70,7 @@ class Test::Unit::TestCase
     format = opts[:format] || 'msgpack.gz'
     schema = opts[:use_ssl] ? 'https' : 'http'
     response = {"database" => db, "table" => table, "elapsed_time" => 0}.to_json
-    endpoint = opts[:endpoint] ? opts[:endpoint] : TreasureData::API::NEW_DEFAULT_IMPORT_ENDPOINT
+    endpoint = opts[:endpoint] ? opts[:endpoint] : TreasureData::API::DEFAULT_IMPORT_ENDPOINT
 
     # for check_table_existence
     url_with_empty = "#{schema}://#{endpoint}/v3/table/import/#{e(db)}/#{e(table)}/#{format}"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-td
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Treasure Data, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-27 00:00:00.000000000 Z
+date: 2019-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -141,8 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Treasure Data Cloud Data Service plugin for Fluentd