insights-api-common 4.0.0 → 4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f6030728902f58dcb0ce11d0de032c9c3ab442877686e097a83a7c6a7da2cfe
-  data.tar.gz: ef7838a59298b7ef0a5c0b4aa6681331f4757fc073cebbdc791f154c28c05fe9
+  metadata.gz: da2ebb5e76ab8009c3a4afda352c91ebcaee7eaa293b1fcc7c55bcd7711f2e6b
+  data.tar.gz: 2a772f8bc79d01d48f2ca637ba9adcf0a1fa67c1aefda8bb414d45f5111b4558
 SHA512:
-  metadata.gz: bd8564c491431e177fa89daa27330dcbfe02ddfdeaa915eb6207a32fe659257cda7684ef39d0c05e8732c404a3bf3c54617b3f563c4054b170f06ac9901230e4
-  data.tar.gz: 90c76dc626605e9d9c890203832213751938ae6a45dedeeac4b5d30ce3e76804a166b894be4281549a5169495920d8e6de17446aaf2645ef706b4b19fc7e4697
+  metadata.gz: d174ee5da9f78f4c7312ef570c0e3563d059c7332a1e43ad58ac17d7ec9051a4a8ebda04f7f1afa9b4f0179c0c4751204f25dae81d21eded96186336c6ed61a3
+  data.tar.gz: e46f808117d0c742c89cc0b477308b8ddfff3e68f72ee36dbd57cc886df1fec97f8070836609c80164457fe98f2982f0a1f25919eee1ffe3aae08400a40696f4

data/lib/insights/api/common/application_controller_mixins/exception_handling.rb

@@ -10,8 +10,11 @@ module Insights
               logger.error("#{exception.class.name}: #{exception.message}\n#{exception.backtrace.join("\n")}")
               errors = Insights::API::Common::ErrorDocument.new.tap do |error_document|
                 exception_list_from(exception).each do |exc|
-                  code = exc.respond_to?(:code) ? exc.code : error_code_from_class(exc)
-                  error_document.add(code.to_s, "#{exc.class}: #{exc.message}")
+                  if api_client_exception?(exc)
+                    api_client_errors(exc, error_document)
+                  else
+                    error_document.add(error_code_from_class(exc).to_s, "#{exc.class}: #{exc.message}")
+                  end
                 end
               end
 
@@ -35,6 +38,24 @@ module Insights
               DEFAULT_ERROR_CODE
             end
           end
+
+          def api_client_exception?(exc)
+            exc.respond_to?(:code) && exc.respond_to?(:response_body) && exc.respond_to?(:response_headers) &&
+              !exc.response_body.nil?
+          end
+
+          def api_client_errors(exc, error_document)
+            body = JSON.parse(exc.response_body)
+            if body.is_a?(Hash) && body.key?('errors') && body['errors'].is_a?(Array)
+              body['errors'].each do |error|
+                next unless error.key?('status') && error.key?('detail')
+
+                error_document.add(error['status'], error['detail'])
+              end
+            else
+              error_document.add(exc.code.to_s, exc.message )
+            end
+          end
         end
       end
     end

data/lib/insights/api/common/version.rb

@@ -1,7 +1,7 @@
 module Insights
   module API
     module Common
-      VERSION = "4.0.0".freeze
+      VERSION = "4.0.1".freeze
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: insights-api-common
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.0.1
 platform: ruby
 authors:
 - Insights Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-15 00:00:00.000000000 Z
+date: 2020-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_tenant
@@ -56,22 +56,22 @@ dependencies:
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.2.1.1
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.2.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.2.1.1
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.2.1.1
 - !ruby/object:Gem::Dependency
   name: manageiq-loggers
   requirement: !ruby/object:Gem::Requirement
@@ -399,7 +399,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Common Utilites for Insights microservices