allure-report-publisher 0.0.3 → 0.1.1

data/lib/allure_report_publisher/lib/providers/gitlab.rb

@@ -4,7 +4,7 @@ module Publisher
   module Providers
     # Gitlab implementation
     #
-    class Gitlab < Base
+    class Gitlab < Provider
       # Get ci run ID without creating instance of ci provider
       #
       # @return [String]
@@ -12,6 +12,13 @@ module Publisher
         @run_id ||= ENV["CI_PIPELINE_ID"]
       end
 
+      # Pull request run
+      #
+      # @return [Boolean]
+      def pr?
+        ENV["CI_PIPELINE_SOURCE"] == "merge_request_event"
+      end
+
       # Get executor info
       #
       # @return [Hash]
@@ -28,6 +35,8 @@ module Publisher
         }
       end
 
+      private
+
       # Current pull request description
       #
       # @return [String]
@@ -37,10 +46,27 @@ module Publisher
 
       # Update pull request description
       #
-      # @param [String] desc
       # @return [void]
-      def update_pr_description(desc)
-        client.update_merge_request(project, mr_iid, description: desc)
+      def update_pr_description
+        client.update_merge_request(project, mr_iid, description: updated_pr_description)
+      end
+
+      # Add comment with report url
+      #
+      # @return [void]
+      def add_comment
+        return client.create_merge_request_comment(project, mr_iid, comment_body) unless comment
+
+        client.edit_merge_request_note(project, mr_iid, comment.id, comment_body)
+      end
+
+      # Existing comment with allure urls
+      #
+      # @return [Gitlab::ObjectifiedHash]
+      def comment
+        client.merge_request_comments(project, mr_iid).auto_paginate.detect do |comment|
+          comment.body.match?(DESCRIPTION_PATTERN)
+        end
       end
 
       # Get gitlab client
@@ -57,13 +83,6 @@ module Publisher
         end
       end
 
-      # Pull request run
-      #
-      # @return [Boolean]
-      def pr?
-        ENV["CI_PIPELINE_SOURCE"] == "merge_request_event"
-      end
-
       # Merge request iid
       #
       # @return [Integer]
@@ -89,15 +108,25 @@ module Publisher
       #
       # @return [String]
       def build_name
-        @build_name ||= ENV["CI_JOB_NAME"]
+        @build_name ||= ENV[ALLURE_JOB_NAME] || ENV["CI_JOB_NAME"]
       end
 
-      # Github repository
+      # Gitlab repository
       #
       # @return [String]
       def project
         @project ||= ENV["CI_PROJECT_PATH"]
       end
+
+      # Commit sha url
+      #
+      # @return [String]
+      def sha_url
+        sha = ENV["CI_MERGE_REQUEST_SOURCE_BRANCH_SHA"] || ENV["CI_COMMIT_SHA"]
+        short_sha = sha[0..7]
+
+        "[#{short_sha}](#{server_url}/#{project}/-/merge_requests/#{mr_iid}/diffs?commit_id=#{sha})"
+      end
     end
   end
 end

data/lib/allure_report_publisher/lib/report_generator.rb

@@ -10,35 +10,32 @@ module Publisher
   class ReportGenerator
     include Helpers
 
-    def initialize(results_glob, results_dir, report_dir)
+    def initialize(results_glob, results_path, report_path)
       @results_glob = results_glob
-      @results_dir = results_dir
-      @report_dir = report_dir
+      @results_path = results_path
+      @report_path = report_path
     end
 
     # Generate allure report
     #
     # @return [void]
     def generate
-      log("Generating allure report")
-      Helpers::Spinner.spin("generating report") do
-        aggregate_results
-        generate_report
-      end
+      aggregate_results
+      generate_report
     end
 
     private
 
-    attr_reader :results_glob, :results_dir, :report_dir
+    attr_reader :results_glob, :results_path, :report_path
 
     # Copy all results files to results directory
     #
     # @return [void]
     def aggregate_results
       results = Dir.glob(results_glob)
-      error("Missing allure results") if results.empty?
+      raise(NoAllureResultsError, "Missing allure results") if results.empty?
 
-      FileUtils.cp(results, results_dir)
+      FileUtils.cp(results, results_path)
     end
 
     # Generate allure report
@@ -46,9 +43,9 @@ module Publisher
     # @return [void]
     def generate_report
       out, _err, status = Open3.capture3(
-        "allure generate --clean --output #{report_dir} #{results_dir}"
+        "allure generate --clean --output #{report_path} #{results_path}"
       )
-      error(out) unless status.success?
+      raise(AllureError, out) unless status.success?
     end
   end
 end

data/lib/allure_report_publisher/lib/uploaders/_uploader.rb

@@ -1,10 +1,13 @@
 module Publisher
   module Uploaders
+    class HistoryNotFoundError < StandardError; end
+
     # Uploader implementation
     #
     class Uploader
       include Helpers
 
+      EXECUTOR_JSON = "executor.json".freeze
       HISTORY = [
         "categories-trend.json",
         "duration-trend.json",
@@ -13,36 +16,76 @@ module Publisher
         "retry-trend.json"
       ].freeze
 
-      def initialize(results_glob, bucket, prefix = nil)
+      def initialize(results_glob:, bucket:, update_pr: nil, prefix: nil, copy_latest: false)
         @results_glob = results_glob
-        @bucket = bucket
+        @bucket_name = bucket
         @prefix = prefix
+        @update_pr = update_pr
+        @copy_latest = !!(Providers.provider && copy_latest) # copy latest for ci only
       end
 
-      # :nocov:
-
       # Execute allure report generation and upload
       #
       # @return [void]
-      def execute(update_pr: false)
-        check_client_configured
-
+      def execute
         generate_report
-        upload_history_and_report
-        add_report_url if update_pr
-      rescue StandardError => e
-        error(e.message)
+        upload
+        add_url_to_pr
       end
 
-      private
+      # Generate allure report
+      #
+      # @return [void]
+      def generate_report
+        add_history
+        add_executor_info
 
-      attr_reader :results_glob, :bucket, :prefix
+        ReportGenerator.new(results_glob, results_path, report_path).generate
+      end
 
-      # Validate if client is properly configured
-      # and raise error if it is not
+      # Upload report to storage provider
       #
       # @return [void]
-      def check_client_configured
+      def upload
+        run_uploads
+      end
+
+      # Add allure report url to pull request description
+      #
+      # @return [void]
+      def add_url_to_pr
+        return unless update_pr && ci_provider
+
+        ci_provider.add_report_url
+      end
+
+      # Uploaded report urls
+      #
+      # @return [Hash<String, String>] uploaded report urls
+      def report_urls
+        urls = { "Report url" => report_url }
+        urls["Latest report url"] = latest_report_url if copy_latest
+
+        urls
+      end
+
+      # Executed in PR pipeline
+      #
+      # @return [Boolean]
+      def pr?
+        ci_provider&.pr?
+      end
+
+      private
+
+      attr_reader :results_glob, :bucket_name, :prefix, :update_pr, :copy_latest
+
+      # :nocov:
+
+      # Cloud provider client
+      #
+      # @return [Object]
+      def client
         raise("Not Implemented!")
       end
 
@@ -53,58 +96,71 @@ module Publisher
         raise("Not Implemented!")
       end
 
-      # Upload report to s3
+      # Latest report url
+      #
+      # @return [String]
+      def latest_report_url
+        raise("Not Implemented!")
+      end
+
+      # Download allure history
       #
       # @return [void]
-      def upload_history_and_report
+      def download_history
         raise("Not implemented!")
       end
 
-      # Add allure history
+      # Upload history to s3
       #
       # @return [void]
-      def add_history
-        log("Adding allure history")
-        Helpers::Spinner.spin("adding history", exit_on_error: false) do
-          create_history_dir
-          yield
-        end
+      def upload_history
+        raise("Not implemented!")
       end
 
-      # Add CI executor info
+      # Upload report to s3
       #
       # @return [void]
-      def add_executor_info
-        return unless ci_provider
-
-        log("Adding executor info")
-        Helpers::Spinner.spin("adding executor") do
-          ci_provider.write_executor_info
-        end
+      def upload_report
+        raise("Not implemented!")
       end
 
-      # Generate allure report
+      # Upload copy of latest run
       #
       # @return [void]
-      def generate_report
-        add_history
-        add_executor_info
+      def upload_latest_copy
+        raise("Not implemented!")
+      end
+      # :nocov:
 
-        ReportGenerator.new(results_glob, results_dir, report_dir).generate
+      # Add allure history
+      #
+      # @return [void]
+      def add_history
+        create_history_dir
+        download_history
+      rescue HistoryNotFoundError
+        nil
       end
 
-      # Add allure report url to pull request description
+      # Add CI executor info
       #
       # @return [void]
-      def add_report_url
+      def add_executor_info
         return unless ci_provider
 
-        log("Adding allure report link to pr description")
-        Helpers::Spinner.spin("adding link", exit_on_error: false) do
-          ci_provider.add_report_url
+        File.open("#{results_path}/#{EXECUTOR_JSON}", "w") do |file|
+          file.write(ci_provider.executor_info.to_json)
         end
       end
-      # :nocov:
+
+      # Run upload commands
+      #
+      # @return [void]
+      def run_uploads
+        upload_history unless !run_id || copy_latest
+        upload_report
+        upload_latest_copy if copy_latest
+      end
 
       # Get run id
       #
@@ -119,14 +175,14 @@ module Publisher
       def ci_provider
         return @ci_provider if defined?(@ci_provider)
 
-        @ci_provider = Providers.provider&.new(results_dir, report_url)
+        @ci_provider = Providers.provider&.new(report_url: report_url, update_pr: update_pr)
       end
 
       # Fetch allure report history
       #
       # @return [void]
       def create_history_dir
-        FileUtils.mkdir_p(path(results_dir, "history"))
+        FileUtils.mkdir_p(path(results_path, "history"))
       end
 
       # Report path prefix
@@ -143,15 +199,15 @@ module Publisher
       # Aggregated results directory
       #
       # @return [String]
-      def results_dir
-        @results_dir ||= Dir.mktmpdir("allure-results")
+      def results_path
+        @results_path ||= Dir.mktmpdir("allure-results")
       end
 
       # Allure report directory
       #
       # @return [String]
-      def report_dir
-        @report_dir ||= Dir.mktmpdir("allure-report")
+      def report_path
+        @report_path ||= Dir.mktmpdir("allure-report")
       end
 
       # Report files
@@ -159,7 +215,7 @@ module Publisher
       # @return [Array<Pathname>]
       def report_files
         @report_files ||= Pathname
-                          .glob("#{report_dir}/**/*")
+                          .glob("#{report_path}/**/*")
                           .reject(&:directory?)
       end
     end

data/lib/allure_report_publisher/lib/uploaders/gcs.rb

@@ -0,0 +1,104 @@
+require "google/cloud/storage"
+
+module Publisher
+  module Uploaders
+    # Google cloud storage uploader implementation
+    #
+    class GCS < Uploader
+      private
+
+      # GCS client
+      #
+      # @return [Google::Cloud::Storage::Project]
+      def client
+        @client ||= Google::Cloud::Storage.new
+      end
+
+      # GCS bucket
+      #
+      # @return [Google::Cloud::Storage::Bucket]
+      def bucket
+        @bucket ||= client.bucket(bucket_name, skip_lookup: true)
+      end
+
+      # Report url
+      #
+      # @return [String]
+      def report_url
+        @report_url ||= url(full_prefix)
+      end
+
+      # Latest report url
+      #
+      # @return [String]
+      def latest_report_url
+        @latest_report_url ||= url(prefix)
+      end
+
+      # Download allure history
+      #
+      # @return [void]
+      def download_history
+        HISTORY.each do |file_name|
+          file = bucket.file(key(prefix, "history", file_name))
+          raise(HistoryNotFoundError, "Allure history from previous runs not found!") unless file
+
+          file.download(path(results_path, "history", file_name))
+        end
+      end
+
+      # Upload allure history
+      #
+      # @return [void]
+      def upload_history
+        upload_to_gcs(report_files.select { |file| file.fnmatch?("*/history/*") }, prefix)
+      end
+
+      # Upload allure report
+      #
+      # @return [void]
+      def upload_report
+        upload_to_gcs(report_files, full_prefix)
+      end
+
+      # Upload copy of latest run
+      #
+      # @return [void]
+      def upload_latest_copy
+        upload_to_gcs(report_files, prefix)
+      end
+
+      # Upload files to s3
+      #
+      # @param [Array<Pathname>] files
+      # @param [String] key_prefix
+      # @return [Array<Hash>]
+      def upload_to_gcs(files, key_prefix)
+        args = files.map do |file|
+          {
+            file: file.to_s,
+            path: key(key_prefix, file.relative_path_from(report_path))
+          }
+        end
+
+        Parallel.each(args, in_threads: 8) { |obj| bucket.create_file(obj[:file], obj[:path]) }
+      end
+
+      # Fabricate key for s3 object
+      #
+      # @param [String] *args
+      # @return [String]
+      def key(*args)
+        args.compact.join("/")
+      end
+
+      # Report url
+      #
+      # @param [String] path_prefix
+      # @return [String]
+      def url(path_prefix)
+        ["https://storage.googleapis.com", bucket_name, path_prefix, "index.html"].compact.join("/")
+      end
+    end
+  end
+end