influxdb-client 1.11.0.pre.1492 → 1.12.0.pre.1894

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1236713d44eae0b2c2ae536e01701d2bd18aa5117de56abc9a7b4f66fcbb2be0
-  data.tar.gz: 167624af36d2c8e14f80b453dd530f7c0a91e6d2e0f454082c401e0ab2086678
+  metadata.gz: 348cc579c1aa802928e344e2075f7aa4896363108f9e30407e07c8fe8d293686
+  data.tar.gz: 434a5039b83030ce068a3b913880e2c3d084f495cfbd119a839428ceb08f4f5e
 SHA512:
-  metadata.gz: bac2f6e4a30be9fc2b98a8ab428e9ff4659f8b1350107cbdf8a73899735353bfba2668c901be2405ae66b8636d314416e56904df7f7cb56399e7c7f052a1b06a
-  data.tar.gz: 656c0752105f1af52295a94d7b6dc95db691948ecbde468382f991b30498cd9189b25745393fcdddf0a6384944e4c0d0bb4cae7a996deafbd7d1cd90a3510a96
+  metadata.gz: f917dc680761aabd57d033211da42712cb560c7461cec2f15f581e40e9f22b6e511c1e8c9874ceaa6f8dc8502c512dc09640f4cdbfdce7e601ba970670ab1788
+  data.tar.gz: e5d9bc0d90cf42b3b9b8cd2e10c771f095cbe176adeb022ed903b27e347b028abde77c01bcb59113a419589dcfcce92bb429a4881e82269d5dcf0abedbf7fa2d

data/.circleci/config.yml

@@ -78,7 +78,7 @@ jobs:
         default: &default-ruby-image "circleci/ruby:2.6-stretch"
       influxdb-image:
         type: string
-        default: &default-influxdb-image "influxdb:v2.0.3"
+        default: &default-influxdb-image "influxdb:v2.0.4"
     docker:
       - image: << parameters.ruby-image >>
       - image: &influx-image quay.io/influxdb/<< parameters.influxdb-image >>
@@ -117,6 +117,9 @@ workflows:
   version: 2
   build:
     jobs:
+      - tests-ruby:
+          name: ruby-3.0
+          ruby-image: "circleci/ruby:3.0-buster"
       - tests-ruby:
           name: ruby-2.7
           ruby-image: "circleci/ruby:2.7-buster"
@@ -133,6 +136,7 @@ workflows:
           ruby-image: "circleci/ruby:2.4-stretch"
       - deploy-preview:
           requires:
+            - ruby-3.0
             - ruby-2.7
             - ruby-2.6
             - ruby-2.6-nightly

data/CHANGELOG.md

@@ -1,7 +1,13 @@
-## 1.11.0 [unreleased]
+## 1.12.0 [unreleased]
+
+### Features
+1. [#71](https://github.com/influxdata/influxdb-client-ruby/pull/71): Added possibility to specify the certification verification behaviour
+
+## 1.11.0 [2021-01-29]
 
 ### CI
 1. [#63](https://github.com/influxdata/influxdb-client-ruby/pull/63): Updated default docker image to v2.0.3
+1. [#65](https://github.com/influxdata/influxdb-client-ruby/pull/65): Added Ruby 3.0 into CI
 
 ## 1.10.0 [2020-12-04]
 

data/README.md

@@ -23,7 +23,7 @@ The client can be installed manually or with bundler.
 To install the client gem manually:
 
 ```
-gem install influxdb-client -v 1.10.0
+gem install influxdb-client -v 1.11.0
 ```
 
 ## Usage
@@ -48,6 +48,7 @@ client = InfluxDB2::Client.new('https://localhost:8086', 'my-token')
 | read_timeout | Number of seconds to wait for one block of data to be read | Integer | 10 |
 | max_redirect_count | Maximal number of followed HTTP redirects | Integer | 10 |
 | use_ssl | Turn on/off SSL for HTTP communication | bool | true |
+| verify_mode | Sets the flags for the certification verification at beginning of SSL/TLS session. | `OpenSSL::SSL::VERIFY_NONE` or `OpenSSL::SSL::VERIFY_PEER` | none |
 
 ```ruby
 client = InfluxDB2::Client.new('https://localhost:8086', 'my-token',

data/bin/influxdb-restart.sh

@@ -27,7 +27,7 @@ DEFAULT_DOCKER_REGISTRY="quay.io/influxdb/"
 DOCKER_REGISTRY="${DOCKER_REGISTRY:-$DEFAULT_DOCKER_REGISTRY}"
 
 DEFAULT_INFLUXDB_V2_REPOSITORY="influxdb"
-DEFAULT_INFLUXDB_V2_VERSION="v2.0.3"
+DEFAULT_INFLUXDB_V2_VERSION="v2.0.4"
 INFLUXDB_V2_REPOSITORY="${INFLUXDB_V2_REPOSITORY:-$DEFAULT_INFLUXDB_V2_REPOSITORY}"
 INFLUXDB_V2_VERSION="${INFLUXDB_V2_VERSION:-$DEFAULT_INFLUXDB_V2_VERSION}"
 INFLUXDB_V2_IMAGE=${DOCKER_REGISTRY}${INFLUXDB_V2_REPOSITORY}:${INFLUXDB_V2_VERSION}

data/lib/influxdb2/client/client.rb

@@ -43,6 +43,9 @@ module InfluxDB2
     # @option options [Integer] :read_timeout Number of seconds to wait for one block of data to be read
     # @option options [Integer] :max_redirect_count Maximal number of followed HTTP redirects
     # @option options [bool] :use_ssl Turn on/off SSL for HTTP communication
+    # @option options [Integer] :verify_mode Sets the flags for the certification verification
+    #   at beginning of SSL/TLS session. Could be one of `OpenSSL::SSL::VERIFY_NONE` or `OpenSSL::SSL::VERIFY_PEER`.
+    #   For more info see - https://docs.ruby-lang.org/en/3.0.0/Net/HTTP.html#verify_mode.
     # @option options [Logger] :logger Logger used for logging. Disable logging by set to false.
     # @option options [Hash] :tags Default tags which will be added to each point written by api.
     #   the body line-protocol

data/lib/influxdb2/client/default_api.rb

@@ -84,11 +84,7 @@ module InfluxDB2
     def _request(payload, uri, limit: @max_redirect_count, headers: {}, request: Net::HTTP::Post)
       raise InfluxError.from_message("Too many HTTP redirects. Exceeded limit: #{@max_redirect_count}") if limit.zero?
 
-      http = Net::HTTP.new(uri.host, uri.port)
-      http.open_timeout = @options[:open_timeout] || DEFAULT_TIMEOUT
-      http.write_timeout = @options[:write_timeout] || DEFAULT_TIMEOUT if Net::HTTP.method_defined? :write_timeout
-      http.read_timeout = @options[:read_timeout] || DEFAULT_TIMEOUT
-      http.use_ssl = @options[:use_ssl].nil? ? true : @options[:use_ssl]
+      http = _prepare_http_client(uri)
 
       request = request.new(uri.request_uri)
       request['Authorization'] = "Token #{@options[:token]}"
@@ -115,6 +111,16 @@ module InfluxDB2
       end
     end
 
+    def _prepare_http_client(uri)
+      http = Net::HTTP.new(uri.host, uri.port)
+      http.open_timeout = @options[:open_timeout] || DEFAULT_TIMEOUT
+      http.write_timeout = @options[:write_timeout] || DEFAULT_TIMEOUT if Net::HTTP.method_defined? :write_timeout
+      http.read_timeout = @options[:read_timeout] || DEFAULT_TIMEOUT
+      http.use_ssl = @options[:use_ssl].nil? ? true : @options[:use_ssl]
+      http.verify_mode = @options[:verify_mode] if @options[:verify_mode]
+      http
+    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

data/lib/influxdb2/client/version.rb

@@ -19,5 +19,5 @@
 # THE SOFTWARE.
 
 module InfluxDB2
-  VERSION = '1.11.0'.freeze
+  VERSION = '1.12.0'.freeze
 end

data/test/influxdb/default_api_test.rb

@@ -57,4 +57,33 @@ class DefaultApiTest < MiniTest::Test
 
     @api.log(:info, 'without error')
   end
+
+  def test_default_verify_mode
+    http_client = @api.send(:_prepare_http_client, URI.parse('https://localhost:8086'))
+
+    refute_nil http_client
+    assert_nil http_client.verify_mode
+
+    http_client.finish if http_client.started?
+  end
+
+  def test_default_verify_mode_none
+    @api = InfluxDB2::DefaultApi.new(options: { logger: @logger, verify_mode: OpenSSL::SSL::VERIFY_NONE })
+    http_client = @api.send(:_prepare_http_client, URI.parse('https://localhost:8086'))
+
+    refute_nil http_client
+    assert_equal OpenSSL::SSL::VERIFY_NONE, http_client.verify_mode
+
+    http_client.finish if http_client.started?
+  end
+
+  def test_default_verify_mode_peer
+    @api = InfluxDB2::DefaultApi.new(options: { logger: @logger, verify_mode: OpenSSL::SSL::VERIFY_PEER })
+    http_client = @api.send(:_prepare_http_client, URI.parse('https://localhost:8086'))
+
+    refute_nil http_client
+    assert_equal OpenSSL::SSL::VERIFY_PEER, http_client.verify_mode
+
+    http_client.finish if http_client.started?
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: influxdb-client
 version: !ruby/object:Gem::Version
-  version: 1.11.0.pre.1492
+  version: 1.12.0.pre.1894
 platform: ruby
 authors:
 - Jakub Bednar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-16 00:00:00.000000000 Z
+date: 2021-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler