hybrid_platforms_conductor 33.3.0 → 33.7.0

data/spec/hybrid_platforms_conductor_test/api/deployer/secrets_reader_plugins/thycotic_spec.rb

@@ -39,9 +39,9 @@ describe HybridPlatformsConductor::Deployer do
         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(test_deployer.instance_variable_get(:@secrets_readers)[:thycotic]).to receive(:with_credentials_for) do |id, resource: nil, &client_code|
             expect(id).to eq :thycotic
-            expect(url).to eq thycotic_url
+            expect(resource).to eq thycotic_url
             client_code.call user, password
           end
         end

data/spec/hybrid_platforms_conductor_test/api/nodes_handler/cmdbs/host_keys_spec.rb

@@ -4,7 +4,7 @@ describe HybridPlatformsConductor::NodesHandler do
 
     it 'makes sure to have hostname or host_ip set to compute host_keys' do
       with_test_platform({}) do
-        expect(cmdb(:host_keys).property_dependencies[:host_keys].sort).to eq %i[hostname host_ip].sort
+        expect(cmdb(:host_keys).property_dependencies[:host_keys].sort).to eq %i[hostname host_ip ssh_port].sort
       end
     end
 
@@ -17,17 +17,27 @@ describe HybridPlatformsConductor::NodesHandler do
     it 'returns host keys when hostname is set' do
       with_test_platform({ nodes: { 'test_node' => {} } }) do
         with_cmd_runner_mocked [
-          ['ssh-keyscan my_host.my_domain', proc { [0, "my_host.my_domain ssh-rsa fake_host_key\n", ''] }]
+          ['ssh-keyscan -p 22 my_host.my_domain', proc { [0, "my_host.my_domain ssh-rsa fake_host_key\n", ''] }]
         ] do
           expect(cmdb(:host_keys).get_host_keys(['test_node'], { 'test_node' => { hostname: 'my_host.my_domain' } })).to eq('test_node' => ['ssh-rsa fake_host_key'])
         end
       end
     end
 
+    it 'returns host keys for the correct ssh port' do
+      with_test_platform({ nodes: { 'test_node' => {} } }) do
+        with_cmd_runner_mocked [
+          ['ssh-keyscan -p 666 my_host.my_domain', proc { [0, "my_host.my_domain ssh-rsa fake_host_key\n", ''] }]
+        ] do
+          expect(cmdb(:host_keys).get_host_keys(['test_node'], { 'test_node' => { hostname: 'my_host.my_domain', ssh_port: 666 } })).to eq('test_node' => ['ssh-rsa fake_host_key'])
+        end
+      end
+    end
+
     it 'returns host keys when host_ip is set' do
       with_test_platform({ nodes: { 'test_node' => {} } }) do
         with_cmd_runner_mocked [
-          ['ssh-keyscan 192.168.42.42', proc { [0, "192.168.42.42 ssh-rsa fake_host_key\n", ''] }]
+          ['ssh-keyscan -p 22 192.168.42.42', proc { [0, "192.168.42.42 ssh-rsa fake_host_key\n", ''] }]
         ] do
           expect(cmdb(:host_keys).get_host_keys(['test_node'], { 'test_node' => { host_ip: '192.168.42.42' } })).to eq('test_node' => ['ssh-rsa fake_host_key'])
         end
@@ -37,7 +47,7 @@ describe HybridPlatformsConductor::NodesHandler do
     it 'returns several host keys' do
       with_test_platform({ nodes: { 'test_node' => {} } }) do
         with_cmd_runner_mocked [
-          ['ssh-keyscan 192.168.42.42', proc do
+          ['ssh-keyscan -p 22 192.168.42.42', proc do
             [0, <<~EO_STDOUT, '']
               192.168.42.42 ssh-rsa fake_host_key_rsa
               192.168.42.42 ssh-ed25519 fake_host_key_ed25519
@@ -55,7 +65,7 @@ describe HybridPlatformsConductor::NodesHandler do
     it 'returns several host keys and ignores comments from ssh-keyscan' do
       with_test_platform({ nodes: { 'test_node' => {} } }) do
         with_cmd_runner_mocked [
-          ['ssh-keyscan 192.168.42.42', proc do
+          ['ssh-keyscan -p 22 192.168.42.42', proc do
             [0, <<~EO_STDOUT, '']
               # That's a comment
               192.168.42.42 ssh-rsa fake_host_key_rsa
@@ -78,7 +88,7 @@ describe HybridPlatformsConductor::NodesHandler do
     it 'returns host keys sorted' do
       with_test_platform({ nodes: { 'test_node' => {} } }) do
         with_cmd_runner_mocked [
-          ['ssh-keyscan 192.168.42.42', proc do
+          ['ssh-keyscan -p 22 192.168.42.42', proc do
             [0, <<~EO_STDOUT, '']
               192.168.42.42 ssh-dsa fake_host_key_dsa
               192.168.42.42 ssh-rsa fake_host_key_rsa
@@ -100,7 +110,7 @@ describe HybridPlatformsConductor::NodesHandler do
     it 'does not return host keys when ssh-keyscan can\'t retrieve them' do
       with_test_platform({ nodes: { 'test_node' => {} } }) do
         with_cmd_runner_mocked [
-          ['ssh-keyscan 192.168.42.42', proc { [0, '', ''] }]
+          ['ssh-keyscan -p 22 192.168.42.42', proc { [0, '', ''] }]
         ] do
           expect(cmdb(:host_keys).get_host_keys(['test_node'], { 'test_node' => { host_ip: '192.168.42.42' } })).to eq({})
         end
@@ -119,9 +129,9 @@ describe HybridPlatformsConductor::NodesHandler do
         }
       ) do
         with_cmd_runner_mocked [
-          ['ssh-keyscan 192.168.42.1', proc { [0, "192.168.42.1 ssh-rsa fake_host_key_1\n", ''] }],
-          ['ssh-keyscan 192.168.42.2', proc { [0, '', ''] }],
-          ['ssh-keyscan my_host_4.my_domain', proc { [0, "my_host_4.my_domain ssh-rsa fake_host_key_4\n", ''] }]
+          ['ssh-keyscan -p 22 192.168.42.1', proc { [0, "192.168.42.1 ssh-rsa fake_host_key_1\n", ''] }],
+          ['ssh-keyscan -p 22 192.168.42.2', proc { [0, '', ''] }],
+          ['ssh-keyscan -p 22 my_host_4.my_domain', proc { [0, "my_host_4.my_domain ssh-rsa fake_host_key_4\n", ''] }]
         ] do
           expect(
             cmdb(:host_keys).get_host_keys(
@@ -141,6 +151,35 @@ describe HybridPlatformsConductor::NodesHandler do
       end
     end
 
+    it 'returns different host keys for hosts having the same IPs but different SSH ports' do
+      with_test_platform(
+        {
+          nodes: {
+            'test_node1' => {},
+            'test_node2' => {}
+          }
+        }
+      ) do
+        with_cmd_runner_mocked [
+          ['ssh-keyscan -p 6661 192.168.42.1', proc { [0, "192.168.42.1 ssh-rsa fake_host_key_1\n", ''] }],
+          ['ssh-keyscan -p 6662 192.168.42.1', proc { [0, "192.168.42.1 ssh-rsa fake_host_key_2\n", ''] }]
+        ] do
+          expect(
+            cmdb(:host_keys).get_host_keys(
+              ['test_node'],
+              {
+                'test_node1' => { host_ip: '192.168.42.1', ssh_port: 6661 },
+                'test_node2' => { host_ip: '192.168.42.1', ssh_port: 6662 }
+              }
+            )
+          ).to eq(
+            'test_node1' => ['ssh-rsa fake_host_key_1'],
+            'test_node2' => ['ssh-rsa fake_host_key_2']
+          )
+        end
+      end
+    end
+
   end
 
 end

data/spec/hybrid_platforms_conductor_test/api/platform_handlers/serverless_chef/services_deployment_spec.rb

@@ -256,6 +256,44 @@ describe HybridPlatformsConductor::HpcPlugins::PlatformHandler::ServerlessChef d
 
     end
 
+    context 'with a platform having 1 local node' do
+
+      it 'returns actions to deploy on this node' do
+        with_serverless_chef_platforms('1_local_node') do |platform, repository|
+          mock_package(repository)
+          platform.prepare_for_deploy(
+            services: { 'node' => %w[test_policy] },
+            secrets: {},
+            local_environment: false,
+            why_run: false
+          )
+          with_cmd_runner_mocked [
+            ['whoami', proc { [0, 'test_user', ''] }]
+          ] do
+            expect(platform.actions_to_deploy_on('node', 'test_policy', use_why_run: false)).to eq expected_actions_to_deploy_chef(repository)
+          end
+        end
+      end
+
+      it 'returns actions to deploy on this node as root' do
+        with_serverless_chef_platforms('1_local_node') do |platform, repository|
+          mock_package(repository)
+          platform.prepare_for_deploy(
+            services: { 'node' => %w[test_policy] },
+            secrets: {},
+            local_environment: false,
+            why_run: false
+          )
+          with_cmd_runner_mocked [
+            ['whoami', proc { [0, 'root', ''] }]
+          ] do
+            expect(platform.actions_to_deploy_on('node', 'test_policy', use_why_run: false)).to eq expected_actions_to_deploy_chef(repository, sudo: '')
+          end
+        end
+      end
+
+    end
+
     context 'with a platform having several nodes' do
 
       it 'deploys services declared on 1 node on another node if asked' do

data/spec/hybrid_platforms_conductor_test/api/tests_runner/test_plugins/bitbucket_conf_spec.rb

@@ -5,8 +5,9 @@ describe HybridPlatformsConductor::TestsRunner do
     context 'with bitbucket_conf' do
 
       it 'iterates over defined Bitbucket repos' do
-        with_repository do
-          platforms = <<~EO_CONFIG
+        with_test_platform(
+          { nodes: { 'node' => {} } },
+          additional_config: <<~EO_CONFIG
             bitbucket_repos(
               url: 'https://my_bb1.my_domain.com',
               project: 'PR1',
@@ -34,73 +35,52 @@ describe HybridPlatformsConductor::TestsRunner do
               }
             )
           EO_CONFIG
-          with_platforms platforms do
-            repos = []
-            test_config.for_each_bitbucket_repo do |bitbucket, repo_info|
-              repos << {
-                bitbucket_url: bitbucket.bitbucket_url,
-                repo_info: repo_info
-              }
-            end
-            expect(repos).to eq [
-              {
-                bitbucket_url: 'https://my_bb1.my_domain.com',
-                repo_info: {
-                  name: 'repo1',
-                  project: 'PR1',
-                  url: 'https://my_bb1.my_domain.com/scm/pr1/repo1.git',
-                  jenkins_ci_url: nil,
-                  checks: {}
-                }
-              },
-              {
-                bitbucket_url: 'https://my_bb1.my_domain.com',
-                repo_info: {
-                  name: 'repo2',
-                  project: 'PR1',
-                  url: 'https://my_bb1.my_domain.com/scm/pr1/repo2.git',
-                  jenkins_ci_url: nil,
-                  checks: {}
-                }
-              },
-              {
-                bitbucket_url: 'https://my_bb2.my_domain.com',
-                repo_info: {
-                  name: 'repo3',
-                  project: 'PR2',
-                  url: 'https://my_bb2.my_domain.com/scm/pr2/repo3.git',
-                  jenkins_ci_url: 'https://my_jenkins.com/job/repo3',
-                  checks: {
-                    branch_permissions: [
-                      {
-                        type: 'fast-forward-only',
-                        branch: 'master',
-                        exempted_users: ['toto']
-                      }
-                    ]
-                  }
-                }
-              },
-              {
-                bitbucket_url: 'https://my_bb2.my_domain.com',
-                repo_info: {
-                  name: 'repo4',
-                  project: 'PR2',
-                  url: 'https://my_bb2.my_domain.com/scm/pr2/repo4.git',
-                  jenkins_ci_url: 'https://my_jenkins.com/job/repo4',
-                  checks: {
-                    branch_permissions: [
-                      {
-                        type: 'fast-forward-only',
-                        branch: 'master',
-                        exempted_users: ['toto']
-                      }
-                    ]
-                  }
-                }
-              }
-            ]
-          end
+        ) do
+          test_tests_runner.tests = [:bitbucket_conf]
+          WebMock.disable_net_connect!
+          stub_request(:get, 'https://my_bb1.my_domain.com/rest/api/1.0/projects/PR1/repos/repo1/settings/pull-requests').to_return(body: {}.to_json)
+          stub_request(:get, 'https://my_bb1.my_domain.com/rest/default-reviewers/1.0/projects/PR1/repos/repo1/conditions').to_return(body: {}.to_json)
+          expect(Git).to receive(:ls_remote).with('https://my_bb1.my_domain.com/scm/pr1/repo1.git').and_return(
+            'branches' => { 'master' => { sha: '12345' } },
+            'tags' => { 'v1.0.0' => { sha: '12345' } }
+          )
+          stub_request(:get, 'https://my_bb1.my_domain.com/rest/api/1.0/projects/PR1/repos/repo2/settings/pull-requests').to_return(body: {}.to_json)
+          stub_request(:get, 'https://my_bb1.my_domain.com/rest/default-reviewers/1.0/projects/PR1/repos/repo2/conditions').to_return(body: {}.to_json)
+          expect(Git).to receive(:ls_remote).with('https://my_bb1.my_domain.com/scm/pr1/repo2.git').and_return(
+            'branches' => { 'master' => { sha: '12345' } },
+            'tags' => { 'v1.0.0' => { sha: '12345' } }
+          )
+          stub_request(:get, 'https://my_bb2.my_domain.com/rest/api/1.0/projects/PR2/repos/repo3/settings/pull-requests').to_return(body: {}.to_json)
+          stub_request(:get, 'https://my_bb2.my_domain.com/rest/default-reviewers/1.0/projects/PR2/repos/repo3/conditions').to_return(body: {}.to_json)
+          stub_request(:get, 'https://my_bb2.my_domain.com/rest/branch-permissions/2.0/projects/PR2/repos/repo3/restrictions').to_return(body: {
+            'values' => [{
+              'type' => 'fast-forward-only',
+              'matcher' => { 'id' => 'refs/heads/master' },
+              'users' => [{ 'name' => 'toto' }],
+              'groups' => [],
+              'accessKeys' => []
+            }]
+          }.to_json)
+          expect(Git).to receive(:ls_remote).with('https://my_bb2.my_domain.com/scm/pr2/repo3.git').and_return(
+            'branches' => { 'master' => { sha: '12345' } },
+            'tags' => { 'v1.0.0' => { sha: '12345' } }
+          )
+          stub_request(:get, 'https://my_bb2.my_domain.com/rest/api/1.0/projects/PR2/repos/repo4/settings/pull-requests').to_return(body: {}.to_json)
+          stub_request(:get, 'https://my_bb2.my_domain.com/rest/default-reviewers/1.0/projects/PR2/repos/repo4/conditions').to_return(body: {}.to_json)
+          stub_request(:get, 'https://my_bb2.my_domain.com/rest/branch-permissions/2.0/projects/PR2/repos/repo4/restrictions').to_return(body: {
+            'values' => [{
+              'type' => 'fast-forward-only',
+              'matcher' => { 'id' => 'refs/heads/master' },
+              'users' => [{ 'name' => 'toto' }],
+              'groups' => [],
+              'accessKeys' => []
+            }]
+          }.to_json)
+          expect(Git).to receive(:ls_remote).with('https://my_bb2.my_domain.com/scm/pr2/repo4.git').and_return(
+            'branches' => { 'master' => { sha: '12345' } },
+            'tags' => { 'v1.0.0' => { sha: '12345' } }
+          )
+          expect(test_tests_runner.run_tests(%w[node])).to eq 0
         end
       end
 

data/spec/hybrid_platforms_conductor_test/api/tests_runner/test_plugins/github_ci_spec.rb

@@ -1,3 +1,5 @@
+require 'octokit'
+
 describe HybridPlatformsConductor::TestsRunner do
 
   context 'when checking test plugins' do
@@ -5,8 +7,9 @@ describe HybridPlatformsConductor::TestsRunner do
     context 'with github_ci' do
 
       it 'iterates over defined Github repos' do
-        with_repository do
-          platforms = <<~EO_CONFIG
+        with_test_platform(
+          { nodes: { 'node' => {} } },
+          additional_config: <<~EO_CONFIG
             github_repos(
               url: 'https://my_gh.my_domain.com',
               user: 'GH-User1',
@@ -23,45 +26,32 @@ describe HybridPlatformsConductor::TestsRunner do
               ]
             )
           EO_CONFIG
-          with_platforms platforms do
-            repos = []
-            test_config.for_each_github_repo do |github, repo_info|
-              repos << {
-                github_url: github.api_endpoint,
-                repo_info: repo_info
-              }
+        ) do
+          ENV['hpc_user_for_github'] = 'test-github-user'
+          ENV['hpc_password_for_github'] = 'GHTestToken'
+          test_tests_runner.tests = [:github_ci]
+          first_time = true
+          expect(Octokit::Client).to receive(:new).with(access_token: 'GHTestToken').twice do
+            mocked_client = instance_double(Octokit::Client)
+            if first_time
+              expect(mocked_client).to receive(:repository_workflow_runs).with('GH-User1/repo1').and_return(
+                workflow_runs: [{ head_branch: 'master', created_at: '2021-12-01 12:45:11', conclusion: 'success' }]
+              )
+              expect(mocked_client).to receive(:repository_workflow_runs).with('GH-User1/repo2').and_return(
+                workflow_runs: [{ head_branch: 'master', created_at: '2021-12-01 12:45:11', conclusion: 'success' }]
+              )
+              first_time = false
+            else
+              expect(mocked_client).to receive(:repository_workflow_runs).with('GH-User2/repo3').and_return(
+                workflow_runs: [{ head_branch: 'master', created_at: '2021-12-01 12:45:11', conclusion: 'success' }]
+              )
+              expect(mocked_client).to receive(:repository_workflow_runs).with('GH-User2/repo4').and_return(
+                workflow_runs: [{ head_branch: 'master', created_at: '2021-12-01 12:45:11', conclusion: 'success' }]
+              )
             end
-            expect(repos).to eq [
-              {
-                github_url: 'https://my_gh.my_domain.com/',
-                repo_info: {
-                  name: 'repo1',
-                  slug: 'GH-User1/repo1'
-                }
-              },
-              {
-                github_url: 'https://my_gh.my_domain.com/',
-                repo_info: {
-                  name: 'repo2',
-                  slug: 'GH-User1/repo2'
-                }
-              },
-              {
-                github_url: 'https://api.github.com/',
-                repo_info: {
-                  name: 'repo3',
-                  slug: 'GH-User2/repo3'
-                }
-              },
-              {
-                github_url: 'https://api.github.com/',
-                repo_info: {
-                  name: 'repo4',
-                  slug: 'GH-User2/repo4'
-                }
-              }
-            ]
+            mocked_client
           end
+          expect(test_tests_runner.run_tests(%w[node])).to eq 0
         end
       end
 

data/spec/hybrid_platforms_conductor_test/helpers/connector_ssh_helpers.rb

@@ -11,6 +11,7 @@ module HybridPlatformsConductorTest
       # * *nodes_connections* (Hash<String, Hash<Symbol,Object> >): Nodes' connections info, per node name:
       #   * *connection* (String): Connection string (fqdn, IP...) used by SSH
       #   * *ip* (String): IP used by SSH (can be different from connection in case of transformed SSH) [default: connection]
+      #   * *port* (Integer): SSH port used [default: 22]
       #   * *user* (String): User used by SSH
       #   * *times* (Integer): Number of times this connection should be used [default: 1]
       #   * *control_master_create_error* (String or nil): Error to simulate during the SSH ControlMaster creation, or nil for none [default: nil]
@@ -37,6 +38,7 @@ module HybridPlatformsConductorTest
       )
         nodes_connections.map do |node, node_connection_info|
           node_connection_info[:times] = 1 unless node_connection_info.key?(:times)
+          node_connection_info[:port] = 22 unless node_connection_info.key?(:port)
           ssh_commands_once = []
           ssh_commands_per_connection = []
           if with_strict_host_key_checking
@@ -44,7 +46,7 @@ module HybridPlatformsConductorTest
             ssh_commands_once.concat(
               [
                 [
-                  "ssh-keyscan #{ip}",
+                  "ssh-keyscan -p #{node_connection_info[:port]} #{ip}",
                   proc { [0, "#{ip} ssh-rsa fake_host_key_for_#{ip}", ''] }
                 ]
               ]
@@ -67,7 +69,7 @@ module HybridPlatformsConductorTest
                 %r{^xterm -e '.+/ssh -o ControlMaster=yes -o ControlPersist=yes hpc\.#{Regexp.escape(node)}'$}
               end,
               proc do
-                control_file = test_actions_executor.connector(:ssh).send(:control_master_file, node_connection_info[:connection], '22', node_connection_info[:user])
+                control_file = test_actions_executor.connector(:ssh).send(:control_master_file, node_connection_info[:connection], node_connection_info[:port].to_s, node_connection_info[:user])
                 # Fail if the ControlMaster file already exists, as would SSH do if the file is stalled
                 if File.exist?(control_file)
                   [255, '', "Control file #{control_file} already exists"]
@@ -97,7 +99,7 @@ module HybridPlatformsConductorTest
               %r{^.+/ssh -O exit hpc\.#{Regexp.escape(node)} 2>&1 \| grep -v 'Exit request sent\.'$},
               proc do
                 # Really mock the control file deletion
-                File.unlink(test_actions_executor.connector(:ssh).send(:control_master_file, node_connection_info[:connection], '22', node_connection_info[:user]))
+                File.unlink(test_actions_executor.connector(:ssh).send(:control_master_file, node_connection_info[:connection], node_connection_info[:port].to_s, node_connection_info[:user]))
                 [1, '', '']
               end,
               { optional: with_control_master_destroy_optional }

data/spec/hybrid_platforms_conductor_test/serverless_chef_repositories/1_local_node/chef_versions.yml

@@ -0,0 +1,3 @@
+---
+workstation: '21.5'
+client: '17.0'

data/spec/hybrid_platforms_conductor_test/serverless_chef_repositories/1_local_node/nodes/node.json

@@ -0,0 +1,15 @@
+{
+  "name": "node",
+  "normal": {
+    "description": "Single test node",
+    "image": "debian_9",
+    "private_ips": ["172.16.0.1"],
+    "local_node": true,
+    "property_1": {
+      "property_11": "value11"
+    },
+    "property_2": "value2"
+  },
+  "policy_name": "test_policy",
+  "policy_group": "test_group"
+}