hybrid_platforms_conductor 33.0.0 → 33.0.1

data/lib/hybrid_platforms_conductor/hpc_plugins/log/remote_fs.rb

@@ -37,7 +37,7 @@ module HybridPlatformsConductor
             {
               ruby: proc do
                 FileUtils.mkdir_p File.dirname(log_file)
-                File.write(log_file, <<~EOS)
+                File.write(log_file, <<~EO_DEPLOYMENT_LOG)
                   #{
                     deployment_info.merge(
                       debug: log_debug? ? 'Yes' : 'No',
@@ -49,7 +49,7 @@ module HybridPlatformsConductor
                   #{stdout}
                   #{MARKER_STDERR}
                   #{stderr}
-                EOS
+                EO_DEPLOYMENT_LOG
               end,
               remote_bash: "#{sudo_prefix}mkdir -p /var/log/deployments && #{sudo_prefix}chmod 600 /var/log/deployments"
             },
@@ -112,7 +112,7 @@ module HybridPlatformsConductor
         #   * *exit_status* (Integer or Symbol): Deployment exit status
         #   * *stdout* (String): Deployment stdout
         #   * *stderr* (String): Deployment stderr
-        def logs_for(node, exit_status, stdout, stderr)
+        def logs_for(_node, exit_status, stdout, stderr)
           # Expected format for stdout:
           # Property1: Value1
           # ...
@@ -133,7 +133,8 @@ module HybridPlatformsConductor
               deploy_info = {}
               stdout_lines[0..stdout_idx - 1].each do |line|
                 if line =~ /^([^:]+): (.+)$/
-                  key_str, value = $1, $2
+                  key_str = Regexp.last_match(1)
+                  value = Regexp.last_match(2)
                   key = key_str.to_sym
                   # Type-cast some values
                   case key_str
@@ -164,7 +165,7 @@ module HybridPlatformsConductor
                 deployment_info: deploy_info,
                 exit_status: exit_status =~ /^\d+$/ ? Integer(exit_status) : exit_status.to_sym,
                 stdout: stdout_lines[stdout_idx + 1..stderr_idx - 1].join("\n"),
-                stderr: stdout_lines[stderr_idx + 1..-1].join("\n")
+                stderr: stdout_lines[stderr_idx + 1..].join("\n")
               }
             end
           end

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

@@ -45,7 +45,7 @@ module HybridPlatformsConductor
           end
 
         end
-        self.extend_config_dsl_with MyDSLExtension, :init_serverless_chef
+        extend_config_dsl_with MyDSLExtension, :init_serverless_chef
 
         # Constructor
         #
@@ -59,8 +59,8 @@ module HybridPlatformsConductor
         def initialize(
           platform_type,
           repository_path,
-          logger: Logger.new(STDOUT),
-          logger_stderr: Logger.new(STDERR),
+          logger: Logger.new($stdout),
+          logger_stderr: Logger.new($stderr),
           config: Config.new,
           cmd_runner: CmdRunner.new
         )
@@ -146,11 +146,10 @@ module HybridPlatformsConductor
               if info[:status].nil?
                 {}
               else
-                Hash[
-                  (info[:status][:added_files] + info[:status][:changed_files] + info[:status][:untracked_files]).
-                    sort.
-                    map { |f| [f, File.mtime("#{@repository_path}/#{f}").strftime('%F %T')] }
-                ]
+                (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
               end,
             deleted_files: info[:status].nil? ? [] : info[:status][:deleted_files].sort
           }
@@ -159,40 +158,41 @@ module HybridPlatformsConductor
             package_dir = "dist/#{local_environment ? 'local' : 'prod'}/#{service}"
             package_info_file = "#{@repository_path}/#{package_dir}/hpc_package.info"
             current_package_info = File.exist?(package_info_file) ? JSON.parse(File.read(package_info_file)).transform_keys(&:to_sym) : {}
-            unless current_package_info == package_info
-              Bundler.with_unbundled_env do
-                policy_file = "policyfiles/#{service}.rb"
-                if local_environment
-                  local_policy_file = "policyfiles/#{service}.local.rb"
-                  # In local mode, we always regenerate the lock file as we may modify the run list
-                  run_list = known_cookbook_paths.any? { |cookbook_path| File.exist?("#{@repository_path}/#{cookbook_path}/hpc_test/recipes/before_run.rb") } ? ['hpc_test::before_run'] : []
-                  dsl_parser = DslParser.new
-                  dsl_parser.parse("#{@repository_path}/#{policy_file}")
-                  run_list.concat dsl_parser.calls.find { |call_info| call_info[:method] == :run_list }[:args].flatten
-                  run_list << 'hpc_test::after_run' if known_cookbook_paths.any? { |cookbook_path| File.exist?("#{@repository_path}/#{cookbook_path}/hpc_test/recipes/after_run.rb") }
-                  File.write("#{@repository_path}/#{local_policy_file}", File.read("#{@repository_path}/#{policy_file}") + "\nrun_list #{run_list.map { |recipe| "'#{recipe}'" }.join(', ')}\n")
-                  policy_file = local_policy_file
-                end
-                lock_file = "#{File.dirname(policy_file)}/#{File.basename(policy_file, '.rb')}.lock.json"
-                # If the policy lock file does not exist, generate it
-                @cmd_runner.run_cmd "cd #{@repository_path} && /opt/chef-workstation/bin/chef install #{policy_file} --chef-license accept" unless File.exist?("#{@repository_path}/#{lock_file}")
-                extra_cp_data_bags = File.exist?("#{@repository_path}/data_bags") ? " && cp -ar data_bags/ #{package_dir}/" : ''
-                @cmd_runner.run_cmd "cd #{@repository_path} && \
-                  #{@cmd_runner.root? ? '' : 'sudo '}rm -rf #{package_dir} && \
-                  /opt/chef-workstation/bin/chef export #{policy_file} #{package_dir} --chef-license accept#{extra_cp_data_bags}"
-              end
-              unless @cmd_runner.dry_run
-                # Create secrets file
-                secrets_file = "#{@repository_path}/#{package_dir}/data_bags/hpc_secrets/hpc_secrets.json"
-                FileUtils.mkdir_p(File.dirname(secrets_file))
-                File.write(secrets_file, secrets.merge(id: 'hpc_secrets').to_json)
-                # Remember the package info
-                File.write(package_info_file, package_info.to_json)
+            next if current_package_info == package_info
+
+            Bundler.with_unbundled_env do
+              policy_file = "policyfiles/#{service}.rb"
+              if local_environment
+                local_policy_file = "policyfiles/#{service}.local.rb"
+                # In local mode, we always regenerate the lock file as we may modify the run list
+                run_list = known_cookbook_paths.any? { |cookbook_path| File.exist?("#{@repository_path}/#{cookbook_path}/hpc_test/recipes/before_run.rb") } ? ['hpc_test::before_run'] : []
+                dsl_parser = DslParser.new
+                dsl_parser.parse("#{@repository_path}/#{policy_file}")
+                run_list.concat dsl_parser.calls.find { |call_info| call_info[:method] == :run_list }[:args].flatten
+                run_list << 'hpc_test::after_run' if known_cookbook_paths.any? { |cookbook_path| File.exist?("#{@repository_path}/#{cookbook_path}/hpc_test/recipes/after_run.rb") }
+                File.write("#{@repository_path}/#{local_policy_file}", File.read("#{@repository_path}/#{policy_file}") + "\nrun_list #{run_list.map { |recipe| "'#{recipe}'" }.join(', ')}\n")
+                policy_file = local_policy_file
               end
+              lock_file = "#{File.dirname(policy_file)}/#{File.basename(policy_file, '.rb')}.lock.json"
+              # If the policy lock file does not exist, generate it
+              @cmd_runner.run_cmd "cd #{@repository_path} && /opt/chef-workstation/bin/chef install #{policy_file} --chef-license accept" unless File.exist?("#{@repository_path}/#{lock_file}")
+              extra_cp_data_bags = File.exist?("#{@repository_path}/data_bags") ? " && cp -ar data_bags/ #{package_dir}/" : ''
+              @cmd_runner.run_cmd "cd #{@repository_path} && \
+                #{@cmd_runner.root? ? '' : 'sudo '}rm -rf #{package_dir} && \
+                /opt/chef-workstation/bin/chef export #{policy_file} #{package_dir} --chef-license accept#{extra_cp_data_bags}"
             end
+            next if @cmd_runner.dry_run
+
+            # Create secrets file
+            secrets_file = "#{@repository_path}/#{package_dir}/data_bags/hpc_secrets/hpc_secrets.json"
+            FileUtils.mkdir_p(File.dirname(secrets_file))
+            File.write(secrets_file, secrets.merge(id: 'hpc_secrets').to_json)
+            # Remember the package info
+            File.write(package_info_file, package_info.to_json)
           end
         end
 
+        # rubocop:disable Lint/UnusedMethodArgument
         # Prepare deployments.
         # This method is called just before getting and executing the actions to be deployed.
         # It is called once per platform.
@@ -208,6 +208,7 @@ module HybridPlatformsConductor
         def prepare_for_deploy(services:, secrets:, local_environment:, why_run:)
           @local_env = local_environment
         end
+        # rubocop:enable Lint/UnusedMethodArgument
 
         # Get the list of actions to perform to deploy on a given node.
         # Those actions can be executed in parallel with other deployments on other nodes. They must be thread safe.
@@ -242,6 +243,7 @@ module HybridPlatformsConductor
             package_name = File.basename(package_dir)
             chef_versions_file = "#{@repository_path}/chef_versions.yml"
             raise "Missing file #{chef_versions_file} specifying the Chef Infra Client version to be deployed" unless File.exist?(chef_versions_file)
+
             required_chef_client_version = YAML.load_file(chef_versions_file)['client']
             sudo = (@actions_executor.connector(:ssh).ssh_user == 'root' ? '' : "#{@nodes_handler.sudo_on(node)} ")
             [
@@ -285,7 +287,7 @@ module HybridPlatformsConductor
         #     * *:changed*: The task has been changed
         #     * *:identical*: The task has not been changed
         #   * *diffs* (String): Differences, if any
-        def parse_deploy_output(stdout, stderr)
+        def parse_deploy_output(stdout, _stderr)
           tasks = []
           current_task = nil
           stdout.split("\n").each do |line|
@@ -293,8 +295,8 @@ module HybridPlatformsConductor
             case line.gsub(/\e\[[^\x40-\x7E]*[\x40-\x7E]/, '').strip
             when /^\* (\w+\[[^\]]+\]) action (.+)$/
               # New task
-              task_name = $1
-              task_action = $2
+              task_name = Regexp.last_match(1)
+              task_action = Regexp.last_match(2)
               current_task = {
                 name: task_name,
                 action: task_action,
@@ -303,7 +305,7 @@ module HybridPlatformsConductor
               tasks << current_task
             when /^- (.+)$/
               # Diff on the current task
-              diff_description = $1
+              diff_description = Regexp.last_match(1)
               unless current_task.nil?
                 current_task[:diffs] = '' unless current_task.key?(:diffs)
                 current_task[:diffs] << "#{diff_description}\n"
@@ -333,25 +335,23 @@ module HybridPlatformsConductor
           impacted_recipes = []
           impacted_global = false
           files_diffs.keys.sort.each do |impacted_file|
-            if impacted_file =~ /^policyfiles\/([^\/]+)\.rb$/
-              log_debug "[#{impacted_file}] - Impacted service: #{$1}"
-              impacted_services << $1
-            elsif impacted_file =~ /^policyfiles\/([^\/]+)\.lock.json$/
-              log_debug "[#{impacted_file}] - Impacted service: #{$1}"
-              impacted_services << $1
-            elsif impacted_file =~ /^nodes\/([^\/]+)\.json/
-              log_debug "[#{impacted_file}] - Impacted node: #{$1}"
-              impacted_nodes << $1
+            case impacted_file
+            when %r{^policyfiles/([^/]+)\.rb$}, %r{^policyfiles/([^/]+)\.lock.json$}
+              log_debug "[#{impacted_file}] - Impacted service: #{Regexp.last_match(1)}"
+              impacted_services << Regexp.last_match(1)
+            when %r{^nodes/([^/]+)\.json}
+              log_debug "[#{impacted_file}] - Impacted node: #{Regexp.last_match(1)}"
+              impacted_nodes << Regexp.last_match(1)
             else
-              cookbook_path = known_cookbook_paths.find { |cookbooks_path| impacted_file =~ /^#{Regexp.escape(cookbooks_path)}\/.+$/ }
+              cookbook_path = known_cookbook_paths.find { |cookbooks_path| impacted_file =~ %r{^#{Regexp.escape(cookbooks_path)}/.+$} }
               if cookbook_path.nil?
                 # Global file
                 log_debug "[#{impacted_file}] - Global file impacted"
                 impacted_global = true
               else
                 # File belonging to a cookbook
-                cookbook_name, file_path = impacted_file.match(/^#{cookbook_path}\/(\w+)\/(.+)$/)[1..2]
-                cookbook = cookbook_name.to_sym
+                file_cookbook_name, file_path = impacted_file.match(%r{^#{cookbook_path}/(\w+)/(.+)$})[1..2]
+                cookbook = file_cookbook_name.to_sym
                 # Small helper to register a recipe
                 register = proc do |source, recipe_name, cookbook_name: cookbook|
                   cookbook_name = cookbook_name.to_sym if cookbook_name.is_a?(String)
@@ -359,41 +359,41 @@ module HybridPlatformsConductor
                   impacted_recipes << [cookbook_name, recipe_name.to_sym]
                 end
                 case file_path
-                when /recipes\/(.+)\.rb/
-                  register.call('direct', $1)
-                when /attributes\/.+\.rb/, 'metadata.rb'
+                when %r{recipes/(.+)\.rb}
+                  register.call('direct', Regexp.last_match(1))
+                when %r{attributes/.+\.rb}, 'metadata.rb'
                   # Consider all recipes are impacted
                   Dir.glob("#{@repository_path}/#{cookbook_path}/#{cookbook}/recipes/*.rb") do |recipe_path|
                     register.call('attributes', File.basename(recipe_path, '.rb'))
                   end
-                when /(templates|files)\/(.+)/
+                when %r{(templates|files)/(.+)}
                   # Find recipes using this file name
-                  included_file = File.basename($2)
+                  included_file = File.basename(Regexp.last_match(2))
                   template_regexp = /["']#{Regexp.escape(included_file)}["']/
                   Dir.glob("#{@repository_path}/#{cookbook_path}/#{cookbook}/recipes/*.rb") do |recipe_path|
                     register.call("included file #{included_file}", File.basename(recipe_path, '.rb')) if File.read(recipe_path) =~ template_regexp
                   end
-                when /resources\/(.+)/
+                when %r{resources/(.+)}
                   # Find any recipe using this resource
-                  included_resource = "#{cookbook}_#{File.basename($1, '.rb')}"
+                  included_resource = "#{cookbook}_#{File.basename(Regexp.last_match(1), '.rb')}"
                   resource_regexp = /(\W|^)#{Regexp.escape(included_resource)}(\W|$)/
                   known_cookbook_paths.each do |cookbooks_path|
                     Dir.glob("#{@repository_path}/#{cookbooks_path}/**/recipes/*.rb") do |recipe_path|
                       if File.read(recipe_path) =~ resource_regexp
-                        cookbook_name, recipe_name = recipe_path.match(/#{cookbooks_path}\/(\w+)\/recipes\/(\w+)\.rb/)[1..2]
+                        cookbook_name, recipe_name = recipe_path.match(%r{#{cookbooks_path}/(\w+)/recipes/(\w+)\.rb})[1..2]
                         register.call("included resource #{included_resource}", recipe_name, cookbook_name: cookbook_name)
                       end
                     end
                   end
-                when /libraries\/(.+)/
+                when %r{libraries/(.+)}
                   # Find any recipe using methods from this library
-                  lib_methods_regexps = File.read("#{@repository_path}/#{impacted_file}").scan(/(\W|^)def\s+(\w+)(\W|$)/).map { |_grp1, method_name, _grp2| /(\W|^)#{Regexp.escape(method_name)}(\W|$)/ }
+                  lib_methods_regexps = File.read("#{@repository_path}/#{impacted_file}").scan(/(\W|^)def\s+(\w+)(\W|$)/).map { |_grp_1, method_name, _grp_2| /(\W|^)#{Regexp.escape(method_name)}(\W|$)/ }
                   known_cookbook_paths.each do |cookbooks_path|
                     Dir.glob("#{@repository_path}/#{cookbooks_path}/**/recipes/*.rb") do |recipe_path|
                       file_content = File.read(recipe_path)
                       found_lib_regexp = lib_methods_regexps.find { |regexp| file_content =~ regexp }
                       unless found_lib_regexp.nil?
-                        cookbook_name, recipe_name = recipe_path.match(/#{cookbooks_path}\/(\w+)\/recipes\/(\w+)\.rb/)[1..2]
+                        cookbook_name, recipe_name = recipe_path.match(%r{#{cookbooks_path}/(\w+)/recipes/(\w+)\.rb})[1..2]
                         register.call("included library helper #{found_lib_regexp.source[6..-7]}", recipe_name, cookbook_name: cookbook_name)
                       end
                     end
@@ -476,6 +476,7 @@ module HybridPlatformsConductor
           dsl_parser.parse(policy_file)
           run_list_call = dsl_parser.calls.find { |call_info| call_info[:method] == :run_list }
           raise "Policy #{policy} has no run list defined in #{policy_file}" if run_list_call.nil?
+
           run_list_call[:args].map { |recipe_def| decode_recipe(recipe_def) }
         end
 
@@ -493,13 +494,14 @@ module HybridPlatformsConductor
         # * Symbol: The cookbook name
         # * Symbol: The recipe name
         def decode_recipe(recipe_def)
-          recipe_def = $1 if recipe_def =~ /^recipe\[(.+)\]$/
+          recipe_def = Regexp.last_match(1) if recipe_def =~ /^recipe\[(.+)\]$/
           cookbook, recipe = recipe_def.split('::').map(&:to_sym)
           recipe = :default if recipe.nil?
           # Find the cookbook it belongs to
           cookbook_dir = known_cookbook_paths.find { |cookbook_path| File.exist?("#{@repository_path}/#{cookbook_path}/#{cookbook}") }
           raise "Unknown recipe #{cookbook}::#{recipe} from cookbook #{@repository_path}/#{cookbook_dir}/#{cookbook}." if !cookbook_dir.nil? && !File.exist?("#{@repository_path}/#{cookbook_dir}/#{cookbook}/recipes/#{recipe}.rb")
-          return cookbook_dir, cookbook, recipe
+
+          [cookbook_dir, cookbook, recipe]
         end
 
         private

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

@@ -29,6 +29,10 @@ module HybridPlatformsConductor
             instance_eval(File.read(source))
           end
 
+          # Intercept all missing methods
+          #
+          # Parameters::
+          # * *method_name* (Symbol): The missing method being called
           def method_missing(method_name, *args, &block)
             sub_calls = []
             @calls << {
@@ -40,6 +44,15 @@ module HybridPlatformsConductor
             DslParser.new(sub_calls)
           end
 
+          # Make sure we register the methods we handle in method_missing
+          #
+          # Parameters::
+          # * *name* (Symbol): The missing method name
+          # * *include_private* (Boolean): Should we include private methods in the search?
+          def respond_to_missing?(_name, _include_private)
+            true
+          end
+
         end
 
       end

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

@@ -40,11 +40,14 @@ module HybridPlatformsConductor
                 add_recipe_in_tree(cookbook_dir, cookbook, recipe)
               end
             end
+            # Make sure we don't combine those 2 loops
+            # rubocop:disable Style/CombinableLoops
             @platform.deployable_services.each do |service|
-              @platform.policy_run_list(service).each do |(cookbook_dir, cookbook, recipe)|
+              @platform.policy_run_list(service).each do |(_cookbook_dir, cookbook, recipe)|
                 mark_recipe_used_by_policy(cookbook, recipe, service)
               end
             end
+            # rubocop:enable Style/CombinableLoops
             @recipes_tree
           end
 
@@ -58,25 +61,25 @@ module HybridPlatformsConductor
           # * *recipe* (Symbol): The recipe name
           def add_recipe_in_tree(cookbook_dir, cookbook, recipe)
             @recipes_tree[cookbook] = {} unless @recipes_tree.key?(cookbook)
-            unless @recipes_tree[cookbook].key?(recipe)
-              recipe_info =
-                if cookbook_dir.nil?
-                  # This recipe comes from an external cookbook, we won't get into it.
-                  {
-                    included_recipes: [],
-                    used_templates: [],
-                    used_files: [],
-                    used_cookbooks: []
-                  }
-                else
-                  recipe_usage(cookbook_dir, cookbook, recipe)
-                end
-              @recipes_tree[cookbook][recipe] = recipe_info.merge(
-                used_by_policies: []
-              )
-              recipe_info[:included_recipes].each do |(sub_cookbook_dir, sub_cookbook, sub_recipe)|
-                add_recipe_in_tree(sub_cookbook_dir, sub_cookbook, sub_recipe)
+            return if @recipes_tree[cookbook].key?(recipe)
+
+            recipe_info =
+              if cookbook_dir.nil?
+                # This recipe comes from an external cookbook, we won't get into it.
+                {
+                  included_recipes: [],
+                  used_templates: [],
+                  used_files: [],
+                  used_cookbooks: []
+                }
+              else
+                recipe_usage(cookbook_dir, cookbook, recipe)
               end
+            @recipes_tree[cookbook][recipe] = recipe_info.merge(
+              used_by_policies: []
+            )
+            recipe_info[:included_recipes].each do |(sub_cookbook_dir, sub_cookbook, sub_recipe)|
+              add_recipe_in_tree(sub_cookbook_dir, sub_cookbook, sub_recipe)
             end
           end
 
@@ -115,18 +118,18 @@ module HybridPlatformsConductor
             recipe_content.
               scan(/source\s+(["'])(.+?)\1/).
               each do |(_sub_grp, source)|
-                sources << source unless source =~ /^https?:\/\//
+                sources << source unless source =~ %r{^https?://}
               end
             erb_sources = sources.select { |source| File.extname(source).downcase == '.erb' }
             non_erb_sources = sources - erb_sources
             erb_sources.concat(recipe_content.scan(/template:?\s+(["'])(.+?)\1/).map { |(_sub_grp, source)| source })
             # Check for known resources and library methods
             used_cookbooks = []
-            known_resources.each do |cookbook, methods|
-              used_cookbooks << cookbook if methods.any? { |method_name| recipe_content.include?(method_name) }
+            known_resources.each do |itr_cookbook, methods|
+              used_cookbooks << itr_cookbook if methods.any? { |method_name| recipe_content.include?(method_name) }
             end
-            known_library_methods.each do |cookbook, methods|
-              used_cookbooks << cookbook if methods.any? { |method_name| recipe_content.include?(method_name) }
+            known_library_methods.each do |itr_cookbook, methods|
+              used_cookbooks << itr_cookbook if methods.any? { |method_name| recipe_content.include?(method_name) }
             end
             {
               included_recipes: used_recipes,
@@ -171,9 +174,9 @@ module HybridPlatformsConductor
               @known_library_methods = {}
               for_each_cookbook do |cookbook, cookbook_dir|
                 if File.exist?("#{cookbook_dir}/libraries")
-                  found_methods =  Dir.glob("#{cookbook_dir}/libraries/*.rb").
-                      map { |lib_file| File.read(lib_file).scan(/\bdef\s+(\w+)\b/).map { |(method_name)| method_name } }.
-                      flatten - INVALID_LIBRARY_METHODS
+                  found_methods = Dir.glob("#{cookbook_dir}/libraries/*.rb").
+                    map { |lib_file| File.read(lib_file).scan(/\bdef\s+(\w+)\b/).map { |(method_name)| method_name } }.
+                    flatten - INVALID_LIBRARY_METHODS
                   @known_library_methods[cookbook] = found_methods unless found_methods.empty?
                 end
               end
@@ -184,15 +187,13 @@ module HybridPlatformsConductor
           # Iterate over all cookbooks
           #
           # Parameters::
-          # * Proc: Code called for each cookbook:
+          # * *block* (Proc): Code called for each cookbook:
           #   * Parameters::
           #     * *cookbook* (Symbol): Cookbook name
           #     * *cookbook_dir* (String): Cookbook directory
-          def for_each_cookbook
+          def for_each_cookbook(&block)
             @platform.known_cookbook_paths.each do |cookbook_path|
-              cookbooks_in(cookbook_path).each do |cookbook, cookbook_dir|
-                yield cookbook, cookbook_dir
-              end
+              cookbooks_in(cookbook_path).each(&block)
             end
           end
 
@@ -203,7 +204,7 @@ module HybridPlatformsConductor
           # Result::
           # * Hash<Symbol, String>: List of cookbook directories, per cookbook name
           def cookbooks_in(cookbook_type)
-            Hash[Dir.glob("#{@platform.repository_path}/#{cookbook_type}/*").map { |dir| [File.basename(dir).to_sym, dir] }.sort]
+            Dir.glob("#{@platform.repository_path}/#{cookbook_type}/*").map { |dir| [File.basename(dir).to_sym, dir] }.sort.to_h
           end
 
           # Mark a recipe (and its included recipes) as used by a policy
@@ -213,11 +214,11 @@ module HybridPlatformsConductor
           # * *recipe* (Symbol): The recipe
           # * *used_by_policy* (String): The policy using this recipe
           def mark_recipe_used_by_policy(cookbook, recipe, used_by_policy)
-            unless @recipes_tree[cookbook][recipe][:used_by_policies].include?(used_by_policy)
-              @recipes_tree[cookbook][recipe][:used_by_policies] << used_by_policy
-              @recipes_tree[cookbook][recipe][:included_recipes].each do |(_sub_cookbook_dir, sub_cookbook, sub_recipe)|
-                mark_recipe_used_by_policy(sub_cookbook, sub_recipe, used_by_policy)
-              end
+            return if @recipes_tree[cookbook][recipe][:used_by_policies].include?(used_by_policy)
+
+            @recipes_tree[cookbook][recipe][:used_by_policies] << used_by_policy
+            @recipes_tree[cookbook][recipe][:included_recipes].each do |(_sub_cookbook_dir, sub_cookbook, sub_recipe)|
+              mark_recipe_used_by_policy(sub_cookbook, sub_recipe, used_by_policy)
             end
           end