hybrid_platforms_conductor 32.17.0 → 33.0.2

data/spec/hybrid_platforms_conductor_test/docs_spec.rb

@@ -4,7 +4,7 @@ describe 'Documentation' do
     check_stdout = `bundle exec tools/check_md README.md #{Dir.glob('docs/**/*.md').join(' ')}`.split("\n")
     summary_idx = check_stdout.index { |line| line =~ /^\d+ errors:$/ }
     expect(summary_idx).not_to eq(nil), "Could not parse check output: #{check_stdout.join("\n")}"
-    expect(check_stdout[summary_idx]).to eq('0 errors:'), "Invalid links found: #{check_stdout[summary_idx..-1].join("\n")}"
+    expect(check_stdout[summary_idx]).to eq('0 errors:'), "Invalid links found: #{check_stdout[summary_idx..].join("\n")}"
   end
 
 end

data/spec/hybrid_platforms_conductor_test/executables/{check-node_spec.rb → check_node_spec.rb}

@@ -3,13 +3,11 @@ describe 'check-node executable' do
   # Setup a platform for check-node tests
   #
   # Parameters::
-  # * Proc: Code called when the platform is setup
+  # * *block* (Proc): Code called when the platform is setup
   #   * Parameters::
   #     * *repository* (String): Platform's repository
-  def with_test_platform_for_check_node
-    with_test_platform({ nodes: { 'node' => {} } }) do |repository|
-      yield repository
-    end
+  def with_test_platform_for_check_node(&block)
+    with_test_platform({ nodes: { 'node' => {} } }, &block)
   end
 
   it 'checks a given node' do
@@ -21,7 +19,7 @@ describe 'check-node executable' do
       end
       exit_code, stdout, stderr = run 'check-node', '--node', 'node'
       expect(exit_code).to eq 0
-      expect(stdout).to match /Check ok/
+      expect(stdout).to match(/Check ok/)
       expect(stderr).to eq ''
     end
   end

data/spec/hybrid_platforms_conductor_test/executables/deploy_spec.rb

@@ -3,13 +3,11 @@ describe 'deploy executable' do
   # Setup a platform for deploy tests
   #
   # Parameters::
-  # * Proc: Code called when the platform is setup
+  # * *block* (Proc): Code called when the platform is setup
   #   * Parameters::
   #     * *repository* (String): Platform's repository
-  def with_test_platform_for_deploy
-    with_test_platform({ nodes: { 'node' => {} } }) do |repository|
-      yield repository
-    end
+  def with_test_platform_for_deploy(&block)
+    with_test_platform({ nodes: { 'node' => {} } }, &block)
   end
 
   it 'deploys a given node' do
@@ -21,7 +19,7 @@ describe 'deploy executable' do
       end
       exit_code, stdout, stderr = run 'deploy', '--node', 'node'
       expect(exit_code).to eq 0
-      expect(stdout).to match /Deploy ok/
+      expect(stdout).to match(/Deploy ok/)
       expect(stderr).to eq ''
     end
   end

data/spec/hybrid_platforms_conductor_test/executables/get_impacted_nodes_spec.rb

@@ -3,20 +3,19 @@ describe 'get_impacted_nodes executable' do
   # Setup a platform for get_impacted_nodes tests
   #
   # Parameters::
-  # * Proc: Code called when the platform is setup
+  # * *block* (Proc): Code called when the platform is setup
   #   * Parameters::
   #     * *repository* (String): Platform's repository
-  def with_test_platform_for_get_impacted_nodes
+  def with_test_platform_for_get_impacted_nodes(&block)
     with_test_platform(
       {
         nodes: {
           'node1' => { services: %w[service1] },
           'node2' => { services: %w[service2] }
         }
-      }
-    ) do |repository|
-      yield repository
-    end
+      },
+      &block
+    )
   end
 
   it 'returns nodes impacted by a git diff' do
@@ -26,22 +25,22 @@ describe 'get_impacted_nodes executable' do
         from_commit: 'master',
         to_commit: nil,
         smallest_set: false
-      ) { [%w[node1 node2], %w[node1], %w[service2], false] }
+      ).and_return [%w[node1 node2], %w[node1], %w[service2], false]
       exit_code, stdout, stderr = run 'get_impacted_nodes', '--platform', 'platform'
       expect(exit_code).to eq 0
-      expect(stdout).to eq <<~EOS
-       
-       * 1 impacted services:
-       service2
-       
-       * 1 impacted nodes (directly):
-       node1
-       
-       * 2 impacted nodes (total):
-       node1
-       node2
-
-      EOS
+      expect(stdout).to eq <<~EO_STDOUT
+        
+        * 1 impacted services:
+        service2
+        
+        * 1 impacted nodes (directly):
+        node1
+        
+        * 2 impacted nodes (total):
+        node1
+        node2
+        
+      EO_STDOUT
       expect(stderr).to eq ''
     end
   end
@@ -53,23 +52,23 @@ describe 'get_impacted_nodes executable' do
         from_commit: 'master',
         to_commit: nil,
         smallest_set: false
-      ) { [%w[node1 node2], %w[node1], %w[service2], true] }
+      ).and_return [%w[node1 node2], %w[node1], %w[service2], true]
       exit_code, stdout, stderr = run 'get_impacted_nodes', '--platform', 'platform'
       expect(exit_code).to eq 0
-      expect(stdout).to eq <<~EOS
-       * Potentially all nodes of this platform are impacted.
-       
-       * 1 impacted services:
-       service2
-       
-       * 1 impacted nodes (directly):
-       node1
-       
-       * 2 impacted nodes (total):
-       node1
-       node2
-
-      EOS
+      expect(stdout).to eq <<~EO_STDOUT
+        * Potentially all nodes of this platform are impacted.
+        
+        * 1 impacted services:
+        service2
+        
+        * 1 impacted nodes (directly):
+        node1
+        
+        * 2 impacted nodes (total):
+        node1
+        node2
+        
+      EO_STDOUT
       expect(stderr).to eq ''
     end
   end
@@ -81,22 +80,22 @@ describe 'get_impacted_nodes executable' do
         from_commit: 'from_commit',
         to_commit: nil,
         smallest_set: false
-      ) { [%w[node1 node2], %w[node1], %w[service2], false] }
+      ).and_return [%w[node1 node2], %w[node1], %w[service2], false]
       exit_code, stdout, stderr = run 'get_impacted_nodes', '--platform', 'platform', '--from-commit', 'from_commit'
       expect(exit_code).to eq 0
-      expect(stdout).to eq <<~EOS
-       
-       * 1 impacted services:
-       service2
-       
-       * 1 impacted nodes (directly):
-       node1
-       
-       * 2 impacted nodes (total):
-       node1
-       node2
-
-      EOS
+      expect(stdout).to eq <<~EO_STDOUT
+        
+        * 1 impacted services:
+        service2
+        
+        * 1 impacted nodes (directly):
+        node1
+        
+        * 2 impacted nodes (total):
+        node1
+        node2
+        
+      EO_STDOUT
       expect(stderr).to eq ''
     end
   end
@@ -108,22 +107,22 @@ describe 'get_impacted_nodes executable' do
         from_commit: 'master',
         to_commit: 'to_commit',
         smallest_set: false
-      ) { [%w[node1 node2], %w[node1], %w[service2], false] }
+      ).and_return [%w[node1 node2], %w[node1], %w[service2], false]
       exit_code, stdout, stderr = run 'get_impacted_nodes', '--platform', 'platform', '--to-commit', 'to_commit'
       expect(exit_code).to eq 0
-      expect(stdout).to eq <<~EOS
-       
-       * 1 impacted services:
-       service2
-       
-       * 1 impacted nodes (directly):
-       node1
-       
-       * 2 impacted nodes (total):
-       node1
-       node2
-
-      EOS
+      expect(stdout).to eq <<~EO_STDOUT
+        
+        * 1 impacted services:
+        service2
+        
+        * 1 impacted nodes (directly):
+        node1
+        
+        * 2 impacted nodes (total):
+        node1
+        node2
+        
+      EO_STDOUT
       expect(stderr).to eq ''
     end
   end
@@ -135,22 +134,22 @@ describe 'get_impacted_nodes executable' do
         from_commit: 'master',
         to_commit: nil,
         smallest_set: true
-      ) { [%w[node1 node2], %w[node1], %w[service2], false] }
+      ).and_return [%w[node1 node2], %w[node1], %w[service2], false]
       exit_code, stdout, stderr = run 'get_impacted_nodes', '--platform', 'platform', '--smallest-test-sample'
       expect(exit_code).to eq 0
-      expect(stdout).to eq <<~EOS
-       
-       * 1 impacted services:
-       service2
-       
-       * 1 impacted nodes (directly):
-       node1
-       
-       * 2 impacted nodes (total smallest set):
-       node1
-       node2
-
-      EOS
+      expect(stdout).to eq <<~EO_STDOUT
+        
+        * 1 impacted services:
+        service2
+        
+        * 1 impacted nodes (directly):
+        node1
+        
+        * 2 impacted nodes (total smallest set):
+        node1
+        node2
+        
+      EO_STDOUT
       expect(stderr).to eq ''
     end
   end

data/spec/hybrid_platforms_conductor_test/executables/last_deploys_spec.rb

@@ -3,169 +3,215 @@ describe 'last_deploys executable' do
   # Setup a platform for last_deploys tests
   #
   # Parameters::
-  # * Proc: Code called when the platform is setup
+  # * *block* (Proc): Code called when the platform is setup
   #   * Parameters::
   #     * *repository* (String): Platform's repository
-  def with_test_platform_for_last_deploys
-    with_test_platform({ nodes: { 'node1' => {}, 'node2' => {} } }) do |repository|
-      yield repository
-    end
+  def with_test_platform_for_last_deploys(&block)
+    with_test_platform({ nodes: { 'node1' => {}, 'node2' => {} } }, &block)
   end
 
   it 'checks all nodes by default' do
     with_test_platform_for_last_deploys do
-      expect_actions_executor_runs([proc do |actions, timeout: nil, concurrent: false, log_to_dir: 'run_logs', log_to_stdout: true|
-        expect(actions).to eq(
-          'node1' => { remote_bash: "cd /var/log/deployments && ls -t | head -1 | xargs sed '/===== STDOUT =====/q'" },
-          'node2' => { remote_bash: "cd /var/log/deployments && ls -t | head -1 | xargs sed '/===== STDOUT =====/q'" }
-        )
+      expect(test_deployer).to receive(:deployment_info_from).with(%w[node1 node2]) do
         {
-          'node1' => [0, <<~EOS, ''],
-            date: 2019-08-21 10:12:15
-            user: admin_user1
-            services: service1
-          EOS
-          'node2' => [0, <<~EOS, '']
-            date: 2019-08-22 10:12:15
-            user: admin_user2
-            services: service1, service2
-          EOS
+          'node1' => {
+            services: %w[service1],
+            deployment_info: {
+              repo_name_0: 'platform',
+              commit_id_0: 'abcdef1',
+              exit_status: 0,
+              date: Time.parse('2019-08-21 10:12:15 UTC'),
+              user: 'admin_user1'
+            },
+            exit_status: 0,
+            stdout: '',
+            stderr: ''
+          },
+          'node2' => {
+            services: %w[service1 service2],
+            deployment_info: {
+              repo_name_0: 'platform',
+              commit_id_0: 'abcdef2',
+              exit_status: 0,
+              date: Time.parse('2019-08-22 10:12:15 UTC'),
+              user: 'admin_user2'
+            },
+            exit_status: 0,
+            stdout: '',
+            stderr: ''
+          }
         }
-      end])
+      end
       exit_code, stdout, stderr = run 'last_deploys'
       expect(exit_code).to eq 0
-      expect(stdout).to eq(<<~EOS)
-        +-------+---------------------+-------------+--------------------+-------+
-        | Node  | Date                | Admin       | Services           | Error |
-        +-------+---------------------+-------------+--------------------+-------+
-        | node1 | 2019-08-21 10:12:15 | admin_user1 | service1           |       |
-        | node2 | 2019-08-22 10:12:15 | admin_user2 | service1, service2 |       |
-        +-------+---------------------+-------------+--------------------+-------+
-      EOS
+      expect(stdout).to eq <<~EO_STDOUT
+        +-------+-------------------------+-------------+--------------------+-------+
+        | Node  | Date                    | Admin       | Services           | Error |
+        +-------+-------------------------+-------------+--------------------+-------+
+        | node1 | 2019-08-21 10:12:15 UTC | admin_user1 | service1           |       |
+        | node2 | 2019-08-22 10:12:15 UTC | admin_user2 | service1, service2 |       |
+        +-------+-------------------------+-------------+--------------------+-------+
+      EO_STDOUT
       expect(stderr).to eq ''
     end
   end
 
   it 'sorts results by user' do
     with_test_platform_for_last_deploys do
-      expect_actions_executor_runs([proc do |actions, timeout: nil, concurrent: false, log_to_dir: 'run_logs', log_to_stdout: true|
-        expect(actions).to eq(
-          'node1' => { remote_bash: "cd /var/log/deployments && ls -t | head -1 | xargs sed '/===== STDOUT =====/q'" },
-          'node2' => { remote_bash: "cd /var/log/deployments && ls -t | head -1 | xargs sed '/===== STDOUT =====/q'" }
-        )
+      expect(test_deployer).to receive(:deployment_info_from).with(%w[node1 node2]) do
         {
-          'node1' => [0, <<~EOS, ''],
-            date: 2019-08-21 10:12:15
-            user: admin_user2
-            services: service1
-          EOS
-          'node2' => [0, <<~EOS, '']
-            date: 2019-08-22 10:12:15
-            user: admin_user1
-            services: service1, service2
-          EOS
+          'node1' => {
+            services: %w[service1],
+            deployment_info: {
+              repo_name_0: 'platform',
+              commit_id_0: 'abcdef1',
+              exit_status: 0,
+              date: Time.parse('2019-08-21 10:12:15 UTC'),
+              user: 'admin_user2'
+            },
+            exit_status: 0,
+            stdout: '',
+            stderr: ''
+          },
+          'node2' => {
+            services: %w[service1 service2],
+            deployment_info: {
+              repo_name_0: 'platform',
+              commit_id_0: 'abcdef2',
+              exit_status: 0,
+              date: Time.parse('2019-08-22 10:12:15 UTC'),
+              user: 'admin_user1'
+            },
+            exit_status: 0,
+            stdout: '',
+            stderr: ''
+          }
         }
-      end])
+      end
       exit_code, stdout, stderr = run 'last_deploys', '--sort-by', 'user'
       expect(exit_code).to eq 0
-      expect(stdout).to eq(<<~EOS)
-        +-------+---------------------+-------------+--------------------+-------+
-        | Node  | Date                | Admin       | Services           | Error |
-        +-------+---------------------+-------------+--------------------+-------+
-        | node2 | 2019-08-22 10:12:15 | admin_user1 | service1, service2 |       |
-        | node1 | 2019-08-21 10:12:15 | admin_user2 | service1           |       |
-        +-------+---------------------+-------------+--------------------+-------+
-      EOS
+      expect(stdout).to eq <<~EO_STDOUT
+        +-------+-------------------------+-------------+--------------------+-------+
+        | Node  | Date                    | Admin       | Services           | Error |
+        +-------+-------------------------+-------------+--------------------+-------+
+        | node2 | 2019-08-22 10:12:15 UTC | admin_user1 | service1, service2 |       |
+        | node1 | 2019-08-21 10:12:15 UTC | admin_user2 | service1           |       |
+        +-------+-------------------------+-------------+--------------------+-------+
+      EO_STDOUT
       expect(stderr).to eq ''
     end
   end
 
   it 'sorts results by user descending' do
     with_test_platform_for_last_deploys do
-      expect_actions_executor_runs([proc do |actions, timeout: nil, concurrent: false, log_to_dir: 'run_logs', log_to_stdout: true|
-        expect(actions).to eq(
-          'node1' => { remote_bash: "cd /var/log/deployments && ls -t | head -1 | xargs sed '/===== STDOUT =====/q'" },
-          'node2' => { remote_bash: "cd /var/log/deployments && ls -t | head -1 | xargs sed '/===== STDOUT =====/q'" }
-        )
+      expect(test_deployer).to receive(:deployment_info_from).with(%w[node1 node2]) do
         {
-          'node1' => [0, <<~EOS, ''],
-            date: 2019-08-21 10:12:15
-            user: admin_user2
-            services: service1
-          EOS
-          'node2' => [0, <<~EOS, '']
-            date: 2019-08-22 10:12:15
-            user: admin_user1
-            services: service1, service2
-          EOS
+          'node1' => {
+            services: %w[service1],
+            deployment_info: {
+              repo_name_0: 'platform',
+              commit_id_0: 'abcdef1',
+              exit_status: 0,
+              date: Time.parse('2019-08-21 10:12:15 UTC'),
+              user: 'admin_user2'
+            },
+            exit_status: 0,
+            stdout: '',
+            stderr: ''
+          },
+          'node2' => {
+            services: %w[service1 service2],
+            deployment_info: {
+              repo_name_0: 'platform',
+              commit_id_0: 'abcdef2',
+              exit_status: 0,
+              date: Time.parse('2019-08-22 10:12:15 UTC'),
+              user: 'admin_user1'
+            },
+            exit_status: 0,
+            stdout: '',
+            stderr: ''
+          }
         }
-      end])
+      end
       exit_code, stdout, stderr = run 'last_deploys', '--sort-by', 'user_desc'
       expect(exit_code).to eq 0
-      expect(stdout).to eq(<<~EOS)
-        +-------+---------------------+-------------+--------------------+-------+
-        | Node  | Date                | Admin       | Services           | Error |
-        +-------+---------------------+-------------+--------------------+-------+
-        | node1 | 2019-08-21 10:12:15 | admin_user2 | service1           |       |
-        | node2 | 2019-08-22 10:12:15 | admin_user1 | service1, service2 |       |
-        +-------+---------------------+-------------+--------------------+-------+
-      EOS
+      expect(stdout).to eq <<~EO_STDOUT
+        +-------+-------------------------+-------------+--------------------+-------+
+        | Node  | Date                    | Admin       | Services           | Error |
+        +-------+-------------------------+-------------+--------------------+-------+
+        | node1 | 2019-08-21 10:12:15 UTC | admin_user2 | service1           |       |
+        | node2 | 2019-08-22 10:12:15 UTC | admin_user1 | service1, service2 |       |
+        +-------+-------------------------+-------------+--------------------+-------+
+      EO_STDOUT
       expect(stderr).to eq ''
     end
   end
 
   it 'displays only the selected nodes' do
     with_test_platform_for_last_deploys do
-      expect_actions_executor_runs([proc do |actions, timeout: nil, concurrent: false, log_to_dir: 'run_logs', log_to_stdout: true|
-        expect(actions).to eq('node1' => { remote_bash: "cd /var/log/deployments && ls -t | head -1 | xargs sed '/===== STDOUT =====/q'" })
+      expect(test_deployer).to receive(:deployment_info_from).with(%w[node1]) do
         {
-          'node1' => [0, <<~EOS, ''],
-            date: 2019-08-21 10:12:15
-            user: admin_user1
-            services: service1
-          EOS
+          'node1' => {
+            services: %w[service1],
+            deployment_info: {
+              repo_name_0: 'platform',
+              commit_id_0: 'abcdef1',
+              exit_status: 0,
+              date: Time.parse('2019-08-21 10:12:15 UTC'),
+              user: 'admin_user1'
+            },
+            exit_status: 0,
+            stdout: '',
+            stderr: ''
+          }
         }
-      end])
+      end
       exit_code, stdout, stderr = run 'last_deploys', '--node', 'node1'
       expect(exit_code).to eq 0
-      expect(stdout).to eq(<<~EOS)
-        +-------+---------------------+-------------+----------+-------+
-        | Node  | Date                | Admin       | Services | Error |
-        +-------+---------------------+-------------+----------+-------+
-        | node1 | 2019-08-21 10:12:15 | admin_user1 | service1 |       |
-        +-------+---------------------+-------------+----------+-------+
-      EOS
+      expect(stdout).to eq <<~EO_STDOUT
+        +-------+-------------------------+-------------+----------+-------+
+        | Node  | Date                    | Admin       | Services | Error |
+        +-------+-------------------------+-------------+----------+-------+
+        | node1 | 2019-08-21 10:12:15 UTC | admin_user1 | service1 |       |
+        +-------+-------------------------+-------------+----------+-------+
+      EO_STDOUT
       expect(stderr).to eq ''
     end
   end
 
   it 'displays errors when we can\'t get info from some nodes' do
     with_test_platform_for_last_deploys do
-      expect_actions_executor_runs([proc do |actions, timeout: nil, concurrent: false, log_to_dir: 'run_logs', log_to_stdout: true|
-        expect(actions).to eq(
-          'node1' => { remote_bash: "cd /var/log/deployments && ls -t | head -1 | xargs sed '/===== STDOUT =====/q'" },
-          'node2' => { remote_bash: "cd /var/log/deployments && ls -t | head -1 | xargs sed '/===== STDOUT =====/q'" }
-        )
+      expect(test_deployer).to receive(:deployment_info_from).with(%w[node1 node2]) do
         {
-          'node1' => [:connection_error, 'Error on stdout', 'Error on stderr'],
-          'node2' => [0, <<~EOS, '']
-            date: 2019-08-22 10:12:15
-            user: admin_user1
-            services: service1, service2
-          EOS
+          'node1' => {
+            error: 'Error while getting logs'
+          },
+          'node2' => {
+            services: %w[service1 service2],
+            deployment_info: {
+              repo_name_0: 'platform',
+              commit_id_0: 'abcdef2',
+              exit_status: 0,
+              date: Time.parse('2019-08-22 10:12:15 UTC'),
+              user: 'admin_user2'
+            },
+            exit_status: 0,
+            stdout: '',
+            stderr: ''
+          }
         }
-      end])
+      end
       exit_code, stdout, stderr = run 'last_deploys', '--sort-by', 'user_desc'
       expect(exit_code).to eq 0
-      expect(stdout).to eq(<<~EOS)
-        +-------+---------------------+-------------+--------------------+-------------------------+
-        | Node  | Date                | Admin       | Services           | Error                   |
-        +-------+---------------------+-------------+--------------------+-------------------------+
-        | node2 | 2019-08-22 10:12:15 | admin_user1 | service1, service2 |                         |
-        | node1 |                     |             |                    | Error: connection_error |
-        |       |                     |             |                    | Error on stderr         |
-        +-------+---------------------+-------------+--------------------+-------------------------+
-      EOS
+      expect(stdout).to eq <<~EO_STDOUT
+        +-------+-------------------------+-------------+--------------------+--------------------------+
+        | Node  | Date                    | Admin       | Services           | Error                    |
+        +-------+-------------------------+-------------+--------------------+--------------------------+
+        | node2 | 2019-08-22 10:12:15 UTC | admin_user2 | service1, service2 |                          |
+        | node1 |                         |             |                    | Error while getting logs |
+        +-------+-------------------------+-------------+--------------------+--------------------------+
+      EO_STDOUT
       expect(stderr).to eq ''
     end
   end