gitlab-triage 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da8631c8e4a01092f91bba3be37db11cbadee2e321c62922f1a2a27ea3a98e41
-  data.tar.gz: cc565d9cc79cbdfdbabaa5f86880172cd5ef711b3d8ac2286476a045ae1510fe
+  metadata.gz: cd48e4232bda87bda7044a5453a42c0a39b29ebe69cd5953048df8dd577c872f
+  data.tar.gz: d14d0e432023d50f6a11fcf3ff8ec223c3235ac5c53191cf2dd5babfbaeaa10b
 SHA512:
-  metadata.gz: e2b39262189075194795e05df1adf15eaa86a987731834f821f3daa24e06642cbcc9b97a918cdae7827d4a89d29c204c4f6c939a1cdb597d8a665c0971116a4f
-  data.tar.gz: 13aeac661214408c2584a6b41b9bbf9a69f1fb68e620f5f5fea08a9f74635315a0e8e03c84f86ab5ce84b71a32b206f368b433dfff90e2903d0e2eba625da4a2
+  metadata.gz: 9aa0e6f1062e6c39785b020c23c0c382a2387446fe77e29dd154cbe6530ee4cd6f873da842ab1abae04e2516cd4a7a2c070019ef8ebdce63b16eeb9becb5b5cb
+  data.tar.gz: 67fbbe46988133f88de13d8e066eb61da9cfbf025d1c4cd622a97e4c41420838a4d27ce1300fc88cacbb70a2447c46b3af84d342405206cd578c40b59d250dd0

data/lib/gitlab/triage/engine.rb

@@ -39,7 +39,7 @@ module Gitlab
 
         assert_project_id!
         assert_token!
-        require_ruby_file
+        require_ruby_files
       end
 
       def perform
@@ -75,10 +75,8 @@ module Gitlab
         raise ArgumentError, 'A token is needed (pass it with the `--token` option)!'
       end
 
-      def require_ruby_file
-        return unless options.require
-
-        require options.require
+      def require_ruby_files
+        options.require_files.each(&method(:require))
       end
 
       def resource_rules

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

@@ -17,7 +17,7 @@ module Gitlab
         end
 
         def calculate
-          context = Resource::Context.build(@resource, network: @network)
+          context = Resource::Context.build(@resource, network: @network, redact_confidentials: false)
 
           !!context.eval(@expression)
         end

data/lib/gitlab/triage/network.rb

@@ -10,6 +10,7 @@ module Gitlab
       include Retryable
 
       TokenNotFound = Class.new(StandardError)
+      MINIMUM_RATE_LIMIT = 25
 
       attr_reader :options, :adapter
 
@@ -44,6 +45,9 @@ module Gitlab
           else
             resources << results
           end
+
+          rate_limit_debug(response) if options.debug
+          rate_limit_wait(response)
         end while response.delete(:more_pages)
 
         resources.map!(&:with_indifferent_access)
@@ -52,14 +56,18 @@ module Gitlab
       end
 
       def post_api(url, body)
-        execute_with_retry(Net::ReadTimeout) do
+        response = execute_with_retry(Net::ReadTimeout) do
           puts Gitlab::Triage::UI.debug "post_api: #{url}" if options.debug
 
           @adapter.post(token, url, body)
         end
 
+        rate_limit_debug(response) if options.debug
+        rate_limit_wait(response)
+
+        response.delete(:results).with_indifferent_access
       rescue Net::ReadTimeout
-        false
+        {}
       end
 
       private
@@ -67,6 +75,18 @@ module Gitlab
       def token
         options.token || raise(TokenNotFound)
       end
+
+      def rate_limit_debug(response)
+        rate_limit_infos = "Rate limit remaining: #{response[:ratelimit_remaining]} (reset at #{response[:ratelimit_reset_at]})"
+        puts Gitlab::Triage::UI.debug "rate_limit_infos: #{rate_limit_infos}"
+      end
+
+      def rate_limit_wait(response)
+        return unless response.delete(:ratelimit_remaining) < MINIMUM_RATE_LIMIT
+
+        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
     end
   end
 end

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

@@ -16,20 +16,19 @@ module Gitlab
             }
           )
 
-          if response.response.is_a?(Net::HTTPUnauthorized)
-            puts Gitlab::Triage::UI.debug response.inspect if options.debug
-            raise 'The provided token is unauthorized!'
-          end
+          raise_on_unauthorized_error!(response)
 
           {
             more_pages: (response.headers["x-next-page"].to_s != ""),
             next_page_url: url + "&page=#{response.headers['x-next-page']}",
-            results: response.parsed_response
+            results: response.parsed_response,
+            ratelimit_remaining: response.headers["ratelimit-remaining"].to_i,
+            ratelimit_reset_at: Time.at(response.headers["ratelimit-reset"].to_i)
           }
         end
 
         def post(token, url, body)
-          HTTParty.post(
+          response = HTTParty.post(
             url,
             body: body.to_json,
             headers: {
@@ -37,6 +36,23 @@ module Gitlab
               'PRIVATE-TOKEN' => token
             }
           )
+
+          raise_on_unauthorized_error!(response)
+
+          {
+            results: response.parsed_response,
+            ratelimit_remaining: response.headers["ratelimit-remaining"].to_i,
+            ratelimit_reset_at: Time.at(response.headers["ratelimit-reset"].to_i)
+          }
+        end
+
+        private
+
+        def raise_on_unauthorized_error!(response)
+          return unless response.response.is_a?(Net::HTTPUnauthorized)
+
+          puts Gitlab::Triage::UI.debug response.inspect if options.debug
+          raise 'The provided token is unauthorized!'
         end
       end
     end

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

@@ -20,12 +20,18 @@ module Gitlab
           {
             more_pages: false,
             next_page_url: nil,
-            results: results
+            results: results,
+            ratelimit_remaining: 600,
+            ratelimit_reset_at: Time.now
           }
         end
 
         def post(token, url, body)
-          # no-op in tests
+          {
+            results: {},
+            ratelimit_remaining: 600,
+            ratelimit_reset_at: Time.now
+          }
         end
       end
     end

data/lib/gitlab/triage/option_parser.rb

@@ -48,7 +48,7 @@ module Gitlab
             end
 
             opts.on('-r', '--require [string]', String, 'Require a file before performing') do |value|
-              options.require = value
+              options.require_files << value
             end
 
             opts.on('-d', '--debug', 'Print debug information') do |value|

data/lib/gitlab/triage/options.rb

@@ -8,7 +8,7 @@ module Gitlab
       :token,
       :debug,
       :host_url,
-      :require,
+      :require_files,
       :api_version
     ) do
       def initialize(*args)
@@ -18,6 +18,7 @@ module Gitlab
         self.host_url ||= 'https://gitlab.com'
         self.api_version ||= 'v4'
         self.source ||= 'projects'
+        self.require_files ||= []
       end
     end
   end

data/lib/gitlab/triage/version.rb

@@ -1,5 +1,5 @@
 module Gitlab
   module Triage
-    VERSION = '1.1.1'.freeze
+    VERSION = '1.2.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-triage
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - GitLab
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-04 00:00:00.000000000 Z
+date: 2019-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport