gitlab-triage 1.14.1 → 1.17.0

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

@@ -19,6 +19,7 @@ module Gitlab
 
           raise_on_unauthorized_error!(response)
           raise_on_internal_server_error!(response)
+          raise_on_too_many_requests!(response)
 
           {
             more_pages: (response.headers["x-next-page"].to_s != ""),
@@ -41,6 +42,7 @@ module Gitlab
 
           raise_on_unauthorized_error!(response)
           raise_on_internal_server_error!(response)
+          raise_on_too_many_requests!(response)
 
           {
             results: response.parsed_response,
@@ -67,6 +69,14 @@ module Gitlab
           raise Errors::Network::InternalServerError, 'Internal server error encountered!'
         end
 
+        def raise_on_too_many_requests!(response)
+          return unless response.response.is_a?(Net::HTTPTooManyRequests)
+
+          puts Gitlab::Triage::UI.debug response.inspect if options.debug
+
+          raise Errors::Network::TooManyRequests, 'Too many requests made!'
+        end
+
         def next_page_url(url, response)
           return unless response.headers['x-next-page'].present?
 

data/lib/gitlab/triage/option_parser.rb

@@ -88,6 +88,8 @@ module Gitlab
 
           parser.parse!(argv)
 
+          options.source = nil if options.all
+
           options
         end
       end

data/lib/gitlab/triage/param_builders/date_param_builder.rb

@@ -0,0 +1,58 @@
+require_relative '../validators/params_validator'
+
+module Gitlab
+  module Triage
+    module ParamBuilders
+      class DateParamBuilder
+        CONDITIONS = %w[older_than newer_than].freeze
+        INTERVAL_TYPES = %w[days weeks months years].freeze
+
+        def initialize(allowed_attributes, condition_hash)
+          @allowed_attributes = allowed_attributes
+          @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 param_content
+          interval.public_send(interval_type).ago.to_date # rubocop:disable GitlabSecurity/PublicSend
+        end
+
+        private
+
+        attr_reader :allowed_attributes, :attribute, :interval_condition, :interval_type, :interval
+
+        def validate_condition(condition)
+          ParamsValidator.new(filter_parameters, condition).validate!
+        end
+
+        def 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
+      end
+    end
+  end
+end

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

@@ -4,7 +4,10 @@ module Gitlab
   module Triage
     module Policies
       class BasePolicy
+        InvalidPolicyError = Class.new(StandardError)
+
         attr_reader :type, :policy_spec, :resources, :network
+        attr_accessor :summary
 
         def initialize(type, policy_spec, resources, network)
           @type = type
@@ -13,10 +16,32 @@ module Gitlab
           @network = network
         end
 
+        def validate!
+          raise InvalidPolicyError, 'Policies that comment_on_summary must include summarize action' if comment_on_summary? && !summarize?
+        end
+
         def name
           @name ||= (policy_spec[:name] || "#{type}-#{object_id}")
         end
 
+        def source
+          case type
+          when 'epics'
+            'groups'
+          else
+            'projects'
+          end
+        end
+
+        def source_id_sym
+          case type
+          when 'epics'
+            :group_id
+          else
+            :project_id
+          end
+        end
+
         def actions
           @actions ||= policy_spec.fetch(:actions) { {} }
         end
@@ -25,9 +50,13 @@ module Gitlab
           actions.key?(:summarize)
         end
 
+        def comment_on_summary?
+          actions.key?(:comment_on_summary)
+        end
+
         def comment?
           # The actual keys are strings
-          (actions.keys.map(&:to_sym) - [:summarize]).any?
+          (actions.keys.map(&:to_sym) - [:summarize, :comment_on_summary]).any?
         end
 
         def build_issue

data/lib/gitlab/triage/resource/context.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative 'base'
+require_relative 'epic'
 require_relative 'issue'
 require_relative 'merge_request'
 require_relative 'instance_version'

data/lib/gitlab/triage/resource/epic.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require_relative 'base'
+require_relative 'shared/issuable'
+
+module Gitlab
+  module Triage
+    module Resource
+      class Epic < Base
+        include Shared::Issuable
+
+        def project_path
+          @project_path ||=
+            request_group(resource[:group_id])[:full_path]
+        end
+        alias_method :group_path, :project_path
+
+        def reference
+          '&'
+        end
+      end
+    end
+  end
+end

data/lib/gitlab/triage/retryable.rb

@@ -2,23 +2,25 @@ module Gitlab
   module Triage
     module Retryable
       MAX_RETRIES = 3
+      BACK_OFF_SECONDS = 10
 
       attr_accessor :tries
 
-      def execute_with_retry(exception_types = [StandardError])
+      def execute_with_retry(exception_types: [StandardError], backoff_exceptions: [])
         @tries = 0
 
         until maximum_retries_reached?
           begin
             @tries += 1
-            result = yield
-            break
+            return yield
           rescue *exception_types
             raise if maximum_retries_reached?
+          rescue *backoff_exceptions
+            raise if maximum_retries_reached?
+
+            sleep(BACK_OFF_SECONDS)
           end
         end
-
-        result
       end
 
       private

data/lib/gitlab/triage/utils.rb

@@ -0,0 +1,13 @@
+module Gitlab
+  module Triage
+    module Utils
+      module_function
+
+      def graphql_quote(string)
+        contents = string.to_s.gsub('"', '\\"')
+
+        %("#{contents}")
+      end
+    end
+  end
+end

data/lib/gitlab/triage/validators/params_validator.rb

@@ -34,7 +34,7 @@ module Gitlab
       def validate_parameter_content(value)
         @parameter_definitions.each do |param|
           if param[:values]
-            raise InvalidParameter, "#{param[:name]} must be of one of #{param[:values].join(',')}" unless param[:values].include?(value[param[:name]])
+            raise InvalidParameter, "#{param[:name]} must be one of #{param[:values].join(',')}" unless param[:values].include?(value[param[:name]])
           end
         end
       end

data/lib/gitlab/triage/version.rb

@@ -2,6 +2,6 @@
 
 module Gitlab
   module Triage
-    VERSION = '1.14.1'
+    VERSION = '1.17.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-triage
 version: !ruby/object:Gem::Version
-  version: 1.14.1
+  version: 1.17.0
 platform: ruby
 authors:
 - GitLab
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-27 00:00:00.000000000 Z
+date: 2021-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -162,6 +162,7 @@ files:
 - lib/gitlab/triage/action.rb
 - lib/gitlab/triage/action/base.rb
 - lib/gitlab/triage/action/comment.rb
+- lib/gitlab/triage/action/comment_on_summary.rb
 - lib/gitlab/triage/action/summarize.rb
 - lib/gitlab/triage/api_query_builders/base_query_param_builder.rb
 - lib/gitlab/triage/api_query_builders/date_query_param_builder.rb
@@ -195,8 +196,9 @@ files:
 - lib/gitlab/triage/filters/votes_conditions_filter.rb
 - lib/gitlab/triage/graphql_network.rb
 - lib/gitlab/triage/graphql_queries/query_builder.rb
-- lib/gitlab/triage/graphql_queries/threads_query.rb
-- lib/gitlab/triage/graphql_queries/user_notes_query.rb
+- lib/gitlab/triage/graphql_queries/query_param_builders/base_param_builder.rb
+- lib/gitlab/triage/graphql_queries/query_param_builders/date_param_builder.rb
+- lib/gitlab/triage/graphql_queries/query_param_builders/labels_param_builder.rb
 - lib/gitlab/triage/limiters/base_limiter.rb
 - lib/gitlab/triage/limiters/date_field_limiter.rb
 - lib/gitlab/triage/network.rb
@@ -206,6 +208,7 @@ files:
 - lib/gitlab/triage/network_adapters/test_adapter.rb
 - lib/gitlab/triage/option_parser.rb
 - lib/gitlab/triage/options.rb
+- lib/gitlab/triage/param_builders/date_param_builder.rb
 - lib/gitlab/triage/policies/base_policy.rb
 - lib/gitlab/triage/policies/rule_policy.rb
 - lib/gitlab/triage/policies/summary_policy.rb
@@ -213,6 +216,7 @@ files:
 - lib/gitlab/triage/policies_resources/summary_resources.rb
 - lib/gitlab/triage/resource/base.rb
 - lib/gitlab/triage/resource/context.rb
+- lib/gitlab/triage/resource/epic.rb
 - lib/gitlab/triage/resource/instance_version.rb
 - lib/gitlab/triage/resource/issue.rb
 - lib/gitlab/triage/resource/label.rb
@@ -223,6 +227,7 @@ files:
 - lib/gitlab/triage/retryable.rb
 - lib/gitlab/triage/ui.rb
 - lib/gitlab/triage/url_builders/url_builder.rb
+- lib/gitlab/triage/utils.rb
 - lib/gitlab/triage/validators/limiter_validator.rb
 - lib/gitlab/triage/validators/params_validator.rb
 - lib/gitlab/triage/version.rb
@@ -247,7 +252,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: GitLab triage automation project.

data/lib/gitlab/triage/graphql_queries/threads_query.rb

@@ -1,31 +0,0 @@
-module Gitlab
-  module Triage
-    module GraphqlQueries
-      ThreadsQuery = <<-GRAPHQL.freeze # rubocop:disable Naming/ConstantName
-        query($source: ID!, $after: String, $iids: [String!]) {
-          %{source_type}(fullPath: $source) {
-            id
-            %{resource_type}(after: $after, iids: $iids%{group_query}) {
-              pageInfo {
-                hasNextPage
-                endCursor
-              }
-              nodes {
-                id
-                discussions {
-                  nodes {
-                    notes {
-                      nodes {
-                        system
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      GRAPHQL
-    end
-  end
-end

data/lib/gitlab/triage/graphql_queries/user_notes_query.rb

@@ -1,23 +0,0 @@
-module Gitlab
-  module Triage
-    module GraphqlQueries
-      UserNotesQuery = <<-GRAPHQL.freeze # rubocop:disable Naming/ConstantName
-        query($source: ID!, $after: String, $iids: [String!]) {
-          %{source_type}(fullPath: $source) {
-            id
-            %{resource_type}(after: $after, iids: $iids%{group_query}) {
-              pageInfo {
-                hasNextPage
-                endCursor
-              }
-              nodes {
-                id
-                userNotesCount
-              }
-            }
-          }
-        }
-      GRAPHQL
-    end
-  end
-end