hybrid_platforms_conductor 33.0.0 → 33.0.1

data/spec/hybrid_platforms_conductor_test/api/reports_handler_spec.rb

@@ -5,7 +5,7 @@ describe HybridPlatformsConductor::ReportsHandler do
   # Parameters::
   # * Proc: Code called when platform is setup
   def with_test_platform_for_reports_test
-    with_test_platform(nodes: { 'node1' => {}, 'node2' => {}, 'node3' => {} }) do
+    with_test_platform({ nodes: { 'node1' => {}, 'node2' => {}, 'node3' => {} } }) do
       register_report_plugins(test_reports_handler, report: HybridPlatformsConductorTest::ReportPlugin)
       test_reports_handler.format = :report
       yield
@@ -37,7 +37,7 @@ describe HybridPlatformsConductor::ReportsHandler do
   it 'fails when delivering a simple report with an unknown locale' do
     with_test_platform_for_reports_test do
       test_reports_handler.locale = :de
-      expect { test_reports_handler.produce_report_for([{ all: true }])}.to raise_error(RuntimeError, 'Unknown locale for format report: de')
+      expect { test_reports_handler.produce_report_for([{ all: true }]) }.to raise_error(RuntimeError, 'Unknown locale for format report: de')
     end
   end
 

data/spec/hybrid_platforms_conductor_test/api/services_handler/actions_to_deploy_spec.rb

@@ -1,6 +1,6 @@
 describe HybridPlatformsConductor::ServicesHandler do
 
-  context 'checking actions to deploy services on a node' do
+  context 'when checking actions to deploy services on a node' do
 
     # Expect actions for a deployment to match a given list
     #
@@ -14,103 +14,135 @@ describe HybridPlatformsConductor::ServicesHandler do
     #   * *platform* (String): Platform that should be used to deploy this service [default: 'platform']
     #   * *check* (Boolean): Should the action be deployed in check mode? [default: false]
     def expect_deploy_actions(node, services, check, expected_deploys)
-        actions = test_services_handler.actions_to_deploy_on(node, services, check)
-        expect(actions.size).to eq expected_deploys.size * 3
-        actions.each_slice(3).zip(expected_deploys) do |((marker_begin, action, marker_end), expected_deploy)|
-          # Check that we log the begin marker before deploying the service
-          expect(marker_begin.keys).to eq [:ruby]
-          stdout_begin = StringIO.new
-          stderr_begin = StringIO.new
-          marker_begin[:ruby].call(stdout_begin, stderr_begin)
-          expect(stdout_begin.string.strip).to eq "===== [ #{expected_deploy[:node]} / #{expected_deploy[:service]} ] - HPC Service #{expected_deploy[:check] ? 'Check' : 'Deploy' } ===== Begin"
-          expect(stderr_begin.string.strip).to eq "===== [ #{expected_deploy[:node]} / #{expected_deploy[:service]} ] - HPC Service #{expected_deploy[:check] ? 'Check' : 'Deploy' } ===== Begin"
-          # Check that the service is deployed according to our mocked PlatformHandler
-          expect(action).to eq(bash: "echo \"#{expected_deploy[:check] ? 'Checking' : 'Deploying'} #{expected_deploy[:service]} (#{expected_deploy[:platform] || 'platform'}) on #{expected_deploy[:node]}\"")
-          # Check that we log the end marker after deploying the service
-          stdout_end = StringIO.new
-          stderr_end = StringIO.new
-          marker_end[:ruby].call(stdout_end, stderr_end)
-          expect(stdout_end.string.strip).to eq "===== [ #{expected_deploy[:node]} / #{expected_deploy[:service]} ] - HPC Service #{expected_deploy[:check] ? 'Check' : 'Deploy' } ===== End"
-          expect(stderr_end.string.strip).to eq "===== [ #{expected_deploy[:node]} / #{expected_deploy[:service]} ] - HPC Service #{expected_deploy[:check] ? 'Check' : 'Deploy' } ===== End"
-        end
+      actions = test_services_handler.actions_to_deploy_on(node, services, check)
+      expect(actions.size).to eq expected_deploys.size * 3
+      actions.each_slice(3).zip(expected_deploys) do |((marker_begin, action, marker_end), expected_deploy)|
+        # Check that we log the begin marker before deploying the service
+        expect(marker_begin.keys).to eq [:ruby]
+        stdout_begin = StringIO.new
+        stderr_begin = StringIO.new
+        marker_begin[:ruby].call(stdout_begin, stderr_begin)
+        expect(stdout_begin.string.strip).to eq "===== [ #{expected_deploy[:node]} / #{expected_deploy[:service]} ] - HPC Service #{expected_deploy[:check] ? 'Check' : 'Deploy'} ===== Begin"
+        expect(stderr_begin.string.strip).to eq "===== [ #{expected_deploy[:node]} / #{expected_deploy[:service]} ] - HPC Service #{expected_deploy[:check] ? 'Check' : 'Deploy'} ===== Begin"
+        # Check that the service is deployed according to our mocked PlatformHandler
+        expect(action).to eq(bash: "echo \"#{expected_deploy[:check] ? 'Checking' : 'Deploying'} #{expected_deploy[:service]} (#{expected_deploy[:platform] || 'platform'}) on #{expected_deploy[:node]}\"")
+        # Check that we log the end marker after deploying the service
+        stdout_end = StringIO.new
+        stderr_end = StringIO.new
+        marker_end[:ruby].call(stdout_end, stderr_end)
+        expect(stdout_end.string.strip).to eq "===== [ #{expected_deploy[:node]} / #{expected_deploy[:service]} ] - HPC Service #{expected_deploy[:check] ? 'Check' : 'Deploy'} ===== End"
+        expect(stderr_end.string.strip).to eq "===== [ #{expected_deploy[:node]} / #{expected_deploy[:service]} ] - HPC Service #{expected_deploy[:check] ? 'Check' : 'Deploy'} ===== End"
+      end
     end
 
     it 'deploys a service' do
       with_test_platform(
-        nodes: { 'node' => { services: %w[service1] } },
-        deployable_services: %w[service1]
+        {
+          nodes: { 'node' => { services: %w[service1] } },
+          deployable_services: %w[service1]
+        }
       ) do
-        expect_deploy_actions('node', %w[service1], false, [
-          { node: 'node', service: 'service1' }
-        ])
+        expect_deploy_actions(
+          'node', %w[service1], false,
+          [
+            { node: 'node', service: 'service1' }
+          ]
+        )
       end
     end
 
     it 'deploys a service in why-run mode' do
       with_test_platform(
-        nodes: { 'node' => { services: %w[service1] } },
-        deployable_services: %w[service1]
+        {
+          nodes: { 'node' => { services: %w[service1] } },
+          deployable_services: %w[service1]
+        }
       ) do
-        expect_deploy_actions('node', %w[service1], true, [
-          { node: 'node', service: 'service1', check: true }
-        ])
+        expect_deploy_actions(
+          'node', %w[service1], true,
+          [
+            { node: 'node', service: 'service1', check: true }
+          ]
+        )
       end
     end
 
     it 'deploys several services' do
       with_test_platform(
-        nodes: { 'node' => { services: %w[service1 service2] } },
-        deployable_services: %w[service1 service2]
+        {
+          nodes: { 'node' => { services: %w[service1 service2] } },
+          deployable_services: %w[service1 service2]
+        }
       ) do
-        expect_deploy_actions('node', %w[service1 service2], false, [
-          { node: 'node', service: 'service1' },
-          { node: 'node', service: 'service2' }
-        ])
+        expect_deploy_actions(
+          'node', %w[service1 service2], false,
+          [
+            { node: 'node', service: 'service1' },
+            { node: 'node', service: 'service2' }
+          ]
+        )
       end
     end
 
     it 'deploys several services from different platforms' do
       with_test_platforms(
-        'platform1' => { nodes: { 'node' => { services: %w[service1 service2] } }, deployable_services: %w[service1] },
-        'platform2' => { nodes: {}, deployable_services: %w[service2] }
+        {
+          'platform1' => { nodes: { 'node' => { services: %w[service1 service2] } }, deployable_services: %w[service1] },
+          'platform2' => { nodes: {}, deployable_services: %w[service2] }
+        }
       ) do
-        expect_deploy_actions('node', %w[service1 service2], false, [
-          { node: 'node', service: 'service1', platform: 'platform1' },
-          { node: 'node', service: 'service2', platform: 'platform2' }
-        ])
+        expect_deploy_actions(
+          'node', %w[service1 service2], false,
+          [
+            { node: 'node', service: 'service1', platform: 'platform1' },
+            { node: 'node', service: 'service2', platform: 'platform2' }
+          ]
+        )
       end
     end
 
     it 'deploys several services from different platforms in the correct order' do
       with_test_platforms(
-        'platform1' => { nodes: { 'node' => { services: %w[service1 service2 service3 service4] } }, deployable_services: %w[service1] },
-        'platform2' => { nodes: {}, deployable_services: %w[service2 service3] },
-        'platform3' => { nodes: {}, deployable_services: %w[service4] }
+        {
+          'platform1' => { nodes: { 'node' => { services: %w[service1 service2 service3 service4] } }, deployable_services: %w[service1] },
+          'platform2' => { nodes: {}, deployable_services: %w[service2 service3] },
+          'platform3' => { nodes: {}, deployable_services: %w[service4] }
+        }
       ) do
-        expect_deploy_actions('node', %w[service3 service1 service4 service2], false, [
-          { node: 'node', service: 'service3', platform: 'platform2' },
-          { node: 'node', service: 'service1', platform: 'platform1' },
-          { node: 'node', service: 'service4', platform: 'platform3' },
-          { node: 'node', service: 'service2', platform: 'platform2' }
-        ])
+        expect_deploy_actions(
+          'node', %w[service3 service1 service4 service2], false,
+          [
+            { node: 'node', service: 'service3', platform: 'platform2' },
+            { node: 'node', service: 'service1', platform: 'platform1' },
+            { node: 'node', service: 'service4', platform: 'platform3' },
+            { node: 'node', service: 'service2', platform: 'platform2' }
+          ]
+        )
       end
     end
 
     it 'deploys only required services' do
       with_test_platform(
-        nodes: { 'node' => { services: %w[service1 service2] } },
-        deployable_services: %w[service1 service2]
+        {
+          nodes: { 'node' => { services: %w[service1 service2] } },
+          deployable_services: %w[service1 service2]
+        }
       ) do
-        expect_deploy_actions('node', %w[service2], false, [
-          { node: 'node', service: 'service2' }
-        ])
+        expect_deploy_actions(
+          'node', %w[service2], false,
+          [
+            { node: 'node', service: 'service2' }
+          ]
+        )
       end
     end
 
     it 'fails if a service can\'t be deployed' do
       with_test_platform(
-        nodes: { 'node' => { services: %w[service1 service2] } },
-        deployable_services: %w[service1]
+        {
+          nodes: { 'node' => { services: %w[service1 service2] } },
+          deployable_services: %w[service1]
+        }
       ) do
         expect { test_services_handler.actions_to_deploy_on('node', %w[service2], false) }.to raise_error 'No platform is able to deploy the service service2'
       end

data/spec/hybrid_platforms_conductor_test/api/services_handler/deploy_allowed_spec.rb

@@ -1,23 +1,22 @@
 describe HybridPlatformsConductor::ServicesHandler do
 
-  context 'checking deployment authorization' do
+  context 'when checking deployment authorization' do
 
     # Setup a test platform for our services testing
     #
     # Parameters::
-    # * Proc: Code called when platform is setup
+    # * *block* (Proc): Code called when platform is setup
     #   * Parameters::
     #     * *repository* (String): Platform repository path
-    def with_test_platform_for_services_test
+    def with_test_platform_for_services_test(&block)
       with_test_platform(
         {
           nodes: { 'node1' => { services: %w[service1] }, 'node2' => {}, 'node3' => {} },
           deployable_services: %w[service1]
         },
-        true
-      ) do |repository|
-        yield repository
-      end
+        as_git: true,
+        &block
+      )
     end
 
     # Create a commit on branch and check it out
@@ -35,23 +34,25 @@ describe HybridPlatformsConductor::ServicesHandler do
     it 'allows deployment in local environment' do
       with_test_platform_for_services_test do
         with_cmd_runner_mocked([]) do
-          expect(test_services_handler.deploy_allowed?(services: { 'node1' => %w[service1] }, secrets: {}, local_environment: true)).to eq nil
+          expect(test_services_handler.deploy_allowed?(services: { 'node1' => %w[service1] }, local_environment: true)).to eq nil
         end
       end
     end
 
     it 'allows deployment if branch is on master' do
       with_test_platform_for_services_test do
-        expect(test_services_handler.deploy_allowed?(services: { 'node1' => %w[service1] }, secrets: {}, local_environment: false)).to eq nil
+        expect(test_services_handler.deploy_allowed?(services: { 'node1' => %w[service1] }, local_environment: false)).to eq nil
       end
     end
 
     it 'allows deployment if it is not a git repository' do
       with_test_platform(
-        nodes: { 'node1' => { services: %w[service1] }, 'node2' => {}, 'node3' => {} },
-        deployable_services: %w[service1]
+        {
+          nodes: { 'node1' => { services: %w[service1] }, 'node2' => {}, 'node3' => {} },
+          deployable_services: %w[service1]
+        }
       ) do
-        expect(test_services_handler.deploy_allowed?(services: { 'node1' => %w[service1] }, secrets: {}, local_environment: false)).to eq nil
+        expect(test_services_handler.deploy_allowed?(services: { 'node1' => %w[service1] }, local_environment: false)).to eq nil
       end
     end
 
@@ -61,7 +62,7 @@ describe HybridPlatformsConductor::ServicesHandler do
           git = Git.open(repository)
           git.add_remote('another_remote', remote_repo).fetch
           git.checkout('remotes/another_remote/master')
-          expect(test_services_handler.deploy_allowed?(services: { 'node1' => %w[service1] }, secrets: {}, local_environment: false)).to eq nil
+          expect(test_services_handler.deploy_allowed?(services: { 'node1' => %w[service1] }, local_environment: false)).to eq nil
         end
       end
     end
@@ -69,14 +70,14 @@ describe HybridPlatformsConductor::ServicesHandler do
     it 'allows deployment if branch is on master even if not checked-out' do
       with_test_platform_for_services_test do |repository|
         Git.open(repository).branch('other_branch').checkout
-        expect(test_services_handler.deploy_allowed?(services: { 'node1' => %w[service1] }, secrets: {}, local_environment: false)).to eq nil
+        expect(test_services_handler.deploy_allowed?(services: { 'node1' => %w[service1] }, local_environment: false)).to eq nil
       end
     end
 
     it 'refuses deployment if branch is not master' do
       with_test_platform_for_services_test do |repository|
         checkout_non_master_on(repository)
-        expect(test_services_handler.deploy_allowed?(services: { 'node1' => %w[service1] }, secrets: {}, local_environment: false)).to eq "The following platforms have not checked out master: #{repository}. Only master should be deployed in production."
+        expect(test_services_handler.deploy_allowed?(services: { 'node1' => %w[service1] }, local_environment: false)).to eq "The following platforms have not checked out master: #{repository}. Only master should be deployed in production."
       end
     end
 
@@ -87,13 +88,14 @@ describe HybridPlatformsConductor::ServicesHandler do
           'platform2' => { nodes: { 'node2' => { services: %w[service2] } }, deployable_services: %w[service2] },
           'platform3' => { nodes: { 'node3' => { services: %w[service3] } }, deployable_services: %w[service3] }
         },
-        true
-      ) do |repositories|
-        expect(test_services_handler.deploy_allowed?(
-          services: { 'node1' => %w[service1], 'node2' => %w[service2], 'node3' => %w[service3] },
-          secrets: {},
-          local_environment: false
-        )).to eq nil
+        as_git: true
+      ) do
+        expect(
+          test_services_handler.deploy_allowed?(
+            services: { 'node1' => %w[service1], 'node2' => %w[service2], 'node3' => %w[service3] },
+            local_environment: false
+          )
+        ).to eq nil
       end
     end
 
@@ -105,15 +107,16 @@ describe HybridPlatformsConductor::ServicesHandler do
           'platform3' => { nodes: { 'node3' => { services: %w[service3] } }, deployable_services: %w[service3] },
           'platform4' => { nodes: { 'node4' => { services: %w[service4] } }, deployable_services: %w[service4] }
         },
-        true
+        as_git: true
       ) do |repositories|
         checkout_non_master_on(repositories['platform2'])
         checkout_non_master_on(repositories['platform4'])
-        expect(test_services_handler.deploy_allowed?(
-          services: { 'node1' => %w[service1], 'node2' => %w[service2], 'node3' => %w[service3], 'node4' => %w[service4] },
-          secrets: {},
-          local_environment: false
-        )).to eq "The following platforms have not checked out master: #{repositories['platform2']}, #{repositories['platform4']}. Only master should be deployed in production."
+        expect(
+          test_services_handler.deploy_allowed?(
+            services: { 'node1' => %w[service1], 'node2' => %w[service2], 'node3' => %w[service3], 'node4' => %w[service4] },
+            local_environment: false
+          )
+        ).to eq "The following platforms have not checked out master: #{repositories['platform2']}, #{repositories['platform4']}. Only master should be deployed in production."
       end
     end
 
@@ -125,15 +128,16 @@ describe HybridPlatformsConductor::ServicesHandler do
           'platform3' => { nodes: { 'node3' => { services: %w[service3] } }, deployable_services: %w[service3] },
           'platform4' => { nodes: { 'node4' => { services: %w[service4] } }, deployable_services: %w[service4] }
         },
-        true
+        as_git: true
       ) do |repositories|
         checkout_non_master_on(repositories['platform2'])
         checkout_non_master_on(repositories['platform4'])
-        expect(test_services_handler.deploy_allowed?(
-          services: { 'node1' => %w[service1 service3] },
-          secrets: {},
-          local_environment: false
-        )).to eq nil
+        expect(
+          test_services_handler.deploy_allowed?(
+            services: { 'node1' => %w[service1 service3] },
+            local_environment: false
+          )
+        ).to eq nil
       end
     end
 

data/spec/hybrid_platforms_conductor_test/api/services_handler/log_info_spec.rb

@@ -1,11 +1,13 @@
 describe HybridPlatformsConductor::ServicesHandler do
 
-  context 'checking logs associated to a deployment' do
+  context 'when checking logs associated to a deployment' do
 
     it 'logs platforms info' do
       with_test_platform(
-        nodes: { 'node' => { services: %w[service1] } },
-        deployable_services: %w[service1]
+        {
+          nodes: { 'node' => { services: %w[service1] } },
+          deployable_services: %w[service1]
+        }
       ) do
         expect(test_services_handler.log_info_for('node', %w[service1])).to eq(
           repo_name_0: 'platform'
@@ -19,7 +21,7 @@ describe HybridPlatformsConductor::ServicesHandler do
           nodes: { 'node' => { services: %w[service1] } },
           deployable_services: %w[service1]
         },
-        true
+        as_git: true
       ) do |repository|
         expect(test_services_handler.log_info_for('node', %w[service1])).to eq(
           commit_id_0: Git.open(repository).log.first.sha,
@@ -36,7 +38,7 @@ describe HybridPlatformsConductor::ServicesHandler do
           nodes: { 'node' => { services: %w[service1] } },
           deployable_services: %w[service1]
         },
-        true
+        as_git: true
       ) do |repository|
         FileUtils.touch "#{repository}/new_file"
         expect(test_services_handler.log_info_for('node', %w[service1])).to eq(
@@ -53,9 +55,9 @@ describe HybridPlatformsConductor::ServicesHandler do
         {
           'platform1' => { nodes: { 'node' => { services: %w[service1 service2 service3] } }, deployable_services: %w[service1] },
           'platform2' => { nodes: {}, deployable_services: %w[service2] },
-          'platform3' => { nodes: {}, deployable_services: %w[service3] },
+          'platform3' => { nodes: {}, deployable_services: %w[service3] }
         },
-        true
+        as_git: true
       ) do |repositories|
         expect(test_services_handler.log_info_for('node', %w[service1 service2 service3])).to eq(
           commit_id_0: Git.open(repositories['platform1']).log.first.sha,
@@ -79,9 +81,9 @@ describe HybridPlatformsConductor::ServicesHandler do
         {
           'platform1' => { nodes: { 'node' => { services: %w[service1 service2 service3] } }, deployable_services: %w[service1] },
           'platform2' => { nodes: {}, deployable_services: %w[service2] },
-          'platform3' => { nodes: {}, deployable_services: %w[service3] },
+          'platform3' => { nodes: {}, deployable_services: %w[service3] }
         },
-        true
+        as_git: true
       ) do |repositories|
         expect(test_services_handler.log_info_for('node', %w[service1 service3])).to eq(
           commit_id_0: Git.open(repositories['platform1']).log.first.sha,

data/spec/hybrid_platforms_conductor_test/api/services_handler/package_spec.rb

@@ -1,16 +1,18 @@
 describe HybridPlatformsConductor::ServicesHandler do
 
-  context 'checking packaging' do
+  context 'when checking packaging' do
 
     it 'packages 1 platform' do
       with_test_platform(
-        nodes: { 'node1' => { services: %w[service1] }, 'node2' => {}, 'node3' => {} },
-        deployable_services: %w[service1],
-        package: proc do |services:, secrets:, local_environment:|
-          expect(services).to eq('node1' => %w[service1])
-          expect(secrets).to eq({})
-          expect(local_environment).to eq false
-        end
+        {
+          nodes: { 'node1' => { services: %w[service1] }, 'node2' => {}, 'node3' => {} },
+          deployable_services: %w[service1],
+          package: proc do |services:, secrets:, local_environment:|
+            expect(services).to eq('node1' => %w[service1])
+            expect(secrets).to eq({})
+            expect(local_environment).to eq false
+          end
+        }
       ) do
         test_services_handler.package(
           services: { 'node1' => %w[service1] },
@@ -23,14 +25,16 @@ describe HybridPlatformsConductor::ServicesHandler do
     it 'packages 1 platform only once' do
       nbr_calls = 0
       with_test_platform(
-        nodes: { 'node1' => { services: %w[service1] }, 'node2' => {}, 'node3' => {} },
-        deployable_services: %w[service1],
-        package: proc do |services:, secrets:, local_environment:|
-          expect(services).to eq('node1' => %w[service1])
-          expect(secrets).to eq({})
-          expect(local_environment).to eq false
-          nbr_calls += 1
-        end
+        {
+          nodes: { 'node1' => { services: %w[service1] }, 'node2' => {}, 'node3' => {} },
+          deployable_services: %w[service1],
+          package: proc do |services:, secrets:, local_environment:|
+            expect(services).to eq('node1' => %w[service1])
+            expect(secrets).to eq({})
+            expect(local_environment).to eq false
+            nbr_calls += 1
+          end
+        }
       ) do
         3.times do
           test_services_handler.package(
@@ -46,21 +50,23 @@ describe HybridPlatformsConductor::ServicesHandler do
     it 'packages 1 platform only once even across different ServicesHandler instances' do
       nbr_calls = 0
       with_test_platform(
-        nodes: { 'node1' => { services: %w[service1] }, 'node2' => {}, 'node3' => {} },
-        deployable_services: %w[service1],
-        package: proc do |services:, secrets:, local_environment:|
-          expect(services).to eq('node1' => %w[service1])
-          expect(secrets).to eq({})
-          expect(local_environment).to eq false
-          nbr_calls += 1
-        end
+        {
+          nodes: { 'node1' => { services: %w[service1] }, 'node2' => {}, 'node3' => {} },
+          deployable_services: %w[service1],
+          package: proc do |services:, secrets:, local_environment:|
+            expect(services).to eq('node1' => %w[service1])
+            expect(secrets).to eq({})
+            expect(local_environment).to eq false
+            nbr_calls += 1
+          end
+        }
       ) do
         test_services_handler.package(
           services: { 'node1' => %w[service1] },
           secrets: {},
           local_environment: false
         )
-        HybridPlatformsConductor::ServicesHandler.new(
+        described_class.new(
           logger: logger,
           logger_stderr: logger,
           config: test_config,
@@ -79,13 +85,15 @@ describe HybridPlatformsConductor::ServicesHandler do
 
     it 'packages 1 platform with secrets' do
       with_test_platform(
-        nodes: { 'node1' => { services: %w[service1] }, 'node2' => {}, 'node3' => {} },
-        deployable_services: %w[service1],
-        package: proc do |services:, secrets:, local_environment:|
-          expect(services).to eq('node1' => %w[service1])
-          expect(secrets).to eq('my_secret' => 'value')
-          expect(local_environment).to eq false
-        end
+        {
+          nodes: { 'node1' => { services: %w[service1] }, 'node2' => {}, 'node3' => {} },
+          deployable_services: %w[service1],
+          package: proc do |services:, secrets:, local_environment:|
+            expect(services).to eq('node1' => %w[service1])
+            expect(secrets).to eq('my_secret' => 'value')
+            expect(local_environment).to eq false
+          end
+        }
       ) do
         test_services_handler.package(
           services: { 'node1' => %w[service1] },
@@ -97,13 +105,15 @@ describe HybridPlatformsConductor::ServicesHandler do
 
     it 'packages 1 platform for a local environment' do
       with_test_platform(
-        nodes: { 'node1' => { services: %w[service1] }, 'node2' => {}, 'node3' => {} },
-        deployable_services: %w[service1],
-        package: proc do |services:, secrets:, local_environment:|
-          expect(services).to eq('node1' => %w[service1])
-          expect(secrets).to eq({})
-          expect(local_environment).to eq true
-        end
+        {
+          nodes: { 'node1' => { services: %w[service1] }, 'node2' => {}, 'node3' => {} },
+          deployable_services: %w[service1],
+          package: proc do |services:, secrets:, local_environment:|
+            expect(services).to eq('node1' => %w[service1])
+            expect(secrets).to eq({})
+            expect(local_environment).to eq true
+          end
+        }
       ) do
         test_services_handler.package(
           services: { 'node1' => %w[service1] },
@@ -120,35 +130,37 @@ describe HybridPlatformsConductor::ServicesHandler do
         'platform3' => 0
       }
       with_test_platforms(
-        'platform1' => {
-          nodes: { 'node1' => { services: %w[service1] } },
-          deployable_services: %w[service1],
-          package: proc do |services:, secrets:, local_environment:|
-            expect(services).to eq('node1' => %w[service1])
-            expect(secrets).to eq({})
-            expect(local_environment).to eq false
-            nbr_calls['platform1'] += 1
-          end
-        },
-        'platform2' => {
-          nodes: { 'node2' => { services: %w[service2] } },
-          deployable_services: %w[service2],
-          package: proc do |services:, secrets:, local_environment:|
-            expect(services).to eq('node2' => %w[service2])
-            expect(secrets).to eq({})
-            expect(local_environment).to eq false
-            nbr_calls['platform2'] += 1
-          end
-        },
-        'platform3' => {
-          nodes: { 'node3' => { services: %w[service3] } },
-          deployable_services: %w[service3],
-          package: proc do |services:, secrets:, local_environment:|
-            expect(services).to eq('node3' => %w[service3])
-            expect(secrets).to eq({})
-            expect(local_environment).to eq false
-            nbr_calls['platform3'] += 1
-          end
+        {
+          'platform1' => {
+            nodes: { 'node1' => { services: %w[service1] } },
+            deployable_services: %w[service1],
+            package: proc do |services:, secrets:, local_environment:|
+              expect(services).to eq('node1' => %w[service1])
+              expect(secrets).to eq({})
+              expect(local_environment).to eq false
+              nbr_calls['platform1'] += 1
+            end
+          },
+          'platform2' => {
+            nodes: { 'node2' => { services: %w[service2] } },
+            deployable_services: %w[service2],
+            package: proc do |services:, secrets:, local_environment:|
+              expect(services).to eq('node2' => %w[service2])
+              expect(secrets).to eq({})
+              expect(local_environment).to eq false
+              nbr_calls['platform2'] += 1
+            end
+          },
+          'platform3' => {
+            nodes: { 'node3' => { services: %w[service3] } },
+            deployable_services: %w[service3],
+            package: proc do |services:, secrets:, local_environment:|
+              expect(services).to eq('node3' => %w[service3])
+              expect(secrets).to eq({})
+              expect(local_environment).to eq false
+              nbr_calls['platform3'] += 1
+            end
+          }
         }
       ) do
         test_services_handler.package(
@@ -171,35 +183,37 @@ describe HybridPlatformsConductor::ServicesHandler do
         'platform3' => 0
       }
       with_test_platforms(
-        'platform1' => {
-          nodes: { 'node1' => { services: %w[service1] } },
-          deployable_services: %w[service1],
-          package: proc do |services:, secrets:, local_environment:|
-            expect(services).to eq('node1' => %w[service1])
-            expect(secrets).to eq({})
-            expect(local_environment).to eq false
-            nbr_calls['platform1'] += 1
-          end
-        },
-        'platform2' => {
-          nodes: { 'node2' => { services: %w[service2] } },
-          deployable_services: %w[service2],
-          package: proc do |services:, secrets:, local_environment:|
-            expect(services).to eq('node2' => %w[service2])
-            expect(secrets).to eq({})
-            expect(local_environment).to eq false
-            nbr_calls['platform2'] += 1
-          end
-        },
-        'platform3' => {
-          nodes: { 'node3' => { services: %w[service3] } },
-          deployable_services: %w[service3],
-          package: proc do |services:, secrets:, local_environment:|
-            expect(services).to eq('node1' => %w[service3])
-            expect(secrets).to eq({})
-            expect(local_environment).to eq false
-            nbr_calls['platform3'] += 1
-          end
+        {
+          'platform1' => {
+            nodes: { 'node1' => { services: %w[service1] } },
+            deployable_services: %w[service1],
+            package: proc do |services:, secrets:, local_environment:|
+              expect(services).to eq('node1' => %w[service1])
+              expect(secrets).to eq({})
+              expect(local_environment).to eq false
+              nbr_calls['platform1'] += 1
+            end
+          },
+          'platform2' => {
+            nodes: { 'node2' => { services: %w[service2] } },
+            deployable_services: %w[service2],
+            package: proc do |services:, secrets:, local_environment:|
+              expect(services).to eq('node2' => %w[service2])
+              expect(secrets).to eq({})
+              expect(local_environment).to eq false
+              nbr_calls['platform2'] += 1
+            end
+          },
+          'platform3' => {
+            nodes: { 'node3' => { services: %w[service3] } },
+            deployable_services: %w[service3],
+            package: proc do |services:, secrets:, local_environment:|
+              expect(services).to eq('node1' => %w[service3])
+              expect(secrets).to eq({})
+              expect(local_environment).to eq false
+              nbr_calls['platform3'] += 1
+            end
+          }
         }
       ) do
         test_services_handler.package(
@@ -222,35 +236,37 @@ describe HybridPlatformsConductor::ServicesHandler do
         'platform3' => 0
       }
       with_test_platforms(
-        'platform1' => {
-          nodes: { 'node' => { services: %w[service1 service2 service3 service4 service5 service6] } },
-          deployable_services: %w[service1 service2],
-          package: proc do |services:, secrets:, local_environment:|
-            expect(services).to eq('node' => %w[service1 service2])
-            expect(secrets).to eq({})
-            expect(local_environment).to eq false
-            nbr_calls['platform1'] += 1
-          end
-        },
-        'platform2' => {
-          nodes: {},
-          deployable_services: %w[service3 service4],
-          package: proc do |services:, secrets:, local_environment:|
-            expect(services).to eq('node' => %w[service3])
-            expect(secrets).to eq({})
-            expect(local_environment).to eq false
-            nbr_calls['platform2'] += 1
-          end
-        },
-        'platform3' => {
-          nodes: {},
-          deployable_services: %w[service5 service6],
-          package: proc do |services:, secrets:, local_environment:|
-            expect(services).to eq('node' => %w[service5 service6])
-            expect(secrets).to eq({})
-            expect(local_environment).to eq false
-            nbr_calls['platform3'] += 1
-          end
+        {
+          'platform1' => {
+            nodes: { 'node' => { services: %w[service1 service2 service3 service4 service5 service6] } },
+            deployable_services: %w[service1 service2],
+            package: proc do |services:, secrets:, local_environment:|
+              expect(services).to eq('node' => %w[service1 service2])
+              expect(secrets).to eq({})
+              expect(local_environment).to eq false
+              nbr_calls['platform1'] += 1
+            end
+          },
+          'platform2' => {
+            nodes: {},
+            deployable_services: %w[service3 service4],
+            package: proc do |services:, secrets:, local_environment:|
+              expect(services).to eq('node' => %w[service3])
+              expect(secrets).to eq({})
+              expect(local_environment).to eq false
+              nbr_calls['platform2'] += 1
+            end
+          },
+          'platform3' => {
+            nodes: {},
+            deployable_services: %w[service5 service6],
+            package: proc do |services:, secrets:, local_environment:|
+              expect(services).to eq('node' => %w[service5 service6])
+              expect(secrets).to eq({})
+              expect(local_environment).to eq false
+              nbr_calls['platform3'] += 1
+            end
+          }
         }
       ) do
         test_services_handler.package(
@@ -273,35 +289,37 @@ describe HybridPlatformsConductor::ServicesHandler do
         'platform3' => 0
       }
       with_test_platforms(
-        'platform1' => {
-          nodes: { 'node1' => { services: %w[service1] } },
-          deployable_services: %w[service1],
-          package: proc do |services:, secrets:, local_environment:|
-            expect(services).to eq('node1' => %w[service1])
-            expect(secrets).to eq({})
-            expect(local_environment).to eq false
-            nbr_calls['platform1'] += 1
-          end
-        },
-        'platform2' => {
-          nodes: { 'node2' => { services: %w[service2] } },
-          deployable_services: %w[service2],
-          package: proc do |services:, secrets:, local_environment:|
-            expect(services).to eq('node2' => %w[service2])
-            expect(secrets).to eq({})
-            expect(local_environment).to eq false
-            nbr_calls['platform2'] += 1
-          end
-        },
-        'platform3' => {
-          nodes: { 'node3' => { services: %w[service3] } },
-          deployable_services: %w[service3],
-          package: proc do |services:, secrets:, local_environment:|
-            expect(services).to eq('node3' => %w[service3])
-            expect(secrets).to eq({})
-            expect(local_environment).to eq false
-            nbr_calls['platform3'] += 1
-          end
+        {
+          'platform1' => {
+            nodes: { 'node1' => { services: %w[service1] } },
+            deployable_services: %w[service1],
+            package: proc do |services:, secrets:, local_environment:|
+              expect(services).to eq('node1' => %w[service1])
+              expect(secrets).to eq({})
+              expect(local_environment).to eq false
+              nbr_calls['platform1'] += 1
+            end
+          },
+          'platform2' => {
+            nodes: { 'node2' => { services: %w[service2] } },
+            deployable_services: %w[service2],
+            package: proc do |services:, secrets:, local_environment:|
+              expect(services).to eq('node2' => %w[service2])
+              expect(secrets).to eq({})
+              expect(local_environment).to eq false
+              nbr_calls['platform2'] += 1
+            end
+          },
+          'platform3' => {
+            nodes: { 'node3' => { services: %w[service3] } },
+            deployable_services: %w[service3],
+            package: proc do |services:, secrets:, local_environment:|
+              expect(services).to eq('node3' => %w[service3])
+              expect(secrets).to eq({})
+              expect(local_environment).to eq false
+              nbr_calls['platform3'] += 1
+            end
+          }
         }
       ) do
         test_services_handler.package(
@@ -331,14 +349,16 @@ describe HybridPlatformsConductor::ServicesHandler do
       nbr_calls = 0
       expected_secrets = {}
       with_test_platform(
-        nodes: { 'node1' => { services: %w[service1] } },
-        deployable_services: %w[service1],
-        package: proc do |services:, secrets:, local_environment:|
-          expect(services).to eq('node1' => %w[service1])
-          expect(secrets).to eq(expected_secrets)
-          expect(local_environment).to eq false
-          nbr_calls += 1
-        end
+        {
+          nodes: { 'node1' => { services: %w[service1] } },
+          deployable_services: %w[service1],
+          package: proc do |services:, secrets:, local_environment:|
+            expect(services).to eq('node1' => %w[service1])
+            expect(secrets).to eq(expected_secrets)
+            expect(local_environment).to eq false
+            nbr_calls += 1
+          end
+        }
       ) do
         test_services_handler.package(
           services: { 'node1' => %w[service1] },
@@ -359,14 +379,16 @@ describe HybridPlatformsConductor::ServicesHandler do
       nbr_calls = 0
       expected_local = false
       with_test_platform(
-        nodes: { 'node1' => { services: %w[service1] } },
-        deployable_services: %w[service1],
-        package: proc do |services:, secrets:, local_environment:|
-          expect(services).to eq('node1' => %w[service1])
-          expect(secrets).to eq({})
-          expect(local_environment).to eq expected_local
-          nbr_calls += 1
-        end
+        {
+          nodes: { 'node1' => { services: %w[service1] } },
+          deployable_services: %w[service1],
+          package: proc do |services:, secrets:, local_environment:|
+            expect(services).to eq('node1' => %w[service1])
+            expect(secrets).to eq({})
+            expect(local_environment).to eq expected_local
+            nbr_calls += 1
+          end
+        }
       ) do
         test_services_handler.package(
           services: { 'node1' => %w[service1] },