influxdb-client 1.11.0.pre.1533 → 1.12.0.pre.1923

data/lib/influxdb2/client/models/health_check.rb

@@ -3,14 +3,15 @@
 
 #No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
 
-OpenAPI spec version: 0.1.0
+The version of the OpenAPI document: 0.1.0
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 3.3.4
+OpenAPI Generator version: 5.0.0-beta3
 
 =end
 
 require 'date'
+require 'time'
 
 module InfluxDB2
   class HealthCheck
@@ -20,7 +21,7 @@ module InfluxDB2
 
     attr_accessor :checks
 
-    attr_accessor :status
+    attr_reader :status
 
     attr_accessor :version
 
@@ -48,7 +49,7 @@ module InfluxDB2
       end
     end
 
-    # Attribute mapping from ruby-style variable name to JSON key.
+    # Attribute mapping from ruby-style variable name to JSON key
     def self.attribute_map
       {
         :'name' => :'name',
@@ -56,7 +57,7 @@ module InfluxDB2
         :'checks' => :'checks',
         :'status' => :'status',
         :'version' => :'version',
-        :'commit' => :'commit'
+        :'commit' => :'commit',
       }
     end
 
@@ -68,41 +69,54 @@ module InfluxDB2
         :'checks' => :'Array<HealthCheck>',
         :'status' => :'String',
         :'version' => :'String',
-        :'commit' => :'String'
+        :'commit' => :'String',
       }
     end
 
+    # List of attributes with nullable: true
+    def self.openapi_nullable
+      Set.new([
+      ])
+    end
+
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
     def initialize(attributes = {})
-      return unless attributes.is_a?(Hash)
+      if (!attributes.is_a?(Hash))
+        fail ArgumentError, "The input argument (attributes) must be a hash in `InfluxDB2::HealthCheck` initialize method"
+      end
 
-      # convert string to symbol for hash key
-      attributes = attributes.each_with_object({}) { |(k, v), h| h[k.to_sym] = v }
+      # check to see if the attribute exists and convert string to symbol for hash key
+      attributes = attributes.each_with_object({}) { |(k, v), h|
+        if (!self.class.attribute_map.key?(k.to_sym))
+          fail ArgumentError, "`#{k}` is not a valid attribute in `InfluxDB2::HealthCheck`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
+        end
+        h[k.to_sym] = v
+      }
 
-      if attributes.has_key?(:'name')
+      if attributes.key?(:'name')
         self.name = attributes[:'name']
       end
 
-      if attributes.has_key?(:'message')
+      if attributes.key?(:'message')
         self.message = attributes[:'message']
       end
 
-      if attributes.has_key?(:'checks')
+      if attributes.key?(:'checks')
         if (value = attributes[:'checks']).is_a?(Array)
           self.checks = value
         end
       end
 
-      if attributes.has_key?(:'status')
+      if attributes.key?(:'status')
         self.status = attributes[:'status']
       end
 
-      if attributes.has_key?(:'version')
+      if attributes.key?(:'version')
         self.version = attributes[:'version']
       end
 
-      if attributes.has_key?(:'commit')
+      if attributes.key?(:'commit')
         self.commit = attributes[:'commit']
       end
     end
@@ -127,7 +141,7 @@ module InfluxDB2
     def valid?
       return false if @name.nil?
       return false if @status.nil?
-      status_validator = EnumAttributeValidator.new('String', ['pass', 'fail'])
+      status_validator = EnumAttributeValidator.new('String', ["pass", "fail"])
       return false unless status_validator.valid?(@status)
       true
     end
@@ -135,9 +149,9 @@ module InfluxDB2
     # Custom attribute writer method checking allowed values (enum).
     # @param [Object] status Object to be assigned
     def status=(status)
-      validator = EnumAttributeValidator.new('String', ['pass', 'fail'])
+      validator = EnumAttributeValidator.new('String', ["pass", "fail"])
       unless validator.valid?(status)
-        fail ArgumentError, 'invalid value for "status", must be one of #{validator.allowable_values}.'
+        fail ArgumentError, "invalid value for \"status\", must be one of #{validator.allowable_values}."
       end
       @status = status
     end
@@ -162,9 +176,16 @@ module InfluxDB2
     end
 
     # Calculates hash code according to all attributes.
-    # @return [Fixnum] Hash code
+    # @return [Integer] Hash code
     def hash
-      [name, message, checks, status, version, commit].hash
+      [name, message, checks, status, version, commit, ].hash
+    end
+
+    # Builds the object from hash
+    # @param [Hash] attributes Model attributes in the form of hash
+    # @return [Object] Returns the model itself
+    def self.build_from_hash(attributes)
+      new.build_from_hash(attributes)
     end
 
     # Builds the object from hash
@@ -173,15 +194,17 @@ module InfluxDB2
     def build_from_hash(attributes)
       return nil unless attributes.is_a?(Hash)
       self.class.openapi_types.each_pair do |key, type|
-        if type =~ /\AArray<(.*)>/i
-          # check to ensure the input is an array given that the the attribute
+        if attributes[self.class.attribute_map[key]].nil? && self.class.openapi_nullable.include?(key)
+          self.send("#{key}=", nil)
+        elsif type =~ /\AArray<(.*)>/i
+          # check to ensure the input is an array given that the attribute
           # is documented as an array but the input is not
           if attributes[self.class.attribute_map[key]].is_a?(Array)
             self.send("#{key}=", attributes[self.class.attribute_map[key]].map { |v| _deserialize($1, v) })
           end
         elsif !attributes[self.class.attribute_map[key]].nil?
           self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
-        end # or else data not found in attributes(hash), not an issue as the data can be optional
+        end
       end
 
       self
@@ -193,8 +216,8 @@ module InfluxDB2
     # @return [Object] Deserialized data
     def _deserialize(type, value)
       case type.to_sym
-      when :DateTime
-        DateTime.parse(value)
+      when :Time
+        Time.parse(value)
       when :Date
         Date.parse(value)
       when :String
@@ -203,7 +226,7 @@ module InfluxDB2
         value.to_i
       when :Float
         value.to_f
-      when :BOOLEAN
+      when :Boolean
         if value.to_s =~ /\A(true|t|yes|y|1)\z/i
           true
         else
@@ -224,8 +247,7 @@ module InfluxDB2
           end
         end
       else # model
-        temp_model = InfluxDB2.const_get(type).new
-        temp_model.build_from_hash(value)
+        InfluxDB2.const_get(type).build_from_hash(value)
       end
     end
 
@@ -247,7 +269,11 @@ module InfluxDB2
       hash = {}
       self.class.attribute_map.each_pair do |attr, param|
         value = self.send(attr)
-        next if value.nil?
+        if value.nil?
+          is_nullable = self.class.openapi_nullable.include?(attr)
+          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
+        end
+        
         hash[param] = _to_hash(value)
       end
       hash
@@ -270,5 +296,6 @@ module InfluxDB2
         value
       end
     end
+
   end
 end

data/lib/influxdb2/client/models/query.rb

@@ -3,14 +3,15 @@
 
 #No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
 
-OpenAPI spec version: 0.1.0
+The version of the OpenAPI document: 0.1.0
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 3.3.4
+OpenAPI Generator version: 5.0.0-beta3
 
 =end
 
 require 'date'
+require 'time'
 
 module InfluxDB2
   # Query influx using the Flux language
@@ -21,7 +22,7 @@ module InfluxDB2
     attr_accessor :query
 
     # The type of query. Must be \"flux\".
-    attr_accessor :type
+    attr_reader :type
 
     attr_accessor :dialect
 
@@ -50,14 +51,14 @@ module InfluxDB2
       end
     end
 
-    # Attribute mapping from ruby-style variable name to JSON key.
+    # Attribute mapping from ruby-style variable name to JSON key
     def self.attribute_map
       {
         :'extern' => :'extern',
         :'query' => :'query',
         :'type' => :'type',
         :'dialect' => :'dialect',
-        :'now' => :'now'
+        :'now' => :'now',
       }
     end
 
@@ -68,35 +69,48 @@ module InfluxDB2
         :'query' => :'String',
         :'type' => :'String',
         :'dialect' => :'Dialect',
-        :'now' => :'DateTime'
+        :'now' => :'Time',
       }
     end
 
+    # List of attributes with nullable: true
+    def self.openapi_nullable
+      Set.new([
+      ])
+    end
+
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
     def initialize(attributes = {})
-      return unless attributes.is_a?(Hash)
+      if (!attributes.is_a?(Hash))
+        fail ArgumentError, "The input argument (attributes) must be a hash in `InfluxDB2::Query` initialize method"
+      end
 
-      # convert string to symbol for hash key
-      attributes = attributes.each_with_object({}) { |(k, v), h| h[k.to_sym] = v }
+      # check to see if the attribute exists and convert string to symbol for hash key
+      attributes = attributes.each_with_object({}) { |(k, v), h|
+        if (!self.class.attribute_map.key?(k.to_sym))
+          fail ArgumentError, "`#{k}` is not a valid attribute in `InfluxDB2::Query`. Please check the name to make sure it's valid. List of attributes: " + self.class.attribute_map.keys.inspect
+        end
+        h[k.to_sym] = v
+      }
 
-      if attributes.has_key?(:'extern')
+      if attributes.key?(:'extern')
         self.extern = attributes[:'extern']
       end
 
-      if attributes.has_key?(:'query')
+      if attributes.key?(:'query')
         self.query = attributes[:'query']
       end
 
-      if attributes.has_key?(:'type')
+      if attributes.key?(:'type')
         self.type = attributes[:'type']
       end
 
-      if attributes.has_key?(:'dialect')
+      if attributes.key?(:'dialect')
         self.dialect = attributes[:'dialect']
       end
 
-      if attributes.has_key?(:'now')
+      if attributes.key?(:'now')
         self.now = attributes[:'now']
       end
     end
@@ -116,7 +130,7 @@ module InfluxDB2
     # @return true if the model is valid
     def valid?
       return false if @query.nil?
-      type_validator = EnumAttributeValidator.new('String', ['flux'])
+      type_validator = EnumAttributeValidator.new('String', ["flux"])
       return false unless type_validator.valid?(@type)
       true
     end
@@ -124,9 +138,9 @@ module InfluxDB2
     # Custom attribute writer method checking allowed values (enum).
     # @param [Object] type Object to be assigned
     def type=(type)
-      validator = EnumAttributeValidator.new('String', ['flux'])
+      validator = EnumAttributeValidator.new('String', ["flux"])
       unless validator.valid?(type)
-        fail ArgumentError, 'invalid value for "type", must be one of #{validator.allowable_values}.'
+        fail ArgumentError, "invalid value for \"type\", must be one of #{validator.allowable_values}."
       end
       @type = type
     end
@@ -150,9 +164,16 @@ module InfluxDB2
     end
 
     # Calculates hash code according to all attributes.
-    # @return [Fixnum] Hash code
+    # @return [Integer] Hash code
     def hash
-      [extern, query, type, dialect, now].hash
+      [extern, query, type, dialect, now, ].hash
+    end
+
+    # Builds the object from hash
+    # @param [Hash] attributes Model attributes in the form of hash
+    # @return [Object] Returns the model itself
+    def self.build_from_hash(attributes)
+      new.build_from_hash(attributes)
     end
 
     # Builds the object from hash
@@ -161,15 +182,17 @@ module InfluxDB2
     def build_from_hash(attributes)
       return nil unless attributes.is_a?(Hash)
       self.class.openapi_types.each_pair do |key, type|
-        if type =~ /\AArray<(.*)>/i
-          # check to ensure the input is an array given that the the attribute
+        if attributes[self.class.attribute_map[key]].nil? && self.class.openapi_nullable.include?(key)
+          self.send("#{key}=", nil)
+        elsif type =~ /\AArray<(.*)>/i
+          # check to ensure the input is an array given that the attribute
           # is documented as an array but the input is not
           if attributes[self.class.attribute_map[key]].is_a?(Array)
             self.send("#{key}=", attributes[self.class.attribute_map[key]].map { |v| _deserialize($1, v) })
           end
         elsif !attributes[self.class.attribute_map[key]].nil?
           self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
-        end # or else data not found in attributes(hash), not an issue as the data can be optional
+        end
       end
 
       self
@@ -181,8 +204,8 @@ module InfluxDB2
     # @return [Object] Deserialized data
     def _deserialize(type, value)
       case type.to_sym
-      when :DateTime
-        DateTime.parse(value)
+      when :Time
+        Time.parse(value)
       when :Date
         Date.parse(value)
       when :String
@@ -191,7 +214,7 @@ module InfluxDB2
         value.to_i
       when :Float
         value.to_f
-      when :BOOLEAN
+      when :Boolean
         if value.to_s =~ /\A(true|t|yes|y|1)\z/i
           true
         else
@@ -212,8 +235,7 @@ module InfluxDB2
           end
         end
       else # model
-        temp_model = InfluxDB2.const_get(type).new
-        temp_model.build_from_hash(value)
+        InfluxDB2.const_get(type).build_from_hash(value)
       end
     end
 
@@ -235,7 +257,11 @@ module InfluxDB2
       hash = {}
       self.class.attribute_map.each_pair do |attr, param|
         value = self.send(attr)
-        next if value.nil?
+        if value.nil?
+          is_nullable = self.class.openapi_nullable.include?(attr)
+          next if !is_nullable || (is_nullable && !instance_variable_defined?(:"@#{attr}"))
+        end
+        
         hash[param] = _to_hash(value)
       end
       hash
@@ -258,5 +284,6 @@ module InfluxDB2
         value
       end
     end
+
   end
 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