allure-report-publisher 3.2.1 → 4.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ab566653044eb65dcda70282d0d9a951bac9060645fc7b1bd0559a40f44aa7a
-  data.tar.gz: 7061067412360b2a0cb41e393e4b3e329c76266e17e35b05a0264dab66070673
+  metadata.gz: ba8581fa9d96433802742522763a5f00aaa292ce611ddff70a539f79fa72966a
+  data.tar.gz: 99759bf845adc787ab167087fd3003118bdae5c1f67fa1468c7fd9e04bd3377c
 SHA512:
-  metadata.gz: 91735d0fd14f8fe53c2be7a477a2f32400c0a87fd2f7c168139680af4b324d86186850c27599cecc40ae67ba56e5ea1460ff80e1c4b610ad2ec03404fc8b737d
-  data.tar.gz: ca0ac1ec124f0b73c1490028439e04e0afdbe1b79cdb05344cf7c59af86c9a6e3c37079eb6fc760254d3ee4f694f3e2041bcfacc70f756322d10f536fe49ee36
+  metadata.gz: 2cead4c3295aceef509f1293e29068752f501d540e2797f1d9c5e65fe81479e8e4b2bf6c028ce10a55ab3707c53ae8d0fc10048bf307d6c7d985d555faaa981c
+  data.tar.gz: 58fbf4ed284c17fd6bb6651a4e722dee25e38b2ea8628f12d22a64fc2a35261b1691fe560c93487673d59649e4a82abc37728fb0e54068040f5f3d8cf94e802b

data/README.md

@@ -5,7 +5,6 @@
 ![Workflow status](https://github.com/andrcuns/allure-report-publisher/workflows/Test/badge.svg)
 [![Maintainability](https://api.codeclimate.com/v1/badges/210eaa4f74588fb08313/maintainability)](https://codeclimate.com/github/andrcuns/allure-report-publisher/maintainability)
 [![Test Coverage](https://api.codeclimate.com/v1/badges/210eaa4f74588fb08313/test_coverage)](https://codeclimate.com/github/andrcuns/allure-report-publisher/test_coverage)
-[![Test Report](https://img.shields.io/badge/report-allure-blue.svg)](https://storage.googleapis.com/allure-test-reports/allure-report-publisher/refs/heads/main/index.html)
 
 Upload your report to a file storage of your choice.
 
@@ -57,7 +56,6 @@ Options:
   --[no-]copy-latest                # Keep copy of latest report at base prefix path, default: false
   --[no-]color                      # Force color output
   --[no-]ignore-missing-results     # Ignore missing allure results, default: false
-  --[no-]unresolved-discussion-on-failure  # Add an unresolved discussion comment on test failure. GitLab only, default: false
   --[no-]debug                      # Print additional debug output, default: false
   --help, -h                        # Print this help
 

data/lib/allure_report_publisher/commands/upload.rb

@@ -76,10 +76,6 @@ module Publisher
              type: :boolean,
              default: false,
              desc: "Ignore missing allure results"
-      option :unresolved_discussion_on_failure,
-             type: :boolean,
-             default: false,
-             desc: "Add an unresolved discussion comment on test failure. GitLab only"
       option :debug,
              type: :boolean,
              default: false,
@@ -134,7 +130,6 @@ module Publisher
             :collapse_summary,
             :flaky_warning_status,
             :summary_table_type,
-            :unresolved_discussion_on_failure,
             :report_title
           )
         )
@@ -148,13 +143,14 @@ module Publisher
         {
           "s3" => Uploaders::S3,
           "gcs" => Uploaders::GCS
-        }[uploader]
+        }.fetch(uploader)
       end
 
       # Validate required args
       #
       # @return [void]
       def validate_args
+        error("Unsupported cloud storage type! Supported types are: s3, gcs") unless %w[s3 gcs].include?(args[:type])
         error("Missing argument --results-glob!") unless args[:results_glob]
         error("Missing argument --bucket!") unless args[:bucket]
         URI.parse(args[:base_url]) if args[:base_url]

data/lib/allure_report_publisher/lib/helpers/url_section_builder.rb

@@ -4,7 +4,7 @@ module Publisher
     #
     class UrlSectionBuilder
       DESCRIPTION_PATTERN = /<!-- allure -->[\s\S]+<!-- allurestop -->/
-      JOBS_PATTERN = /<!-- jobs -->\n([\s\S]+)\n<!-- jobs -->/
+      JOBS_PATTERN = /<!-- jobs -->(?<jobs>[\s\S]+)<!-- jobs -->/
 
       # Url section builder
       #
@@ -106,7 +106,7 @@ module Publisher
           entry << "<summary>expand test summary</summary>\n" if collapse_summary
           entry << summary.table if summary_type
           entry << "</details>" if collapse_summary
-          entry << "<!-- #{build_name} -->\n"
+          entry << "<!-- #{build_name} -->"
 
           entry.join("\n")
         end
@@ -116,36 +116,31 @@ module Publisher
       #
       # @return [RegExp]
       def job_entry_pattern
-        @job_entry_pattern ||= /<!-- #{build_name} -->\n([\s\S]+)\n<!-- #{build_name} -->\n/
+        @job_entry_pattern ||= /<!-- #{build_name} -->[\s\S]+<!-- #{build_name} -->/
       end
 
       # Allure report url section
       #
       # @return [String]
       def url_section(job_entries: job_entry, separator: true)
-        reports = <<~BODY.strip
-          <!-- allure -->
-          ---
-          #{heading}
-
+        <<~BODY.strip
+          <!-- allure -->#{separator ? "\n---\n" : "\n"}#{heading}\n
           <!-- jobs -->
           #{job_entries}
           <!-- jobs -->
           <!-- allurestop -->
         BODY
-
-        separator ? reports : reports.gsub("---\n", "")
       end
 
       # Return updated jobs section
       #
-      # @param [String] urls
+      # @param [String] body
       # @return [String]
-      def jobs_section(urls_block)
-        jobs = urls_block.match(JOBS_PATTERN)[1]
-        return jobs.gsub(job_entry_pattern, job_entry) if jobs.match?(job_entry_pattern)
+      def jobs_section(body)
+        jobs = body.match(JOBS_PATTERN)[:jobs]
+        return jobs.gsub(job_entry_pattern, job_entry).strip if jobs.match?(job_entry_pattern)
 
-        "#{jobs}\n#{job_entry}"
+        "#{jobs.strip}\n\n#{job_entry}"
       end
     end
   end

data/lib/allure_report_publisher/lib/providers/_provider.rb

@@ -33,7 +33,6 @@ module Publisher
       # @option args [Symbol] :summary_table_type
       # @option args [Boolean] :collapse_summay
       # @option args [Boolean] :flaky_warning_status
-      # @option args [Boolean] :unresolved_discussion_on_failure
       # @option args [String] :report_title
       def initialize(**args)
         @report_url = args[:report_url]
@@ -43,7 +42,6 @@ module Publisher
         @summary_table_type = args[:summary_table_type]
         @collapse_summary = args[:collapse_summary]
         @flaky_warning_status = args[:flaky_warning_status]
-        @unresolved_discussion_on_failure = args[:unresolved_discussion_on_failure]
         @report_title = args[:report_title]
       end
 
@@ -65,7 +63,6 @@ module Publisher
                   :collapse_summary,
                   :summary_table_type,
                   :flaky_warning_status,
-                  :unresolved_discussion_on_failure,
                   :report_title
 
       # Current pull request description

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

@@ -38,23 +38,6 @@ module Publisher
         @pr_description ||= client.merge_request(project, mr_iid).description
       end
 
-      # Comment with alert text
-      #
-      # @return [Gitlab::ObjectifiedHash]
-      def alert_comment
-        @alert_comment ||= discussion&.notes&.detect do |note|
-          note.body.include?(alert_comment_text)
-        end
-      end
-
-      # Text for alert comment
-      #
-      # @return [String]
-      def alert_comment_text
-        @alert_comment_text ||=
-          env("ALLURE_FAILURE_ALERT_COMMENT") || "There are some test failures that need attention"
-      end
-
       # Custom sha
       #
       # @return [String]
@@ -96,39 +79,19 @@ module Publisher
       # @return [void]
       def add_comment
         create_or_update_comment
-        create_or_resolve_discussion
       end
 
       # Create or update comment with report url
       #
       # @return [void]
       def create_or_update_comment
-        if main_comment
-          log_debug("Updating summary in comment with id #{discussion.id} in mr !#{mr_iid}")
-
-          return client.edit_merge_request_note(
-            project,
-            mr_iid,
-            main_comment.id,
-            url_section_builder.comment_body(main_comment.body)
-          )
+        unless comment
+          log_debug("Creating comment with summary for mr !#{mr_iid}")
+          return client.create_merge_request_comment(project, mr_iid, url_section_builder.comment_body) unless comment
         end
 
-        log_debug("Creating comment with summary for mr ! #{mr_iid}")
-        client.create_merge_request_comment(project, mr_iid, url_section_builder.comment_body)
-      end
-
-      # Create or resolve comment discussion
-      #
-      # @return [void]
-      def create_or_resolve_discussion
-        @discussion = nil
-
-        if unresolved_discussion_on_failure && report_has_failures? && !alert_comment
-          client.create_merge_request_discussion_note(project, mr_iid, discussion.id, body: alert_comment_text)
-        elsif alert_comment && !report_has_failures?
-          client.delete_merge_request_discussion_note(project, mr_iid, discussion.id, alert_comment.id)
-        end
+        log_debug("Creating comment with summary for mr !#{mr_iid}")
+        client.edit_merge_request_note(project, mr_iid, comment.id, url_section_builder.comment_body(comment.body))
       end
 
       # Check if allure report has failures
@@ -138,21 +101,14 @@ module Publisher
         main_comment&.body&.include?("❌")
       end
 
-      # Existing discussion that has comment with allure urls
+      # Existing comment with allure urls
       #
       # @return [Gitlab::ObjectifiedHash]
-      def discussion
-        @discussion ||= client.merge_request_discussions(project, mr_iid).auto_paginate.detect do |discussion|
-          discussion.notes.any? { |note| Helpers::UrlSectionBuilder.match?(note.body) }
+      def comment
+        client.merge_request_comments(project, mr_iid).auto_paginate.detect do |comment|
+          Helpers::UrlSectionBuilder.match?(comment.body)
         end
       end
-
-      # Comment/note with allure urls
-      #
-      # @return [Gitlab::ObjectifiedHash]
-      def main_comment
-        discussion&.notes&.detect { |note| Helpers::UrlSectionBuilder.match?(note.body) }
-      end
     end
   end
 end

data/lib/allure_report_publisher/lib/uploaders/s3.rb

@@ -31,8 +31,8 @@ module Publisher
       def client_args
         @client_args ||= {
           region: ENV["AWS_REGION"] || "us-east-1",
-          force_path_style: ENV["AWS_FORCE_PATH_STYLE"] == "true",
-          endpoint: ENV["AWS_ENDPOINT"]
+          force_path_style: path_style?,
+          endpoint: aws_endpoint
         }.compact
       end
 
@@ -43,6 +43,20 @@ module Publisher
         @latest_report_url ||= url(prefix)
       end
 
+      # Custom aws endpoint
+      #
+      # @return [<String, nil>]
+      def aws_endpoint
+        @aws_endpoint ||= ENV["AWS_ENDPOINT"]
+      end
+
+      # Force aws path style
+      #
+      # @return [Boolean]
+      def path_style?
+        ENV["AWS_FORCE_PATH_STYLE"] == "true"
+      end
+
       # Add allure history
       #
       # @return [void]
@@ -143,7 +157,15 @@ module Publisher
       # @param [String] path_prefix
       # @return [String]
       def url(path_prefix)
-        [base_url || "http://#{bucket_name}.s3.amazonaws.com", path_prefix, "index.html"].compact.join("/")
+        custom_base = if aws_endpoint
+                        path_style? ? "#{aws_endpoint}/#{bucket_name}" : aws_endpoint
+                      end
+
+        [
+          base_url || custom_base || "http://#{bucket_name}.s3.amazonaws.com",
+          path_prefix,
+          "index.html"
+        ].compact.join("/")
       end
 
       # Get file content type

data/lib/allure_report_publisher/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Publisher
-  VERSION = "3.2.1"
+  VERSION = "4.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: allure-report-publisher
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 4.0.2
 platform: ruby
 authors:
 - Andrejs Cunskis
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-04-15 00:00:00.000000000 Z
+date: 2024-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
@@ -19,7 +19,7 @@ dependencies:
         version: 1.93.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: 1.147.0
+        version: 1.156.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: 1.93.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: 1.147.0
+        version: 1.156.0
 - !ruby/object:Gem::Dependency
   name: dry-cli
   requirement: !ruby/object:Gem::Requirement
@@ -74,16 +74,22 @@ dependencies:
   name: gitlab
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.17'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.17'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: google-cloud-storage
   requirement: !ruby/object:Gem::Requirement
@@ -121,7 +127,7 @@ dependencies:
         version: '4.21'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '9.0'
+        version: '10.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -131,7 +137,7 @@ dependencies:
         version: '4.21'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '9.0'
+        version: '10.0'
 - !ruby/object:Gem::Dependency
   name: parallel
   requirement: !ruby/object:Gem::Requirement
@@ -235,7 +241,6 @@ homepage: https://github.com/andrcuns/allure-report-uploader
 licenses:
 - MIT
 metadata:
-  homepage_uri: https://github.com/andrcuns/allure-report-uploader
   source_code_uri: https://github.com/andrcuns/allure-report-uploader
   changelog_uri: https://github.com/andrcuns/allure-report-uploader/releases
   documentation_uri: https://github.com/andrcuns/allure-report-uploader/blob/master/README.md
@@ -249,7 +254,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.0'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="