initv2

Author: 3v0k4

lib/knapsack_pro/client/api/v2/queues.rb

@@ -46,6 +46,34 @@ def queue(args)
               )
             end
 
+            def connect
+              git_adapter = KnapsackPro::RepositoryAdapters::GitAdapter.new
+              repository_adapter = KnapsackPro::RepositoryAdapterInitiator.call
+
+              request_hash = {
+                attempt_connect_to_queue: true,
+                batch_uuid: SecureRandom.uuid,
+                branch: KnapsackPro::Crypto::BranchEncryptor.call(repository_adapter.branch),
+                build_author: git_adapter.build_author,
+                can_initialize_queue: true,
+                commit_authors: git_adapter.commit_authors,
+                commit_hash: repository_adapter.commit_hash,
+                fixed_queue_split: KnapsackPro::Config::Env.fixed_queue_split_?,
+                node_index: KnapsackPro::Config::Env.ci_node_index,
+                node_total: KnapsackPro::Config::Env.ci_node_total,
+                node_uuid: SecureRandom.uuid,
+                skip_pull: true,
+                test_queue_id: KnapsackPro::Config::Env.test_queue_id,
+                user_seat: KnapsackPro::Config::Env.masked_user_seat,
+              }
+
+              action_class.new(
+                endpoint_path: '/v2/queues/queue',
+                http_method: :post,
+                request_hash: request_hash
+              )
+            end
+
             def initialize(paths)
               git_adapter = KnapsackPro::RepositoryAdapters::GitAdapter.new
               repository_adapter = KnapsackPro::RepositoryAdapterInitiator.call

lib/knapsack_pro/rspec/test_queue_initializer.rb

@@ -23,7 +23,7 @@ def call(args)
       private
 
       def test_queue_exists?
-        action = KnapsackPro::Client::API::V1::Queues.connect
+        action = KnapsackPro::Client::API::V2::Queues.connect
         connection = KnapsackPro::Client::Connection.new(action)
         response = connection.call
 
@@ -53,7 +53,7 @@ def initialize_test_queue(slow_id_paths)
           exit 1
         end
 
-        action = KnapsackPro::Client::API::V1::Queues.initialize(paths)
+        action = KnapsackPro::Client::API::V2::Queues.initialize(paths)
         connection = KnapsackPro::Client::Connection.new(action)
         response = connection.call
 

spec/integration/rspec/test_queue_initializer.rb

@@ -3,7 +3,8 @@
 require 'json'
 
 ENV['KNAPSACK_PRO_TEST_SUITE_TOKEN'] = SecureRandom.hex
-ENV['KNAPSACK_PRO_CI_NODE_BUILD_ID'] = SecureRandom.uuid
+ENV['KNAPSACK_PRO_TEST_QUEUE_ID'] = SecureRandom.uuid
+ENV['KNAPSACK_PRO_CI_NODE_BUILD_ID'] = ENV['KNAPSACK_PRO_TEST_QUEUE_ID']
 ENV['KNAPSACK_PRO_TEST_DIR'] = 'spec_integration'
 ENV['KNAPSACK_PRO_TEST_FILE_PATTERN'] = "spec_integration/**{,/*/**}/*_spec.rb"
 

spec/integration/rspec/test_queue_initializer_spec.rb

@@ -111,7 +111,7 @@ def log(stdout, stderr, status)
 
     expect(actual.stdout).to include('DEBUG -- knapsack_pro: GET https://api.knapsackpro.com/v1/build_distributions/last').once
     expect(actual.stdout).to include('INFO -- knapsack_pro: Calculating Split by Test Examples. Analyzing 1 slow test files').once
-    expect(actual.stdout).to include('DEBUG -- knapsack_pro: POST https://api.knapsackpro.com/v1/queues/queue').twice
+    expect(actual.stdout).to include('DEBUG -- knapsack_pro: POST https://api.knapsackpro.com/v2/queues/queue').twice
     expect(actual.stdout).to include('"test_files":[{"path":"spec_integration/fast_spec.rb[1:1]"},{"path":"spec_integration/fast_spec.rb[1:2]"},{"path":"spec_integration/slow_spec.rb[1:1]"},{"path":"spec_integration/slow_spec.rb[1:2]"}]').once
     expect(actual.stdout).to include('INFO -- knapsack_pro: Test Queue URL: http://example.com').once