gitlab-triage 1.14.1 → 1.14.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fbce3d75b063c517b80bbbfa5a0cf8ef2cf0f6ffe9eabcebe743f7ea5e6fbc23
-  data.tar.gz: '09687c2d578d80f351a54a614113bcf36b70a15144f848409b8143be53c95f9b'
+  metadata.gz: c40a53d7edad2e8472cb3a7a503af2d45d31dfb4b7192e12b170016cd47b0b23
+  data.tar.gz: 35c4cfc534faee10e6d1d02b6108d3300ad4cee20883e6e1299d97c5315a0cde
 SHA512:
-  metadata.gz: f88d9507fd36e15941fa9b1345887e138893e8e7e5ae1b872408cfea449c2565c48c4267c1df278fa0f1ddf3f1c857050e4868eef88268b4acf9c7078dda0a53
-  data.tar.gz: 77dfd58b8e61d3115e9057b688d7f2b91b8473dd4e7a177a32cad0585f1f42c115d371f9d10f10a0a27fd3ee1b4230ee757982dcc85207395ebef82274165e70
+  metadata.gz: 27424e4cab78096d186c11b9508340b50f70b04fdf9ee942bc1063dd3e4a0b14e4f10ebe7651947f3e32bd891cff98eb33db2315cd021aaef86e1f38e3dc9552
+  data.tar.gz: 3c4e60ac07b46c9c755d8b85c39fed6addc39370b268885090e7cf822456877e1f3bf241adf7288c5f5df6cda802284ca05cfa8c91d79d92dc04086c36d8a182

data/.gitlab/merge_request_templates/Release.md

@@ -32,4 +32,4 @@ with the latest commit from https://gitlab.com/gitlab-org/gitlab-triage/commits/
 - Checklist after merging:
   - [ ] [Update the release notes for the newly created tag](docs/release_process.md#how-to).
 
-/label ~"Engineering Productivity" ~"ep::triage" ~"tooling::workflow"
+/label ~"Engineering Productivity" ~"ep::triage" ~tooling ~"tooling::workflow"

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

@@ -2,16 +2,25 @@ module Gitlab
   module Triage
     module APIQueryBuilders
       class BaseQueryParamBuilder
-        attr_reader :param_name, :param_contents
+        attr_reader :param_name, :param_contents, :allowed_values
 
-        def initialize(param_name, param_contents)
+        def initialize(param_name, param_contents, allowed_values: nil)
           @param_name = param_name
           @param_contents = param_contents
+          @allowed_values = allowed_values
+
+          validate_allowed_values! if allowed_values
         end
 
         def build_param
           "&#{param_name}=#{param_content.strip}"
         end
+
+        private
+
+        def validate_allowed_values!
+          ParamsValidator.new([{ name: param_name, type: String, values: allowed_values }], { param_name => param_contents }).validate!
+        end
       end
     end
   end

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

@@ -6,14 +6,22 @@ module Gitlab
       class MultiQueryParamBuilder < BaseQueryParamBuilder
         attr_reader :separator
 
-        def initialize(param_name, param_contents, separator)
+        def initialize(param_name, param_contents, separator, allowed_values: nil)
           @separator = separator
-          super(param_name, param_contents)
+          super(param_name, Array(param_contents), allowed_values: allowed_values)
         end
 
         def param_content
           param_contents.map(&:strip).join(separator)
         end
+
+        private
+
+        def validate_allowed_values!
+          param_contents.each do |param|
+            ParamsValidator.new([{ name: param_name, type: String, values: allowed_values }], { param_name => param }).validate!
+          end
+        end
       end
     end
   end

data/lib/gitlab/triage/engine.rb

@@ -33,6 +33,10 @@ module Gitlab
 
       DEFAULT_NETWORK_ADAPTER = Gitlab::Triage::NetworkAdapters::HttpartyAdapter
       DEFAULT_GRAPHQL_ADAPTER = Gitlab::Triage::NetworkAdapters::GraphqlAdapter
+      ALLOWED_STATE_VALUES = {
+        issues: %w[opened closed],
+        merge_requests: %w[opened closed merged]
+      }.with_indifferent_access.freeze
 
       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 }
@@ -276,7 +280,13 @@ module Gitlab
           condition_builders << APIQueryBuilders::MultiQueryParamBuilder.new('not[labels]', conditions[:forbidden_labels], ',')
         end
 
-        condition_builders << APIQueryBuilders::SingleQueryParamBuilder.new('state', conditions[:state]) if conditions[:state]
+        if conditions[:state]
+          condition_builders << APIQueryBuilders::SingleQueryParamBuilder.new(
+            'state',
+            conditions[:state],
+            allowed_values: ALLOWED_STATE_VALUES[resource_type])
+        end
+
         condition_builders << APIQueryBuilders::SingleQueryParamBuilder.new('milestone', Array(conditions[:milestone])[0]) if conditions[:milestone]
         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]

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.14.2'
   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.14.2
 platform: ruby
 authors:
 - GitLab
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-27 00:00:00.000000000 Z
+date: 2020-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport