gitlab-triage 1.19.0 → 1.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75bd839eb28f1b1feee624b5591b623966520685ecf9577d66bd08eb68e25227
-  data.tar.gz: 6fe5843105229f7488bc6c5e54fb58269a928bd80df3b579163636639cd64f6b
+  metadata.gz: 84173833ef78959cc6fdb59fa9dbe7e69ad7061265d22a1941c57a36b2f8e42b
+  data.tar.gz: 1293b7b39aca995152acfbed956af54c35d4897eee90f9db586bb318c20bd18c
 SHA512:
-  metadata.gz: d0f70cecc7cd0315143783856920a36970f63d834838ad26ca3210e2077f60859a54ae1208cb1c21d7ead6c718cae36900ad47724e43cbb3c1c3ad095441d715
-  data.tar.gz: 9044cb1de497e46b1b24f0e8ddf73da2fdd9d1dde178c4c0b1a5ff62e599c0581cb965f946ea14802a861180c9f37f72ba84fc972545b759644b528bb1865204
+  metadata.gz: 73b18f51c5386dc91946fe55531057d04908b74f42b16830458c8af11efdbac16a13791191310eddb5732764e2ffa49a89500d5fbbd8ca10a63dbae9f89acef8
+  data.tar.gz: ab7cefaa8a5574fb8f0e9b1c73875441975976275e28eb0f2e57194f6b26cf69323f60c3094b9d10cad88120df4abdbe112516c8c5e6a3c9f1e5e1efaad46a6f

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

@@ -82,21 +82,37 @@ module Gitlab
             condition_queries << QueryParamBuilders::BaseParamBuilder.new('milestoneTitle', condition_params) if condition.to_s == 'milestone'
             condition_queries << QueryParamBuilders::BaseParamBuilder.new('state', condition_params, with_quotes: false) if condition.to_s == 'state'
 
-            if resource_type == 'merge_requests'
-              condition_queries << QueryParamBuilders::LabelsParamBuilder.new('labels', condition_params) if condition.to_s == 'labels'
-              condition_queries << QueryParamBuilders::BaseParamBuilder.new('sourceBranch', condition_params) if condition.to_s == 'source_branch'
-              condition_queries << QueryParamBuilders::BaseParamBuilder.new('targetBranch', condition_params) if condition.to_s == 'target_branch'
-            end
-
-            if resource_type == 'issues'
-              condition_queries << QueryParamBuilders::LabelsParamBuilder.new('labelName', condition_params) if condition.to_s == 'labels'
-            end
+            condition_queries << merge_requests_resource_query(condition, condition_params) if resource_type == 'merge_requests'
+            condition_queries << issues_resource_query(condition, condition_params) if resource_type == 'issues'
           end
 
           condition_queries
+            .compact
             .map(&:build_param)
             .join
         end
+
+        def merge_requests_resource_query(condition, condition_params)
+          case condition.to_s
+          when 'forbidden_labels'
+            QueryParamBuilders::LabelsParamBuilder.new('labels', condition_params, negated: true)
+          when 'labels'
+            QueryParamBuilders::LabelsParamBuilder.new('labels', condition_params)
+          when 'source_branch'
+            QueryParamBuilders::BaseParamBuilder.new('sourceBranch', condition_params)
+          when 'target_branch'
+            QueryParamBuilders::BaseParamBuilder.new('targetBranch', condition_params)
+          end
+        end
+
+        def issues_resource_query(condition, condition_params)
+          case condition.to_s
+          when 'forbidden_labels'
+            QueryParamBuilders::LabelsParamBuilder.new('labelName', condition_params, negated: true)
+          when 'labels'
+            QueryParamBuilders::LabelsParamBuilder.new('labelName', condition_params)
+          end
+        end
       end
     end
   end

data/lib/gitlab/triage/graphql_queries/query_param_builders/base_param_builder.rb

@@ -5,18 +5,23 @@ module Gitlab
     module GraphqlQueries
       module QueryParamBuilders
         class BaseParamBuilder
-          attr_reader :param_name, :param_contents, :with_quotes
+          attr_reader :param_name, :param_contents, :with_quotes, :negated
 
-          def initialize(param_name, param_contents, with_quotes: true)
+          def initialize(param_name, param_contents, with_quotes: true, negated: false)
             @param_name = param_name
             @param_contents = param_contents.to_s.strip
             @with_quotes = with_quotes
+            @negated = negated
           end
 
           def build_param
             contents = with_quotes ? Utils.graphql_quote(param_contents) : param_contents
 
-            ", #{param_name}: #{contents}"
+            if negated
+              ", not: { #{param_name}: #{contents} }"
+            else
+              ", #{param_name}: #{contents}"
+            end
           end
         end
       end

data/lib/gitlab/triage/graphql_queries/query_param_builders/labels_param_builder.rb

@@ -6,10 +6,10 @@ module Gitlab
     module GraphqlQueries
       module QueryParamBuilders
         class LabelsParamBuilder < BaseParamBuilder
-          def initialize(param_name, labels)
+          def initialize(param_name, labels, negated: false)
             label_param_content = labels.map { |label| Utils.graphql_quote(label) }.join(', ').then { |content| "[#{content}]" }
 
-            super(param_name, label_param_content, with_quotes: false)
+            super(param_name, label_param_content, with_quotes: false, negated: negated)
           end
         end
       end

data/lib/gitlab/triage/network.rb

@@ -49,7 +49,7 @@ module Gitlab
           when Hash
             resources << results
           else
-            raise Errors::Network::UnexpectedResponse, "Unexpected response: #{results.inspect}"
+            raise_unexpected_response(results)
           end
 
           rate_limit_debug(response) if options.debug
@@ -73,7 +73,14 @@ module Gitlab
         rate_limit_debug(response) if options.debug
         rate_limit_wait(response)
 
-        response.delete(:results).with_indifferent_access
+        results = response.delete(:results)
+
+        case results
+        when Hash
+          results.with_indifferent_access
+        else
+          raise_unexpected_response(results)
+        end
       rescue Net::ReadTimeout
         {}
       end
@@ -95,6 +102,10 @@ module Gitlab
         puts Gitlab::Triage::UI.debug "Rate limit almost exceeded, sleeping for #{response[:ratelimit_reset_at] - Time.now} seconds" if options.debug
         sleep(1) until Time.now >= response[:ratelimit_reset_at]
       end
+
+      def raise_unexpected_response(results)
+        raise Errors::Network::UnexpectedResponse, "Unexpected response: #{results.inspect}"
+      end
     end
   end
 end

data/lib/gitlab/triage/version.rb

@@ -2,6 +2,6 @@
 
 module Gitlab
   module Triage
-    VERSION = '1.19.0'
+    VERSION = '1.20.0'
   end
 end

metadata

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