insights-api-common 5.0.2 → 5.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2aa2430e936c484f6b54cbcc8587462ab0ace760f6a2ab7a295e02258953a932
-  data.tar.gz: a41b5a30792c05b38b48df621f60ced0aa098b49fc6c1dbf3282d36bfbb5830c
+  metadata.gz: 43e76c5bf47d65b4040b8ed210158adaae8730ea0ceca8a5bd51816d6572e75c
+  data.tar.gz: eca7c58f7e1c6051ed91d31a77e37f7559113aaedc54d6640f5986efc23557cf
 SHA512:
-  metadata.gz: 48d2cff3476fa94a453cdb247c2a452a6197729f531361ac093e76c03530777f22a097487b1a0f4bcc6e733cad32f7425764d976ddc2a72d2edb1efe84e15eb8
-  data.tar.gz: da7a2598ce95a1769f028a26461436a5962aa2455605dbf4ac7fd23a5c86d7ca0aaaa2eb68e20e423286a5d2e8cc812892cf94fc26b6200acac2d1cd94e636c3
+  metadata.gz: '081dae0fe687ba670fc6f6f1ca3a15ce399c99b7c55bc6297cce261a818189bbb6674d44e96c93296394780c25169cd214680c42dc941b0ab83c6dcfe37df246'
+  data.tar.gz: d2f112e2339e2398c761e08f447e2aed84ba4a7b15c2ec7fc9371d9aea6602afdb4c9f6ec96ead262e2879ee6f849ab572a20aa1582180f13265899ab98bb245

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

@@ -44,10 +44,14 @@ module Insights
             private
 
             def id_regexp(primary_collection_name)
-              @id_regexp ||= begin
+              @id_regexp_table ||= {}
+
+              if @id_regexp_table.empty? || @id_regexp_table[primary_collection_name].nil?
                 id_parameter = id_parameter_from_api_doc(primary_collection_name)
-                id_parameter ? id_parameter.fetch_path("schema", "pattern") : /^\d+$/
+                @id_regexp_table[primary_collection_name] = id_parameter ? id_parameter.fetch_path("schema", "pattern") : /^\d+$/
               end
+
+              @id_regexp_table[primary_collection_name]
             end
 
             def id_parameter_from_api_doc(primary_collection_name)

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

@@ -4,7 +4,8 @@ module Insights
       class ErrorDocument
         def add(status = 400, message)
           @status = status
-          errors << {"status" => status, "detail" => message}
+          safe_message = message.to_s.encode('UTF-8', :invalid => :replace, :undef => :replace)
+          errors << {"status" => status, "detail" => safe_message}
           self
         end
 

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

@@ -177,6 +177,20 @@ module Insights
           end
         end
 
+        def self.build_filtered_scope(scope, api_version, klass_name, filter)
+          return scope unless filter
+
+          openapi_doc = ::Insights::API::Common::OpenApi::Docs.instance[api_version]
+          openapi_schema_name, = ::Insights::API::Common::GraphQL::Generator.openapi_schema(openapi_doc, klass_name)
+
+          action_parameters = ActionController::Parameters.new(filter)
+          definitions = openapi_doc.definitions
+
+          association_attribute_properties = association_attribute_properties(definitions, action_parameters)
+
+          new(scope, action_parameters, definitions[openapi_schema_name], association_attribute_properties).apply
+        end
+
         def timestamp(k, val)
           if val.kind_of?(Hash)
             val.each do |comparator, value|

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

@@ -164,8 +164,16 @@ module Insights
 
               graphql_model_type_template = ERB.new(template("model_type"), nil, '<>').result(binding)
               graphql_namespace.module_eval(graphql_model_type_template)
+
+              unless graphql_namespace.const_defined?("#{klass_name}AggregateType", false)
+                graphql_aggregate_model_type_template = ERB.new(template("aggregate_model_type"), nil, '<>').result(binding)
+                graphql_namespace.module_eval(graphql_aggregate_model_type_template)
+              end
             end
 
+            graphql_aggregate_type_template = ERB.new(template("aggregate_type"), nil, '<>').result(binding)
+            graphql_namespace.module_eval(graphql_aggregate_type_template)
+
             graphql_query_type_template = ERB.new(template("query_type"), nil, '<>').result(binding)
             graphql_namespace.module_eval(graphql_query_type_template)
 

data/lib/insights/api/common/graphql/templates/aggregate_model_type.erb

@@ -0,0 +1,8 @@
+<%= klass_name %>AggregateType = ::GraphQL::ObjectType.define do
+  name "<%= klass_name %>AggregateType"
+  description "A <%= klass_name %>AggregateType to wrap metrics aggregation"
+
+  field :aggregate, AggregateType do
+    resolve ->(object, _args, _ctx) { object }
+  end
+end

data/lib/insights/api/common/graphql/templates/aggregate_type.erb

@@ -0,0 +1,14 @@
+AggregateType = ::GraphQL::ObjectType.define do
+  name "AggregateType"
+  description "A AggregateType type for aggregation metrics"
+
+  field :total_count, !types.Int do
+    resolve ->(object, _args, _ctx) {
+      if object.kind_of?(QueryRelation) # from nested aggregation
+        object.count # count is array operation
+      else
+        object
+      end
+    }
+  end
+end

data/lib/insights/api/common/graphql/templates/model_type.erb

@@ -30,6 +30,19 @@
       ::Insights::API::Common::GraphQL::AssociationLoader.new(<%= klass_name.constantize %>, "<%= associations %>", args, graphql_options).load(obj)
     }
   end
+
+  field :<%= associations %>_aggregate do
+    description "Aggregation of <%= associations %> associated with <%= klass_name %> model."
+    type <%= "#{association_class_name}AggregateType" %>
+
+    associations_name = "<%= associations %>"
+    preload :<%= associations %>
+
+    resolve lambda { |obj, args, _ctx|
+      ::Insights::API::Common::GraphQL::AssociationLoader.new(<%= klass_name.constantize %>, "<%= associations %>", args, graphql_options).load(obj)
+    }
+  end
+
 <%   end %>
 <% end %>
 end

data/lib/insights/api/common/graphql/templates/query_type.erb

@@ -31,18 +31,9 @@ QueryType = ::GraphQL::ObjectType.define do
           scope = model_class
         end
 
-        if args[:filter]
-          openapi_doc = ::Insights::API::Common::OpenApi::Docs.instance["<%= api_version %>"]
-          openapi_schema_name, _schema = ::Insights::API::Common::GraphQL::Generator.openapi_schema(openapi_doc, klass_name)
-          association_attribute_properties =
-            Insights::API::Common::Filter.association_attribute_properties(openapi_doc.definitions, ActionController::Parameters.new(args[:filter]))
-          scope = ::Insights::API::Common::Filter.new(
-            scope,
-            ActionController::Parameters.new(args[:filter]),
-            openapi_doc.definitions[openapi_schema_name],
-            association_attribute_properties).apply
-        end
+        scope = ::Insights::API::Common::Filter.build_filtered_scope(scope, "<%= api_version %>", klass_name, args[:filter])
         scope = ::Insights::API::Common::GraphQL.search_options(scope, args)
+
         if <%= graphql_options[:use_pagination_v2] %> == true
           ::Insights::API::Common::PaginatedResponseV2.new(
             base_query: scope, request: nil, limit: args[:limit], offset: args[:offset], sort_by: args[:sort_by]
@@ -54,5 +45,24 @@ QueryType = ::GraphQL::ObjectType.define do
         end
       }
     end
+
+    field_aggregate = "#{collection}_aggregate"
+    field field_aggregate do
+      description "The #{collection} aggregation associated with this #{klass_name}"
+      klass_name_type = "::Insights::API::Common::GraphQL::Api::#{version_namespace}::#{klass_name}AggregateType".constantize
+      argument :filter, ::Insights::API::Common::GraphQL::Types::QueryFilter, "The Query Filter for querying the #{collection}"
+
+      type klass_name_type
+
+      resolve lambda { |_obj, args, _ctx|
+        if base_query.present?
+          scope = base_query.call(model_class, args, ctx)
+        else
+          scope = model_class
+        end
+
+        ::Insights::API::Common::Filter.build_filtered_scope(scope, "<%= api_version %>", klass_name, args[:filter]).count
+      }
+    end
   end
 end

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

@@ -2,14 +2,27 @@ module Insights
   module API
     module Common
       class Logging
-        def self.activate(config)
-          require 'manageiq/loggers'
-          config.logger = if Rails.env.production?
-                            config.colorize_logging = false
-                            ManageIQ::Loggers::CloudWatch.new
-                          else
-                            ManageIQ::Loggers::Base.new(Rails.root.join("log", "#{Rails.env}.log"))
-                          end
+        def self.logger_class
+          if ENV['LOG_HANDLER'] == "haberdasher"
+            "Insights::Loggers::StdErrorLogger"
+          else
+            "Insights::Loggers::CloudWatch"
+          end
+        end
+
+        def self.activate(config, app_name = nil)
+          require 'insights/loggers'
+          log_params = {}
+          klass_for_logger = if Rails.env.production?
+                               config.colorize_logging = false
+                               log_params[:app_name] = app_name if app_name
+                               logger_class
+                             else
+                               log_params = {:log_path => Rails.root.join("log", "#{Rails.env}.log")}
+                               "ManageIQ::Loggers::Base"
+                             end
+
+          config.logger = Insights::Loggers::Factory.create_logger(klass_for_logger, log_params)
         end
       end
     end

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: insights-api-common
 version: !ruby/object:Gem::Version
-  version: 5.0.2
+  version: 5.0.6
 platform: ruby
 authors:
 - Insights Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-09 00:00:00.000000000 Z
+date: 2021-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_tenant
@@ -73,33 +73,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 5.2.2.1
 - !ruby/object:Gem::Dependency
-  name: manageiq-loggers
+  name: insights-loggers-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 0.1.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
-- !ruby/object:Gem::Dependency
-  name: cloudwatchlogger
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.2.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.1.10
 - !ruby/object:Gem::Dependency
   name: prometheus_exporter
   requirement: !ruby/object:Gem::Requirement
@@ -396,6 +382,8 @@ files:
 - lib/insights/api/common/graphql/associated_records.rb
 - lib/insights/api/common/graphql/association_loader.rb
 - lib/insights/api/common/graphql/generator.rb
+- lib/insights/api/common/graphql/templates/aggregate_model_type.erb
+- lib/insights/api/common/graphql/templates/aggregate_type.erb
 - lib/insights/api/common/graphql/templates/model_type.erb
 - lib/insights/api/common/graphql/templates/query_type.erb
 - lib/insights/api/common/graphql/templates/schema.erb
@@ -457,7 +445,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: Common Utilites for Insights microservices