hybrid_platforms_conductor 32.4.0 → 32.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 51da406ed4d19996c3802636ee0b1f9034b7c4505e746a11863f42e24dd7e81e
-  data.tar.gz: bc39ae4e01d39dd9468baac3ee370abf63de7f0313882d5bf84ea75850da6a01
+  metadata.gz: 4e0dfe56d0297ba7c9c90dfbf4737cd6b4754b20a36f7dec0962d62a19b5bf2b
+  data.tar.gz: 3a0363efcb7dc771c9cf41911d3012fae0a764a465e4bd925f241a422d5f11b0
 SHA512:
-  metadata.gz: 3363c4a1314e44fd3ebf0fc87943b49124b1c751e9e136357f7e8497b4d7b76b9f8e312831391bf85a6aa5b97d568937a44dbada7ae2deecbfe64be8a00e08da
-  data.tar.gz: 711f95a3e86978cf362589724ad9cbc4729811f5870cbce77b3b78c334f2100ae1039628368b931430e3f94fdd9acc72888a339fbc6a2f8102c9679fc39563a5
+  metadata.gz: e1dae403085c924a043dfee0185b46478eff9c99fa1d69848f5e92b571e4dfb1dc62ab1f80792d3b1928323eecf72a8f0904317b17facf3b92b6a07b82381112
+  data.tar.gz: 6156b57048a690c5bc6e91ffd61a8276b84b2a2196206a8b77779ee25fe559aa4a4ec21bf741f015736cb3796b9bf4c33d9ec0203b4e4ff7c44a77c1d06fbe83

data/bin/nodes_to_deploy

@@ -72,11 +72,17 @@ unless ignore_deploy_info
         commit_id = node_deploy_info["commit_id_#{repo_idx}".to_sym]
         impacted_nodes = cache_impacted_nodes.dig(repo_name, commit_id)
         if impacted_nodes.nil?
-          impacted_nodes, _single_impacted_nodes, _impacted_services, _impact_global = nodes_handler.impacted_nodes_from_git_diff(
-            repo_name,
-            from_commit: commit_id,
-            to_commit: 'master'
-          )
+          begin
+            impacted_nodes, _single_impacted_nodes, _impacted_services, _impact_global = nodes_handler.impacted_nodes_from_git_diff(
+              repo_name,
+              from_commit: commit_id,
+              to_commit: 'master'
+            )
+          rescue HybridPlatformsConductor::NodesHandler::GitError
+            # Consider the node was deployed with a non-release branch commit (as it is missing)
+            # So we have to make sure we deploy it again
+            impacted_nodes = [node]
+          end
           cache_impacted_nodes[repo_name] = {} unless cache_impacted_nodes.key?(repo_name)
           cache_impacted_nodes[repo_name][commit_id] = impacted_nodes
         end

data/lib/hybrid_platforms_conductor/nodes_handler.rb

@@ -40,6 +40,9 @@ module HybridPlatformsConductor
 
     include LoggerHelpers, ParallelThreads
 
+    class GitError < RuntimeError
+    end
+
     # Constructor
     #
     # Parameters::
@@ -484,7 +487,11 @@ module HybridPlatformsConductor
     def impacted_nodes_from_git_diff(platform_name, from_commit: 'master', to_commit: nil, smallest_set: false)
       platform = @platforms_handler.platform(platform_name)
       raise "Unkown platform #{platform_name}. Possible platforms are #{@platforms_handler.known_platforms.map(&:name).sort.join(', ')}" if platform.nil?
-      _exit_status, stdout, _stderr = @cmd_runner.run_cmd "cd #{platform.repository_path} && git --no-pager diff --no-color #{from_commit} #{to_commit.nil? ? '' : to_commit}", log_to_stdout: log_debug?
+      begin
+        _exit_status, stdout, _stderr = @cmd_runner.run_cmd "cd #{platform.repository_path} && git --no-pager diff --no-color #{from_commit} #{to_commit.nil? ? '' : to_commit}", log_to_stdout: log_debug?
+      rescue CmdRunner::UnexpectedExitCodeError
+        raise GitError, $!.to_s
+      end
       # Parse the git diff output to create a structured diff
       # Hash< String, Hash< Symbol, Object > >: List of diffs info, per file name having a diff. Diffs info have the following properties:
       # * *moved_to* (String): The new file path, in case it has been moved [optional]

data/lib/hybrid_platforms_conductor/version.rb

@@ -1,5 +1,5 @@
 module HybridPlatformsConductor
 
-  VERSION = '32.4.0'
+  VERSION = '32.4.1'
 
 end

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

@@ -33,6 +33,16 @@ describe HybridPlatformsConductor::NodesHandler do
       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
+          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([

data/spec/hybrid_platforms_conductor_test/executables/nodes_to_deploy_spec.rb

@@ -106,6 +106,31 @@ describe 'nodes_to_deploy executable' do
     end
   end
 
+  it 'considers nodes having invalid commit ids in their logs to be deployed' do
+    with_test_platform_for_nodes_to_deploy do
+      expect_actions_executor_runs([proc do |actions|
+        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'" }
+        )
+        {
+          'node1' => [0, "repo_name_0: platform\nexit_status: 0\ncommit_id_0: abcdef1", ''],
+          'node2' => [0, "repo_name_0: platform\nexit_status: 0\ncommit_id_0: abcdef2", '']
+        }
+      end])
+      expect(test_nodes_handler).to receive(:impacted_nodes_from_git_diff).with('platform', from_commit: 'abcdef1', to_commit: 'master') do
+        raise HybridPlatformsConductor::NodesHandler::GitError, 'Mocked git error due to an invalid commit id'
+      end
+      expect(test_nodes_handler).to receive(:impacted_nodes_from_git_diff).with('platform', from_commit: 'abcdef2', to_commit: 'master') { [%w[], [], [], false] }
+      exit_code, stdout, stderr = run 'nodes_to_deploy'
+      expect(exit_code).to eq 0
+      expect(stdout).to eq <<~EOS
+        ===== Nodes to deploy =====
+        node1
+      EOS
+    end
+  end
+
   it 'ignores impacts if asked' do
     with_test_platform_for_nodes_to_deploy do
       exit_code, stdout, stderr = run 'nodes_to_deploy', '--ignore-deployed-info'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hybrid_platforms_conductor
 version: !ruby/object:Gem::Version
-  version: 32.4.0
+  version: 32.4.1
 platform: ruby
 authors:
 - Muriel Salvan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-19 00:00:00.000000000 Z
+date: 2021-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: range_operators
@@ -281,20 +281,20 @@ description: Provides a complete toolset to help DevOps maintain, deploy, monito
 email:
 - muriel@x-aeon.com
 executables:
-- test
-- topograph
 - dump_nodes_json
-- free_veids
-- report
+- test
+- last_deploys
+- check-node
 - setup
+- free_ips
+- ssh_config
 - deploy
-- last_deploys
+- report
+- free_veids
 - get_impacted_nodes
-- ssh_config
 - run
 - nodes_to_deploy
-- check-node
-- free_ips
+- topograph
 extensions: []
 extra_rdoc_files: []
 files: