hybrid_platforms_conductor 33.3.0 → 33.4.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/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
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hybrid_platforms_conductor
 version: !ruby/object:Gem::Version
-  version: 33.3.0
+  version: 33.4.0
 platform: ruby
 authors:
 - Muriel Salvan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-02 00:00:00.000000000 Z
+date: 2021-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: range_operators
@@ -332,6 +332,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.4'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.11'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.11'
 description: Provides a complete toolset to help DevOps maintain, deploy, monitor
   and test multiple platforms using various technologies
 email:
@@ -718,6 +732,7 @@ files:
 - lib/hybrid_platforms_conductor/current_dir_monitor.rb
 - lib/hybrid_platforms_conductor/deployer.rb
 - lib/hybrid_platforms_conductor/executable.rb
+- lib/hybrid_platforms_conductor/github.rb
 - lib/hybrid_platforms_conductor/hpc_plugins/action/bash.rb
 - lib/hybrid_platforms_conductor/hpc_plugins/action/interactive.rb
 - lib/hybrid_platforms_conductor/hpc_plugins/action/my_action.rb.sample
@@ -842,6 +857,7 @@ files:
 - spec/hybrid_platforms_conductor_test/api/actions_executor/timeout_spec.rb
 - spec/hybrid_platforms_conductor_test/api/cmd_runner_spec.rb
 - spec/hybrid_platforms_conductor_test/api/config_spec.rb
+- spec/hybrid_platforms_conductor_test/api/credentials_spec.rb
 - spec/hybrid_platforms_conductor_test/api/deployer/check_spec.rb
 - spec/hybrid_platforms_conductor_test/api/deployer/config_dsl_spec.rb
 - spec/hybrid_platforms_conductor_test/api/deployer/deploy_spec.rb