hybrid_platforms_conductor 32.17.0 → 33.0.2

data/spec/hybrid_platforms_conductor_test/api/nodes_handler/config_dsl_spec.rb

@@ -1,6 +1,6 @@
 describe HybridPlatformsConductor::NodesHandler do
 
-  context 'checking config DSL' do
+  context 'when checking config DSL' do
 
     it 'adds helpers for master cmdbs' do
       with_test_platform(
@@ -11,30 +11,29 @@ describe HybridPlatformsConductor::NodesHandler do
             'node3' => {}
           }
         },
-        false,
-        '
+        additional_config: <<~'EO_CONFIG'
           master_cmdbs(
-            test_cmdb: :property1,
-            test_cmdb2: :property2
+            test_cmdb: :property_1,
+            test_cmdb_2: :property_2
           )
-          for_nodes(\'node2\') do
-            master_cmdbs(test_cmdb: :property3)
+          for_nodes('node2') do
+            master_cmdbs(test_cmdb: :property_3)
           end
-        '
+        EO_CONFIG
       ) do
-        register_test_cmdb(%i[test_cmdb test_cmdb2])
+        register_test_cmdb(%i[test_cmdb test_cmdb_2])
         expect(test_config.cmdb_masters).to eq [
           {
             nodes_selectors_stack: [],
             cmdb_masters: {
-              test_cmdb: [:property1],
-              test_cmdb2: [:property2]
+              test_cmdb: [:property_1],
+              test_cmdb_2: [:property_2]
             }
           },
           {
             nodes_selectors_stack: ['node2'],
             cmdb_masters: {
-              test_cmdb: [:property3]
+              test_cmdb: [:property_3]
             }
           }
         ]
@@ -50,13 +49,12 @@ describe HybridPlatformsConductor::NodesHandler do
             'node3' => {}
           }
         },
-        false,
-        '
+        additional_config: <<~'EO_CONFIG'
           sudo_for { |user| "alt_sudo1 -p #{user}" }
-          for_nodes(\'node2\') do
+          for_nodes('node2') do
             sudo_for { |user| "alt_sudo2 -q #{user}" }
           end
-        '
+        EO_CONFIG
       ) do
         expect(test_config.sudo_procs.size).to eq 2
         expect(test_config.sudo_procs[0][:nodes_selectors_stack]).to eq []

data/spec/hybrid_platforms_conductor_test/api/nodes_handler/git_diff_impacts_spec.rb

@@ -1,6 +1,6 @@
 describe HybridPlatformsConductor::NodesHandler do
 
-  context 'checking computation of impacted nodes by a git diff' do
+  context 'when checking computation of impacted nodes by a git diff' do
 
     it 'returns all the impacted platform nodes by default' do
       with_test_platforms(
@@ -8,11 +8,11 @@ describe HybridPlatformsConductor::NodesHandler do
           'platform_1' => { nodes: { 'node11' => {}, 'node12' => {} } },
           'platform_2' => { nodes: { 'node21' => {}, 'node22' => {} } }
         },
-        true
+        as_git: true
       ) do
-        with_cmd_runner_mocked([
-          [/cd .+\/platform_2 && git --no-pager diff --no-color master/, proc { [0, '', ''] }]
-        ]) do
+        with_cmd_runner_mocked [
+          [%r{cd .+/platform_2 && git --no-pager diff --no-color master}, proc { [0, '', ''] }]
+        ] do
           expect(test_nodes_handler.impacted_nodes_from_git_diff('platform_2')).to eq [
             %w[node21 node22].sort,
             [],
@@ -24,42 +24,42 @@ describe HybridPlatformsConductor::NodesHandler do
     end
 
     it 'diffs from another commit if asked' do
-      with_test_platform({}, true) do
-        with_cmd_runner_mocked([
-          [/cd .+\/my_remote_platform && git --no-pager diff --no-color from_branch/, proc { [0, '', ''] }]
-        ]) do
+      with_test_platform({}, as_git: true) do
+        with_cmd_runner_mocked [
+          [%r{cd .+/my_remote_platform && git --no-pager diff --no-color from_branch}, proc { [0, '', ''] }]
+        ] do
           expect(test_nodes_handler.impacted_nodes_from_git_diff('my_remote_platform', from_commit: 'from_branch')).to eq [[], [], [], true]
         end
       end
     end
 
     it 'fails when the commit id is invalid' do
-      with_test_platform({}, true) do
-        with_cmd_runner_mocked([
-          [/cd .+\/my_remote_platform && git --no-pager diff --no-color invalid_id/, proc { raise HybridPlatformsConductor::CmdRunner::UnexpectedExitCodeError, 'Mocked git error due to an invalid commit id' }]
-        ]) do
+      with_test_platform({}, as_git: true) do
+        with_cmd_runner_mocked [
+          [%r{cd .+/my_remote_platform && git --no-pager diff --no-color invalid_id}, proc { raise HybridPlatformsConductor::CmdRunner::UnexpectedExitCodeError, 'Mocked git error due to an invalid commit id' }]
+        ] do
           expect { test_nodes_handler.impacted_nodes_from_git_diff('my_remote_platform', from_commit: 'invalid_id') }.to raise_error HybridPlatformsConductor::NodesHandler::GitError, 'Mocked git error due to an invalid commit id'
         end
       end
     end
 
     it 'diffs to another commit if asked' do
-      with_test_platform({}, true) do
-        with_cmd_runner_mocked([
-          [/cd .+\/my_remote_platform && git --no-pager diff --no-color master to_branch/, proc { [0, '', ''] }]
-        ]) do
+      with_test_platform({}, as_git: true) do
+        with_cmd_runner_mocked [
+          [%r{cd .+/my_remote_platform && git --no-pager diff --no-color master to_branch}, proc { [0, '', ''] }]
+        ] do
           expect(test_nodes_handler.impacted_nodes_from_git_diff('my_remote_platform', to_commit: 'to_branch')).to eq [[], [], [], true]
         end
       end
     end
 
     it 'gives the platform handler the correct git diff result' do
-      with_test_platform({}, true) do
-        with_cmd_runner_mocked([
-          [/cd .+\/my_remote_platform && git --no-pager diff --no-color master/, proc do
+      with_test_platform({}, as_git: true) do
+        with_cmd_runner_mocked [
+          [%r{cd .+/my_remote_platform && git --no-pager diff --no-color master}, proc do
             [
               0,
-              <<~EOS,
+              <<~EO_STDOUT,
                 diff --git a/Gemfile b/Gemfile
                 index d65e2a6..cb9a38e 100644
                 --- a/Gemfile
@@ -83,15 +83,15 @@ describe HybridPlatformsConductor::NodesHandler do
                 +        '--nodes-git-impact GIT_IMPACT',
                          nodes_selectors << node
                        end
-              EOS
+              EO_STDOUT
               ''
             ]
           end]
-        ]) do
+        ] do
           expect(test_nodes_handler.impacted_nodes_from_git_diff('my_remote_platform')).to eq [[], [], [], true]
           expect(test_platforms_handler.platform('my_remote_platform').files_diffs).to eq(
             'Gemfile' => {
-              diff: <<~EOS.strip
+              diff: <<~EO_STDOUT.strip
                 index d65e2a6..cb9a38e 100644
                 --- a/Gemfile
                 +++ b/Gemfile
@@ -102,11 +102,11 @@ describe HybridPlatformsConductor::NodesHandler do
                 +
                 +gem 'byebug'
                 
-              EOS
+              EO_STDOUT
             },
             'lib/hybrid_platforms_conductor/nodes_handler.rb' => {
               moved_to: 'lib/stale/hybrid_platforms_conductor/nodes_handler.rb',
-              diff: <<~EOS.strip
+              diff: <<~EO_STDOUT.strip
                 index e8e1778..69a84bd 100644
                 --- a/lib/hybrid_platforms_conductor/nodes_handler.rb
                 +++ b/lib/hybrid_platforms_conductor/nodes_handler.rb
@@ -118,7 +118,7 @@ describe HybridPlatformsConductor::NodesHandler do
                 +        '--nodes-git-impact GIT_IMPACT',
                          nodes_selectors << node
                        end
-              EOS
+              EO_STDOUT
             }
           )
         end
@@ -134,11 +134,11 @@ describe HybridPlatformsConductor::NodesHandler do
             impacted_nodes: %w[node1 node3]
           }
         },
-        true
+        as_git: true
       ) do
-        with_cmd_runner_mocked([
-          [/cd .+\/my_remote_platform && git --no-pager diff --no-color master/, proc { [0, '', ''] }]
-        ]) do
+        with_cmd_runner_mocked [
+          [%r{cd .+/my_remote_platform && git --no-pager diff --no-color master}, proc { [0, '', ''] }]
+        ] do
           expect(test_nodes_handler.impacted_nodes_from_git_diff('my_remote_platform')).to eq [
             %w[node1 node3],
             %w[node1 node3],
@@ -162,11 +162,11 @@ describe HybridPlatformsConductor::NodesHandler do
             impacted_services: %w[service1 service3]
           }
         },
-        true
+        as_git: true
       ) do
-        with_cmd_runner_mocked([
-          [/cd .+\/my_remote_platform && git --no-pager diff --no-color master/, proc { [0, '', ''] }]
-        ]) do
+        with_cmd_runner_mocked [
+          [%r{cd .+/my_remote_platform && git --no-pager diff --no-color master}, proc { [0, '', ''] }]
+        ] do
           expect(test_nodes_handler.impacted_nodes_from_git_diff('my_remote_platform')).to eq [
             %w[node1 node2],
             [],
@@ -190,11 +190,11 @@ describe HybridPlatformsConductor::NodesHandler do
             impacted_global: true
           }
         },
-        true
+        as_git: true
       ) do
-        with_cmd_runner_mocked([
-          [/cd .+\/my_remote_platform && git --no-pager diff --no-color master/, proc { [0, '', ''] }]
-        ]) do
+        with_cmd_runner_mocked [
+          [%r{cd .+/my_remote_platform && git --no-pager diff --no-color master}, proc { [0, '', ''] }]
+        ] do
           expect(test_nodes_handler.impacted_nodes_from_git_diff('my_remote_platform')).to eq [
             %w[node1 node2 node3],
             [],
@@ -205,30 +205,6 @@ describe HybridPlatformsConductor::NodesHandler do
       end
     end
 
-    it 'returns the impacted nodes given by the platform handler' do
-      with_test_platforms(
-        {
-          'other_platform' => { nodes: { 'other_node_1' => {}, 'other_node_2' => {} } },
-          'my_remote_platform' => {
-            nodes: { 'node1' => {}, 'node2' => {}, 'node3' => {} },
-            impacted_nodes: %w[node1 node3]
-          }
-        },
-        true
-      ) do
-        with_cmd_runner_mocked([
-          [/cd .+\/my_remote_platform && git --no-pager diff --no-color master/, proc { [0, '', ''] }]
-        ]) do
-          expect(test_nodes_handler.impacted_nodes_from_git_diff('my_remote_platform')).to eq [
-            %w[node1 node3],
-            %w[node1 node3],
-            [],
-            false
-          ]
-        end
-      end
-    end
-
     it 'returns both impacted services and nodes given by the platform handler' do
       with_test_platforms(
         {
@@ -244,11 +220,11 @@ describe HybridPlatformsConductor::NodesHandler do
             impacted_services: %w[service1 service3]
           }
         },
-        true
+        as_git: true
       ) do
-        with_cmd_runner_mocked([
-          [/cd .+\/my_remote_platform && git --no-pager diff --no-color master/, proc { [0, '', ''] }]
-        ]) do
+        with_cmd_runner_mocked [
+          [%r{cd .+/my_remote_platform && git --no-pager diff --no-color master}, proc { [0, '', ''] }]
+        ] do
           expect(test_nodes_handler.impacted_nodes_from_git_diff('my_remote_platform')).to eq [
             %w[node1 node2 node4],
             %w[node4],
@@ -276,11 +252,11 @@ describe HybridPlatformsConductor::NodesHandler do
             impacted_services: %w[service2 service3]
           }
         },
-        true
+        as_git: true
       ) do
-        with_cmd_runner_mocked([
-          [/cd .+\/my_remote_platform && git --no-pager diff --no-color master/, proc { [0, '', ''] }]
-        ]) do
+        with_cmd_runner_mocked [
+          [%r{cd .+/my_remote_platform && git --no-pager diff --no-color master}, proc { [0, '', ''] }]
+        ] do
           expect(test_nodes_handler.impacted_nodes_from_git_diff('my_remote_platform')).to eq [
             %w[node1 node2 node3 node4 node5 node6],
             [],
@@ -308,11 +284,11 @@ describe HybridPlatformsConductor::NodesHandler do
             impacted_services: %w[service2 service3]
           }
         },
-        true
+        as_git: true
       ) do
-        with_cmd_runner_mocked([
-          [/cd .+\/my_remote_platform && git --no-pager diff --no-color master/, proc { [0, '', ''] }]
-        ]) do
+        with_cmd_runner_mocked [
+          [%r{cd .+/my_remote_platform && git --no-pager diff --no-color master}, proc { [0, '', ''] }]
+        ] do
           expect(test_nodes_handler.impacted_nodes_from_git_diff('my_remote_platform', smallest_set: true)).to eq [
             %w[node1 node2],
             [],

data/spec/hybrid_platforms_conductor_test/api/nodes_handler/nodes_selectors_spec.rb

@@ -1,23 +1,24 @@
 describe HybridPlatformsConductor::NodesHandler do
 
-  context 'checking nodes selection capabilities' do
+  context 'when checking nodes selection capabilities' do
 
     # Set the test environment with a given list of nodes for our tests
     #
     # Parameters::
-    # * Proc: Code called when environment is ready
-    def with_test_platform_for_nodes
+    # * *block* (Proc): Code called when environment is ready
+    def with_test_platform_for_nodes(&block)
       with_test_platforms(
-        'platform1' => {
-          nodes: { 'node1' => {}, 'node2' => { services: ['service1'] }, 'node3' => { services: ['service2'] } },
-          nodes_lists: { 'nodeslist1' => %w[node1 node3], 'nodeslist2' => ['/node[12]/'] }
+        {
+          'platform1' => {
+            nodes: { 'node1' => {}, 'node2' => { services: ['service1'] }, 'node3' => { services: ['service2'] } },
+            nodes_lists: { 'nodeslist1' => %w[node1 node3], 'nodeslist2' => ['/node[12]/'] }
+          },
+          'platform2' => {
+            nodes: { 'node4' => {}, 'node5' => { services: %w[service3 service1] }, 'node6' => {} }
+          }
         },
-        'platform2' => {
-          nodes: { 'node4' => {}, 'node5' => { services: ['service3', 'service1'] }, 'node6' => {} }
-        }
-      ) do
-        yield
-      end
+        &block
+      )
     end
 
     # List all tests of nodes selectors, and the corresponding nodes list they should be resolved into
@@ -50,7 +51,7 @@ describe HybridPlatformsConductor::NodesHandler do
 
     it 'ignore unknown nodes when asked' do
       with_test_platform_for_nodes do
-        expect(test_nodes_handler.select_nodes(['node1', 'node7'], ignore_unknowns: true).sort).to eq %w[node1 node7].sort
+        expect(test_nodes_handler.select_nodes(%w[node1 node7], ignore_unknowns: true).sort).to eq %w[node1 node7].sort
       end
     end
 
@@ -61,7 +62,7 @@ describe HybridPlatformsConductor::NodesHandler do
           from_commit: 'master',
           to_commit: nil,
           smallest_set: false
-        ) { [%w[node4 node6], [], [], false] }
+        ).and_return [%w[node4 node6], [], [], false]
         expect(test_nodes_handler.select_nodes([{ git_diff: { platform: 'platform2' } }]).sort).to eq %w[node4 node6].sort
       end
     end
@@ -73,7 +74,7 @@ describe HybridPlatformsConductor::NodesHandler do
           from_commit: 'from_commit',
           to_commit: nil,
           smallest_set: false
-        ) { [%w[node4 node6], [], [], false] }
+        ).and_return [%w[node4 node6], [], [], false]
         expect(test_nodes_handler.select_nodes([{ git_diff: { platform: 'platform2', from_commit: 'from_commit' } }]).sort).to eq %w[node4 node6].sort
       end
     end
@@ -85,7 +86,7 @@ describe HybridPlatformsConductor::NodesHandler do
           from_commit: 'master',
           to_commit: 'to_commit',
           smallest_set: false
-        ) { [%w[node4 node6], [], [], false] }
+        ).and_return [%w[node4 node6], [], [], false]
         expect(test_nodes_handler.select_nodes([{ git_diff: { platform: 'platform2', to_commit: 'to_commit' } }]).sort).to eq %w[node4 node6].sort
       end
     end
@@ -97,7 +98,7 @@ describe HybridPlatformsConductor::NodesHandler do
           from_commit: 'master',
           to_commit: nil,
           smallest_set: true
-        ) { [%w[node4 node6], [], [], false] }
+        ).and_return [%w[node4 node6], [], [], false]
         expect(test_nodes_handler.select_nodes([{ git_diff: { platform: 'platform2', smallest_set: true } }]).sort).to eq %w[node4 node6].sort
       end
     end
@@ -110,20 +111,28 @@ describe HybridPlatformsConductor::NodesHandler do
 
     it 'considers nodes selector intersection in a nodes selector stack' do
       with_test_platform_for_nodes do
-        expect(test_nodes_handler.select_from_nodes_selector_stack([
-          %w[node1 node2 node3],
-          %w[node2 node3 node4]
-        ]).sort).to eq %w[node2 node3].sort
+        expect(
+          test_nodes_handler.select_from_nodes_selector_stack(
+            [
+              %w[node1 node2 node3],
+              %w[node2 node3 node4]
+            ]
+          ).sort
+        ).to eq %w[node2 node3].sort
       end
     end
 
     it 'considers nodes selector intersection between different kind of selectors in a nodes selector stack' do
       with_test_platform_for_nodes do
-        expect(test_nodes_handler.select_from_nodes_selector_stack([
-          '/node[1256]/',
-          [{ platform: 'platform2' }],
-          [{ service: 'service1' }]
-        ]).sort).to eq %w[node5].sort
+        expect(
+          test_nodes_handler.select_from_nodes_selector_stack(
+            [
+              '/node[1256]/',
+              [{ platform: 'platform2' }],
+              [{ service: 'service1' }]
+            ]
+          ).sort
+        ).to eq %w[node5].sort
       end
     end
 

data/spec/hybrid_platforms_conductor_test/api/nodes_handler/platform_handlers_plugins_api_spec.rb

@@ -1,23 +1,25 @@
 describe HybridPlatformsConductor::NodesHandler do
 
-  context 'checking Platform Handlers plugins\' API called by NodesHandler' do
+  context 'when checking Platform Handlers plugins\' API called by NodesHandler' do
 
     it 'returns nodes' do
-      with_test_platform(nodes: { 'node1' => {}, 'node2' => {} }) do
+      with_test_platform({ nodes: { 'node1' => {}, 'node2' => {} } }) do
         expect(test_nodes_handler.known_nodes.sort).to eq %w[node1 node2].sort
       end
     end
 
     it 'returns nodes lists' do
-      with_test_platform(nodes_lists: { 'test_nodes_list' => [] }) do
+      with_test_platform({ nodes_lists: { 'test_nodes_list' => [] } }) do
         expect(test_nodes_handler.known_nodes_lists).to eq ['test_nodes_list']
       end
     end
 
     it 'returns nodes defined in a nodes lists' do
       with_test_platform(
-        nodes: { 'node1' => {}, 'node2' => {} },
-        nodes_lists: { 'test_nodes_list' => %w[node1 node2] }
+        {
+          nodes: { 'node1' => {}, 'node2' => {} },
+          nodes_lists: { 'test_nodes_list' => %w[node1 node2] }
+        }
       ) do
         expect(test_nodes_handler.nodes_from_list('test_nodes_list').sort).to eq %w[node1 node2].sort
       end
@@ -25,13 +27,15 @@ describe HybridPlatformsConductor::NodesHandler do
 
     it 'returns nodes selectors defined in a nodes lists' do
       with_test_platform(
-        nodes: {
-          'node10' => { services: ['test_service'] },
-          'node11' => { services: ['test_service_2'] },
-          'node20' => { services: ['test_service_3', 'test_service'] },
-          'node21' => { services: ['test_service_2'] }
-        },
-        nodes_lists: { 'test_nodes_list' => ['/node1.+/', { service: 'test_service' }] }
+        {
+          nodes: {
+            'node10' => { services: ['test_service'] },
+            'node11' => { services: ['test_service_2'] },
+            'node20' => { services: %w[test_service_3 test_service] },
+            'node21' => { services: ['test_service_2'] }
+          },
+          nodes_lists: { 'test_nodes_list' => ['/node1.+/', { service: 'test_service' }] }
+        }
       ) do
         expect(test_nodes_handler.nodes_from_list('test_nodes_list').sort).to eq %w[node10 node11 node20].sort
       end
@@ -39,8 +43,10 @@ describe HybridPlatformsConductor::NodesHandler do
 
     it 'returns nodes defined in a nodes lists while ignoring unknown ones' do
       with_test_platform(
-        nodes: { 'node1' => {} },
-        nodes_lists: { 'test_nodes_list' => %w[node1 node2] }
+        {
+          nodes: { 'node1' => {} },
+          nodes_lists: { 'test_nodes_list' => %w[node1 node2] }
+        }
       ) do
         expect(test_nodes_handler.nodes_from_list('test_nodes_list', ignore_unknowns: true).sort).to eq %w[node1 node2].sort
       end
@@ -48,8 +54,10 @@ describe HybridPlatformsConductor::NodesHandler do
 
     it 'fails when returning unknown nodes defined in a nodes lists' do
       with_test_platform(
-        nodes: { 'node1' => {} },
-        nodes_lists: { 'test_nodes_list' => %w[node1 node2] }
+        {
+          nodes: { 'node1' => {} },
+          nodes_lists: { 'test_nodes_list' => %w[node1 node2] }
+        }
       ) do
         expect { test_nodes_handler.nodes_from_list('test_nodes_list') }.to raise_error(RuntimeError, 'Unknown nodes: node2')
       end