knapsack_pro 8.3.3 → 8.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a43269c3d826dc9e9faed08299cffbc2d12afc454de28b58435e2bc05861e55
-  data.tar.gz: 41c2129c7f580d3637a2cf7a189d4b4cf4e0ce10fa677162fd82640c2bf1b582
+  metadata.gz: 17dceae7090394f68959e5b8bdef4c0640ce4027b28efe41fb8f3d612b5f0348
+  data.tar.gz: 5828288a2160348d9acce467e17d16da00e8f794aa39e70d0d0b5fecc0b9188c
 SHA512:
-  metadata.gz: e3a172a78479d59fd9a5becff1606df2555e5db961573ab42786ee37942f8a3c56305c996c3c774a5890189ad1ad75be1057066b0043f3260d4ce97668154a84
-  data.tar.gz: a8176152345555ddcac3024a903cc6749b7d32ea0f432f5b01b8e10813202288f511b5ba06f5a1dd6b20738d4f4a25d9af7f6604d70544c771c2b30f186cc4e0
+  metadata.gz: abf9abe76b5e0841d95c09230cd88289e6c197a26dad27cd2a9c7f2fe97310c9d1fbe1ddb77134676c604daa7a28bd8d6c405598262f9623a9110c5b7ce15751
+  data.tar.gz: 7c9a0f978b8f01b2e5ad888535ddfbaf006b20da5a5853edc454dd82044f1608b2ce9d21acd25a00c77146bbad7e0954d76f5fc2ae541970cdfd9feaee0bc45e

data/.circleci/config.yml

@@ -65,7 +65,6 @@ jobs:
       - run: bundle update rspec
       - run: bundle exec rspec --version
       - run: bundle exec rspec spec
-      - run: bundle exec ruby spec/knapsack_pro/formatters/time_tracker_specs.rb
 
   integration-rspec:
     parallelism: 1

data/.gitignore

@@ -36,5 +36,4 @@ Gemfile.lock
 .rvmrc
 
 # dynamically generated specs
-spec/knapsack_pro/formatters/tmp_time_tracker*_spec.rb
 spec_integration/

data/CHANGELOG.md

@@ -2,9 +2,17 @@
 
 ### UNRELEASED (patch)
 
+### 8.4.0
+
+* Add a batch UUID to the V1 Queue API request payload to improve handling of retried requests
+
+    https://github.com/KnapsackPro/knapsack_pro-ruby/pull/307
+
+https://github.com/KnapsackPro/knapsack_pro-ruby/compare/v8.3.3...v8.4.0
+
 ### 8.3.3
 
-* Fix a `Hash#sum` bug in the time tracker for RSpec
+* Replace `Hash#sum` with `Hash#reduce` to fix a rare bug in the RSpec time tracker for a specific project
 
     https://github.com/KnapsackPro/knapsack_pro-ruby/pull/305
 

data/README.md

@@ -67,7 +67,7 @@ bundle update knapsack_pro
 RSpec:
 
 ```bash
-bin/test
+bundle exec rspec
 ```
 
 Scripted tests can be found in the [Rails App With Knapsack Pro repository](https://github.com/KnapsackPro/rails-app-with-knapsack_pro/blob/master/bin/knapsack_pro_all.rb).

data/lib/knapsack_pro/client/api/v1/queues.rb

@@ -19,6 +19,7 @@ module KnapsackPro
                 :node_index => args.fetch(:node_index),
                 :node_build_id => KnapsackPro::Config::Env.ci_node_build_id,
                 :user_seat => KnapsackPro::Config::Env.masked_user_seat,
+                batch_uuid: args.fetch(:batch_uuid)
               }
 
               if request_hash[:can_initialize_queue] && !request_hash[:attempt_connect_to_queue]

data/lib/knapsack_pro/queue_allocator.rb

@@ -41,26 +41,26 @@ module KnapsackPro
       @fallback_mode = false
     end
 
-    def test_file_paths(can_initialize_queue, executed_test_files)
+    def test_file_paths(can_initialize_queue, executed_test_files, batch_uuid: SecureRandom.uuid)
       return [] if @fallback_mode
 
-      batch = pull_tests_from_queue(can_initialize_queue)
+      batch = pull_tests_from_queue(can_initialize_queue, batch_uuid)
 
       return switch_to_fallback_mode(executed_test_files: executed_test_files) if batch.connection_failed?
       return normalize_test_files(batch.test_files) if batch.queue_exists?
 
       test_files_result = test_suite.calculate_test_files
 
-      return try_initializing_queue(test_files_result.test_files) if test_files_result.quick?
+      return try_initializing_queue(test_files_result.test_files, batch_uuid) if test_files_result.quick?
 
       # The tests to run were found slowly. By that time, the queue could have already been initialized by another CI node.
       # Attempt to pull tests from the queue to avoid the attempt to initialize the queue unnecessarily (queue initialization is an expensive request with a big test files payload).
-      batch = pull_tests_from_queue(can_initialize_queue)
+      batch = pull_tests_from_queue(can_initialize_queue, batch_uuid)
 
       return switch_to_fallback_mode(executed_test_files: executed_test_files) if batch.connection_failed?
       return normalize_test_files(batch.test_files) if batch.queue_exists?
 
-      try_initializing_queue(test_files_result.test_files)
+      try_initializing_queue(test_files_result.test_files, batch_uuid)
     end
 
     private
@@ -80,7 +80,7 @@ module KnapsackPro
       KnapsackPro::TestFilePresenter.paths(decrypted_test_files)
     end
 
-    def build_action(can_initialize_queue:, attempt_connect_to_queue:, test_files: nil)
+    def build_action(can_initialize_queue:, attempt_connect_to_queue:, batch_uuid:, test_files: nil)
       if can_initialize_queue && !attempt_connect_to_queue
         raise 'Test files are required when initializing a new queue.' if test_files.nil?
         test_files = KnapsackPro::Crypto::Encryptor.call(test_files)
@@ -95,25 +95,26 @@ module KnapsackPro
         node_index: ci_node_index,
         node_build_id: ci_node_build_id,
         test_files: test_files,
+        batch_uuid: batch_uuid
       )
     end
 
-    def pull_tests_from_queue(can_initialize_queue)
-      action = build_action(can_initialize_queue: can_initialize_queue, attempt_connect_to_queue: can_initialize_queue)
+    def pull_tests_from_queue(can_initialize_queue, batch_uuid)
+      action = build_action(can_initialize_queue: can_initialize_queue, attempt_connect_to_queue: can_initialize_queue, batch_uuid: batch_uuid)
       connection = KnapsackPro::Client::Connection.new(action)
       response = connection.call
       Batch.new(connection, response)
     end
 
-    def initialize_queue(tests_to_run)
-      action = build_action(can_initialize_queue: true, attempt_connect_to_queue: false, test_files: tests_to_run)
+    def initialize_queue(tests_to_run, batch_uuid)
+      action = build_action(can_initialize_queue: true, attempt_connect_to_queue: false, batch_uuid: batch_uuid, test_files: tests_to_run)
       connection = KnapsackPro::Client::Connection.new(action)
       response = connection.call
       Batch.new(connection, response)
     end
 
-    def try_initializing_queue(tests)
-      result = initialize_queue(tests)
+    def try_initializing_queue(tests, batch_uuid)
+      result = initialize_queue(tests, batch_uuid)
 
       return switch_to_fallback_mode(executed_test_files: []) if result.connection_failed?
 

data/lib/knapsack_pro/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module KnapsackPro
-  VERSION = '8.3.3'
+  VERSION = '8.4.0'
 end

data/spec/knapsack_pro/client/api/v1/queues_spec.rb

@@ -10,6 +10,7 @@ describe KnapsackPro::Client::API::V1::Queues do
     let(:masked_user_seat) { double }
     let(:can_initialize_queue) { [false, true].sample }
     let(:attempt_connect_to_queue) { [false, true].sample }
+    let(:batch_uuid) { SecureRandom.uuid }
 
     subject do
       described_class.queue(
@@ -19,7 +20,8 @@ describe KnapsackPro::Client::API::V1::Queues do
         branch: branch,
         node_total: node_total,
         node_index: node_index,
-        test_files: test_files
+        test_files: test_files,
+        batch_uuid: batch_uuid
       )
     end