gitlab-triage 1.17.0 → 1.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68a42526c02ea2ea87e7f0ca3d24ac0fb5acbdd145fb30fc2bbd79e533ce9b65
-  data.tar.gz: 274ba6fb0d4040abc095207eb3349c3719e57e6e37d6087af1bedaed78e8b6b5
+  metadata.gz: '0609b18bd6e787fbf4e4c586b8631bc5f8c83c0a9c1a90047da3f953b558a6d6'
+  data.tar.gz: dec00b0fe73a998726c0c42a845aa5fa48e5b590597df4f054ed26200d4a47ca
 SHA512:
-  metadata.gz: be15fd2ef8f9e4d12116f83906905bd43a45f0ba81978f03504aa751e97ae367f92110072abb2b2c4ae2419fd01c9599d89db3469f96c871341291dfdcddc43a
-  data.tar.gz: e2a9669fd8373304b66d8470fe24fae0c55349c229accf9a523462ead4e63ea4f8ef3f3bc3c1d9a6765073a5d7226f8787f2feeb8a1c6c4491d6dcedbaa3af1f
+  metadata.gz: bb63d114b513c6a8705e47b432e5c7612fc4cbe9bf729d625286917b14341a0bfffc18ce70b06968a347b61ae8a2a629ed2c76f0e8d0c37b35a611c97b7d1045
+  data.tar.gz: e0752eb15014713b4ef6f1ad64494a6b3607348be75107a93a59e11659a2fa8fca4a80b4e45c8a9eca9fb7fe4ecd2dcd0923fd27bfae8d09de9ee3bf45c8e2f8

data/.rubocop.yml

@@ -3,7 +3,7 @@ inherit_gem:
     - rubocop-default.yml
 
 AllCops:
-  TargetRubyVersion: 2.6
+  TargetRubyVersion: 2.7
   Exclude:
     - 'vendor/**/*'
     - 'tmp/**/*'

data/lib/gitlab/triage/action/comment.rb

@@ -62,7 +62,7 @@ module Gitlab
             source: policy.source,
             source_id: resource[policy.source_id_sym],
             resource_type: policy.type,
-            resource_id: resource['iid'],
+            resource_id: resource_id(resource),
             sub_resource_type: sub_resource_type
           }
 
@@ -84,6 +84,15 @@ module Gitlab
             raise ArgumentError, "Unknown comment type: #{type}"
           end
         end
+
+        def resource_id(resource)
+          case policy.type
+          when 'epics'
+            resource['id']
+          else
+            resource['iid']
+          end
+        end
       end
     end
   end

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

@@ -14,7 +14,11 @@ module Gitlab
 
         def ensure_labels_exist!
           items.each do |label|
-            label_opts = { project_id: resource[:project_id], name: label }
+            source_id_key = resource.key?(:group_id) ? :group_id : :project_id
+            label_opts = {
+              source_id_key => resource[source_id_key],
+              name: label
+            }
 
             unless Resource::Label.new(label_opts, network: network).exist?
               raise Resource::Label::LabelDoesntExistError,

data/lib/gitlab/triage/engine.rb

@@ -37,6 +37,7 @@ module Gitlab
         issues: %w[opened closed],
         merge_requests: %w[opened closed merged]
       }.with_indifferent_access.freeze
+      EpicsTriagingForProjectImpossibleError = Class.new(StandardError)
 
       def initialize(policies:, options:, network_adapter_class: DEFAULT_NETWORK_ADAPTER, graphql_network_adapter_class: DEFAULT_GRAPHQL_ADAPTER)
         options.host_url = policies.delete(:host_url) { options.host_url }
@@ -62,6 +63,10 @@ module Gitlab
         puts
 
         resource_rules.each do |resource_type, resource|
+          if resource_type == 'epics' && options.source != :groups
+            raise(EpicsTriagingForProjectImpossibleError, "Epics can only be triaged at the group level. Please set the `--source groups` option.")
+          end
+
           puts Gitlab::Triage::UI.header("Processing rules for #{resource_type}", char: '-')
           puts
 

data/lib/gitlab/triage/graphql_network.rb

@@ -51,7 +51,7 @@ module Gitlab
 
       def normalize(resource)
         resource
-          .slice(:iid, :state, :author, :merged_at, :user_notes_count, :user_discussions_count, :upvotes, :downvotes, :project_id, :web_url)
+          .slice(:iid, :title, :state, :author, :merged_at, :user_notes_count, :user_discussions_count, :upvotes, :downvotes, :project_id, :web_url)
           .merge(
             id: extract_id_from_global_id(resource[:id]),
             labels: [*resource.dig(:labels, :nodes)].pluck(:title),

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

@@ -1,9 +1,11 @@
-require 'httparty'
+require_relative '../version'
 
 module Gitlab
   module Triage
     module NetworkAdapters
       class BaseAdapter
+        USER_AGENT = "GitLab Triage #{Gitlab::Triage::VERSION}".freeze
+
         attr_reader :options
 
         def initialize(options)

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

@@ -1,4 +1,3 @@
-require 'httparty'
 require 'graphql/client'
 require 'graphql/client/http'
 
@@ -64,6 +63,7 @@ module Gitlab
                 uri,
                 body: body.to_json,
                 headers: {
+                  'User-Agent' => USER_AGENT,
                   'Content-type' => 'application/json',
                   'PRIVATE-TOKEN' => context[:token]
                 }

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

@@ -12,6 +12,7 @@ module Gitlab
           response = HTTParty.get(
             url,
             headers: {
+              'User-Agent' => USER_AGENT,
               'Content-type' => 'application/json',
               'PRIVATE-TOKEN' => token
             }
@@ -35,6 +36,7 @@ module Gitlab
             url,
             body: body.to_json,
             headers: {
+              'User-Agent' => "GitLab Triage #{Gitlab::Triage::VERSION}",
               'Content-type' => 'application/json',
               'PRIVATE-TOKEN' => token
             }

data/lib/gitlab/triage/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-triage
 version: !ruby/object:Gem::Version
-  version: 1.17.0
+  version: 1.18.0
 platform: ruby
 authors:
 - GitLab
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-07 00:00:00.000000000 Z
+date: 2021-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport