allure-report-publisher 3.1.0 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b57fedd5eddc21b48d4c01d4c8858cf4c3c2638d239973a195612fbc14e885f5
-  data.tar.gz: c3745051f24d11bbc89c229aaceddb2c8f4cb97fce2b8e6a8029c0c36099e353
+  metadata.gz: d13fcb7c7d00d54bffa1cab27e27573332a4fd42fc0ff6f54c4e4f7985a2d57b
+  data.tar.gz: 917e091dea4e5f771e6b3386712684335c8cd15ee448f09b4e1a486e88cde874
 SHA512:
-  metadata.gz: bc55ecf458d787dc7813fe08bc8e12459cda59e73eeb8fe2de3ab6b52730382ba8e1af563d0181ac82eb612cc9f684795c4a1921e77b853834c6f7df4e078c45
-  data.tar.gz: 4e134f36135b30fd8e1185ea85091d5d477cb90b95082b606d490dba6fc519d38c6e7d4e5b4ab7ca6f2b656426822c97fc5e510daf1de12153a281a03e914c33
+  metadata.gz: 1b2cdb3075fbe04af803e5827a71f0eb6d89dc4a411a9479abb6bdce062e47efb6768a0465a1196184fe3254a0214e14aef3e92b5202acfafd32485251279279
+  data.tar.gz: 3065ba9869d235de689bae099513f0c3c8e074c5d0990521c492d1081f1d66b4aa733108d13af41a8de7c96c6cf02a9743624059cb29036161a4c9665b79e7a6

data/README.md

@@ -51,6 +51,7 @@ Options:
   --summary=VALUE                   # Additionally add summary table to PR comment or description. Required: false: (behaviors/suites/packages/total), default: "total"
   --summary-table-type=VALUE        # Summary table type. Required: false: (ascii/markdown), default: "ascii"
   --base-url=VALUE                  # Use custom base url instead of default cloud provider one. Required: false
+  --parallel=VALUE                  # Number of parallel threads to use for report file upload to cloud storage. Required: false, default: 8
   --[no-]flaky-warning-status       # Mark run with a '!' status in PR comment/description if report contains flaky tests, default: false
   --[no-]collapse-summary           # Create summary as a collapsible section, default: false
   --[no-]copy-latest                # Keep copy of latest report at base prefix path, default: false

data/lib/allure_report_publisher/commands/upload.rb

@@ -53,6 +53,10 @@ module Publisher
       option :base_url,
              type: :string,
              desc: "Use custom base url instead of default cloud provider one. Required: false"
+      option :parallel,
+             type: :integer,
+             desc: "Number of parallel threads to use for report file upload to cloud storage. Required: false",
+             default: 8
       option :flaky_warning_status,
              type: :boolean,
              default: false,
@@ -112,6 +116,7 @@ module Publisher
       def uploader
         @uploader ||= uploaders(args[:type]).new(
           result_paths: @result_paths,
+          parallel: parallel_threads,
           **args.slice(:bucket, :prefix, :base_url, :copy_latest, :report_name)
         )
       end
@@ -153,10 +158,23 @@ module Publisher
         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]
+        validate_parallel_args
       rescue URI::InvalidURIError
         error("Invalid --base-url value!")
       end
 
+      # Parallel threads
+      #
+      # @return [Integer]
+      def parallel_threads
+        @parallel_threads ||= Integer(args[:parallel]).tap do |threads|
+          raise ArgumentError if threads < 1
+        end
+      rescue ArgumentError
+        error("Invalid --parallel value, must be a positive number!")
+      end
+      alias validate_parallel_args parallel_threads
+
       # Scan for allure results paths
       #
       # @param [String] results_glob

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

@@ -5,8 +5,6 @@ module Publisher
   module Uploaders
     class HistoryNotFoundError < StandardError; end
 
-    PARALLEL_THREADS = 8
-
     # Uploader implementation
     #
     class Uploader
@@ -31,6 +29,7 @@ module Publisher
       # @option args [String] :base_url
       # @option args [String] :copy_latest
       # @option args [String] :report_name
+      # @option args [Integer] :parallel
       def initialize(**args)
         @result_paths = args[:result_paths]
         @bucket_name = args[:bucket]
@@ -38,6 +37,7 @@ module Publisher
         @base_url = args[:base_url]
         @copy_latest = ci_info && args[:copy_latest] # copy latest for ci only
         @report_name = args[:report_name]
+        @parallel = args[:parallel]
       end
 
       # Execute allure report generation and upload
@@ -97,7 +97,8 @@ module Publisher
                   :prefix,
                   :base_url,
                   :copy_latest,
-                  :report_name
+                  :report_name,
+                  :parallel
 
       def_delegator :report_generator, :common_info_path
 

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

@@ -75,7 +75,7 @@ module Publisher
         # it's not possible to overwrite whole directory so we clean out unique data files from last run
         log_debug("Cleaning data files")
         data_files = bucket.files(prefix: key(prefix, "data"))
-        Parallel.each(data_files, in_threads: PARALLEL_THREADS, &:delete)
+        Parallel.each(data_files, in_threads: parallel, &:delete)
 
         log_debug("Copying report files")
         args = report_files.map do |file|
@@ -84,7 +84,7 @@ module Publisher
             destination: key(prefix, file.relative_path_from(report_path))
           }
         end
-        Parallel.each(args, in_threads: PARALLEL_THREADS) do |obj|
+        Parallel.each(args, in_threads: parallel) do |obj|
           obj[:source_file].copy(obj[:destination], force_copy_metadata: true) do |f|
             f.cache_control = "public, max-age=60"
           end
@@ -106,8 +106,8 @@ module Publisher
           }
         end
 
-        log_debug("Uploading '#{args.size}' files in '#{PARALLEL_THREADS}' threads")
-        Parallel.each(args, in_threads: PARALLEL_THREADS) do |obj|
+        log_debug("Uploading '#{args.size}' files in '#{parallel}' threads")
+        Parallel.each(args, in_threads: parallel) do |obj|
           bucket.create_file(*obj.slice(:file, :path).values, cache_control: "public, max-age=3600")
         end
         log_debug("Finished upload successfully")

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

@@ -103,7 +103,7 @@ module Publisher
             cache_control: "max-age=60"
           }
         end
-        Parallel.each(args, in_threads: PARALLEL_THREADS) { |obj| client.copy_object(obj) }
+        Parallel.each(args, in_threads: parallel) { |obj| client.copy_object(obj) }
         log_debug("Finished latest report copy successfully")
       end
 
@@ -115,7 +115,7 @@ module Publisher
       def upload_to_s3(files, key_prefix)
         args = files.map do |file|
           {
-            body: File.new(file),
+            body: file.to_s,
             bucket: bucket_name,
             key: key(key_prefix, file.relative_path_from(report_path)),
             content_type: MiniMime.lookup_by_filename(file).content_type,
@@ -123,8 +123,10 @@ module Publisher
           }
         end
 
-        log_debug("Uploading '#{args.size}' files in '#{PARALLEL_THREADS}' threads")
-        Parallel.each(args, in_threads: PARALLEL_THREADS) { |obj| client.put_object(obj) }
+        log_debug("Uploading '#{args.size}' files in '#{parallel}' threads")
+        Parallel.each(args, in_threads: parallel) do |obj|
+          client.put_object(obj.tap { |o| o[:body] = File.read(o[:body]) })
+        end
         log_debug("Finished upload successfully")
       end
 

data/lib/allure_report_publisher/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: allure-report-publisher
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.2.0
 platform: ruby
 authors:
 - Andrejs Cunskis
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-01-25 00:00:00.000000000 Z
+date: 2024-03-07 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.143.0
+        version: 1.144.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.143.0
+        version: 1.144.0
 - !ruby/object:Gem::Dependency
   name: dry-cli
   requirement: !ruby/object:Gem::Requirement