fix(influxdb2/client): Send Content-Type headers (#30)

* chore(changelog): Update changelog to add Content-Type header fix.

CHANGELOG.md

@@ -11,6 +11,7 @@
 ### Bugs
 1. [#22](https://github.com/influxdata/influxdb-client-ruby/pull/22): Fixed batch write
 1. [#28](https://github.com/influxdata/influxdb-client-ruby/pull/28): Correctly parse CSV where multiple results include multiple tables
+1. [#30](https://github.com/influxdata/influxdb-client-ruby/pull/30): Send Content-Type headers
 
 ## 1.1.0 [2020-02-14]
 

lib/influxdb2/client/default_api.rb

@@ -24,6 +24,8 @@ class DefaultApi
     DEFAULT_TIMEOUT = 10
     DEFAULT_REDIRECT_COUNT = 10
 
+    HEADER_CONTENT_TYPE = 'Content-Type'.freeze
+
     # @param [Hash] options The options to be used by the client.
     def initialize(options:)
       @options = options
@@ -32,7 +34,17 @@ def initialize(options:)
 
     private
 
-    def _post(payload, uri, limit = @max_redirect_count)
+    def _post_json(payload, uri, headers: {})
+      _check_arg_type(:headers, headers, Hash)
+      _post(payload, uri, headers: headers.merge({HEADER_CONTENT_TYPE => 'application/json'}))
+    end
+
+    def _post_text(payload, uri, headers: {})
+      _check_arg_type(:headers, headers, Hash)
+      _post(payload, uri, headers: headers.merge({HEADER_CONTENT_TYPE => 'text/plain'}))
+    end
+
+    def _post(payload, uri, limit: @max_redirect_count, headers: {})
       raise InfluxError.from_message("Too many HTTP redirects. Exceeded limit: #{@max_redirect_count}") if limit.zero?
 
       http = Net::HTTP.new(uri.host, uri.port)
@@ -44,6 +56,8 @@ def _post(payload, uri, limit = @max_redirect_count)
       request = Net::HTTP::Post.new(uri.request_uri)
       request['Authorization'] = "Token #{@options[:token]}"
       request['User-Agent'] = "influxdb-client-ruby/#{InfluxDB2::VERSION}"
+      headers.each { |k,v| request[k] = v }
+
       request.body = payload
 
       begin
@@ -53,7 +67,7 @@ def _post(payload, uri, limit = @max_redirect_count)
           response
         when Net::HTTPRedirection then
           location = response['location']
-          _post(payload, URI.parse(location), limit - 1)
+          _post(payload, URI.parse(location), limit: limit - 1, headers: headers)
         else
           raise InfluxError.from_response(response)
         end
@@ -62,6 +76,10 @@ def _post(payload, uri, limit = @max_redirect_count)
       end
     end
 
+    def _check_arg_type(name, value, klass)
+      raise TypeError, "expected a #{klass.name} for #{name}; got #{value.class.name}" unless value.is_a?(klass)
+    end
+
     def _check(key, value)
       raise ArgumentError, "The '#{key}' should be defined as argument or default option: #{@options}" if value.nil?
     end

lib/influxdb2/client/delete_api.rb

@@ -64,7 +64,7 @@ def _delete(delete_request, bucket: nil, org: nil)
       uri = URI.parse(File.join(@options[:url], '/api/v2/delete'))
       uri.query = URI.encode_www_form(org: org_param, bucket: bucket_param)
 
-      _post(delete_request.to_body.to_json, uri)
+      _post_json(delete_request.to_body.to_json, uri)
     end
 
     def _to_rfc3339(time)

lib/influxdb2/client/query_api.rb

@@ -73,7 +73,7 @@ def _post_query(query: nil, org: nil, dialect: DEFAULT_DIALECT)
       uri = URI.parse(File.join(@options[:url], '/api/v2/query'))
       uri.query = URI.encode_www_form(org: org_param)
 
-      _post(payload.to_body.to_json, uri)
+      _post_json(payload.to_body.to_json, uri)
     end
 
     def _generate_payload(query, dialect)

lib/influxdb2/client/write_api.rb

@@ -163,7 +163,7 @@ def write_raw(payload, precision: nil, bucket: nil, org: nil)
       uri = URI.parse(File.join(@options[:url], '/api/v2/write'))
       uri.query = URI.encode_www_form(bucket: bucket_param, org: org_param, precision: precision_param.to_s)
 
-      _post(payload, uri)
+      _post_text(payload, uri)
     end
 
     # Item for batching queue

test/influxdb/delete_api_test.rb

@@ -112,7 +112,8 @@ def test_user_agent_header
     body = '{"start":"2019-02-03T04:05:06+07:00","stop":"2019-04-03T04:05:06+07:00"}'
     headers = {
       'Authorization' => 'Token my-token',
-      'User-Agent' => "influxdb-client-ruby/#{InfluxDB2::VERSION}"
+      'User-Agent' => "influxdb-client-ruby/#{InfluxDB2::VERSION}",
+      'Content-Type' => 'application/json'
     }
     assert_requested(:post, 'http://localhost:9999/api/v2/delete?bucket=my-bucket&org=my-org',
                      times: 1, body: body, headers: headers)

test/influxdb/query_api_test.rb

@@ -73,7 +73,7 @@ def test_query
     assert_equal 'free', record1.field
   end
 
-  def test_user_agent_header
+  def test_headers
     stub_request(:post, 'http://localhost:9999/api/v2/query?org=my-org')
       .to_return(body: SUCCESS_DATA)
 
@@ -87,7 +87,8 @@ def test_user_agent_header
 
     headers = {
       'Authorization' => 'Token my-token',
-      'User-Agent' => "influxdb-client-ruby/#{InfluxDB2::VERSION}"
+      'User-Agent' => "influxdb-client-ruby/#{InfluxDB2::VERSION}",
+      'Content-Type' => 'application/json'
     }
     assert_requested(:post, 'http://localhost:9999/api/v2/query?org=my-org',
                      times: 1, headers: headers)

test/influxdb/write_api_test.rb

@@ -252,7 +252,7 @@ def test_write_precision_constant
     assert_equal 'The time precision not_supported is not supported.', error.message
   end
 
-  def test_user_agent_header
+  def test_headers
     stub_request(:any, 'http://localhost:9999/api/v2/write?bucket=my-bucket&org=my-org&precision=ns')
       .to_return(status: 204)
 
@@ -266,7 +266,8 @@ def test_user_agent_header
 
     headers = {
       'Authorization' => 'Token my-token',
-      'User-Agent' => "influxdb-client-ruby/#{InfluxDB2::VERSION}"
+      'User-Agent' => "influxdb-client-ruby/#{InfluxDB2::VERSION}",
+      'Content-Type' => 'text/plain'
     }
     assert_requested(:post, 'http://localhost:9999/api/v2/write?bucket=my-bucket&org=my-org&precision=ns',
                      times: 1, body: 'h2o,location=west value=33i 15', headers: headers)