Reraise Excon errors as K8s::Errors

lib/k8s/error.rb

@@ -5,6 +5,10 @@
 module K8s
   # Top-level class for all errors raised by this gem.
   class Error < StandardError
+    Transport = Class.new(Error).freeze
+    SSL = Class.new(Transport).freeze
+    Socket = Class.new(Transport).freeze
+
     # Kube API error, related to a HTTP response with a non-2xx code
     class API < Error
       extend Forwardable

lib/k8s/resource_client.rb

@@ -224,7 +224,6 @@ def meta_list(labelSelector: nil, fieldSelector: nil, namespace: @namespace)
     # @param resourceVersion [nil, String]
     # @param timeout [nil, Integer]
     # @yield [K8S::WatchEvent]
-    # @raise [Excon::Error]
     def watch(labelSelector: nil, fieldSelector: nil, resourceVersion: nil, timeout: nil, namespace: @namespace)
       method = 'GET'
       path = path(namespace: namespace)

lib/k8s/transport.rb

@@ -175,6 +175,8 @@ def build_excon
         headers: REQUEST_HEADERS,
         **@options
       )
+    rescue Excon::Error => e
+      raise K8s::Error::Transport, "#{e.message} (#{e.class})"
     end
 
     # @param parts [Array<String>] join path parts together to build the full URL
@@ -227,7 +229,6 @@ def format_request(options)
     # @param request_options [Hash] as passed to Excon#request
     # @param response_class [Class] coerce into response body using #new
     # @raise [K8s::Error]
-    # @raise [Excon::Error] TODO: wrap
     # @return [response_class, Hash]
     def parse_response(response, request_options, response_class: K8s::Resource)
       method = request_options[:method]
@@ -270,6 +271,7 @@ def parse_response(response, request_options, response_class: K8s::Resource)
     # @param response_class [Class] coerce into response class using #new
     # @param options [Hash] @see Excon#request
     # @return [response_class, Hash]
+    # @raise [K8s::Error::SSL, K8s::Error::Socket, K8s::Error::Transport, K8s::Error::API]
     def request(response_class: K8s::Resource, **options)
       if options[:method] == 'DELETE' && need_delete_body?
         options[:request_object] = options.delete(:query)
@@ -283,6 +285,12 @@ def request(response_class: K8s::Resource, **options)
       t = Time.now - start
 
       obj = options[:response_block] ? {} : parse_response(response, options, response_class: response_class)
+    rescue Excon::Error::Certificate, Excon::Errors::CertificateError => e
+      raise K8s::Error::SSL, "#{e.socket_error.message} (#{e.socket_error.class})"
+    rescue Excon::Error::Socket, Excon::Errors::SocketError => e
+      raise K8s::Error::Socket, "#{e.socket_error.message} (#{e.socket_error.class})"
+    rescue Excon::Error => e
+      raise K8s::Error::Transport, "#{e.message} (#{e.class})"
     rescue K8s::Error::API => e
       logger.warn { "#{format_request(options)} => HTTP #{e.code} #{e.reason} in #{'%.3f' % t}s" }
       logger.debug { "Request: #{excon_options[:body]}" } if excon_options[:body]