hybrid_platforms_conductor 32.16.3 → 33.0.0

data/spec/hybrid_platforms_conductor_test/executables/nodes_to_deploy_spec.rb

@@ -8,23 +8,43 @@ describe 'nodes_to_deploy executable' do
   #   * Parameters::
   #     * *repository* (String): Platform's repository
   def with_test_platform_for_nodes_to_deploy(additional_platforms_content: '')
-    with_test_platform({ nodes: { 'node1' => {}, 'node2' => {} } }, false, additional_platforms_content) do |repository|
+    with_test_platform(
+      { nodes: { 'node1' => {}, 'node2' => {} } },
+      false,
+      additional_platforms_content + "\nsend_logs_to :test_log"
+    ) do |repository|
       yield repository
     end
   end
 
   it 'returns all nodes by default' do
     with_test_platform_for_nodes_to_deploy do
-      expect_actions_executor_runs([proc do |actions|
-        expect(actions).to eq(
-          'node1' => { remote_bash: "cd /var/log/deployments && ls -t | head -1 | xargs sed '/===== STDOUT =====/q'" },
-          'node2' => { remote_bash: "cd /var/log/deployments && ls -t | head -1 | xargs sed '/===== STDOUT =====/q'" }
-        )
+      expect(test_deployer).to receive(:deployment_info_from).with(%w[node1 node2]) do
         {
-          'node1' => [0, "repo_name_0: platform\nexit_status: 0\ncommit_id_0: abcdef1", ''],
-          'node2' => [0, "repo_name_0: platform\nexit_status: 0\ncommit_id_0: abcdef2", '']
+          'node1' => {
+            services: %w[service1],
+            deployment_info: {
+              repo_name_0: 'platform',
+              commit_id_0: 'abcdef1',
+              exit_status: 0
+            },
+            exit_status: 0,
+            stdout: '',
+            stderr: ''
+          },
+          'node2' => {
+            services: %w[service2],
+            deployment_info: {
+              repo_name_0: 'platform',
+              commit_id_0: 'abcdef2',
+              exit_status: 0
+            },
+            exit_status: 0,
+            stdout: '',
+            stderr: ''
+          }
         }
-      end])
+      end
       expect(test_nodes_handler).to receive(:impacted_nodes_from_git_diff).with('platform', from_commit: 'abcdef1', to_commit: 'master') { [%w[node1 node2], [], [], false] }
       expect(test_nodes_handler).to receive(:impacted_nodes_from_git_diff).with('platform', from_commit: 'abcdef2', to_commit: 'master') { [%w[node1 node2], [], [], false] }
       exit_code, stdout, stderr = run 'nodes_to_deploy'
@@ -41,14 +61,21 @@ describe 'nodes_to_deploy executable' do
 
   it 'can filter nodes' do
     with_test_platform_for_nodes_to_deploy do
-      expect_actions_executor_runs([proc do |actions|
-        expect(actions).to eq(
-          'node2' => { remote_bash: "cd /var/log/deployments && ls -t | head -1 | xargs sed '/===== STDOUT =====/q'" }
-        )
+      expect(test_deployer).to receive(:deployment_info_from).with(%w[node2]) do
         {
-          'node2' => [0, "repo_name_0: platform\nexit_status: 0\ncommit_id_0: abcdef2", '']
+          'node2' => {
+            services: %w[service2],
+            deployment_info: {
+              repo_name_0: 'platform',
+              commit_id_0: 'abcdef2',
+              exit_status: 0
+            },
+            exit_status: 0,
+            stdout: '',
+            stderr: ''
+          }
         }
-      end])
+      end
       expect(test_nodes_handler).to receive(:impacted_nodes_from_git_diff).with('platform', from_commit: 'abcdef2', to_commit: 'master') { [%w[node1 node2], [], [], false] }
       exit_code, stdout, stderr = run 'nodes_to_deploy', '--node', 'node2'
       expect(exit_code).to eq 0
@@ -63,16 +90,32 @@ describe 'nodes_to_deploy executable' do
 
   it 'does not return nodes that have no impact' do
     with_test_platform_for_nodes_to_deploy do
-      expect_actions_executor_runs([proc do |actions|
-        expect(actions).to eq(
-          'node1' => { remote_bash: "cd /var/log/deployments && ls -t | head -1 | xargs sed '/===== STDOUT =====/q'" },
-          'node2' => { remote_bash: "cd /var/log/deployments && ls -t | head -1 | xargs sed '/===== STDOUT =====/q'" }
-        )
+      expect(test_deployer).to receive(:deployment_info_from).with(%w[node1 node2]) do
         {
-          'node1' => [0, "repo_name_0: platform\nexit_status: 0\ncommit_id_0: abcdef1", ''],
-          'node2' => [0, "repo_name_0: platform\nexit_status: 0\ncommit_id_0: abcdef2", '']
+          'node1' => {
+            services: %w[service1],
+            deployment_info: {
+              repo_name_0: 'platform',
+              commit_id_0: 'abcdef1',
+              exit_status: 0
+            },
+            exit_status: 0,
+            stdout: '',
+            stderr: ''
+          },
+          'node2' => {
+            services: %w[service2],
+            deployment_info: {
+              repo_name_0: 'platform',
+              commit_id_0: 'abcdef2',
+              exit_status: 0
+            },
+            exit_status: 0,
+            stdout: '',
+            stderr: ''
+          }
         }
-      end])
+      end
       expect(test_nodes_handler).to receive(:impacted_nodes_from_git_diff).with('platform', from_commit: 'abcdef1', to_commit: 'master') { [%w[node1], [], [], false] }
       expect(test_nodes_handler).to receive(:impacted_nodes_from_git_diff).with('platform', from_commit: 'abcdef2', to_commit: 'master') { [%w[], [], [], false] }
       exit_code, stdout, stderr = run 'nodes_to_deploy'
@@ -86,16 +129,28 @@ describe 'nodes_to_deploy executable' do
 
   it 'considers nodes having no repository info in their logs to be deployed' do
     with_test_platform_for_nodes_to_deploy do
-      expect_actions_executor_runs([proc do |actions|
-        expect(actions).to eq(
-          'node1' => { remote_bash: "cd /var/log/deployments && ls -t | head -1 | xargs sed '/===== STDOUT =====/q'" },
-          'node2' => { remote_bash: "cd /var/log/deployments && ls -t | head -1 | xargs sed '/===== STDOUT =====/q'" }
-        )
+      expect(test_deployer).to receive(:deployment_info_from).with(%w[node1 node2]) do
         {
-          'node1' => [0, "exit_status: 0\n", ''],
-          'node2' => [0, "repo_name_0: platform\nexit_status: 0\ncommit_id_0: abcdef2", '']
+          'node1' => {
+            services: %w[service1],
+            deployment_info: {},
+            exit_status: 0,
+            stdout: '',
+            stderr: ''
+          },
+          'node2' => {
+            services: %w[service2],
+            deployment_info: {
+              repo_name_0: 'platform',
+              commit_id_0: 'abcdef2',
+              exit_status: 0
+            },
+            exit_status: 0,
+            stdout: '',
+            stderr: ''
+          }
         }
-      end])
+      end
       expect(test_nodes_handler).to receive(:impacted_nodes_from_git_diff).with('platform', from_commit: 'abcdef2', to_commit: 'master') { [%w[], [], [], false] }
       exit_code, stdout, stderr = run 'nodes_to_deploy'
       expect(exit_code).to eq 0
@@ -108,16 +163,32 @@ describe 'nodes_to_deploy executable' do
 
   it 'considers nodes having invalid commit ids in their logs to be deployed' do
     with_test_platform_for_nodes_to_deploy do
-      expect_actions_executor_runs([proc do |actions|
-        expect(actions).to eq(
-          'node1' => { remote_bash: "cd /var/log/deployments && ls -t | head -1 | xargs sed '/===== STDOUT =====/q'" },
-          'node2' => { remote_bash: "cd /var/log/deployments && ls -t | head -1 | xargs sed '/===== STDOUT =====/q'" }
-        )
+      expect(test_deployer).to receive(:deployment_info_from).with(%w[node1 node2]) do
         {
-          'node1' => [0, "repo_name_0: platform\nexit_status: 0\ncommit_id_0: abcdef1", ''],
-          'node2' => [0, "repo_name_0: platform\nexit_status: 0\ncommit_id_0: abcdef2", '']
+          'node1' => {
+            services: %w[service1],
+            deployment_info: {
+              repo_name_0: 'platform',
+              commit_id_0: 'abcdef1',
+              exit_status: 0
+            },
+            exit_status: 0,
+            stdout: '',
+            stderr: ''
+          },
+          'node2' => {
+            services: %w[service2],
+            deployment_info: {
+              repo_name_0: 'platform',
+              commit_id_0: 'abcdef2',
+              exit_status: 0
+            },
+            exit_status: 0,
+            stdout: '',
+            stderr: ''
+          }
         }
-      end])
+      end
       expect(test_nodes_handler).to receive(:impacted_nodes_from_git_diff).with('platform', from_commit: 'abcdef1', to_commit: 'master') do
         raise HybridPlatformsConductor::NodesHandler::GitError, 'Mocked git error due to an invalid commit id'
       end
@@ -148,14 +219,21 @@ describe 'nodes_to_deploy executable' do
       for_nodes(\'node1\') { deployment_schedule(IceCube::Schedule.new(Time.now.utc - 120, duration: 60)) }
       for_nodes(\'node2\') { deployment_schedule(IceCube::Schedule.new(Time.now.utc - 60, duration: 120)) }
     ') do
-      expect_actions_executor_runs([proc do |actions|
-        expect(actions).to eq(
-          'node2' => { remote_bash: "cd /var/log/deployments && ls -t | head -1 | xargs sed '/===== STDOUT =====/q'" }
-        )
+      expect(test_deployer).to receive(:deployment_info_from).with(%w[node2]) do
         {
-          'node2' => [0, "repo_name_0: platform\nexit_status: 0\ncommit_id_0: abcdef2", '']
+          'node2' => {
+            services: %w[service2],
+            deployment_info: {
+              repo_name_0: 'platform',
+              commit_id_0: 'abcdef2',
+              exit_status: 0
+            },
+            exit_status: 0,
+            stdout: '',
+            stderr: ''
+          }
         }
-      end])
+      end
       expect(test_nodes_handler).to receive(:impacted_nodes_from_git_diff).with('platform', from_commit: 'abcdef2', to_commit: 'master') { [%w[node1 node2], [], [], false] }
       exit_code, stdout, stderr = run 'nodes_to_deploy'
       expect(exit_code).to eq 0
@@ -172,14 +250,21 @@ describe 'nodes_to_deploy executable' do
       for_nodes(\'node1\') { deployment_schedule(IceCube::Schedule.new(Time.now.utc - 120, duration: 60)) }
       for_nodes(\'node2\') { deployment_schedule(IceCube::Schedule.new(Time.now.utc - 60, duration: 120)) }
     ') do
-      expect_actions_executor_runs([proc do |actions|
-        expect(actions).to eq(
-          'node1' => { remote_bash: "cd /var/log/deployments && ls -t | head -1 | xargs sed '/===== STDOUT =====/q'" }
-        )
+      expect(test_deployer).to receive(:deployment_info_from).with(%w[node1]) do
         {
-          'node1' => [0, "repo_name_0: platform\nexit_status: 0\ncommit_id_0: abcdef1", '']
+          'node1' => {
+            services: %w[service1],
+            deployment_info: {
+              repo_name_0: 'platform',
+              commit_id_0: 'abcdef1',
+              exit_status: 0
+            },
+            exit_status: 0,
+            stdout: '',
+            stderr: ''
+          }
         }
-      end])
+      end
       expect(test_nodes_handler).to receive(:impacted_nodes_from_git_diff).with('platform', from_commit: 'abcdef1', to_commit: 'master') { [%w[node1 node2], [], [], false] }
       # 90 seconds before now, the schedule should match only node1
       exit_code, stdout, stderr = run 'nodes_to_deploy', '--deployment-time', (Time.now.utc - 90).strftime('%F %T')
@@ -197,16 +282,32 @@ describe 'nodes_to_deploy executable' do
       for_nodes(\'node1\') { deployment_schedule(IceCube::Schedule.new(Time.now.utc - 120, duration: 60)) }
       for_nodes(\'node2\') { deployment_schedule(IceCube::Schedule.new(Time.now.utc - 60, duration: 120)) }
     ') do
-      expect_actions_executor_runs([proc do |actions|
-        expect(actions).to eq(
-          'node1' => { remote_bash: "cd /var/log/deployments && ls -t | head -1 | xargs sed '/===== STDOUT =====/q'" },
-          'node2' => { remote_bash: "cd /var/log/deployments && ls -t | head -1 | xargs sed '/===== STDOUT =====/q'" }
-        )
+      expect(test_deployer).to receive(:deployment_info_from).with(%w[node1 node2]) do
         {
-          'node1' => [0, "repo_name_0: platform\nexit_status: 0\ncommit_id_0: abcdef1", ''],
-          'node2' => [0, "repo_name_0: platform\nexit_status: 0\ncommit_id_0: abcdef2", '']
+          'node1' => {
+            services: %w[service1],
+            deployment_info: {
+              repo_name_0: 'platform',
+              commit_id_0: 'abcdef1',
+              exit_status: 0
+            },
+            exit_status: 0,
+            stdout: '',
+            stderr: ''
+          },
+          'node2' => {
+            services: %w[service2],
+            deployment_info: {
+              repo_name_0: 'platform',
+              commit_id_0: 'abcdef2',
+              exit_status: 0
+            },
+            exit_status: 0,
+            stdout: '',
+            stderr: ''
+          }
         }
-      end])
+      end
       expect(test_nodes_handler).to receive(:impacted_nodes_from_git_diff).with('platform', from_commit: 'abcdef1', to_commit: 'master') { [%w[node1 node2], [], [], false] }
       expect(test_nodes_handler).to receive(:impacted_nodes_from_git_diff).with('platform', from_commit: 'abcdef2', to_commit: 'master') { [%w[node1 node2], [], [], false] }
       exit_code, stdout, stderr = run 'nodes_to_deploy', '--ignore-schedule'
@@ -225,16 +326,32 @@ describe 'nodes_to_deploy executable' do
       'platform1' => { nodes: { 'node1' => {}, 'node2' => {} } },
       'platform2' => { nodes: {} }
     ) do
-      expect_actions_executor_runs([proc do |actions|
-        expect(actions).to eq(
-          'node1' => { remote_bash: "cd /var/log/deployments && ls -t | head -1 | xargs sed '/===== STDOUT =====/q'" },
-          'node2' => { remote_bash: "cd /var/log/deployments && ls -t | head -1 | xargs sed '/===== STDOUT =====/q'" }
-        )
+      expect(test_deployer).to receive(:deployment_info_from).with(%w[node1 node2]) do
         {
-          'node1' => [0, "repo_name_0: platform1\nexit_status: 0\ncommit_id_0: abcdef1", ''],
-          'node2' => [0, "repo_name_0: platform2\nexit_status: 0\ncommit_id_0: abcdef2", '']
+          'node1' => {
+            services: %w[service1],
+            deployment_info: {
+              repo_name_0: 'platform1',
+              commit_id_0: 'abcdef1',
+              exit_status: 0
+            },
+            exit_status: 0,
+            stdout: '',
+            stderr: ''
+          },
+          'node2' => {
+            services: %w[service2],
+            deployment_info: {
+              repo_name_0: 'platform2',
+              commit_id_0: 'abcdef2',
+              exit_status: 0
+            },
+            exit_status: 0,
+            stdout: '',
+            stderr: ''
+          }
         }
-      end])
+      end
       expect(test_nodes_handler).to receive(:impacted_nodes_from_git_diff).with('platform1', from_commit: 'abcdef1', to_commit: 'master') { [%w[node1], [], [], false] }
       expect(test_nodes_handler).to receive(:impacted_nodes_from_git_diff).with('platform2', from_commit: 'abcdef2', to_commit: 'master') { [%w[node2], [], [], false] }
       exit_code, stdout, stderr = run 'nodes_to_deploy'
@@ -253,16 +370,36 @@ describe 'nodes_to_deploy executable' do
       'platform2' => { nodes: {} },
       'platform3' => { nodes: {} }
     ) do
-      expect_actions_executor_runs([proc do |actions|
-        expect(actions).to eq(
-          'node1' => { remote_bash: "cd /var/log/deployments && ls -t | head -1 | xargs sed '/===== STDOUT =====/q'" },
-          'node2' => { remote_bash: "cd /var/log/deployments && ls -t | head -1 | xargs sed '/===== STDOUT =====/q'" }
-        )
+      expect(test_deployer).to receive(:deployment_info_from).with(%w[node1 node2]) do
         {
-          'node1' => [0, "exit_status: 0\nrepo_name_0: platform1\ncommit_id_0: abcdef1\nrepo_name_1: platform2\ncommit_id_1: 1234567", ''],
-          'node2' => [0, "exit_status: 0\nrepo_name_0: platform2\ncommit_id_0: abcdef2\nrepo_name_1: platform3\ncommit_id_1: 2345678", '']
+          'node1' => {
+            services: %w[service1],
+            deployment_info: {
+              repo_name_0: 'platform1',
+              commit_id_0: 'abcdef1',
+              repo_name_1: 'platform2',
+              commit_id_1: '1234567',
+              exit_status: 0
+            },
+            exit_status: 0,
+            stdout: '',
+            stderr: ''
+          },
+          'node2' => {
+            services: %w[service2],
+            deployment_info: {
+              repo_name_0: 'platform2',
+              commit_id_0: 'abcdef2',
+              repo_name_1: 'platform3',
+              commit_id_1: '2345678',
+              exit_status: 0
+            },
+            exit_status: 0,
+            stdout: '',
+            stderr: ''
+          }
         }
-      end])
+      end
       expect(test_nodes_handler).to receive(:impacted_nodes_from_git_diff).with('platform1', from_commit: 'abcdef1', to_commit: 'master') { [%w[], [], [], false] }
       expect(test_nodes_handler).to receive(:impacted_nodes_from_git_diff).with('platform2', from_commit: '1234567', to_commit: 'master') { [%w[node1], [], [], false] }
       expect(test_nodes_handler).to receive(:impacted_nodes_from_git_diff).with('platform2', from_commit: 'abcdef2', to_commit: 'master') { [%w[], [], [], false] }
@@ -283,16 +420,36 @@ describe 'nodes_to_deploy executable' do
       'platform2' => { nodes: {} },
       'platform3' => { nodes: {} }
     ) do
-      expect_actions_executor_runs([proc do |actions|
-        expect(actions).to eq(
-          'node1' => { remote_bash: "cd /var/log/deployments && ls -t | head -1 | xargs sed '/===== STDOUT =====/q'" },
-          'node2' => { remote_bash: "cd /var/log/deployments && ls -t | head -1 | xargs sed '/===== STDOUT =====/q'" }
-        )
+      expect(test_deployer).to receive(:deployment_info_from).with(%w[node1 node2]) do
         {
-          'node1' => [0, "exit_status: 0\nrepo_name_0: platform1\ncommit_id_0: abcdef1\nrepo_name_1: platform2\ncommit_id_1: 1234567", ''],
-          'node2' => [0, "exit_status: 0\nrepo_name_0: platform2\ncommit_id_0: abcdef2\nrepo_name_1: platform3\ncommit_id_1: 2345678", '']
+          'node1' => {
+            services: %w[service1],
+            deployment_info: {
+              repo_name_0: 'platform1',
+              commit_id_0: 'abcdef1',
+              repo_name_1: 'platform2',
+              commit_id_1: '1234567',
+              exit_status: 0
+            },
+            exit_status: 0,
+            stdout: '',
+            stderr: ''
+          },
+          'node2' => {
+            services: %w[service2],
+            deployment_info: {
+              repo_name_0: 'platform2',
+              commit_id_0: 'abcdef2',
+              repo_name_1: 'platform3',
+              commit_id_1: '2345678',
+              exit_status: 0
+            },
+            exit_status: 0,
+            stdout: '',
+            stderr: ''
+          }
         }
-      end])
+      end
       expect(test_nodes_handler).to receive(:impacted_nodes_from_git_diff).with('platform1', from_commit: 'abcdef1', to_commit: 'master') { [%w[node1], [], [], false] }
       expect(test_nodes_handler).to receive(:impacted_nodes_from_git_diff).with('platform2', from_commit: 'abcdef2', to_commit: 'master') { [%w[node2], [], [], false] }
       exit_code, stdout, stderr = run 'nodes_to_deploy'

data/spec/hybrid_platforms_conductor_test/executables/options/common_spec.rb

@@ -12,7 +12,8 @@ describe 'executables\' common options' do
         nodes: { 'node1' => { meta: { host_ip: '192.168.42.42' }, services: ['node1_service'] } },
         deployable_services: %w[node1_service]
       },
-      true
+      true,
+      'send_logs_to :test_log'
     ) do |repository|
       yield repository
     end

data/spec/hybrid_platforms_conductor_test/executables/options/deployer_spec.rb

@@ -12,188 +12,6 @@ describe 'executables\' Deployer options' do
     end
   end
 
-  # Mock calls being made to a Thycotic SOAP API using Savon
-  #
-  # Parameters::
-  # * *url* (String): Mocked URL
-  # * *secret_id* (String): The mocked secret ID
-  # * *mocked_secrets_file* (String or nil): The mocked secrets file stored in Thycotic, or nil to mock a missing secret
-  # * *user* (String or nil): The user to be expected, or nil if it should be read from netrc [default: nil]
-  # * *password* (String or nil): The password to be expected, or nil if it should be read from netrc [default: nil]
-  def mock_thycotic_file_download_on(url, secret_id, mocked_secrets_file, user: nil, password: nil)
-    if user.nil?
-      user = 'thycotic_user_from_netrc'
-      password = 'thycotic_password_from_netrc'
-      expect(HybridPlatformsConductor::Credentials).to receive(:with_credentials_for) do |id, _logger, _logger_stderr, url: nil, &client_code|
-        expect(id).to eq :thycotic
-        expect(url).to eq url
-        client_code.call user, password
-      end
-    end
-    # Mock the Savon calls
-    mocked_savon_client = double 'Mocked Savon client'
-    expect(Savon).to receive(:client) do |params|
-      expect(params[:wsdl]).to eq "#{url}/webservices/SSWebservice.asmx?wsdl"
-      expect(params[:ssl_verify_mode]).to eq :none
-      mocked_savon_client
-    end
-    expect(mocked_savon_client).to receive(:call).with(
-      :authenticate,
-      message: {
-        username: user,
-        password: password,
-        domain: 'thycotic_auth_domain'
-      }
-    ) do
-      { authenticate_response: { authenticate_result: { token: 'soap_token' } } }
-    end
-    expect(mocked_savon_client).to receive(:call).with(
-      :get_secret,
-      message: {
-        token: 'soap_token',
-        secretId: secret_id
-      }
-    ) do
-      {
-        get_secret_response: {
-          get_secret_result:
-            if mocked_secrets_file
-              { secret: { items: { secret_item: { id: '4242' } } } }
-            else
-              { errors: { string: 'Access Denied'}, secret_error: { error_code: 'LOAD', error_message: 'Access Denied', allows_response: false } }
-            end
-        }
-      }
-    end
-    if mocked_secrets_file
-      expect(mocked_savon_client).to receive(:call).with(
-        :download_file_attachment_by_item_id,
-        message: {
-          token: 'soap_token',
-          secretId: secret_id,
-          secretItemId: '4242'
-        }
-      ) do
-        {
-          download_file_attachment_by_item_id_response: {
-            download_file_attachment_by_item_id_result: {
-              file_attachment: Base64.encode64(mocked_secrets_file)
-            }
-          }
-        }
-      end
-    end
-    ENV['hpc_domain_for_thycotic'] = 'thycotic_auth_domain'
-  end
-
-  it 'gets secrets from a file' do
-    with_test_platform_for_deployer_options do |repository|
-      secrets_file = "#{repository}/my_secrets.json"
-      File.write(secrets_file, '{ "secret_name": "secret_value" }')
-      expect(test_deployer).to receive(:deploy_on).with(['node']) do
-        expect(test_deployer.secrets).to eq [{ 'secret_name' => 'secret_value' }]
-        {}
-      end
-      exit_code, stdout, stderr = run 'deploy', '--node', 'node', '--secrets', secrets_file
-      expect(exit_code).to eq 0
-      expect(stderr).to eq ''
-    end
-  end
-
-  it 'gets secrets from several files' do
-    with_test_platform_for_deployer_options do |repository|
-      secrets_file1 = "#{repository}/my_secrets1.json"
-      File.write(secrets_file1, '{ "secret1": "value1" }')
-      secrets_file2 = "#{repository}/my_secrets2.json"
-      File.write(secrets_file2, '{ "secret2": "value2" }')
-      expect(test_deployer).to receive(:deploy_on).with(['node']) do
-        expect(test_deployer.secrets).to eq [{ 'secret1' => 'value1' }, { 'secret2' => 'value2' }]
-        {}
-      end
-      exit_code, stdout, stderr = run 'deploy', '--node', 'node', '--secrets', secrets_file1, '--secrets', secrets_file2
-      expect(exit_code).to eq 0
-      expect(stderr).to eq ''
-    end
-  end
-
-  it 'fails to get secrets from a missing file' do
-    with_test_platform_for_deployer_options do
-      expect do
-        run 'deploy', '--node', 'node', '--secrets', 'unknown_file.json'
-      end.to raise_error 'Missing secret file: unknown_file.json'
-    end
-  end
-
-  it 'gets secrets from a Thycotic Secret Server' do
-    with_test_platform_for_deployer_options do
-      expect(test_deployer).to receive(:deploy_on).with(['node']) do
-        expect(test_deployer.secrets).to eq [{ 'secret_name' => 'secret_value' }]
-        {}
-      end
-      mock_thycotic_file_download_on('https://my_thycotic.domain.com/SecretServer', '1107', '{ "secret_name": "secret_value" }')
-      exit_code, stdout, stderr = run 'deploy', '--node', 'node', '--secrets', 'https://my_thycotic.domain.com/SecretServer:1107'
-      expect(exit_code).to eq 0
-      expect(stderr).to eq ''
-    end
-  end
-
-  it 'gets secrets from a Thycotic Secret Server using env variables' do
-    with_test_platform_for_deployer_options do
-      expect(test_deployer).to receive(:deploy_on).with(['node']) do
-        expect(test_deployer.secrets).to eq [{ 'secret_name' => 'secret_value' }]
-        {}
-      end
-      mock_thycotic_file_download_on(
-        'https://my_thycotic.domain.com/SecretServer',
-        '1107',
-        '{ "secret_name": "secret_value" }',
-        user: 'thycotic_user_from_env',
-        password: 'thycotic_password_from_env'
-      )
-      ENV['hpc_user_for_thycotic'] = 'thycotic_user_from_env'
-      ENV['hpc_password_for_thycotic'] = 'thycotic_password_from_env'
-      exit_code, stdout, stderr = run 'deploy', '--node', 'node', '--secrets', 'https://my_thycotic.domain.com/SecretServer:1107'
-      expect(exit_code).to eq 0
-      expect(stderr).to eq ''
-    end
-  end
-
-  it 'gets secrets from several Thycotic Secret Servers and files' do
-    with_test_platform_for_deployer_options do |repository|
-      secrets_file1 = "#{repository}/my_secrets1.json"
-      File.write(secrets_file1, '{ "secret1": "value1" }')
-      secrets_file3 = "#{repository}/my_secrets3.json"
-      File.write(secrets_file3, '{ "secret3": "value3" }')
-      expect(test_deployer).to receive(:deploy_on).with(['node']) do
-        expect(test_deployer.secrets).to eq [
-          { 'secret1' => 'value1' },
-          { 'secret2' => 'value2' },
-          { 'secret3' => 'value3' },
-          { 'secret4' => 'value4' }
-        ]
-        {}
-      end
-      mock_thycotic_file_download_on('https://my_thycotic2.domain.com/SecretServer', '110702', '{ "secret2": "value2" }')
-      mock_thycotic_file_download_on('https://my_thycotic4.domain.com/SecretServer', '110704', '{ "secret4": "value4" }')
-      exit_code, stdout, stderr = run 'deploy', '--node', 'node',
-        '--secrets', secrets_file1,
-        '--secrets', 'https://my_thycotic2.domain.com/SecretServer:110702',
-        '--secrets', secrets_file3,
-        '--secrets', 'https://my_thycotic4.domain.com/SecretServer:110704'
-      expect(exit_code).to eq 0
-      expect(stderr).to eq ''
-    end
-  end
-
-  it 'fails to get secrets from a missing Thycotic Secret Server' do
-    with_test_platform_for_deployer_options do
-      mock_thycotic_file_download_on('https://my_thycotic.domain.com/SecretServer', '1107', nil)
-      expect do
-        run 'deploy', '--node', 'node', '--secrets', 'https://my_thycotic.domain.com/SecretServer:1107'
-      end.to raise_error 'Unable to fetch secret file ID https://my_thycotic.domain.com/SecretServer:1107'
-    end
-  end
-
   it 'uses parallel mode' do
     with_test_platform_for_deployer_options do |repository|
       expect(test_deployer).to receive(:deploy_on).with(['node']) do