dri 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 879c4292254a2a17a0ebcd8e2c0a3f8bbc6e654a69c153ad66423c71eb750fc4
-  data.tar.gz: 51f8e1acec1894ce4a6ab264ef690cf063259f46512d743609bf2f5a6529132f
+  metadata.gz: cb71a1d13a00cb33c436608e3c34e40a4202505bad341d31d5d85803c36495d4
+  data.tar.gz: 73648bafa41eac28824435b62a41ead17494c144bbd99c6af52062e616379f2a
 SHA512:
-  metadata.gz: ad020b17eb8d05322800332e59b5d286dcb8712df055dab50be7f234df2864a5ba719f900d61b0ba25308a1ea130fa2b586b7f01215beec90eafb614cc8c6da1
-  data.tar.gz: c0ef20575dcc1f9fa3312df5970b79a8b6fa11b8401a1a80d30561c8a764c7bcd140d4e649c619fbce1be6b9f71c943fb51aa5a48c20b18c5f480af4a821bc07
+  metadata.gz: 6c2d592d0906e3764ec1ab2fe298a42a1798be1d58dd216261ed2a88227cfe007a97a175ae199f5ee4f4db16f7efe2dd6f99521e8febc740e191b61c0f2ef8cc
+  data.tar.gz: 1106b7fc11be59d38c72f471f8a5148eb4e724a81665b4382185da5c22a4e554fc7e1b1cc274a980b9ceeb6071f7fa5da0397e3657655132a6d21f2a31cf9712

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dri (0.4.0)
+    dri (0.5.0)
       gitlab (~> 4.18)
       httparty (~> 0.20.0)
       json (~> 2.6.1)

data/lib/dri/commands/fetch/failures.rb

@@ -13,8 +13,9 @@ module Dri
         SORT_BY_OPTIONS = {
           title: 0,
           triaged: 1,
-          author: 2,
-          url: 3
+          environment: 2,
+          author: 3,
+          url: 4
         }.freeze
 
         def initialize(options)
@@ -25,14 +26,16 @@ module Dri
         def execute(input: $stdin, output: $stdout) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity, Metrics/MethodLength
           verify_config_exists
 
+          urgent_environments = %w[canary canary.staging]
+
           title = add_color('Title', :bright_yellow)
           triaged = add_color('Triaged?', :bright_yellow)
+          environment = add_color('Environment', :bright_yellow)
           author = add_color('Author', :bright_yellow)
           url = add_color('URL', :bright_yellow)
 
           failures = []
-          urgent = []
-          labels = [title, triaged, author, url]
+          labels = [title, triaged, environment, author, url]
           triaged_counter = 0
 
           logger.info "Fetching today's failures..."
@@ -50,6 +53,12 @@ module Dri
               author = failure.to_h.dig('author', 'username')
               url = failure.web_url
               triaged = add_color('x', :red)
+              envs = failure.labels.select { |l| l.include?('found:') }.map do |l|
+                env = l.split(':').last.gsub('.gitlab.com', '')
+
+                env == 'gitlab.com' ? 'production' : env
+              end
+              urgent = urgent_environments.all? { |env| envs.include?(env) }
 
               emoji_awards = api_client.fetch_awarded_emojis(failure.iid).find do |e|
                 e.name == emoji && e.to_h.dig('user', 'username') == username
@@ -61,32 +70,27 @@ module Dri
               end
 
               if @options[:urgent]
-                labels = failure.labels
-
-                labels.each do |label|
-                  if label.include?('found:canary.gitlab.com' && 'found:canary.staging.gitlab.com')
-                    urgent << [title, triaged, author, url]
-                  end
-                end
+                failures << [title, triaged, envs.first, author, url] if urgent
+              else
+                failures << [title, triaged, envs.first, author, url]
               end
-
-              failures << [title, triaged, author, url]
-
-              failures.sort_by! { |e| e[SORT_BY_OPTIONS[@options[:sort_by].to_sym]] } if @options[:sort_by]
             end
-          end
 
-          if @options[:urgent]
-            print_table(labels, urgent, alignments: [:left, :center, :center, :left])
-            output.puts(<<~MSG)
-              Found: #{urgent.size} urgent failures, occurring in both canary.gitlab.com and canary.staging.gitlab.com.
-            MSG
-          else
-            print_table(labels, failures, alignments: [:left, :center, :center, :left])
-            output.puts(<<~MSG)
-              Found: #{failures.size} failures, of these #{triaged_counter} have been triaged with a #{emoji}.
-            MSG
+            failures.sort_by! { |failure| failure[SORT_BY_OPTIONS[@options[:sort_by]&.to_sym || :environment]] }
           end
+
+          msg = if @options[:urgent]
+                  <<~MSG
+                    Found: #{failures.size} urgent failures, occurring in both canary.gitlab.com and canary.staging.gitlab.com.
+                  MSG
+                else
+                  <<~MSG
+                    Found: #{failures.size} failures, of these #{triaged_counter} have been triaged with a #{emoji}.
+                  MSG
+                end
+
+          print_table(labels, failures, alignments: [:left, :center, :center, :left])
+          output.puts(msg)
         end
       end
     end

data/lib/dri/report.rb

@@ -95,7 +95,7 @@ module Dri
         end
 
         unless pipeline_link.empty?
-          pipeline_link_sanitized = pipeline_link.join.strip.chop
+          pipeline_link_sanitized = pipeline_link.join.strip
           pipeline_markdown = "[#{pipeline_markdown}](#{pipeline_link_sanitized})"
         end
 

data/lib/dri/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Dri
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dri
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - GitLab Quality
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-06-09 00:00:00.000000000 Z
+date: 2022-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gitlab
@@ -337,7 +337,6 @@ files:
 - lib/dri/gitlab/issues.rb
 - lib/dri/refinements/truncate.rb
 - lib/dri/report.rb
-- lib/dri/templates/incidents/.gitkeep
 - lib/dri/utils/feature_flag_consts.rb
 - lib/dri/utils/markdown_lists.rb
 - lib/dri/utils/table.rb

data/lib/dri/templates/incidents/.gitkeep

@@ -1 +0,0 @@
-#