pulp_docker_client 4.0.0b5 → 4.0.0b6

data/lib/pulp_docker_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.0
+OpenAPI Generator version: 4.1.2-SNAPSHOT
 
 =end
 
@@ -14,8 +14,7 @@ require 'date'
 require 'json'
 require 'logger'
 require 'tempfile'
-require 'typhoeus'
-require 'uri'
+require 'faraday'
 
 module PulpDockerClient
   class ApiClient
@@ -47,26 +46,46 @@ module PulpDockerClient
     # @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 PulpDockerClient
       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 PulpDockerClient
     # @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 PulpDockerClient
 
       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 PulpDockerClient
           @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 PulpDockerClient
     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_docker_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.0
+OpenAPI Generator version: 4.1.2-SNAPSHOT
 
 =end
 

data/lib/pulp_docker_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.0
+OpenAPI Generator version: 4.1.2-SNAPSHOT
 
 =end
 
-require 'uri'
-
 module PulpDockerClient
   class Configuration
     # Defines url scheme
@@ -88,33 +86,28 @@ module PulpDockerClient
     # @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 PulpDockerClient
       @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 PulpDockerClient
     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_docker_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.0
+OpenAPI Generator version: 4.1.2-SNAPSHOT
 
 =end
 

data/lib/pulp_docker_client/models/blob.rb

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

data/lib/pulp_docker_client/models/docker_distribution.rb

@@ -6,7 +6,7 @@
 The version of the OpenAPI document: v3
 
 Generated by: https://openapi-generator.tech
-OpenAPI Generator version: 4.0.0
+OpenAPI Generator version: 4.1.2-SNAPSHOT
 
 =end
 
@@ -14,39 +14,39 @@ require 'date'
 
 module PulpDockerClient
   class DockerDistribution
-    # RepositoryVersion to be served
-    attr_accessor :repository_version
-
-    # The latest RepositoryVersion for this Repository will be served.
-    attr_accessor :repository
-
-    # Timestamp of creation.
-    attr_accessor :_created
+    # A unique name. Ex, `rawhide` and `stable`.
+    attr_accessor :name
 
     # An optional content-guard.
     attr_accessor :content_guard
 
-    attr_accessor :_href
+    # Timestamp of creation.
+    attr_accessor :_created
 
-    # A unique name. Ex, `rawhide` and `stable`.
-    attr_accessor :name
+    # RepositoryVersion to be served
+    attr_accessor :repository_version
 
     # The base (relative) path component of the published url. Avoid paths that                     overlap with other distribution base paths (e.g. \"foo\" and \"foo/bar\")
     attr_accessor :base_path
 
+    # The latest RepositoryVersion for this Repository will be served.
+    attr_accessor :repository
+
+    attr_accessor :_href
+
     # The Registry hostame:port/name/ to use with docker pull command defined by this distribution.
     attr_accessor :registry_path
 
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
+        :'name' => :'name',
+        :'content_guard' => :'content_guard',
+        :'_created' => :'_created',
         :'repository_version' => :'repository_version',
+        :'base_path' => :'base_path',
         :'repository' => :'repository',
-        :'_created' => :'_created',
-        :'content_guard' => :'content_guard',
         :'_href' => :'_href',
-        :'name' => :'name',
-        :'base_path' => :'base_path',
         :'registry_path' => :'registry_path'
       }
     end
@@ -54,13 +54,13 @@ module PulpDockerClient
     # Attribute type mapping.
     def self.openapi_types
       {
+        :'name' => :'String',
+        :'content_guard' => :'String',
+        :'_created' => :'DateTime',
         :'repository_version' => :'String',
+        :'base_path' => :'String',
         :'repository' => :'String',
-        :'_created' => :'DateTime',
-        :'content_guard' => :'String',
         :'_href' => :'String',
-        :'name' => :'String',
-        :'base_path' => :'String',
         :'registry_path' => :'String'
       }
     end
@@ -80,32 +80,32 @@ module PulpDockerClient
         h[k.to_sym] = v
       }
 
-      if attributes.key?(:'repository_version')
-        self.repository_version = attributes[:'repository_version']
+      if attributes.key?(:'name')
+        self.name = attributes[:'name']
       end
 
-      if attributes.key?(:'repository')
-        self.repository = attributes[:'repository']
+      if attributes.key?(:'content_guard')
+        self.content_guard = attributes[:'content_guard']
       end
 
       if attributes.key?(:'_created')
         self._created = attributes[:'_created']
       end
 
-      if attributes.key?(:'content_guard')
-        self.content_guard = attributes[:'content_guard']
+      if attributes.key?(:'repository_version')
+        self.repository_version = attributes[:'repository_version']
       end
 
-      if attributes.key?(:'_href')
-        self._href = attributes[:'_href']
+      if attributes.key?(:'base_path')
+        self.base_path = attributes[:'base_path']
       end
 
-      if attributes.key?(:'name')
-        self.name = attributes[:'name']
+      if attributes.key?(:'repository')
+        self.repository = attributes[:'repository']
       end
 
-      if attributes.key?(:'base_path')
-        self.base_path = attributes[:'base_path']
+      if attributes.key?(:'_href')
+        self._href = attributes[:'_href']
       end
 
       if attributes.key?(:'registry_path')
@@ -212,13 +212,13 @@ module PulpDockerClient
     def ==(o)
       return true if self.equal?(o)
       self.class == o.class &&
+          name == o.name &&
+          content_guard == o.content_guard &&
+          _created == o._created &&
           repository_version == o.repository_version &&
+          base_path == o.base_path &&
           repository == o.repository &&
-          _created == o._created &&
-          content_guard == o.content_guard &&
           _href == o._href &&
-          name == o.name &&
-          base_path == o.base_path &&
           registry_path == o.registry_path
     end
 
@@ -231,7 +231,7 @@ module PulpDockerClient
     # Calculates hash code according to all attributes.
     # @return [Integer] Hash code
     def hash
-      [repository_version, repository, _created, content_guard, _href, name, base_path, registry_path].hash
+      [name, content_guard, _created, repository_version, base_path, repository, _href, registry_path].hash
     end
 
     # Builds the object from hash

data/lib/pulp_docker_client/models/docker_remote.rb

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

data/lib/pulp_docker_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.0
+OpenAPI Generator version: 4.1.2-SNAPSHOT
 
 =end
 
@@ -14,20 +14,20 @@ require 'date'
 
 module PulpDockerClient
   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 PulpDockerClient
     # Attribute type mapping.
     def self.openapi_types
       {
+        :'count' => :'Integer',
         :'_next' => :'String',
         :'previous' => :'String',
-        :'count' => :'Integer',
         :'results' => :'Array<Blob>'
       }
     end
@@ -57,6 +57,10 @@ module PulpDockerClient
         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 PulpDockerClient
         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 PulpDockerClient
     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 PulpDockerClient
     # 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_docker_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.0
+OpenAPI Generator version: 4.1.2-SNAPSHOT
 
 =end
 
@@ -14,20 +14,20 @@ require 'date'
 
 module PulpDockerClient
   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,10 +35,10 @@ module PulpDockerClient
     # Attribute type mapping.
     def self.openapi_types
       {
+        :'count' => :'Integer',
         :'_next' => :'String',
         :'previous' => :'String',
-        :'count' => :'Integer',
-        :'results' => :'Array<ManifestTag>'
+        :'results' => :'Array<Manifest>'
       }
     end
 
@@ -57,6 +57,10 @@ module PulpDockerClient
         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 PulpDockerClient
         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 PulpDockerClient
     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 PulpDockerClient
     # 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