hybrid_platforms_conductor 33.9.0 → 33.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d88a5c946d63351586ef1b77ec9840e13e84af48c210bc8dfd1004abc27f547d
-  data.tar.gz: 8d04e563077d81cc72d5c3dc883f0010205a3880a255c1fb229ff3ba11771b49
+  metadata.gz: 433e01481e26d03667cde79b93697f0f14e949a6201931c6e570ebb84670e79a
+  data.tar.gz: 61c1eb5c9b9ec3df221528e8ae1c08a7a6bdf3628c2a6a83b1756e11a84a2e88
 SHA512:
-  metadata.gz: 211847acef3bff5d8e2e554a6262c783230989c3877b830cdbf4a3c5ff8a0fdb414669c891b9bf102f8adf26aed4000189df7565a1e33e93094ee384a577cbd1
-  data.tar.gz: 1faa911b27e3fdda61c605711de26598c6bac9a533519a4b2d583da479f1be9ea32265433d34cf9d8c6aaeee06d45e83b80e648c013ed2342df728a83f9bb6cf
+  metadata.gz: 31ff562ab7108537b8ba57b8c657ef516ef5665fb40fc81d4afe4f14a54400f62324597136845af8c39bd8788318d3d12c54362562cb73dff9d769c60cf8bce1
+  data.tar.gz: cb7dfea944204a89f9522703fb588ec8085dcd9a92816abe0cc012f0e7440432ee4a3831825517ae9b74f59e1ac1ff7d4995b6fa75220c28096de1a8e95f31b6

data/CHANGELOG.md

@@ -1,3 +1,42 @@
+# [v33.9.4](https://github.com/sweet-delights/hybrid-platforms-conductor/compare/v33.9.3...v33.9.4) (2022-03-20 16:20:04)
+
+### Patches
+
+* [Added missing tests and corrections from PR #119](https://github.com/sweet-delights/hybrid-platforms-conductor/commit/e86be2f99e273e65bf9073c1b389a10ad53d7353)
+* [Merge branch 'rebase_pull_116'](https://github.com/sweet-delights/hybrid-platforms-conductor/commit/4030ba58e0e9cf4ef96328a32cf4daa6226270c0)
+
+# [v33.9.3](https://github.com/sweet-delights/hybrid-platforms-conductor/compare/v33.9.2...v33.9.3) (2022-03-20 00:06:14)
+
+### Patches
+
+* [Fix semantic-release dependencies](https://github.com/sweet-delights/hybrid-platforms-conductor/commit/68ec49fbec772c1de6971173830a85b76398de42)
+* [Work-around IceCube dependency issue and correct rubocop errors](https://github.com/sweet-delights/hybrid-platforms-conductor/commit/68858e4d5fbb9d91fcee0525f56dfc40850af7df)
+* [fixing issue 118](https://github.com/sweet-delights/hybrid-platforms-conductor/commit/bb917101c336119104889e5d6cedd34aef538f54)
+
+# [v33.9.2](https://github.com/sweet-delights/hybrid-platforms-conductor/compare/v33.9.1...v33.9.2) (2021-09-01 17:46:34)
+
+## Global changes
+### Patches
+
+* [[Fix(nodes_to_deploy)] [#112] Support UTF-8 encoding from log files](https://github.com/sweet-delights/hybrid-platforms-conductor/commit/26a7bd2fd53d387bd972b5e1b60cac9be6541ce5)
+
+## Changes for nodes_to_deploy
+### Patches
+
+* [[Fix(nodes_to_deploy)] [#112] Support UTF-8 encoding from log files](https://github.com/sweet-delights/hybrid-platforms-conductor/commit/26a7bd2fd53d387bd972b5e1b60cac9be6541ce5)
+
+# [v33.9.1](https://github.com/sweet-delights/hybrid-platforms-conductor/compare/v33.9.0...v33.9.1) (2021-09-01 16:59:59)
+
+## Global changes
+### Patches
+
+* [[Fix(nodes_to_deploy)] [#110] Make sure unknown platforms are taken into account when detecting nodes to be deployed](https://github.com/sweet-delights/hybrid-platforms-conductor/commit/c1b8312c5d473a1c5d044f6cda3ad9bed2b3ca61)
+
+## Changes for nodes_to_deploy
+### Patches
+
+* [[Fix(nodes_to_deploy)] [#110] Make sure unknown platforms are taken into account when detecting nodes to be deployed](https://github.com/sweet-delights/hybrid-platforms-conductor/commit/c1b8312c5d473a1c5d044f6cda3ad9bed2b3ca61)
+
 # [v33.9.0](https://github.com/sweet-delights/hybrid-platforms-conductor/compare/v33.8.4...v33.9.0) (2021-08-24 13:15:44)
 
 ## Global changes

data/bin/last_deploys

@@ -8,12 +8,12 @@ possible_string_sorts = %i[
   node
   user
 ]
-possible_sorts = possible_string_sorts.map do |property_name|
+possible_sorts = possible_string_sorts.to_h do |property_name|
   [
     property_name,
     proc { |node, deploy_info| [deploy_info.key?(:error) || !deploy_info.key?(property_name) ? '' : deploy_info[property_name], node] }
   ]
-end.to_h
+end
 
 sort_by = :node
 sort_desc = false
@@ -34,7 +34,7 @@ raise "Unknown sort name: #{sort_by}. Should be one of #{possible_sorts.keys.joi
 
 sorted_deploy_info = deployer.
   deployment_info_from(nodes_handler.select_nodes(executable.selected_nodes.empty? ? [{ all: true }] : executable.selected_nodes)).
-  map do |node, deploy_info|
+  to_h do |node, deploy_info|
     decorated_deploy_info = deploy_info.merge(node: node)
     if deploy_info.key?(:deployment_info)
       decorated_deploy_info.merge!(deploy_info[:deployment_info])
@@ -43,7 +43,6 @@ sorted_deploy_info = deployer.
     decorated_deploy_info[:services] = deploy_info[:services].join(', ') if deploy_info.key?(:services)
     [node, decorated_deploy_info]
   end.
-  to_h.
   sort_by(&possible_sorts[sort_by])
 sorted_deploy_info.reverse! if sort_desc
 info_displayed = {

data/bin/nodes_to_deploy

@@ -17,6 +17,7 @@ executable = HybridPlatformsConductor::Executable.new(deploy_options: false) do
   end
 end
 nodes_handler = executable.nodes_handler
+platforms_handler = executable.platforms_handler
 deployer = executable.deployer
 
 executable.parse_options!
@@ -72,20 +73,29 @@ unless ignore_deploy_info
         commit_id = node_deploy_info[:deployment_info]["commit_id_#{repo_idx}".to_sym]
         impacted_nodes = cache_impacted_nodes.dig(repo_name, commit_id)
         if impacted_nodes.nil?
-          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)
+          if platforms_handler.platform(repo_name)
+            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
+              executable.log_warn "[ #{node} ] - Unknown commit ID from deployment logs: #{repo_name} / #{commit_id}."
+              impacted_nodes = :unknown
+            end
+          else
+            # Consider the node was deployed with an obdsolete platform (as it is unknown)
             # So we have to make sure we deploy it again
-            impacted_nodes = [node]
+            executable.log_warn "[ #{node} ] - Unknown platform from deployment logs: #{repo_name}."
+            impacted_nodes = :unknown
           end
           cache_impacted_nodes[repo_name] = {} unless cache_impacted_nodes.key?(repo_name)
           cache_impacted_nodes[repo_name][commit_id] = impacted_nodes
         end
+        impacted_nodes = [node] if impacted_nodes == :unknown
         if impacted_nodes.include?(node)
           executable.log_debug "[ #{node} ] - Diffs on #{repo_name} between #{commit_id} and master are impacting this node."
           node_impacted = true

data/lib/hybrid_platforms_conductor/actions_executor.rb

@@ -146,7 +146,7 @@ module HybridPlatformsConductor
           actions_per_node[node].concat(resolved_nodes_actions)
         end
       end
-      result = actions_per_node.keys.map { |node| [node, nil] }.to_h
+      result = actions_per_node.keys.to_h { |node| [node, nil] }
       with_connections_prepared_to(nodes_needing_connectors, no_exception: true) do |connected_nodes|
         missing_nodes = []
         connected_nodes.each do |node, connector|
@@ -194,7 +194,7 @@ module HybridPlatformsConductor
     #     * *connected_nodes* (Hash<String, Connector or Symbol>): Prepared connectors (or Symbol in case of failure with no_exception), per node name
     def with_connections_prepared_to(nodes, no_exception: false)
       # Make sure every node needing connectors finds a connector
-      nodes_needing_connectors = nodes.map { |node| [node, nil] }.to_h
+      nodes_needing_connectors = nodes.to_h { |node| [node, nil] }
       @connector_plugins.each_value do |connector|
         nodes_without_connectors = nodes_needing_connectors.select { |_node, selected_connector| selected_connector.nil? }.keys
         break if nodes_without_connectors.empty?

data/lib/hybrid_platforms_conductor/common_config_dsl/file_system_tests.rb

@@ -84,7 +84,7 @@ module HybridPlatformsConductor
           select_confs_for_node(node, fs_paths_rules).
           inject({}) do |merged_paths, paths_info|
             if paths_info[:context][:file_system_type] == file_system_type
-              merged_paths.merge(paths_info[:paths].map do |path|
+              merged_paths.merge(paths_info[:paths].to_h do |path|
                 [
                   path,
                   {
@@ -92,7 +92,7 @@ module HybridPlatformsConductor
                     context: paths_info[:context]
                   }
                 ]
-              end.to_h) do |path, rule_info_1, rule_info_2|
+              end) do |path, rule_info_1, rule_info_2|
                 # Just check that configuration is not inconsistent
                 raise "Inconsistent rule for #{file_system_type} file system checks in configuration for #{node}: #{path} is marked as being both #{rule_info_1[:state]} and #{rule_info_2[:state]}" if rule_info_1[:state] != rule_info_2[:state]
 

data/lib/hybrid_platforms_conductor/config.rb

@@ -3,6 +3,7 @@ require 'hybrid_platforms_conductor/core_extensions/cleanroom/fix_kwargs'
 require 'git'
 require 'ice_cube'
 require 'hybrid_platforms_conductor/plugins'
+require 'active_support/core_ext/module'
 
 module HybridPlatformsConductor
 

data/lib/hybrid_platforms_conductor/deployer.rb

@@ -263,9 +263,9 @@ module HybridPlatformsConductor
     def deploy_on(*nodes_selectors)
       # Get the sorted list of services to be deployed, per node
       # Hash<String, Array<String> >
-      services_to_deploy = @nodes_handler.select_nodes(nodes_selectors.flatten).map do |node|
+      services_to_deploy = @nodes_handler.select_nodes(nodes_selectors.flatten).to_h do |node|
         [node, @nodes_handler.get_services_of(node)]
-      end.to_h
+      end
 
       # Get the secrets to be deployed
       secrets = {}
@@ -474,12 +474,18 @@ module HybridPlatformsConductor
         timeout: 10,
         progress_name: 'Read deployment logs'
       )
-      nodes.map do |node|
+      nodes.to_h do |node|
+        exit_code, stdout, stderr = read_actions_results[node] || [nil, nil, nil]
         [
           node,
-          @log_plugins[log_plugins_for(node).first].logs_for(node, *(read_actions_results[node] || [nil, nil, nil]))
+          @log_plugins[log_plugins_for(node).first].logs_for(
+            node,
+            exit_code,
+            stdout&.force_encoding(Encoding::UTF_8),
+            stderr&.force_encoding(Encoding::UTF_8)
+          )
         ]
-      end.to_h
+      end
     end
 
     # Parse stdout and stderr of a given deploy run and get the list of tasks with their status
@@ -547,7 +553,7 @@ module HybridPlatformsConductor
       # Deploy for real
       @nodes_handler.prefetch_metadata_of services.keys, :image
       outputs = @actions_executor.execute_actions(
-        services.map do |node, node_services|
+        services.to_h do |node, node_services|
           image_id = @nodes_handler.get_image_of(node)
           need_sudo = !@actions_executor.privileged_access?(node)
           sudo = @actions_executor.sudo_prefix(node)
@@ -577,12 +583,12 @@ module HybridPlatformsConductor
                     remote_bash: "#{sudo}yum install -y ca-certificates"
                   },
                   {
-                    scp: Dir.glob("#{ENV['hpc_certificates']}/*.crt").map do |cert_file|
+                    scp: Dir.glob("#{ENV['hpc_certificates']}/*.crt").to_h do |cert_file|
                       [
                         cert_file,
                         '/etc/pki/ca-trust/source/anchors'
                       ]
-                    end.to_h.merge(sudo: need_sudo),
+                    end.merge(sudo: need_sudo),
                     remote_bash: [
                       "#{sudo}update-ca-trust enable",
                       "#{sudo}update-ca-trust extract"
@@ -607,19 +613,19 @@ module HybridPlatformsConductor
               certificate_actions +
               @services_handler.actions_to_deploy_on(node, node_services, @use_why_run)
           ]
-        end.to_h,
+        end,
         timeout: @timeout,
         concurrent: @concurrent_execution,
         log_to_stdout: !@concurrent_execution
       )
       # Free eventual locks
       @actions_executor.execute_actions(
-        services.keys.map do |node|
+        services.keys.to_h do |node|
           [
             node,
             { remote_bash: "#{@actions_executor.sudo_prefix(node)}./mutex_dir unlock /tmp/hybrid_platforms_conductor_deploy_lock" }
           ]
-        end.to_h,
+        end,
         timeout: 10,
         concurrent: true,
         log_to_dir: nil
@@ -641,7 +647,7 @@ module HybridPlatformsConductor
       section "Saving deployment logs for #{logs.size} nodes" do
         ssh_user = @actions_executor.connector(:ssh).ssh_user
         @actions_executor.execute_actions(
-          logs.map do |node, (exit_status, stdout, stderr)|
+          logs.to_h do |node, (exit_status, stdout, stderr)|
             [
               node,
               log_plugins_for(node).
@@ -660,7 +666,7 @@ module HybridPlatformsConductor
                 end.
                 flatten(1)
             ]
-          end.to_h,
+          end,
           timeout: 10,
           concurrent: true,
           log_to_dir: nil,

data/lib/hybrid_platforms_conductor/executable.rb

@@ -99,7 +99,7 @@ module HybridPlatformsConductor
           @instantiated_components[component] = HybridPlatformsConductor.const_get(component.to_s.split('_').collect(&:capitalize).join.to_sym).new(
             logger: @logger,
             logger_stderr: @logger_stderr,
-            **dependencies.map { |dependency| [dependency, send(dependency)] }.to_h
+            **dependencies.to_h { |dependency| [dependency, send(dependency)] }
           )
         end
         @instantiated_components[component]

data/lib/hybrid_platforms_conductor/hpc_plugins/cmdb/host_ip.rb

@@ -73,19 +73,33 @@ module HybridPlatformsConductor
         def ip_for(*hosts)
           results = {}
           log_debug "Get IPs of #{hosts.size} hosts..."
+          exit_status, _stdout, _stderr = @cmd_runner.run_cmd('command -v getent', no_exception: true)
+          getent_present = exit_status.zero?
           for_each_element_in(
             hosts,
             parallel: true,
             nbr_threads_max: MAX_THREADS_GETENT,
             progress: log_debug? ? 'Gather IPs' : nil
           ) do |host|
-            _exit_status, stdout, _stderr = @cmd_runner.run_cmd(
-              "getent hosts #{host}",
-              timeout: TIMEOUT_GETENT,
-              log_to_stdout: log_debug?,
-              no_exception: true
-            )
-            ip = stdout.strip.split(/\s+/).first
+            ip =
+              if getent_present
+                _exit_status, stdout, _stderr = @cmd_runner.run_cmd(
+                  "getent hosts #{host}",
+                  timeout: TIMEOUT_GETENT,
+                  log_to_stdout: log_debug?,
+                  no_exception: true
+                )
+                stdout.strip.split(/\s+/).first
+              else
+                _exit_status, stdout, _stderr = @cmd_runner.run_cmd(
+                  "host #{host} | grep 'has address'",
+                  timeout: TIMEOUT_GETENT,
+                  log_to_stdout: log_debug?,
+                  no_exception: true
+                )
+                stdout.strip.split(/\s+/).last
+              end
+
             if ip.nil?
               log_warn "Host #{host} has no IP."
             else

data/lib/hybrid_platforms_conductor/hpc_plugins/cmdb/platform_handlers.rb

@@ -23,7 +23,7 @@ module HybridPlatformsConductor
         # * Hash<String, Object>: The corresponding property, per required node.
         #     Nodes for which the property can't be fetched can be ommitted.
         def get_services(nodes, _metadata)
-          nodes.map { |node| [node, platform_for(node).services_for(node)] }.to_h
+          nodes.to_h { |node| [node, platform_for(node).services_for(node)] }
         end
 
         # Get other properties for a given set of nodes.
@@ -42,7 +42,7 @@ module HybridPlatformsConductor
         # * Hash<String, Hash<Symbol,Object> >: The corresponding properties, per required node.
         #     Nodes for which the property can't be fetched can be ommitted.
         def get_others(nodes, _metadata)
-          nodes.map { |node| [node, platform_for(node).metadata_for(node)] }.to_h
+          nodes.to_h { |node| [node, platform_for(node).metadata_for(node)] }
         end
 
         private

data/lib/hybrid_platforms_conductor/hpc_plugins/connector/ssh.rb

@@ -605,7 +605,7 @@ module HybridPlatformsConductor
                 end
               else
                 # We have not created any ControlMaster, but still consider the nodes to be ready to connect
-                user_locks = nodes.map { |node| [node, nil] }.to_h
+                user_locks = nodes.to_h { |node| [node, nil] }
               end
               yield user_locks.keys
             ensure

data/lib/hybrid_platforms_conductor/hpc_plugins/platform_handler/serverless_chef.rb

@@ -132,8 +132,7 @@ module HybridPlatformsConductor
               else
                 (info[:status][:added_files] + info[:status][:changed_files] + info[:status][:untracked_files]).
                   sort.
-                  map { |f| [f, File.mtime("#{@repository_path}/#{f}").strftime('%F %T')] }.
-                  to_h
+                  to_h { |f| [f, File.mtime("#{@repository_path}/#{f}").strftime('%F %T')] }
               end,
             deleted_files: info[:status].nil? ? [] : info[:status][:deleted_files].sort
           }

data/lib/hybrid_platforms_conductor/hpc_plugins/provisioner/proxmox/proxmox_waiter.rb

@@ -371,7 +371,7 @@ class ProxmoxWaiter
   # Result::
   # * Hash<String, [Float or nil, Float or nil]>: The set of 2 scores, per PVE node name
   def pve_scores_for(_nbr_cpus, ram_mb, disk_gb)
-    @config['pve_nodes'].map do |pve_node|
+    @config['pve_nodes'].to_h do |pve_node|
       # Get some resource usages stats from the node directly
       status_info = api_get("nodes/#{pve_node}/status")
       load_average = status_info['loadavg'].map { |load_str| Float(load_str) }
@@ -418,11 +418,11 @@ class ProxmoxWaiter
           [
             if expected_ram_percent_used <= @config['limits']['ram_percent_used_max'] &&
                 expected_disk_percent_used <= @config['limits']['disk_percent_used_max']
-              expected_ram_percent_used * @config['coeff_ram_consumption'] + expected_disk_percent_used * @config['coeff_disk_consumption']
+              (expected_ram_percent_used * @config['coeff_ram_consumption']) + (expected_disk_percent_used * @config['coeff_disk_consumption'])
             end,
             if expected_ram_percent_used_without_expired <= @config['limits']['ram_percent_used_max'] &&
                 expected_disk_percent_used_without_expired <= @config['limits']['disk_percent_used_max']
-              expected_ram_percent_used_without_expired * @config['coeff_ram_consumption'] + expected_disk_percent_used_without_expired * @config['coeff_disk_consumption']
+              (expected_ram_percent_used_without_expired * @config['coeff_ram_consumption']) + (expected_disk_percent_used_without_expired * @config['coeff_disk_consumption'])
             end
           ]
         else
@@ -431,7 +431,7 @@ class ProxmoxWaiter
           [nil, nil]
         end
       ]
-    end.to_h
+    end
   end
 
   # Is a given VM expired?
@@ -499,10 +499,10 @@ class ProxmoxWaiter
     if hpc_marker_idx.nil?
       {}
     else
-      vm_description_lines[hpc_marker_idx + 1..].map do |line|
+      vm_description_lines[hpc_marker_idx + 1..].to_h do |line|
         property, value = line.split(': ')
         [property.to_sym, value]
-      end.to_h
+      end
     end
   end
 

data/lib/hybrid_platforms_conductor/hpc_plugins/provisioner/proxmox.rb

@@ -101,10 +101,10 @@ module HybridPlatformsConductor
 
                 # Get the HPC info associated to this VM
                 # Hash<Symbol,String>
-                vm_hpc_info = vm_description_lines[hpc_marker_idx + 1..].map do |line|
+                vm_hpc_info = vm_description_lines[hpc_marker_idx + 1..].to_h do |line|
                   property, value = line.split(': ')
                   [property.to_sym, value]
-                end.to_h
+                end
                 next unless vm_hpc_info[:node] == @node && vm_hpc_info[:environment] == @environment
 
                 # Found it

data/lib/hybrid_platforms_conductor/hpc_plugins/report/mediawiki.rb

@@ -87,7 +87,7 @@ module HybridPlatformsConductor
           @nodes_handler.prefetch_metadata_of nodes, locale.keys
           nodes.
             map do |node|
-              { node: node }.merge(all_properties.map { |property| [property, @nodes_handler.metadata_of(node, property)] }.to_h)
+              { node: node }.merge(all_properties.to_h { |property| [property, @nodes_handler.metadata_of(node, property)] })
             end.
             # Group them by physical / VMs
             group_by do |node_info|

data/lib/hybrid_platforms_conductor/hpc_plugins/secrets_reader/keepass.rb

@@ -125,7 +125,7 @@ module HybridPlatformsConductor
         # * Hash: The JSON secrets parsed from this group
         def parse_xml_secrets(group)
           # Parse all entries
-          group.xpath('Entry').map do |entry|
+          group.xpath('Entry').to_h do |entry|
             [
               entry.at_xpath('String/Key[contains(.,"Title")]/../Value').text,
               FIELDS.map do |property, field|
@@ -139,7 +139,7 @@ module HybridPlatformsConductor
                   ]
                 end
               end.compact.to_h.merge(
-                entry.xpath('Binary').map do |binary|
+                entry.xpath('Binary').to_h do |binary|
                   binary_meta = group.document.at_xpath("KeePassFile/Meta/Binaries/Binary[@ID=#{Integer(binary.xpath('Value').attr('Ref').value)}]")
                   binary_content = Base64.decode64(binary_meta.text)
                   if binary_meta.attr('Compressed') == 'True'
@@ -151,17 +151,17 @@ module HybridPlatformsConductor
                     binary.xpath('Key').text,
                     binary_content
                   ]
-                end.to_h
+                end
               )
             ]
-          end.to_h.merge(
+          end.merge(
             # Add children groups
-            group.xpath('Group').map do |sub_group|
+            group.xpath('Group').to_h do |sub_group|
               [
                 sub_group.at_xpath('Name').text,
                 parse_xml_secrets(sub_group)
               ]
-            end.to_h
+            end
           )
         end
 

data/lib/hybrid_platforms_conductor/hpc_plugins/test/file_system.rb

@@ -15,7 +15,7 @@ module HybridPlatformsConductor
         # Check my_test_plugin.rb.sample documentation for signature details.
         def test_on_node
           # Flatten the paths rules so that we can spot inconsistencies in configuration
-          @config.aggregate_files_rules(@nodes_handler, @node).map do |path, rule_info|
+          @config.aggregate_files_rules(@nodes_handler, @node).to_h do |path, rule_info|
             [
               "if #{@actions_executor.sudo_prefix(@node)}/bin/bash -c '[[ -d \"#{path}\" ]]' ; then echo 1 ; else echo 0 ; fi",
               {
@@ -32,7 +32,7 @@ module HybridPlatformsConductor
                 timeout: 2
               }
             ]
-          end.to_h
+          end
         end
 
       end

data/lib/hybrid_platforms_conductor/hpc_plugins/test/file_system_hdfs.rb

@@ -14,7 +14,7 @@ module HybridPlatformsConductor
         # Check my_test_plugin.rb.sample documentation for signature details.
         def test_on_node
           # Flatten the paths rules so that we can spot inconsistencies in configuration
-          @config.aggregate_files_rules(@nodes_handler, @node, file_system_type: :hdfs).map do |path, rule_info|
+          @config.aggregate_files_rules(@nodes_handler, @node, file_system_type: :hdfs).to_h do |path, rule_info|
             [
               "if sudo#{rule_info[:context][:sudo_user] ? " -u #{rule_info[:context][:sudo_user]}" : ''} hdfs dfs -ls \"#{path}\" ; then echo 1 ; else echo 0 ; fi",
               {
@@ -31,7 +31,7 @@ module HybridPlatformsConductor
                 timeout: 5
               }
             ]
-          end.to_h
+          end
         end
 
       end

data/lib/hybrid_platforms_conductor/hpc_plugins/test/ip.rb

@@ -18,7 +18,7 @@ module HybridPlatformsConductor
               else
                 private_ips = @nodes_handler.get_private_ips_of @node
                 if private_ips
-                  host_ips = stdout.first.split.select { |ip| ip =~ /^172\.16\.\d+\.\d+$/ }.sort
+                  host_ips = stdout.first.split.grep(/^172\.16\.\d+\.\d+$/).sort
                   ref_ips = private_ips.sort
                   assert_equal(
                     host_ips,

data/lib/hybrid_platforms_conductor/hpc_plugins/test/linear_strategy.rb

@@ -31,7 +31,7 @@ module HybridPlatformsConductor
             next if stdout.empty?
 
             _exit_status, stdout, _stderr = @cmd_runner.run_cmd(
-              "cd #{@platform.repository_path} && git --no-pager log #{merge_commit_id} --pretty=format:%aI",
+              "cd #{@platform.repository_path} && git --no-pager log #{merge_commit_id} --max-count 1 --pretty=format:%aI",
               log_to_stdout: log_debug?
             )
             error "Git history is not linear because of Merge commit #{merge_commit_id}" if Time.now - Time.parse(stdout.strip) < LOOKING_PERIOD

data/lib/hybrid_platforms_conductor/hpc_plugins/test/private_ips.rb

@@ -13,8 +13,7 @@ module HybridPlatformsConductor
           @nodes_handler.prefetch_metadata_of @nodes_handler.known_nodes, :private_ips
           private_ips = @nodes_handler.
             known_nodes.
-            map { |node| [node, @nodes_handler.get_private_ips_of(node) || []] }.
-            to_h
+            to_h { |node| [node, @nodes_handler.get_private_ips_of(node) || []] }
 
           # Check there are no duplicates
           nodes_per_private_ip = {}

data/lib/hybrid_platforms_conductor/hpc_plugins/test/public_ips.rb

@@ -13,8 +13,7 @@ module HybridPlatformsConductor
           @nodes_handler.prefetch_metadata_of @nodes_handler.known_nodes, :public_ips
           public_ips = @nodes_handler.
             known_nodes.
-            map { |node| [node, @nodes_handler.get_public_ips_of(node) || []] }.
-            to_h
+            to_h { |node| [node, @nodes_handler.get_public_ips_of(node) || []] }
 
           # Check there are no duplicates
           nodes_per_public_ip = {}

data/lib/hybrid_platforms_conductor/hpc_plugins/test/veids.rb

@@ -13,8 +13,7 @@ module HybridPlatformsConductor
           @nodes_handler.prefetch_metadata_of @nodes_handler.known_nodes, :veid
           veids = @nodes_handler.
             known_nodes.
-            map { |node| [node, @nodes_handler.get_veid_of(node) ? @nodes_handler.get_veid_of(node).to_i : nil] }.
-            to_h
+            to_h { |node| [node, @nodes_handler.get_veid_of(node) ? @nodes_handler.get_veid_of(node).to_i : nil] }
 
           # Check there are no duplicates
           veids.group_by { |_node, veid| veid }.each do |veid, nodes|

data/lib/hybrid_platforms_conductor/hpc_plugins/test/vulnerabilities.rb

@@ -57,7 +57,7 @@ module HybridPlatformsConductor
                 end
               )
               sudo = @actions_executor.sudo_prefix(@node)
-              urls.map do |url|
+              urls.to_h do |url|
                 # 1. Get the OVAL file on the node to be tested (uncompress it if needed)
                 # 2. Make sure oscap is installed
                 # 3. Generate the report for this OVAL file using oscap
@@ -143,7 +143,7 @@ module HybridPlatformsConductor
                     timeout: 240
                   }
                 ]
-              end.to_h
+              end
             else
               error "No OVAL file defined for image #{image} at #{oval_file}"
               {}