pulp_maven_client 0.1.0b2 → 0.1.0b3

data/lib/pulp_maven_client/api_client.rb

@@ -6,7 +6,7 @@
 The version of the OpenAPI document: v3
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 4.0.1-SNAPSHOT
+OpenAPI Generator version: 4.1.3-SNAPSHOT
 
 =end
 
@@ -14,8 +14,7 @@ require 'date'
 require 'json'
 require 'logger'
 require 'tempfile'
-require 'typhoeus'
-require 'uri'
+require 'faraday'
 
 module PulpMavenClient
   class ApiClient
@@ -47,26 +46,46 @@ module PulpMavenClient
     # @return [Array<(Object, Integer, Hash)>] an array of 3 elements:
     #   the data deserialized from response body (could be nil), response status code and response headers.
     def call_api(http_method, path, opts = {})
-      request = build_request(http_method, path, opts)
-      response = request.run
+      ssl_options = {
+        :ca_file => @config.ssl_ca_file,
+        :verify => @config.ssl_verify,
+        :verify_mode => @config.ssl_verify_mode,
+        :client_cert => @config.ssl_client_cert,
+        :client_key => @config.ssl_client_key
+      }
 
-      if @config.debugging
-        @config.logger.debug "HTTP response body ~BEGIN~\n#{response.body}\n~END~\n"
+      connection = Faraday.new(:url => config.base_url, :ssl => ssl_options) do |conn|
+        conn.basic_auth(config.username, config.password)
+        if opts[:header_params]["Content-Type"] == "multipart/form-data"
+          conn.request :multipart
+          conn.request :url_encoded
+        end
+        conn.adapter(Faraday.default_adapter)
       end
 
-      unless response.success?
-        if response.timed_out?
-          fail ApiError.new('Connection timed out')
-        elsif response.code == 0
-          # Errors from libcurl will be made visible here
-          fail ApiError.new(:code => 0,
-                            :message => response.return_message)
-        else
-          fail ApiError.new(:code => response.code,
-                            :response_headers => response.headers,
-                            :response_body => response.body),
-               response.status_message
+      begin
+        response = connection.public_send(http_method.to_sym.downcase) do |req|
+          build_request(http_method, path, req, opts)
+        end
+
+        if @config.debugging
+          @config.logger.debug "HTTP response body ~BEGIN~\n#{response.body}\n~END~\n"
+        end
+
+        unless response.success?
+          if response.status == 0
+            # Errors from libcurl will be made visible here
+            fail ApiError.new(:code => 0,
+                              :message => response.return_message)
+          else
+            fail ApiError.new(:code => response.status,
+                              :response_headers => response.headers,
+                              :response_body => response.body),
+                 response.reason_phrase
+          end
         end
+      rescue Faraday::TimeoutError
+        fail ApiError.new('Connection timed out')
       end
 
       if opts[:return_type]
@@ -74,7 +93,7 @@ module PulpMavenClient
       else
         data = nil
       end
-      return data, response.code, response.headers
+      return data, response.status, response.headers
     end
 
     # Builds the HTTP request
@@ -86,7 +105,7 @@ module PulpMavenClient
     # @option opts [Hash] :form_params Query parameters
     # @option opts [Object] :body HTTP body (JSON/XML)
     # @return [Typhoeus::Request] A Typhoeus Request
-    def build_request(http_method, path, opts = {})
+    def build_request(http_method, path, request, opts = {})
       url = build_request_url(path)
       http_method = http_method.to_sym.downcase
 
@@ -96,25 +115,15 @@ module PulpMavenClient
 
       update_params_for_auth! header_params, query_params, opts[:auth_names]
 
-      # set ssl_verifyhosts option based on @config.verify_ssl_host (true/false)
-      _verify_ssl_host = @config.verify_ssl_host ? 2 : 0
-
       req_opts = {
         :method => http_method,
         :headers => header_params,
         :params => query_params,
         :params_encoding => @config.params_encoding,
         :timeout => @config.timeout,
-        :ssl_verifypeer => @config.verify_ssl,
-        :ssl_verifyhost => _verify_ssl_host,
-        :sslcert => @config.cert_file,
-        :sslkey => @config.key_file,
         :verbose => @config.debugging
       }
 
-      # set custom cert, if provided
-      req_opts[:cainfo] = @config.ssl_ca_cert if @config.ssl_ca_cert
-
       if [:post, :patch, :put, :delete].include?(http_method)
         req_body = build_request_body(header_params, form_params, opts[:body])
         req_opts.update :body => req_body
@@ -122,12 +131,46 @@ module PulpMavenClient
           @config.logger.debug "HTTP request body param ~BEGIN~\n#{req_body}\n~END~\n"
         end
       end
-
-      request = Typhoeus::Request.new(url, req_opts)
+      request.headers = header_params
+      request.body = req_body
+      request.url url
+      request.params = query_params
       download_file(request) if opts[:return_type] == 'File'
       request
     end
 
+    # Builds the HTTP request body
+    #
+    # @param [Hash] header_params Header parameters
+    # @param [Hash] form_params Query parameters
+    # @param [Object] body HTTP body (JSON/XML)
+    # @return [String] HTTP body data in the form of string
+    def build_request_body(header_params, form_params, body)
+      # http form
+      if header_params['Content-Type'] == 'application/x-www-form-urlencoded'
+        data = URI.encode_www_form(form_params)
+      elsif header_params['Content-Type'] == 'multipart/form-data'
+        data = {}
+        form_params.each do |key, value|
+          case value
+          when ::File, ::Tempfile
+            # TODO hardcode to application/octet-stream, need better way to detect content type
+            data[key] = Faraday::UploadIO.new(value.path, 'application/octet-stream', value.path)
+          when ::Array, nil
+            # let Faraday handle Array and nil parameters
+            data[key] = value
+          else
+            data[key] = value.to_s
+          end
+        end
+      elsif body
+        data = body.is_a?(String) ? body : body.to_json
+      else
+        data = nil
+      end
+      data
+    end
+
     # Check if the given MIME is a JSON MIME.
     # JSON MIME examples:
     #   application/json
@@ -262,35 +305,7 @@ module PulpMavenClient
     def build_request_url(path)
       # Add leading and trailing slashes to path
       path = "/#{path}".gsub(/\/+/, '/')
-      URI.encode(@config.base_url + path)
-    end
-
-    # Builds the HTTP request body
-    #
-    # @param [Hash] header_params Header parameters
-    # @param [Hash] form_params Query parameters
-    # @param [Object] body HTTP body (JSON/XML)
-    # @return [String] HTTP body data in the form of string
-    def build_request_body(header_params, form_params, body)
-      # http form
-      if header_params['Content-Type'] == 'application/x-www-form-urlencoded' ||
-          header_params['Content-Type'] == 'multipart/form-data'
-        data = {}
-        form_params.each do |key, value|
-          case value
-          when ::File, ::Array, nil
-            # let typhoeus handle File, Array and nil parameters
-            data[key] = value
-          else
-            data[key] = value.to_s
-          end
-        end
-      elsif body
-        data = body.is_a?(String) ? body : body.to_json
-      else
-        data = nil
-      end
-      data
+      @config.base_url + path
     end
 
     # Update hearder and query params based on authentication settings.

data/lib/pulp_maven_client/api_error.rb

@@ -6,7 +6,7 @@
 The version of the OpenAPI document: v3
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 4.0.1-SNAPSHOT
+OpenAPI Generator version: 4.1.3-SNAPSHOT
 
 =end
 

data/lib/pulp_maven_client/configuration.rb

@@ -6,12 +6,10 @@
 The version of the OpenAPI document: v3
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 4.0.1-SNAPSHOT
+OpenAPI Generator version: 4.1.3-SNAPSHOT
 
 =end
 
-require 'uri'
-
 module PulpMavenClient
   class Configuration
     # Defines url scheme
@@ -88,33 +86,28 @@ module PulpMavenClient
     # @note Do NOT set it to false in production code, otherwise you would face multiple types of cryptographic attacks.
     #
     # @return [true, false]
-    attr_accessor :verify_ssl
+    attr_accessor :ssl_verify
 
     ### TLS/SSL setting
-    # Set this to false to skip verifying SSL host name
-    # Default to true.
+    # Any `OpenSSL::SSL::` constant (see https://ruby-doc.org/stdlib-2.5.1/libdoc/openssl/rdoc/OpenSSL/SSL.html)
     #
     # @note Do NOT set it to false in production code, otherwise you would face multiple types of cryptographic attacks.
     #
-    # @return [true, false]
-    attr_accessor :verify_ssl_host
+    attr_accessor :ssl_verify_mode
 
     ### TLS/SSL setting
     # Set this to customize the certificate file to verify the peer.
     #
     # @return [String] the path to the certificate file
-    #
-    # @see The `cainfo` option of Typhoeus, `--cert` option of libcurl. Related source code:
-    # https://github.com/typhoeus/typhoeus/blob/master/lib/typhoeus/easy_factory.rb#L145
-    attr_accessor :ssl_ca_cert
+    attr_accessor :ssl_ca_file
 
     ### TLS/SSL setting
     # Client certificate file (for client certificate)
-    attr_accessor :cert_file
+    attr_accessor :ssl_client_cert
 
     ### TLS/SSL setting
     # Client private key file (for client certificate)
-    attr_accessor :key_file
+    attr_accessor :ssl_client_key
 
     # Set this to customize parameters encoding of array parameter with multi collectionFormat.
     # Default to nil.
@@ -135,11 +128,11 @@ module PulpMavenClient
       @api_key_prefix = {}
       @timeout = 0
       @client_side_validation = true
-      @verify_ssl = true
-      @verify_ssl_host = true
-      @params_encoding = nil
-      @cert_file = nil
-      @key_file = nil
+      @ssl_verify = true
+      @ssl_verify_mode = nil
+      @ssl_ca_file = nil
+      @ssl_client_cert = nil
+      @ssl_client_key = nil
       @debugging = false
       @inject_format = false
       @force_ending_format = false
@@ -174,8 +167,7 @@ module PulpMavenClient
     end
 
     def base_url
-      url = "#{scheme}://#{[host, base_path].join('/').gsub(/\/+/, '/')}".sub(/\/+\z/, '')
-      URI.encode(url)
+      "#{scheme}://#{[host, base_path].join('/').gsub(/\/+/, '/')}".sub(/\/+\z/, '')
     end
 
     # Gets API key (with prefix if set).

data/lib/pulp_maven_client/models/async_operation_response.rb

@@ -6,7 +6,7 @@
 The version of the OpenAPI document: v3
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 4.0.1-SNAPSHOT
+OpenAPI Generator version: 4.1.3-SNAPSHOT
 
 =end
 

data/lib/pulp_maven_client/models/inline_response200.rb

@@ -6,7 +6,7 @@
 The version of the OpenAPI document: v3
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 4.0.1-SNAPSHOT
+OpenAPI Generator version: 4.1.3-SNAPSHOT
 
 =end
 
@@ -14,20 +14,20 @@ require 'date'
 
 module PulpMavenClient
   class InlineResponse200
+    attr_accessor :count
+
     attr_accessor :_next
 
     attr_accessor :previous
 
-    attr_accessor :count
-
     attr_accessor :results
 
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
+        :'count' => :'count',
         :'_next' => :'next',
         :'previous' => :'previous',
-        :'count' => :'count',
         :'results' => :'results'
       }
     end
@@ -35,9 +35,9 @@ module PulpMavenClient
     # Attribute type mapping.
     def self.openapi_types
       {
+        :'count' => :'Integer',
         :'_next' => :'String',
         :'previous' => :'String',
-        :'count' => :'Integer',
         :'results' => :'Array<MavenArtifact>'
       }
     end
@@ -57,6 +57,10 @@ module PulpMavenClient
         h[k.to_sym] = v
       }
 
+      if attributes.key?(:'count')
+        self.count = attributes[:'count']
+      end
+
       if attributes.key?(:'_next')
         self._next = attributes[:'_next']
       end
@@ -65,10 +69,6 @@ module PulpMavenClient
         self.previous = attributes[:'previous']
       end
 
-      if attributes.key?(:'count')
-        self.count = attributes[:'count']
-      end
-
       if attributes.key?(:'results')
         if (value = attributes[:'results']).is_a?(Array)
           self.results = value
@@ -104,9 +104,9 @@ module PulpMavenClient
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
+          count == o.count &&
           _next == o._next &&
           previous == o.previous &&
-          count == o.count &&
           results == o.results
     end
 
@@ -119,7 +119,7 @@ module PulpMavenClient
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [_next, previous, count, results].hash
+      [count, _next, previous, results].hash
     end
 
     # Builds the object from hash

data/lib/pulp_maven_client/models/inline_response2001.rb

@@ -6,7 +6,7 @@
 The version of the OpenAPI document: v3
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 4.0.1-SNAPSHOT
+OpenAPI Generator version: 4.1.3-SNAPSHOT
 
 =end
 
@@ -14,20 +14,20 @@ require 'date'
 
 module PulpMavenClient
   class InlineResponse2001
+    attr_accessor :count
+
     attr_accessor :_next
 
     attr_accessor :previous
 
-    attr_accessor :count
-
     attr_accessor :results
 
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
+        :'count' => :'count',
         :'_next' => :'next',
         :'previous' => :'previous',
-        :'count' => :'count',
         :'results' => :'results'
       }
     end
@@ -35,9 +35,9 @@ module PulpMavenClient
     # Attribute type mapping.
     def self.openapi_types
       {
+        :'count' => :'Integer',
         :'_next' => :'String',
         :'previous' => :'String',
-        :'count' => :'Integer',
         :'results' => :'Array<MavenDistribution>'
       }
     end
@@ -57,6 +57,10 @@ module PulpMavenClient
         h[k.to_sym] = v
       }
 
+      if attributes.key?(:'count')
+        self.count = attributes[:'count']
+      end
+
       if attributes.key?(:'_next')
         self._next = attributes[:'_next']
       end
@@ -65,10 +69,6 @@ module PulpMavenClient
         self.previous = attributes[:'previous']
       end
 
-      if attributes.key?(:'count')
-        self.count = attributes[:'count']
-      end
-
       if attributes.key?(:'results')
         if (value = attributes[:'results']).is_a?(Array)
           self.results = value
@@ -104,9 +104,9 @@ module PulpMavenClient
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
+          count == o.count &&
           _next == o._next &&
           previous == o.previous &&
-          count == o.count &&
           results == o.results
     end
 
@@ -119,7 +119,7 @@ module PulpMavenClient
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [_next, previous, count, results].hash
+      [count, _next, previous, results].hash
     end
 
     # Builds the object from hash

data/lib/pulp_maven_client/models/inline_response2002.rb

@@ -6,7 +6,7 @@
 The version of the OpenAPI document: v3
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 4.0.1-SNAPSHOT
+OpenAPI Generator version: 4.1.3-SNAPSHOT
 
 =end
 
@@ -14,20 +14,20 @@ require 'date'
 
 module PulpMavenClient
   class InlineResponse2002
+    attr_accessor :count
+
     attr_accessor :_next
 
     attr_accessor :previous
 
-    attr_accessor :count
-
     attr_accessor :results
 
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
+        :'count' => :'count',
         :'_next' => :'next',
         :'previous' => :'previous',
-        :'count' => :'count',
         :'results' => :'results'
       }
     end
@@ -35,9 +35,9 @@ module PulpMavenClient
     # Attribute type mapping.
     def self.openapi_types
       {
+        :'count' => :'Integer',
         :'_next' => :'String',
         :'previous' => :'String',
-        :'count' => :'Integer',
         :'results' => :'Array<MavenRemote>'
       }
     end
@@ -57,6 +57,10 @@ module PulpMavenClient
         h[k.to_sym] = v
       }
 
+      if attributes.key?(:'count')
+        self.count = attributes[:'count']
+      end
+
       if attributes.key?(:'_next')
         self._next = attributes[:'_next']
       end
@@ -65,10 +69,6 @@ module PulpMavenClient
         self.previous = attributes[:'previous']
       end
 
-      if attributes.key?(:'count')
-        self.count = attributes[:'count']
-      end
-
       if attributes.key?(:'results')
         if (value = attributes[:'results']).is_a?(Array)
           self.results = value
@@ -104,9 +104,9 @@ module PulpMavenClient
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
+          count == o.count &&
           _next == o._next &&
           previous == o.previous &&
-          count == o.count &&
           results == o.results
     end
 
@@ -119,7 +119,7 @@ module PulpMavenClient
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [_next, previous, count, results].hash
+      [count, _next, previous, results].hash
     end
 
     # Builds the object from hash

data/lib/pulp_maven_client/models/maven_artifact.rb

@@ -6,7 +6,7 @@
 The version of the OpenAPI document: v3
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 4.0.1-SNAPSHOT
+OpenAPI Generator version: 4.1.3-SNAPSHOT
 
 =end
 

data/lib/pulp_maven_client/models/maven_distribution.rb

@@ -6,7 +6,7 @@
 The version of the OpenAPI document: v3
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 4.0.1-SNAPSHOT
+OpenAPI Generator version: 4.1.3-SNAPSHOT
 
 =end
 

data/lib/pulp_maven_client/models/maven_remote.rb

@@ -6,7 +6,7 @@
 The version of the OpenAPI document: v3
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 4.0.1-SNAPSHOT
+OpenAPI Generator version: 4.1.3-SNAPSHOT
 
 =end
 
@@ -27,13 +27,10 @@ module PulpMavenClient
     # The URL of an external content source.
     attr_accessor :url
 
-    # If True, the plugin will validate imported artifacts.
-    attr_accessor :validate
-
-    # A PEM encoded CA certificate used to validate the server certificate presented by the remote server. Returns SHA256 sum on GET.
+    # A string containing the PEM encoded CA certificate used to validate the server certificate presented by the remote server. All new line characters must be escaped. Returns SHA256 sum on GET.
     attr_accessor :ssl_ca_certificate
 
-    # A PEM encoded client certificate used for authentication. Returns SHA256 sum on GET.
+    # A string containing the PEM encoded client certificate used for authentication. All new line characters must be escaped. Returns SHA256 sum on GET.
     attr_accessor :ssl_client_certificate
 
     # A PEM encoded private key used for authentication. Returns SHA256 sum on GET.
@@ -57,7 +54,7 @@ module PulpMavenClient
     # Total number of simultaneous connections.
     attr_accessor :download_concurrency
 
-    # The policy to use when downloading content. The possible values include: 'immediate', 'on_demand', and 'cache_only'. 'immediate' is the default.
+    # The policy to use when downloading content.
     attr_accessor :policy
 
     class EnumAttributeValidator
@@ -90,7 +87,6 @@ module PulpMavenClient
         :'_type' => :'_type',
         :'name' => :'name',
         :'url' => :'url',
-        :'validate' => :'validate',
         :'ssl_ca_certificate' => :'ssl_ca_certificate',
         :'ssl_client_certificate' => :'ssl_client_certificate',
         :'ssl_client_key' => :'ssl_client_key',
@@ -112,7 +108,6 @@ module PulpMavenClient
         :'_type' => :'String',
         :'name' => :'String',
         :'url' => :'String',
-        :'validate' => :'Boolean',
         :'ssl_ca_certificate' => :'String',
         :'ssl_client_certificate' => :'String',
         :'ssl_client_key' => :'String',
@@ -161,10 +156,6 @@ module PulpMavenClient
         self.url = attributes[:'url']
       end
 
-      if attributes.key?(:'validate')
-        self.validate = attributes[:'validate']
-      end
-
       if attributes.key?(:'ssl_ca_certificate')
         self.ssl_ca_certificate = attributes[:'ssl_ca_certificate']
       end
@@ -278,7 +269,7 @@ module PulpMavenClient
       return false if !@username.nil? && @username.to_s.length < 1
       return false if !@password.nil? && @password.to_s.length < 1
       return false if !@download_concurrency.nil? && @download_concurrency < 1
-      policy_validator = EnumAttributeValidator.new('String', ["immediate", "on_demand", "streamed"])
+      policy_validator = EnumAttributeValidator.new('String', ["immediate", "When syncing, download all metadata and content now."])
       return false unless policy_validator.valid?(@policy)
       true
     end
@@ -394,7 +385,7 @@ module PulpMavenClient
     # Custom attribute writer method checking allowed values (enum).
     # @param [Object] policy Object to be assigned
     def policy=(policy)
-      validator = EnumAttributeValidator.new('String', ["immediate", "on_demand", "streamed"])
+      validator = EnumAttributeValidator.new('String', ["immediate", "When syncing, download all metadata and content now."])
       unless validator.valid?(policy)
         fail ArgumentError, "invalid value for \"policy\", must be one of #{validator.allowable_values}."
       end
@@ -411,7 +402,6 @@ module PulpMavenClient
           _type == o._type &&
           name == o.name &&
           url == o.url &&
-          validate == o.validate &&
           ssl_ca_certificate == o.ssl_ca_certificate &&
           ssl_client_certificate == o.ssl_client_certificate &&
           ssl_client_key == o.ssl_client_key &&
@@ -433,7 +423,7 @@ module PulpMavenClient
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [_href, _created, _type, name, url, validate, ssl_ca_certificate, ssl_client_certificate, ssl_client_key, ssl_validation, proxy_url, username, password, _last_updated, download_concurrency, policy].hash
+      [_href, _created, _type, name, url, ssl_ca_certificate, ssl_client_certificate, ssl_client_key, ssl_validation, proxy_url, username, password, _last_updated, download_concurrency, policy].hash
     end
 
     # Builds the object from hash