gitlab-triage 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 743f14cae78b04f7df22e21ef0ce1f75a17c7d12e7b40376334f12c92f236fb9
-  data.tar.gz: 38d6dafa53eaacf4daecd70eb22cf726862955a2d0d37f92fcdf3e975c10ba95
+  metadata.gz: da8631c8e4a01092f91bba3be37db11cbadee2e321c62922f1a2a27ea3a98e41
+  data.tar.gz: cc565d9cc79cbdfdbabaa5f86880172cd5ef711b3d8ac2286476a045ae1510fe
 SHA512:
-  metadata.gz: e0e1e9ff19465cfe990d392ea6a1332a2be2c021a9fa7bdf91af55e0c74ec1ea4d48fe7f7c7067c16fda1a34d56f69c5685d9c64a6fcf75e6a759a24e2b5f204
-  data.tar.gz: 452730d44ec1dd9880c57fb077411003e25988727c4eb04d277ef04229092ef04748582e6bb4f0c9008ba38cf38b99ef119e452a7e7742436a755275524747f4
+  metadata.gz: e2b39262189075194795e05df1adf15eaa86a987731834f821f3daa24e06642cbcc9b97a918cdae7827d4a89d29c204c4f6c939a1cdb597d8a665c0971116a4f
+  data.tar.gz: 13aeac661214408c2584a6b41b9bbf9a69f1fb68e620f5f5fea08a9f74635315a0e8e03c84f86ab5ce84b71a32b206f368b433dfff90e2903d0e2eba625da4a2

data/lib/gitlab/triage/engine.rb

@@ -13,6 +13,8 @@ require_relative 'limiters/date_field_limiter'
 require_relative 'action'
 require_relative 'policies/rule_policy'
 require_relative 'policies/summary_policy'
+require_relative 'policies_resources/rule_resources'
+require_relative 'policies_resources/summary_resources'
 require_relative 'api_query_builders/single_query_param_builder'
 require_relative 'api_query_builders/multi_query_param_builder'
 require_relative 'url_builders/url_builder'
@@ -120,9 +122,9 @@ module Gitlab
         puts Gitlab::Triage::UI.header("Processing summary: **#{summary[:name]}**", char: '~')
         puts
 
-        summary_parts_for_rules(resource_type, summary[:rules]) do |parts|
+        summary_parts_for_rules(resource_type, summary[:rules]) do |resources|
           policy = Policies::SummaryPolicy.new(
-            resource_type, summary, parts, network)
+            resource_type, summary, resources, network)
 
           process_action(policy)
         end
@@ -141,7 +143,7 @@ module Gitlab
             end
         end
 
-        yield(parts)
+        yield(PoliciesResources::SummaryResources.new(parts))
       end
 
       def resources_for_rule(resource_type, rule)
@@ -163,7 +165,7 @@ module Gitlab
           puts "\n* Total after limiting: #{resources.count} resources"
           puts
 
-          yield(resources, conditions)
+          yield(PoliciesResources::RuleResources.new(resources), conditions)
         end
       end
 

data/lib/gitlab/triage/entity_builders/issue_builder.rb

@@ -6,8 +6,11 @@ module Gitlab
   module Triage
     module EntityBuilders
       class IssueBuilder
-        def initialize(type:, action:, resources:, network:, separator: "\n")
+        def initialize(
+          type:, action:, resources:, network:,
+          policy_spec: {}, separator: "\n")
           @type = type
+          @policy_spec = policy_spec
           @item_template = action[:item]
           @title_template = action[:title]
           @summary_template = action[:summary]

data/lib/gitlab/triage/policies/base_policy.rb

@@ -9,8 +9,7 @@ module Gitlab
         def initialize(type, policy_spec, resources, network)
           @type = type
           @policy_spec = policy_spec
-          # In some filters/actions we want to know which resource type it is
-          @resources = attach_resource_type(resources, type)
+          @resources = resources
           @network = network
         end
 
@@ -34,14 +33,6 @@ module Gitlab
         def build_issue
           raise NotImplementedError
         end
-
-        private
-
-        # We don't have to do this once the response will contain the type
-        # of the resource. For now let's just attach it.
-        def attach_resource_type(resources, type)
-          resources.map { |resource| resource.reverse_merge(type: type) }
-        end
       end
     end
   end

data/lib/gitlab/triage/policies/rule_policy.rb

@@ -13,8 +13,9 @@ module Gitlab
 
           EntityBuilders::IssueBuilder.new(
             type: type,
+            policy_spec: policy_spec,
             action: action,
-            resources: resources,
+            resources: resources.resources,
             network: network)
         end
       end

data/lib/gitlab/triage/policies/summary_policy.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require_relative 'base_policy'
-require_relative 'rule_policy'
 require_relative '../entity_builders/issue_builder'
 
 module Gitlab
@@ -11,13 +10,11 @@ module Gitlab
         # Build an issue from several rules policies
         def build_issue
           action = actions[:summarize]
-
-          issues =
-            resources.map do |inner_policy_spec, inner_resources|
-              Policies::RulePolicy.new(
-                type, inner_policy_spec, inner_resources, network)
-                .build_issue
-            end
+          issues = resources.build_issues do |inner_policy_spec, inner_resources|
+            Policies::RulePolicy.new(
+              type, inner_policy_spec, inner_resources, network)
+              .build_issue
+          end
 
           EntityBuilders::IssueBuilder.new(
             type: type,
@@ -26,20 +23,6 @@ module Gitlab
             network: network,
             separator: "\n\n")
         end
-
-        # Due to resources is a different type, this will never work
-        # FIXME: We should try to make sure type is consistent for resources
-        def comment?
-          false
-        end
-
-        private
-
-        def attach_resource_type(resources, type)
-          resources.each_with_object({}) do |(rule, rule_resources), result|
-            result[rule] = super(rule_resources, type)
-          end
-        end
       end
     end
   end

data/lib/gitlab/triage/policies_resources/rule_resources.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module Triage
+    module PoliciesResources
+      class RuleResources
+        attr_reader :resources
+
+        def initialize(new_resources)
+          @resources = new_resources
+        end
+
+        def each
+          resources.each do |resource|
+            yield(resource)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/gitlab/triage/policies_resources/summary_resources.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module Triage
+    module PoliciesResources
+      class SummaryResources
+        attr_reader :rule_to_resources
+
+        def initialize(new_rule_to_resources)
+          @rule_to_resources = new_rule_to_resources
+        end
+
+        def build_issues
+          rule_to_resources.map do |inner_policy_spec, inner_resources|
+            yield(inner_policy_spec, inner_resources)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/gitlab/triage/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   module Triage
-    VERSION = '1.1.0'.freeze
+    VERSION = '1.1.1'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-triage
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - GitLab
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-19 00:00:00.000000000 Z
+date: 2019-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -172,6 +172,8 @@ files:
 - lib/gitlab/triage/policies/base_policy.rb
 - lib/gitlab/triage/policies/rule_policy.rb
 - lib/gitlab/triage/policies/summary_policy.rb
+- lib/gitlab/triage/policies_resources/rule_resources.rb
+- lib/gitlab/triage/policies_resources/summary_resources.rb
 - lib/gitlab/triage/resource/base.rb
 - lib/gitlab/triage/resource/context.rb
 - lib/gitlab/triage/resource/instance_version.rb