gitlab-triage 1.6.1 → 1.10.0

data/lib/gitlab/triage/api_query_builders/date_query_param_builder.rb

@@ -0,0 +1,78 @@
+require_relative '../validators/params_validator'
+
+module Gitlab
+  module Triage
+    module APIQueryBuilders
+      class DateQueryParamBuilder
+        ATTRIBUTES = %w[updated_at created_at].freeze
+        CONDITIONS = %w[older_than newer_than].freeze
+        INTERVAL_TYPES = %w[days weeks months years].freeze
+
+        def self.filter_parameters
+          [
+            {
+              name: :attribute,
+              type: String,
+              values: ATTRIBUTES
+            },
+            {
+              name: :condition,
+              type: String,
+              values: CONDITIONS
+            },
+            {
+              name: :interval_type,
+              type: String,
+              values: INTERVAL_TYPES
+            },
+            {
+              name: :interval,
+              type: Numeric
+            }
+          ]
+        end
+
+        def self.applicable?(condition)
+          ATTRIBUTES.include?(condition[:attribute].to_s)
+        end
+
+        def initialize(condition_hash)
+          @attribute = condition_hash[:attribute].to_s
+          @interval_condition = condition_hash[:condition].to_sym
+          @interval_type = condition_hash[:interval_type]
+          @interval = condition_hash[:interval]
+          validate_condition(condition_hash)
+        end
+
+        def validate_condition(condition)
+          ParamsValidator.new(self.class.filter_parameters, condition).validate!
+        end
+
+        def param_name
+          prefix = attribute.delete_suffix('_at')
+          suffix =
+            case interval_condition
+            when :older_than
+              'before'
+            when :newer_than
+              'after'
+            end
+
+          "#{prefix}_#{suffix}"
+        end
+
+        def param_content
+          interval.public_send(interval_type).ago.to_date # rubocop:disable GitlabSecurity/PublicSend
+        end
+
+        def build_param
+          "&#{param_name}=#{param_content.strip}"
+        end
+
+        private
+
+        attr_reader :condition_hash, :attribute, :interval_condition, :interval_type, :interval
+      end
+    end
+  end
+end

data/lib/gitlab/triage/command_builders/move_command_builder.rb

@@ -0,0 +1,19 @@
+require_relative 'base_command_builder'
+
+module Gitlab
+  module Triage
+    module CommandBuilders
+      class MoveCommandBuilder < BaseCommandBuilder
+        private
+
+        def slash_command_string
+          "/move"
+        end
+
+        def format_item(item)
+          item
+        end
+      end
+    end
+  end
+end

data/lib/gitlab/triage/command_builders/text_content_builder.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'active_support/core_ext/array/wrap'
+require 'cgi'
 
 require_relative 'base_command_builder'
 require_relative '../resource/context'
@@ -76,7 +77,22 @@ module Gitlab
               template.sub(PLACEHOLDER_REGEX, attribute.to_s)
             end.join(', ')
 
-            comment.gsub("{{#{placeholder}}}", formatted_text)
+            escaped_text =
+              case placeholder
+              when :items
+                # We don't need to escape it because it's recursive,
+                # which the contents should all be escaped already.
+                # Or put it another way, items isn't an attribute
+                # retrieved externally. It's a generated value which
+                # should be safe to begin with. At some point we
+                # may want to make this more distinguishable,
+                # separating values from API and values generated.
+                formatted_text
+              else
+                CGI.escape_html(formatted_text)
+              end
+
+            comment.gsub("{{#{placeholder}}}", escaped_text)
           end
         end
 

data/lib/gitlab/triage/engine.rb

@@ -2,7 +2,6 @@ require 'active_support/all'
 require 'active_support/inflector'
 
 require_relative 'expand_condition'
-require_relative 'filters/issuable_date_conditions_filter'
 require_relative 'filters/merge_request_date_conditions_filter'
 require_relative 'filters/votes_conditions_filter'
 require_relative 'filters/forbidden_labels_conditions_filter'
@@ -16,6 +15,7 @@ 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/date_query_param_builder'
 require_relative 'api_query_builders/single_query_param_builder'
 require_relative 'api_query_builders/multi_query_param_builder'
 require_relative 'url_builders/url_builder'
@@ -38,6 +38,7 @@ module Gitlab
         @options = options
         @network_adapter_class = network_adapter_class
 
+        assert_all!
         assert_project_id!
         assert_token!
         require_ruby_files
@@ -66,6 +67,7 @@ module Gitlab
 
       def assert_project_id!
         return if options.source_id
+        return if options.all
 
         raise ArgumentError, 'A project_id is needed (pass it with the `--source-id` option)!'
       end
@@ -76,6 +78,11 @@ module Gitlab
         raise ArgumentError, 'A token is needed (pass it with the `--token` option)!'
       end
 
+      def assert_all!
+        raise ArgumentError, '--all-projects option cannot be used in conjunction with --source and --source-id option!' if
+          options.all && (options.source || options.source_id)
+      end
+
       def require_ruby_files
         options.require_files.each(&method(:require))
       end
@@ -146,7 +153,7 @@ module Gitlab
       end
 
       def resources_for_rule(resource_type, rule)
-        puts Gitlab::Triage::UI.header("Processing rule: **#{rule[:name]}**", char: '-')
+        puts Gitlab::Triage::UI.header("Gathering resources for rule: **#{rule[:name]}**", char: '-')
 
         ExpandCondition.perform(rule_conditions(rule)) do |conditions|
           # retrieving the resources for every rule is inefficient
@@ -186,22 +193,35 @@ module Gitlab
         resources.select do |resource|
           results = []
 
+          # rubocop:disable Style/IfUnlessModifier
           if conditions[:date]
-            results << case resource[:type]
-                       when 'issues'
-                         Filters::IssuableDateConditionsFilter.new(resource, conditions[:date]).calculate
-                       when 'merge_requests'
-                         Filters::MergeRequestDateConditionsFilter.new(resource, conditions[:date]).calculate
-                       else
-                         raise "Unknown resource type: #{resource[:type]}"
-                       end
+            results << Filters::MergeRequestDateConditionsFilter.new(resource, conditions[:date]).calculate
+          end
+
+          if conditions[:upvotes]
+            results << Filters::VotesConditionsFilter.new(resource, conditions[:upvotes]).calculate
+          end
+
+          if conditions[:forbidden_labels]
+            results << Filters::ForbiddenLabelsConditionsFilter.new(resource, conditions[:forbidden_labels]).calculate
+          end
+
+          if conditions[:no_additional_labels]
+            results << Filters::NoAdditionalLabelsConditionsFilter.new(resource, conditions.fetch(:labels) { [] }).calculate
           end
-          results << Filters::VotesConditionsFilter.new(resource, conditions[:upvotes]).calculate if conditions[:upvotes]
-          results << Filters::ForbiddenLabelsConditionsFilter.new(resource, conditions[:forbidden_labels]).calculate if conditions[:forbidden_labels]
-          results << Filters::NoAdditionalLabelsConditionsFilter.new(resource, conditions.fetch(:labels) { [] }).calculate if conditions[:no_additional_labels]
-          results << Filters::AuthorMemberConditionsFilter.new(resource, conditions[:author_member], network).calculate if conditions[:author_member]
-          results << Filters::AssigneeMemberConditionsFilter.new(resource, conditions[:assignee_member], network).calculate if conditions[:assignee_member]
-          results << Filters::RubyConditionsFilter.new(resource, conditions, network).calculate if conditions[:ruby]
+
+          if conditions[:author_member]
+            results << Filters::AuthorMemberConditionsFilter.new(resource, conditions[:author_member], network).calculate
+          end
+
+          if conditions[:assignee_member]
+            results << Filters::AssigneeMemberConditionsFilter.new(resource, conditions[:assignee_member], network).calculate
+          end
+
+          if conditions[:ruby]
+            results << Filters::RubyConditionsFilter.new(resource, conditions, network).calculate
+          end
+          # rubocop:enable Style/IfUnlessModifier
 
           results.all?
         end
@@ -229,12 +249,17 @@ module Gitlab
         condition_builders << APIQueryBuilders::SingleQueryParamBuilder.new('source_branch', conditions[:source_branch]) if conditions[:source_branch]
         condition_builders << APIQueryBuilders::SingleQueryParamBuilder.new('target_branch', conditions[:target_branch]) if conditions[:target_branch]
 
+        if conditions[:date] && APIQueryBuilders::DateQueryParamBuilder.applicable?(conditions[:date])
+          condition_builders << APIQueryBuilders::DateQueryParamBuilder.new(conditions.delete(:date))
+        end
+
         condition_builders.each do |condition_builder|
           params[condition_builder.param_name] = condition_builder.param_content
         end
 
         UrlBuilders::UrlBuilder.new(
           network_options: options,
+          all: options.all,
           source: options.source,
           source_id: options.source_id,
           resource_type: resource_type,

data/lib/gitlab/triage/errors.rb

@@ -1 +1 @@
-require 'gitlab/triage/errors/network'
+require_relative 'errors/network'

data/lib/gitlab/triage/filters/merge_request_date_conditions_filter.rb

@@ -1,21 +1,67 @@
-require_relative 'issuable_date_conditions_filter'
+require_relative 'base_conditions_filter'
 
 module Gitlab
   module Triage
     module Filters
-      class MergeRequestDateConditionsFilter < IssuableDateConditionsFilter
-        ATTRIBUTES = %w[updated_at created_at merged_at].freeze
+      class MergeRequestDateConditionsFilter < BaseConditionsFilter
+        ATTRIBUTES = %w[merged_at].freeze
+        CONDITIONS = %w[older_than newer_than].freeze
+        INTERVAL_TYPES = %w[days weeks months years].freeze
+
+        def self.allowed_attributes
+          self::ATTRIBUTES
+        end
+
+        def self.filter_parameters
+          [
+            {
+              name: :attribute,
+              type: String,
+              values: allowed_attributes
+            },
+            {
+              name: :condition,
+              type: String,
+              values: CONDITIONS
+            },
+            {
+              name: :interval_type,
+              type: String,
+              values: INTERVAL_TYPES
+            },
+            {
+              name: :interval,
+              type: Numeric
+            }
+          ]
+        end
+
+        def initialize_variables(condition)
+          @attribute = condition[:attribute].to_sym
+          @condition = condition[:condition].to_sym
+          @interval_type = condition[:interval_type].to_sym
+          @interval = condition[:interval]
+        end
 
         # Guard against merge requests with no merged_at values
         def resource_value
-          super if @resource[@attribute]
+          @resource[@attribute]&.to_date
+        end
+
+        def condition_value
+          @interval.public_send(@interval_type).ago.to_date # rubocop:disable GitlabSecurity/PublicSend
         end
 
         # Guard against merge requests with no merged_at values
         def calculate
           return false unless resource_value
 
-          super
+          case @condition
+          when :older_than
+            resource_value < condition_value
+          when :newer_than
+            resource_value > condition_value
+          end
         end
       end
     end

data/lib/gitlab/triage/network.rb

@@ -31,11 +31,12 @@ module Gitlab
 
         begin
           print '.'
+          url = response.fetch(:next_page_url) { url }
 
           response = execute_with_retry([Net::ReadTimeout, Errors::Network::InternalServerError]) do
             puts Gitlab::Triage::UI.debug "query_api: #{url}" if options.debug
 
-            @adapter.get(token, response.fetch(:next_page_url) { url })
+            @adapter.get(token, url)
           end
 
           results = response.delete(:results)

data/lib/gitlab/triage/network_adapters/httparty_adapter.rb

@@ -22,7 +22,7 @@ module Gitlab
 
           {
             more_pages: (response.headers["x-next-page"].to_s != ""),
-            next_page_url: url + "&page=#{response.headers['x-next-page']}",
+            next_page_url: next_page_url(url, response),
             results: response.parsed_response,
             ratelimit_remaining: response.headers["ratelimit-remaining"].to_i,
             ratelimit_reset_at: Time.at(response.headers["ratelimit-reset"].to_i)
@@ -66,6 +66,18 @@ module Gitlab
 
           raise Errors::Network::InternalServerError, 'Internal server error encountered!'
         end
+
+        def next_page_url(url, response)
+          return unless response.headers['x-next-page'].present?
+
+          next_page = "&page=#{response.headers['x-next-page']}"
+
+          if url.include?('&page')
+            url.gsub(/&page=\d+/, next_page)
+          else
+            url + next_page
+          end
+        end
       end
     end
   end

data/lib/gitlab/triage/option_parser.rb

@@ -23,6 +23,10 @@ module Gitlab
               options.policies_files << value
             end
 
+            opts.on('--all-projects', 'Process all projects the token has access to') do |value|
+              options.all = value
+            end
+
             opts.on('-s', '--source [type]', [:projects, :groups], 'The source type between [ projects or groups ], default value: projects') do |value|
               options.source = value
             end
@@ -59,6 +63,12 @@ module Gitlab
               exit # rubocop:disable Rails/Exit
             end
 
+            opts.on('-v', '--version', 'Print version') do
+              require_relative 'version'
+              $stdout.puts Gitlab::Triage::VERSION
+              exit # rubocop:disable Rails/Exit
+            end
+
             opts.on('--init', 'Initialize the project with a policy file') do
               example_path =
                 File.expand_path('../../../support/.triage-policies.example.yml', __dir__)

data/lib/gitlab/triage/options.rb

@@ -3,6 +3,7 @@ module Gitlab
     Options = Struct.new(
       :dry_run,
       :policies_files,
+      :all,
       :source,
       :source_id,
       :token,
@@ -17,6 +18,7 @@ module Gitlab
         # Defaults
         self.host_url ||= 'https://gitlab.com'
         self.api_version ||= 'v4'
+        self.all ||= false
         self.source ||= 'projects'
         self.require_files ||= []
         self.policies_files ||= Set.new

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

@@ -15,7 +15,7 @@ module Gitlab
             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

@@ -10,7 +10,7 @@ module Gitlab
         # Build an issue from several rules policies
         def build_issue
           action = actions[:summarize]
-          issues = resources.build_issues do |inner_policy_spec, inner_resources|
+          issues = resources.map do |inner_policy_spec, inner_resources|
             Policies::RulePolicy.new(
               type, inner_policy_spec, inner_resources, network)
               .build_issue

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

@@ -1,20 +1,19 @@
 # frozen_string_literal: true
 
+require 'forwardable'
+
 module Gitlab
   module Triage
     module PoliciesResources
       class RuleResources
-        attr_reader :resources
+        include Enumerable
+        extend Forwardable
 
         def initialize(new_resources)
           @resources = new_resources
         end
 
-        def each
-          resources.each do |resource|
-            yield(resource)
-          end
-        end
+        def_delegator :@resources, :each
       end
     end
   end