dri 0.11.0 → 1.1.0

data/lib/dri/api_client.rb

@@ -6,13 +6,12 @@ require "tty-config"
 require "cgi"
 require "gitlab"
 
-require_relative './utils/constants'
-
 module Dri
   TokenNotProvidedError = Class.new(StandardError)
   class ApiClient # rubocop:disable Metrics/ClassLength
     include Dri::Utils::Constants::ProjectIDs
     include Dri::Utils::Constants::Triage::Labels
+    using Refinements::Gitlab
 
     API_URL                     = "https://gitlab.com/api/v4"
     OPS_API_URL                 = "https://ops.gitlab.net/api/v4"
@@ -136,7 +135,11 @@ module Dri
     #
     # @return [Gitlab::ObjectifiedHash]
     def fetch_current_triage_issue
-      gitlab.issues(TRIAGE_PROJECT_ID, state: "opened", order_by: "updated_at")
+      issues = gitlab.issues(TRIAGE_PROJECT_ID, labels: "triage report", state: "opened")
+
+      issues.find do |issue|
+        issue.title.include?('Pipeline Triage Report')
+      end
     end
 
     # Create triage report note
@@ -160,34 +163,26 @@ module Dri
 
     # Fetch all new failures
     #
-    # @param [String] start_date
-    # @param [String] end_date
+    # @param [Time] start_date
+    # @param [Time] end_date
     # @param [String] state
     # @return [Array<Gitlab::ObjectifiedHash>]
     def fetch_all_new_failures(start_date:, end_date:, state:)
-      project_ids = [GITLAB_PROJECT_ID, CUSTOMERSDOT_PROJECT_ID]
-      failures = []
-
-      start_date_iso = start_date.strftime('%Y-%m-%dT00:00:00Z')
-      end_date_iso = end_date.strftime('%Y-%m-%dT23:59:59Z')
-
-      project_ids.each do |project_id|
-        failures += fetch_new_failures(
+      [GITLAB_PROJECT_ID, CUSTOMERSDOT_PROJECT_ID].flat_map do |project_id|
+        fetch_new_failures(
           project_id: project_id,
-          start_date: start_date_iso,
-          end_date: end_date_iso,
+          start_date: start_date,
+          end_date: end_date,
           state: state
         )
       end
-
-      failures
     end
 
     # Fetch new failures for a given project
     #
     # @param [Integer] project_id
-    # @param [String] start_date
-    # @param [String] end_date
+    # @param [Time] start_date
+    # @param [Time] end_date
     # @param [String] state
     # @return [Array<Gitlab::ObjectifiedHash>]
     def fetch_new_failures(project_id:, start_date:, end_date:, state:)
@@ -198,8 +193,8 @@ module Dri
         sort: 'desc',
         state: state,
         scope: "all",
-        created_after: start_date,
-        created_before: end_date,
+        created_after: start_date.dup.utc.iso8601, # utc modifies the receiver, so making a copy
+        created_before: end_date.dup.utc.iso8601,
         per_page: 100
       )
     end
@@ -368,12 +363,12 @@ module Dri
     # @return [Gitlab::Client]
     def gitlab
       if @ops_instance
-        @ops_client ||= Gitlab.client(
+        @ops_client ||= ::Gitlab.client(
           endpoint: OPS_API_URL,
           private_token: ops_token
         )
       else
-        @gitlab_client ||= Gitlab.client(
+        @gitlab_client ||= ::Gitlab.client(
           endpoint: API_URL,
           private_token: token
         )

data/lib/dri/cli.rb

@@ -29,7 +29,6 @@ module Dri
 
     desc 'version', 'dri version'
     def version
-      require_relative 'version'
       puts "v#{Dri::VERSION}"
     end
     map %w[--version -v] => :version
@@ -41,12 +40,10 @@ module Dri
       if options[:help]
         invoke :help, ['incidents']
       else
-        require_relative 'commands/incidents'
         Dri::Commands::Incidents.new(options).execute
       end
     end
 
-    require_relative 'commands/rm'
     register Dri::Commands::Rm, 'rm', 'rm [SUBCOMMAND]', 'Remove triage-related items'
 
     desc 'profile', 'View current user settings'
@@ -60,7 +57,6 @@ module Dri
       if options[:help]
         invoke :help, ['profile']
       else
-        require_relative 'commands/profile'
         Dri::Commands::Profile.new(options).execute
       end
     end
@@ -72,7 +68,6 @@ module Dri
       if options[:help]
         invoke :help, ['init']
       else
-        require_relative 'commands/init'
         Dri::Commands::Init.new(options).execute
       end
     end
@@ -86,7 +81,6 @@ module Dri
         invoke :help, ['faq']
       else
         begin
-          require_relative 'commands/faq'
           Dri::Commands::FAQ.new(options).execute
         rescue Dri::Commands::FAQ::ExitCommand
           puts "Exiting faq command..."
@@ -94,19 +88,10 @@ module Dri
       end
     end
 
-    require_relative 'commands/fetch'
     register Dri::Commands::Fetch, 'fetch', 'fetch [SUBCOMMAND]', 'Fetch failures & testcases'
-
-    require_relative 'commands/publish'
     register Dri::Commands::Publish, 'publish', 'publish [SUBCOMMAND]', 'Publish report for handover'
-
-    require_relative 'commands/analyze'
     register Dri::Commands::Analyze, 'analyze', 'analyze [SUBCOMMAND]', 'Analysis of test failures and issues'
-
-    require_relative 'commands/view'
     register Dri::Commands::View, 'view', 'view [SUBCOMMAND]', 'View relevant items to help triage'
-
-    require_relative 'commands/add'
     register Dri::Commands::Add, 'add', 'add [SUBCOMMAND]', 'Add relevant items to help triage'
   end
 end

data/lib/dri/command.rb

@@ -1,19 +1,24 @@
 # frozen_string_literal: true
 
-require_relative 'api_client'
-require_relative 'gitlab/issues'
-
-require 'dri/refinements/truncate'
-
-require "tty-config"
 require "pastel"
 require 'forwardable'
 
 module Dri
   class Command
+    include Utils::Helpers
     extend Forwardable
 
     def_delegators :command, :run
+    def_delegators :configuration,
+                   :profile,
+                   :config,
+                   :emoji,
+                   :username,
+                   :token,
+                   :ops_token,
+                   :timezone,
+                   :tz,
+                   :handover_report_path
 
     def initialize(*options)
       @options = options
@@ -23,50 +28,10 @@ module Dri
       Pastel.new(**options)
     end
 
-    # Main configuration
-    def config
-      @config ||= begin
-        config = TTY::Config.new
-        config.filename = ".dri_profile"
-        config.extname = ".yml"
-        config.append_path Dir.home
-        config.append_path Dir.pwd
-        config
-      end
-    end
-
     def api_client(ops: false)
       ApiClient.new(config, ops)
     end
 
-    def profile
-      @profile ||= config.read
-    end
-
-    def emoji
-      @emoji ||= profile["settings"]["emoji"]
-    end
-
-    def username
-      @username ||= profile["settings"]["user"]
-    end
-
-    def token
-      @token ||= profile["settings"]["token"]
-    end
-
-    def ops_token
-      @ops_token ||= profile["settings"]["ops_token"]
-    end
-
-    def timezone
-      @timezone ||= profile["settings"]["timezone"]
-    end
-
-    def handover_report_path
-      @handover_report_path ||= profile["settings"]["handover_report_path"]
-    end
-
     def verify_config_exists
       return if config.exist?
 
@@ -92,11 +57,6 @@ module Dri
       )
     end
 
-    def logger
-      require 'tty-logger'
-      TTY::Logger.new
-    end
-
     def spinner
       require 'tty-spinner'
       TTY::Spinner.new("[:spinner] ⏳", format: :classic)
@@ -141,5 +101,11 @@ module Dri
       require 'tty-prompt'
       TTY::Prompt.new(**options.merge(interrupt: :exit))
     end
+
+    private
+
+    def configuration
+      @configuration ||= Support::Configuration.new
+    end
   end
 end

data/lib/dri/commands/add/fast_quarantine.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative '../../command'
-
 module Dri
   module Commands
     class Add

data/lib/dri/commands/add.rb

@@ -38,7 +38,6 @@ module Dri
           return
         end
 
-        require_relative 'add/fast_quarantine'
         Dri::Commands::Add::FastQuarantine.new(options).execute
       end
     end

data/lib/dri/commands/analyze/stack_traces.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require_relative '../../command'
-require_relative '../../utils/table'
-require_relative '../../utils/constants'
 require 'amatch'
 require 'fileutils'
 

data/lib/dri/commands/analyze.rb

@@ -12,7 +12,6 @@ module Dri
       def stacktraces(*)
         return invoke :help, %w[stacktraces] if options[:help]
 
-        require_relative 'analyze/stack_traces'
         Dri::Commands::Analyze::StackTraces.new(options).execute
       end
     end

data/lib/dri/commands/faq.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require_relative '../command'
 require 'tty-prompt'
 require 'launchy'
 

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

@@ -2,11 +2,6 @@
 
 require "influxdb-client"
 
-require_relative '../../command'
-require_relative '../../utils/table'
-require_relative '../../utils/constants'
-require_relative '../../support/influxdb_tools'
-
 module Dri
   module Commands
     class Fetch
@@ -14,13 +9,11 @@ module Dri
         include Dri::Utils::Table
         include Dri::Utils::Constants::Triage::Labels
         include Dri::Support::InfluxdbTools
-        using Refinements
+        using Refinements::String
 
         def initialize(options)
           @options = options
-          @start_date = @options[:start_date] ? Date.parse(@options[:start_date]) : Date.today - 1
-          @end_date = @options[:end_date] ? Date.parse(@options[:end_date]) : Date.today
-          @cutoff_time = @options[:cutoff] ? Time.parse(options[:cutoff]).utc : nil
+          @cutoff_time = @options[:cutoff] ? Time.parse(options[:cutoff]) : nil
         end
 
         def execute(_input: $stdin, output: $stdout) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity, Metrics/MethodLength
@@ -37,31 +30,18 @@ module Dri
                      updated_at: updated_at }
           triaged_counter = 0
 
-          if @cutoff_time
-            @start_date = Time.new(
-              @start_date.year,
-              @start_date.month,
-              @start_date.day,
-              @cutoff_time.hour,
-              @cutoff_time.min, 0,
-              "+00:00"
-            )
-          end
-
-          logger.info "Fetching failures from #{@start_date} (UTC) to #{@end_date} (UTC)..."
+          logger.info "Fetching failures from '#{start_date}' to '#{end_date}'..."
 
           spinner.run do # rubocop:disable Metrics/BlockLength
-            failures = api_client.fetch_all_new_failures(start_date: @start_date, end_date: @end_date, state: 'opened')
+            failures = api_client.fetch_all_new_failures(start_date: start_date, end_date: end_date, state: 'opened')
 
             if failures.empty?
-              logger.info "Life is great, there are no new failures between #{@start_date} and #{@end_date}!"
+              logger.info "Life is great, there are no new failures between #{start_date} and #{end_date}!"
               exit 0
             end
 
             blocker_set = Set.new
 
-            blocker_set = Set.new
-
             if query_api
               begin
                 blockers = query_api.query(query: query_reliables_smokes)
@@ -129,6 +109,26 @@ module Dri
 
         private
 
+        def start_date
+          return @start_date if @start_date
+
+          parsed_start_date = @options[:start_date] ? Date.parse(@options[:start_date]) : tz.now
+          @start_date = date_with_time(parsed_start_date, @cutoff_time&.hour, @cutoff_time&.min, 0,
+                                       @options[:start_date] ? "+00:00" : tz.canonical_zone)
+        end
+
+        def end_date
+          return @end_date if @end_date
+
+          parsed_end_date = @options[:end_date] ? Date.parse(@options[:end_date]) : tz.now
+          @end_date = date_with_time(parsed_end_date, 23, 59, 59,
+                                     @options[:end_date] ? "+00:00" : tz.canonical_zone)
+        end
+
+        def date_with_time(date, hour, min, seconds, tz_identifier)
+          Time.new(date.year, date.month, date.day, hour || 0, min || 0, seconds || 0, tz_identifier)
+        end
+
         def blocker?(title, set)
           title_part = title.split('|').last
           return true if title_part&.strip && set.include?(title_part.strip)

data/lib/dri/commands/fetch/{featureflags.rb → feature_flags.rb}

@@ -1,10 +1,5 @@
 # frozen_string_literal: true
 
-require_relative '../../command'
-require_relative '../../utils/table'
-require_relative '../../utils/constants'
-require_relative '../../feature_flag_report'
-
 module Dri
   module Commands
     class Fetch

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

@@ -1,9 +1,6 @@
 # frozen_string_literal: true
 
 require 'date'
-require_relative '../../command'
-require_relative '../../utils/table'
-require_relative '../../utils/constants'
 
 module Dri
   module Commands
@@ -11,7 +8,6 @@ module Dri
       class Pipelines < Dri::Command # rubocop:disable Metrics/ClassLength
         include Dri::Utils::Table
         include Dri::Utils::Constants
-        using Refinements
 
         NUM_OF_TESTS_LIVE_ENV = 1000
         NOT_FOUND = "Not found"

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

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative '../../command'
-require_relative '../../utils/constants'
 require 'tty-markdown'
 require 'tty-prompt'
 require 'base64'

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

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative '../../command'
-
 require 'pastel'
 
 module Dri

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

@@ -1,16 +1,12 @@
 # frozen_string_literal: true
 
-require_relative '../../command'
-require_relative '../../utils/table'
-require_relative '../../utils/constants'
-
 module Dri
   module Commands
     class Fetch
       class Triaged < Dri::Command
         include Dri::Utils::Table
         include Dri::Utils::Constants::Triage::Labels
-        using Refinements
+        using Refinements::String
 
         def initialize(options)
           @options = options

data/lib/dri/commands/fetch.rb

@@ -14,7 +14,6 @@ module Dri
         if options[:help]
           invoke :help, ['featureflags']
         else
-          require_relative 'fetch/featureflags'
           Dri::Commands::Fetch::FeatureFlags.new(options).execute
         end
       end
@@ -26,7 +25,6 @@ module Dri
         if options[:help]
           invoke :help, ['triaged']
         else
-          require_relative 'fetch/triaged'
           Dri::Commands::Fetch::Triaged.new(options).execute
         end
       end
@@ -40,7 +38,6 @@ module Dri
         if options[:help]
           invoke :help, ['testcases']
         else
-          require_relative 'fetch/testcases'
           Dri::Commands::Fetch::Testcases.new(options).execute
         end
       end
@@ -61,7 +58,6 @@ module Dri
         if options[:help]
           invoke :help, ['failures']
         else
-          require_relative 'fetch/failures'
           Dri::Commands::Fetch::Failures.new(options).execute
         end
       end
@@ -74,7 +70,6 @@ module Dri
       def pipelines(*)
         return invoke :help, %w[pipelines] if options[:help]
 
-        require_relative 'fetch/pipelines'
         Dri::Commands::Fetch::Pipelines.new(options).execute
       end
 
@@ -85,7 +80,6 @@ module Dri
       def runbooks(*args)
         return invoke :help, %w[runbooks] if options[:help]
 
-        require_relative 'fetch/runbooks'
         Dri::Commands::Fetch::Runbooks.new(options).execute(folder: args.first)
       end
     end

data/lib/dri/commands/incidents.rb

@@ -1,15 +1,11 @@
 # frozen_string_literal: true
 
-require_relative '../command'
-require_relative '../utils/table'
-require_relative '../utils/constants'
-
 module Dri
   module Commands
     class Incidents < Dri::Command
       include Dri::Utils::Table
       include Dri::Utils::Constants::Triage::Labels
-      using Refinements
+      using Refinements::String
 
       def initialize(options)
         @options = options

data/lib/dri/commands/init.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative '../command'
-
 require "tty-font"
 
 module Dri

data/lib/dri/commands/profile.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative '../command'
-
 require 'tty-box'
 
 module Dri

data/lib/dri/commands/publish/report.rb

@@ -1,14 +1,9 @@
 # frozen_string_literal: true
 
-require_relative '../../command'
-require_relative '../../utils/markdown_lists'
-require_relative '../../utils/constants'
-require_relative '../../report'
-require_relative '../../feature_flag_report'
-
 require 'markdown-tables'
 require 'fileutils'
 require 'uri'
+require 'date'
 
 module Dri
   module Commands
@@ -161,41 +156,34 @@ module Dri
             logger.info 'Downloading the report... '
 
             spinner.start
-
-            FileUtils.mkdir_p(handover_report_path)
-            report_path = "#{handover_report_path.chomp('/')}/report-#{@date}-#{@time}.md"
-
-            File.open(report_path, 'a') do |out_file|
-              out_file.puts note
-            end
-
+            report_md = File.join(handover_report_path, "report-#{@date}-#{@time}.md")
+            File.write(report_md, note)
             spinner.stop
 
             output.puts "Done! ✅\n"
-            logger.success "Report is ready at: #{report_path}"
+            logger.success "Report is ready at: #{report_md}"
             exit 0
           end
 
           # sends note to the weekly triage report
           issues = api_client.fetch_current_triage_issue
-          current_issue_iid = issues.first.iid
+          current_issue_iid = issues.iid
 
           note_action = 'posted'
           posted_note = nil
           if @options[:update]
-            report_file = File.read("handover_reports/.tmp/report-#{@date}.json")
-            report_json = JSON.parse(report_file) if report_file
+            unless File.exist?(report_json_file)
+              return logger.warn("Update action requires initial publish to be executed first!")
+            end
+
+            report_json = JSON.parse(File.read(report_json_file))
             posted_note = api_client.update_triage_report_note(
               iid: current_issue_iid, note_id: report_json['id'], body: note
             )
             note_action = 'updated'
           else
             posted_note = api_client.post_triage_report_note(iid: current_issue_iid, body: note)
-
-            FileUtils.mkdir_p("#{Dir.pwd}/handover_reports/.tmp")
-            report_path = "handover_reports/.tmp/report-#{@date}.json"
-
-            File.write(report_path, posted_note.to_h.to_json)
+            File.write(report_json_file, posted_note.to_h.to_json)
           end
 
           output.puts "Done! ✅\n"
@@ -206,6 +194,18 @@ module Dri
 
         private
 
+        def report_json_file
+          @report_json ||= File.join(handover_tmp_dir, "report-#{@date}.json")
+        end
+
+        def handover_tmp_dir
+          @handover_tmp_dir ||= File.join(handover_report_path, ".tmp").tap { |dir| FileUtils.mkdir_p(dir) }
+        end
+
+        def handover_report_path
+          @handover_report_path ||= super.tap { |dir| FileUtils.mkdir_p(dir) }
+        end
+
         def format_feature_flag_changes(env, changes, labels, format_type)
           unless format_type == :table || format_type == :list
             raise ArgumentError, 'format_type must be one of type :table or :list'

data/lib/dri/commands/publish.rb

@@ -23,7 +23,6 @@ module Dri
         if options[:help]
           invoke :help, ['report']
         else
-          require_relative 'publish/report'
           Dri::Commands::Publish::Report.new(options).execute
         end
       end

data/lib/dri/commands/rm/emoji.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative '../../command'
-
 module Dri
   module Commands
     class Rm

data/lib/dri/commands/rm/profile.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require_relative '../../command'
 require 'fileutils'
 
 module Dri

data/lib/dri/commands/rm/reports.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require_relative '../../command'
 require 'fileutils'
 
 module Dri