insights-api-common 4.0.2 → 4.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a38805baee23f75e802e915bc9bfff80b758d424248a9a0a859d72a28b7d96c
-  data.tar.gz: 6e23b3830ae021373b9849a80425b84b3c9b61af0c46812f25827366b39cc745
+  metadata.gz: 7cf965cd6b7745959546ab9b9479cee4912c35fe1782150a6550accea5a97377
+  data.tar.gz: 0c01ee3607a0526678e5413a1a6f192f5c425848f455d6e6987d422cd0e342ad
 SHA512:
-  metadata.gz: 0adc64a561b7539930ede0a335c9e499e763f041bfb517691a5ba8d827d73ee308157a2ec304fceade1b8f4daeb6721d77b9fbfc252e3da819085a5a043b6bb9
-  data.tar.gz: '0915bedf1ab6c791d8d9ec5aebb634935826ef0269a76ffbd2e74ac7f83d76b2c4a52dafecc464e59287bd82c6c2ac3bdf4d15a10d948d209e4576ea516338bd'
+  metadata.gz: a66ce559fc33707f407c861913d26128b8650141831a9e36aec0aaeadab949b396bc5df4565557d4c9cfce9f52da7eca6b3902741016c8bf42816cd564c0f2ec
+  data.tar.gz: 9607fdd7fae77684fa135029cbd7d318db22b853d8d4933ce6fe548b3c68e1720bca2ca3c2d7e381b474c63fe813ca4dfc4b3cbfeacc71b7ba5c8fb10a445a74

data/README.md

@@ -1,8 +1,8 @@
 # Insights::API::Common
 
 [![Build Status](https://travis-ci.org/RedHatInsights/insights-api-common-rails.svg)](https://travis-ci.org/RedHatInsights/insights-api-common-rails)
-[![Maintainability](https://api.codeclimate.com/v1/badges/790ea6c77d82da6be68a/maintainability)](https://codeclimate.com/github/RedHatInsights/insights-api-common-rails/maintainability)
-[![Test Coverage](https://api.codeclimate.com/v1/badges/790ea6c77d82da6be68a/test_coverage)](https://codeclimate.com/github/RedHatInsights/insights-api-common-rails/test_coverage)
+[![Maintainability](https://api.codeclimate.com/v1/badges/8ec8a19165383fdaed47/maintainability)](https://codeclimate.com/github/RedHatInsights/insights-api-common-rails/maintainability)
+[![Test Coverage](https://api.codeclimate.com/v1/badges/8ec8a19165383fdaed47/test_coverage)](https://codeclimate.com/github/RedHatInsights/insights-api-common-rails/test_coverage)
 [![Security](https://hakiri.io/github/RedHatInsights/insights-api-common-rails/master.svg)](https://hakiri.io/github/RedHatInsights/insights-api-common-rails/master)
 
 Header, Encryption, RBAC, Serialization, Pagination and other common behavior for Insights microservices built with Rails

data/lib/insights/api/common.rb

@@ -1,3 +1,4 @@
+require "insights/api/common/custom_exceptions"
 require "insights/api/common/engine"
 require "insights/api/common/entitlement"
 require "insights/api/common/error_document"

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

@@ -7,19 +7,28 @@ module Insights
 
           def self.included(other)
             other.rescue_from(StandardError, RuntimeError) do |exception|
-              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|
-                  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
+              rescue_from_handler(exception) do |error_document, exc|
+                error_document.add(error_code_from_class(exc).to_s, "#{exc.class}: #{exc.message}")
               end
+            end
+          end
 
-              render :json => errors.to_h, :status => error_code_from_class(exception)
+          def rescue_from_handler(exception)
+            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|
+                if api_client_exception?(exc)
+                  api_client_errors(exc, error_document)
+                elsif custom_exception?(exc)
+                  message = fetch_custom_message(exc)
+                  error_document.add(error_code_from_class(exc).to_s, message)
+                else
+                  yield error_document, exc
+                end
+              end
             end
+
+            render :json => errors.to_h, :status => error_code_from_class(exception)
           end
 
           def exception_list_from(exception)
@@ -31,6 +40,14 @@ module Insights
             end
           end
 
+          def custom_exception?(exception)
+            Insights::API::Common::CustomExceptions::CUSTOM_EXCEPTION_LIST.include?(exception.class.to_s)
+          end
+
+          def fetch_custom_message(exception)
+            Insights::API::Common::CustomExceptions.custom_message(exception)
+          end
+
           def error_code_from_class(exception)
             if ActionDispatch::ExceptionWrapper.rescue_responses.key?(exception.class.to_s)
               Rack::Utils.status_code(ActionDispatch::ExceptionWrapper.rescue_responses[exception.class.to_s])
@@ -45,7 +62,7 @@ module Insights
           end
 
           def api_client_errors(exc, error_document)
-            body = JSON.parse(exc.response_body)
+            body = json_parsed_body(exc)
             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')
@@ -56,6 +73,12 @@ module Insights
               error_document.add(exc.code.to_s, exc.message )
             end
           end
+
+          def json_parsed_body(exc)
+            JSON.parse(exc.response_body)
+          rescue StandardError
+            nil
+          end
         end
       end
     end

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

@@ -0,0 +1,16 @@
+module Insights
+  module API
+    module Common
+      class CustomExceptions
+        CUSTOM_EXCEPTION_LIST = %w[Pundit::NotAuthorizedError].freeze
+
+        def self.custom_message(exception)
+          case exception.class.to_s
+          when "Pundit::NotAuthorizedError"
+            "You are not authorized to #{exception.query.to_s.delete_suffix('?')} this #{exception.record.model_name.human.downcase}"
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -2,10 +2,14 @@ module Insights
   module API
     module Common
       class Metrics
-        def self.activate(config, prefix)
+        def self.activate(config, prefix, args = {})
           require 'prometheus_exporter'
           require 'prometheus_exporter/client'
 
+          setup_custom_metrics(args[:custom_metrics])
+
+          return if metrics_port == 0
+
           ensure_exporter_server
           enable_in_process_metrics
           enable_web_server_metrics(prefix)
@@ -13,10 +17,10 @@ module Insights
 
         private_class_method def self.ensure_exporter_server
           require 'socket'
-          TCPSocket.open("localhost", 9394) {}
+          TCPSocket.open("localhost", metrics_port) {}
         rescue Errno::ECONNREFUSED
           require 'prometheus_exporter/server'
-          server = PrometheusExporter::Server::WebServer.new(port: 9394)
+          server = PrometheusExporter::Server::WebServer.new(port: metrics_port)
           server.start
 
           PrometheusExporter::Client.default = PrometheusExporter::LocalClient.new(collector: server.collector)
@@ -33,6 +37,31 @@ module Insights
           require "insights/api/common/middleware/web_server_metrics"
           Rails.application.middleware.unshift(Insights::API::Common::Middleware::WebServerMetrics, :metrics_prefix => prefix)
         end
+
+        private_class_method def self.setup_custom_metrics(custom_metrics)
+          return if custom_metrics.nil?
+
+          custom_metrics.each do |metric|
+            if metrics_port == 0
+              define_singleton_method(metric[:name]) {}
+            else
+              instance_variable_set("@#{metric[:name]}_#{metric[:type]}", PrometheusExporter::Client.default.register(metric[:type], metric[:name], metric[:description]))
+
+              define_singleton_method(metric[:name]) do
+                case metric[:type]
+                when :counter
+                  instance_variable_get("@#{metric[:name]}_#{metric[:type]}")&.observe(1)
+                else
+                  "Metric of type #{metric[:type]} unsupported, implement it in Insights::API::Common::Metrics#L45"
+                end
+              end
+            end
+          end
+        end
+
+        private_class_method def self.metrics_port
+          @metrics_port ||= (ENV['METRICS_PORT']&.to_i || 9394)
+        end
       end
     end
   end

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

@@ -1,2 +1,3 @@
 require "insights/api/common/open_api/docs"
+require "insights/api/common/open_api/version_from_prefix"
 require "insights/api/common/open_api/serializer"

data/lib/insights/api/common/open_api/generator.rb

@@ -441,7 +441,7 @@ module Insights
               end
 
               # Take existing attrs, that we won't generate
-              ['example', 'format', 'readOnly', 'title', 'description'].each do |property_key|
+              ['example', 'format', 'nullable', 'readOnly', 'title', 'description'].each do |property_key|
                 property_value                 = openapi_contents.dig(*path_parts(SCHEMAS_PATH), klass_name, "properties", key, property_key)
                 properties_value[property_key] = property_value if property_value
               end

data/lib/insights/api/common/open_api/serializer.rb

@@ -3,27 +3,40 @@ module Insights
     module Common
       module OpenApi
         module Serializer
+          include VersionFromPrefix
+
           def as_json(arg = {})
-            previous = super
+            previous = super(:except => _excluded_attributes(arg))
+
             encrypted_columns_set = (self.class.try(:encrypted_columns) || []).to_set
             encryption_filtered = previous.except(*encrypted_columns_set)
             return encryption_filtered unless arg.key?(:prefixes)
-            version = api_version_from_prefix(arg[:prefixes].first)
-            presentation_name = self.class.try(:presentation_name) || self.class.name
-            schema  = ::Insights::API::Common::OpenApi::Docs.instance[version].definitions[presentation_name]
-            attrs   = encryption_filtered.slice(*schema["properties"].keys)
-            schema["properties"].keys.each do |name|
+
+            attrs = encryption_filtered.slice(*_schema_properties(arg).keys)
+            _schema_properties(arg).keys.each do |name|
               next if attrs[name].nil?
               attrs[name] = attrs[name].iso8601 if attrs[name].kind_of?(Time)
               attrs[name] = attrs[name].to_s if name.ends_with?("_id") || name == "id"
-              attrs[name] = self.public_send(name) if !attrs.key?(name) && !encrypted_columns_set.include?(name)
             end
             attrs.compact
           end
 
-          def api_version_from_prefix(prefix)
-            /\/?\w+\/v(?<major>\d+)[x\.]?(?<minor>\d+)?\// =~ prefix
-            [major, minor].compact.join(".")
+          private
+
+          def _excluded_attributes(arg)
+            return [] unless arg.key?(:prefixes)
+
+            self.attributes.keys - _schema_properties(arg).keys
+          end
+
+          def _schema_properties(arg)
+            @schema_properties ||= _schema(arg)["properties"]
+          end
+
+          def _schema(arg)
+            version = api_version_from_prefix(arg[:prefixes].first)
+            presentation_name = self.class.try(:presentation_name) || self.class.name
+            ::Insights::API::Common::OpenApi::Docs.instance[version].definitions[presentation_name]
           end
         end
       end

data/lib/insights/api/common/open_api/version_from_prefix.rb

@@ -0,0 +1,14 @@
+module Insights
+  module API
+    module Common
+      module OpenApi
+        module VersionFromPrefix
+          def api_version_from_prefix(prefix)
+            /\/?\w+\/v(?<major>\d+)[x\.]?(?<minor>\d+)?\// =~ prefix
+            [major, minor].compact.join(".")
+          end
+        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.2".freeze
+      VERSION = "4.1.3".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.2
+  version: 4.1.3
 platform: ruby
 authors:
 - Insights Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-13 00:00:00.000000000 Z
+date: 2020-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_tenant
@@ -58,20 +58,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: 5.2.2
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.1.1
+        version: 5.2.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: 5.2.2
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.1.1
+        version: 5.2.2.1
 - !ruby/object:Gem::Dependency
   name: manageiq-loggers
   requirement: !ruby/object:Gem::Requirement
@@ -92,14 +92,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: prometheus_exporter
   requirement: !ruby/object:Gem::Requirement
@@ -236,16 +236,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -292,16 +292,16 @@ dependencies:
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.17.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.17.1
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -345,6 +345,7 @@ files:
 - lib/insights/api/common/application_controller_mixins/request_body_validation.rb
 - lib/insights/api/common/application_controller_mixins/request_parameter_validation.rb
 - lib/insights/api/common/application_controller_mixins/request_path.rb
+- lib/insights/api/common/custom_exceptions.rb
 - lib/insights/api/common/engine.rb
 - lib/insights/api/common/entitlement.rb
 - lib/insights/api/common/error_document.rb
@@ -371,6 +372,7 @@ files:
 - lib/insights/api/common/open_api/docs/object_definition.rb
 - lib/insights/api/common/open_api/generator.rb
 - lib/insights/api/common/open_api/serializer.rb
+- lib/insights/api/common/open_api/version_from_prefix.rb
 - lib/insights/api/common/option_redirect_enhancements.rb
 - lib/insights/api/common/paginated_response.rb
 - lib/insights/api/common/paginated_response_v2.rb
@@ -413,7 +415,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Common Utilites for Insights microservices