hybrid_platforms_conductor 33.8.3 → 33.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 80a9228f00ac63d2ddf325f1fd4faeab83af8d7bbf73c43ff46d4632883462a4
-  data.tar.gz: 225b174fb0107a743e4daeda8a65148b8ce7d0ea81fb0862066a3626e60b7571
+  metadata.gz: 2a6b91bf179fa45f605d1b08d8c21cced9547c0588139b1998fca01a19f75abe
+  data.tar.gz: 5372e49247ba48adf64eed5a9fe3cc5aff5b2e82be8bc834a2283f815cc4c928
 SHA512:
-  metadata.gz: cc3c6a8c0a245a1929481f2e5482fdc3b9100dc24dab7a98bfbc026a294a8ef88b359060608cafb5c9937197ad89fc39630e3b56265888f5c913be9435960a3b
-  data.tar.gz: c82665286ed8c6783b02640e4122eb08d555c0d04fecbc49a688194caf828144f63f243824e28be8a120f41a331cd5194497b9ede07630d9347e8888383187b9
+  metadata.gz: a1d886444be942a74153cb834e450b8062356959aaca508e10186bcb444f63295f8fc198b3e49f94babbbb7b6315bed146c1a29c21ab23d9112de94971e18d11
+  data.tar.gz: 31640de82a155dc42128926683fe7ded34039bad1cb639ff6bb8d4571f7f01a191f2103ea6a01c3de60322dc67015e92c833a0e8597b10bb3d6030e10199a864

data/CHANGELOG.md

@@ -1,3 +1,51 @@
+# [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
+### Patches
+
+* [[Feature(platform_handler)] [#102] Add the name option when declaring platforms to set the platform name](https://github.com/sweet-delights/hybrid-platforms-conductor/commit/13ada7687f08b3f970521320e2b26ea42d9a6d7f)
+
+## Changes for platform_handler
+### Features
+
+* [[Feature(platform_handler)] [#102] Add the name option when declaring platforms to set the platform name](https://github.com/sweet-delights/hybrid-platforms-conductor/commit/13ada7687f08b3f970521320e2b26ea42d9a6d7f)
+
+# [v33.8.4](https://github.com/sweet-delights/hybrid-platforms-conductor/compare/v33.8.3...v33.8.4) (2021-08-20 15:45:41)
+
+## Global changes
+### Patches
+
+* [[Fix(platform_handler_serverless_chef)] [#99] Make sure dynamic or unparsable cookbook/recipe names are considered using metadata for recipes dependencies](https://github.com/sweet-delights/hybrid-platforms-conductor/commit/1d7feb24881f04cd3f31bc1e41712dfc4cfe715f)
+
+## Changes for platform_handler_serverless_chef
+### Patches
+
+* [[Fix(platform_handler_serverless_chef)] [#99] Make sure dynamic or unparsable cookbook/recipe names are considered using metadata for recipes dependencies](https://github.com/sweet-delights/hybrid-platforms-conductor/commit/1d7feb24881f04cd3f31bc1e41712dfc4cfe715f)
+
 # [v33.8.3](https://github.com/sweet-delights/hybrid-platforms-conductor/compare/v33.8.2...v33.8.3) (2021-08-16 14:18:52)
 
 ## Global changes

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/docs/config_dsl.md

@@ -28,19 +28,25 @@ This DSL can also be completed by plugins. Check [the plugins documentations](pl
 Declare a new platform of type `<platform_type>`, providing either a local path to it (using `path: '/path/to/files'`) or a git repository to it (using `git: 'git_url'`). The possible platform types are the names of the [`platform_handler` plugins](plugins.md#platform_handler).
 
 Git branches can also be specified using `branch: 'branch_name'`.
+
+The name of the platform (as used for example by the [`for_nodes`](#for_nodes) DSL) defaults to the base name of the directory in case of a local path, or the base name of the first remote in case of a git repository. It can be enforced to a given name using `name: 'platform_name'` (useful to avoid name conflicts and keep consistency with the rest of your configuration among the team).
+
 An optional code block taking the local repository path as parameter can also be specified to add configuration that is specific to this platform.
 
 Examples:
 ```ruby
-# Declare a platform of type Chef, located in a distant git repository
+# Declare a platform of type Chef, located in a distant git repository (its name will be my-chef-repo)
 chef_platform git: 'https://my-git.domain.com/project/my-chef-repo.git'
 
-# Declare a platform located in a local path
-chef_platform path: '/path/to/my-chef-repo'
+# Declare a platform located in a local path (its name will be my-other-chef-repo)
+chef_platform path: '/path/to/my-other-chef-repo'
+
+# Declare a platform located in a local path and forces its name (its name will be my-platform)
+chef_platform path: '/path/to/my-repo', name: 'my-platform'
 
 # Declare a platform from a git branch, and apply some configuration to it
 chef_platform(
-  git: 'https://my-git.domain.com/project/my-chef-repo.git',
+  git: 'https://my-git.domain.com/project/devops-chef-repo.git',
   branch: 'my-branch'
 ) do |path|
   # Here path will be a local path containing a checkout of the branch my-branch of the git repo.

data/lib/hybrid_platforms_conductor/deployer.rb

@@ -475,9 +475,15 @@ module HybridPlatformsConductor
         progress_name: 'Read deployment logs'
       )
       nodes.map 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

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

@@ -26,7 +26,7 @@ module HybridPlatformsConductor
           # Parameters::
           # * *source* (String): File to parse
           def parse(source)
-            instance_eval(File.read(source))
+            instance_eval(File.read(source), source)
           end
 
           # Intercept all missing methods

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

@@ -105,8 +105,59 @@ module HybridPlatformsConductor
             recipe_content = File.read("#{@platform.repository_path}/#{cookbook_dir}/#{cookbook}/recipes/#{recipe}.rb")
             # Check for include_recipe
             used_recipes = recipe_content.
-              scan(/include_recipe\s+["'](\w+(::\w+)?)["']/).
-              map { |(recipe_def, _sub_grp)| @platform.decode_recipe(recipe_def) }
+              scan(/include_recipe(\((.+)\)|\s+(.+)|\((.*))$/).
+              map do |(_match, match_1, match_2, match_3)|
+                case match_1 || match_2 || match_3
+                when /^["']([^:'"]+(::[^'"]+)?)["']$/
+                  # The recipe definition is given in a String
+                  used_cookbook, used_recipe = Regexp.last_match(1).split('::')
+                  used_recipe = 'default' if used_recipe.nil?
+                  if used_cookbook =~ /^\w+$/
+                    # Find the cookbook it belongs to
+                    used_cookbook_dir = @platform.known_cookbook_paths.find { |cookbook_path| File.exist?("#{@platform.repository_path}/#{cookbook_path}/#{used_cookbook}") }
+                    if used_recipe =~ /^\w+$/
+                      # Check that the recipe exists if we know the cookbook dir
+                      raise "Unknown recipe #{used_cookbook}::#{used_recipe} from cookbook #{@platform.repository_path}/#{used_cookbook_dir}/#{used_cookbook}." if !used_cookbook_dir.nil? && !File.exist?("#{@platform.repository_path}/#{used_cookbook_dir}/#{used_cookbook}/recipes/#{used_recipe}.rb")
+
+                      [
+                        [used_cookbook_dir, used_cookbook.to_sym, used_recipe.to_sym]
+                      ]
+                    elsif used_cookbook_dir
+                      # We are dealing with a dynamically named recipe.
+                      # Return all recipes of the cookbook if we know the cookbook dir
+                      Dir.glob("#{@platform.repository_path}/#{used_cookbook_dir}/#{used_cookbook}/recipes/*.rb").map do |used_recipe_file_path|
+                        [
+                          used_cookbook_dir,
+                          used_cookbook.to_sym,
+                          File.basename(used_recipe_file_path, '.rb').to_sym
+                        ]
+                      end
+                    else
+                      # We are dealing with a dynamically named recipe.
+                      # We have no cookbook dir - certainly comes from the supermarket.
+                      []
+                    end
+                  elsif used_recipe =~ /^\w+$/
+                    # We are dealing with a dynamically named cookbook, but the recipe name is known.
+                    # Look for this recipe in all cookbooks that are part of the metadata.
+                    dependent_cookbooks(cookbook_dir, cookbook).map do |dependent_cookbook|
+                      dependent_cookbook_dir = @platform.known_cookbook_paths.find { |cookbook_path| File.exist?("#{@platform.repository_path}/#{cookbook_path}/#{dependent_cookbook}") }
+                      if !dependent_cookbook_dir.nil? && File.exist?("#{@platform.repository_path}/#{dependent_cookbook_dir}/#{dependent_cookbook}/recipes/#{used_recipe}.rb")
+                        # Found a matching recipe name
+                        [dependent_cookbook_dir, dependent_cookbook, used_recipe.to_sym]
+                      end
+                    end.compact
+                  else
+                    # We are dealing with cynamically named cookbooks and recipes.
+                    # Consider we depend on all recipes of our dependent cookbooks.
+                    all_dependent_recipes(cookbook_dir, cookbook)
+                  end
+                else
+                  # The recipe definition is much more complex, so treat it as unparsable and consider we depnd on all recipes of our dependent cookbooks from metadata.
+                  all_dependent_recipes(cookbook_dir, cookbook)
+                end
+              end.
+              flatten(1)
             # Check for some helpers we know include some recipes
             @config.known_helpers_including_recipes.each do |helper_name, used_recipes_by_helper|
               if recipe_content =~ Regexp.new(/(\W|^)#{Regexp.escape(helper_name)}(\W|$)/)
@@ -222,6 +273,47 @@ module HybridPlatformsConductor
             end
           end
 
+          # Get the list of dependent cookbooks from a cookbook's metadata
+          #
+          # Parameters::
+          # * *cookbook_dir* (String): The cookbook directory
+          # * *cookbook* (Symbol): The cookbook name
+          # Result::
+          # * Array<Symbol>: List of dependent cookbooks
+          def dependent_cookbooks(cookbook_dir, cookbook)
+            # Read the metadata file
+            dsl_parser = DslParser.new
+            dsl_parser.parse("#{@platform.repository_path}/#{cookbook_dir}/#{cookbook}/metadata.rb")
+            dsl_parser.
+              calls.
+              map { |call_info| call_info[:method] == :depends ? call_info[:args].first.to_sym : nil }.
+              compact
+          end
+
+          # Get all recipes from all cookbooks that are a metadata dependency from a given cookbook.
+          #
+          # Parameters::
+          # * *cookbook_dir* (String): The cookbook directory
+          # * *cookbook* (Symbol): The cookbook name
+          # Result::
+          # * Array< [String, Symbol, Symbol] >: List of tuples [cookbook_dir, cookbook, recipe] used by this recipe
+          def all_dependent_recipes(cookbook_dir, cookbook)
+            dependent_cookbooks(cookbook_dir, cookbook).map do |dependent_cookbook|
+              dependent_cookbook_dir = @platform.known_cookbook_paths.find { |cookbook_path| File.exist?("#{@platform.repository_path}/#{cookbook_path}/#{dependent_cookbook}") }
+              if dependent_cookbook_dir.nil?
+                nil
+              else
+                Dir.glob("#{@platform.repository_path}/#{dependent_cookbook_dir}/#{dependent_cookbook}/recipes/*.rb").map do |used_recipe_file_path|
+                  [
+                    dependent_cookbook_dir,
+                    dependent_cookbook,
+                    File.basename(used_recipe_file_path, '.rb').to_sym
+                  ]
+                end
+              end
+            end.compact.flatten(1)
+          end
+
         end
 
       end

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

@@ -47,24 +47,10 @@ module HybridPlatformsConductor
         end
         extend_config_dsl_with MyDSLExtension, :init_serverless_chef
 
-        # Constructor
-        #
-        # Parameters::
-        # * *platform_type* (Symbol): Platform type
-        # * *repository_path* (String): Repository path
-        # * *logger* (Logger): Logger to be used [default: Logger.new(STDOUT)]
-        # * *logger_stderr* (Logger): Logger to be used for stderr [default: Logger.new(STDERR)]
-        # * *config* (Config): Config to be used. [default: Config.new]
-        # * *cmd_runner* (CmdRunner): Command executor to be used. [default: CmdRunner.new]
-        def initialize(
-          platform_type,
-          repository_path,
-          logger: Logger.new($stdout),
-          logger_stderr: Logger.new($stderr),
-          config: Config.new,
-          cmd_runner: CmdRunner.new
-        )
-          super
+        # Initialize a new instance of this platform handler.
+        # [API] - This method is optional.
+        # [API] - @cmd_runner is accessible.
+        def init
           # Mutex for getting the full recipes tree
           @recipes_tree_mutex = Mutex.new
         end

data/lib/hybrid_platforms_conductor/platform_handler.rb

@@ -17,13 +17,13 @@ module HybridPlatformsConductor
       # Make sure we define automatically a helper for such a platform
       mixin = Module.new
       platform_type = subclass.name.split('::').last.gsub(/([a-z\d])([A-Z\d])/, '\1_\2').downcase.to_sym
-      mixin.define_method("#{platform_type}_platform".to_sym) do |path: nil, git: nil, branch: 'master', &platform_config_code|
+      mixin.define_method("#{platform_type}_platform".to_sym) do |path: nil, git: nil, branch: 'master', name: nil, &platform_config_code|
         repository_path =
           if !path.nil?
             path
           elsif !git.nil?
             # Clone in a local repository
-            local_repository_path = "#{@git_platforms_dir}/#{File.basename(git)[0..-File.extname(git).size - 1]}"
+            local_repository_path = "#{@git_platforms_dir}/#{name.nil? ? File.basename(git)[0..-File.extname(git).size - 1] : name}"
             unless File.exist?(local_repository_path)
               branch = "refs/heads/#{branch}" unless branch.include?('/')
               local_ref = "refs/remotes/origin/#{branch.split('/').last}"
@@ -37,8 +37,10 @@ module HybridPlatformsConductor
           else
             raise 'The platform has to be defined with either a path or a git URL'
           end
-        @platform_dirs[platform_type] = [] unless @platform_dirs.key?(platform_type)
-        @platform_dirs[platform_type] << repository_path
+        @platforms_info[platform_type] = {} unless @platforms_info.key?(platform_type)
+        raise "Platform repository path #{repository_path} is declared several times." if @platforms_info.values.any? { |known_platforms_info| known_platforms_info.key?(repository_path) }
+
+        @platforms_info[platform_type][repository_path] = name.nil? ? {} : { name: name }
         platform_config_code&.call(repository_path)
       end
       # Register this new mixin in the Config DSL
@@ -66,18 +68,21 @@ module HybridPlatformsConductor
     # * *logger_stderr* (Logger): Logger to be used for stderr [default: Logger.new(STDERR)]
     # * *config* (Config): Config to be used. [default: Config.new]
     # * *cmd_runner* (CmdRunner): Command executor to be used. [default: CmdRunner.new]
+    # * *name* (String or nil): Platform name, or nil for defaults (based on path or git remote) [default: nil]
     def initialize(
       platform_type,
       repository_path,
       logger: Logger.new($stdout),
       logger_stderr: Logger.new($stderr),
       config: Config.new,
-      cmd_runner: CmdRunner.new
+      cmd_runner: CmdRunner.new,
+      name: nil
     )
       super(logger: logger, logger_stderr: logger_stderr, config: config)
       @platform_type = platform_type
       @repository_path = repository_path
       @cmd_runner = cmd_runner
+      @name = name
       init if respond_to?(:init)
     end
 
@@ -142,7 +147,12 @@ module HybridPlatformsConductor
             git_status = git.status
             git_commit = git.log.first
             {
-              repo_name: git.remotes.empty? ? File.basename(@repository_path) : File.basename(git.remotes.first.url).gsub(/\.git$/, ''),
+              repo_name:
+                if @name.nil?
+                  git.remotes.empty? ? File.basename(@repository_path) : File.basename(git.remotes.first.url).gsub(/\.git$/, '')
+                else
+                  @name
+                end,
               commit: {
                 id: git_commit.sha,
                 ref: git_commit.name,
@@ -162,7 +172,7 @@ module HybridPlatformsConductor
             }
           else
             {
-              repo_name: File.basename(@repository_path)
+              repo_name: @name.nil? ? File.basename(@repository_path) : @name
             }
           end
       end

data/lib/hybrid_platforms_conductor/platforms_handler.rb

@@ -9,13 +9,14 @@ module HybridPlatformsConductor
     # Add some config DSL
     module ConfigDSLExtension
 
-      # List of platforms repository directories, per platform type
-      #   Hash<Symbol, Array<String> >
-      attr_reader :platform_dirs
+      # List of platforms repository directories and their associated info, per platform type
+      #   Hash<Symbol,        Hash<String,          Hash<Symbol,Object> > >
+      #   Hash<platform_type, Hash<repository_path, Hash<Symbol,Object> > >
+      attr_reader :platforms_info
 
       # Mixin initializer
       def init_platforms_handler
-        @platform_dirs = {}
+        @platforms_info = {}
         # Directory in which platforms are cloned
         @git_platforms_dir = "#{@hybrid_platforms_dir}/cloned_platforms"
       end
@@ -46,15 +47,16 @@ module HybridPlatformsConductor
       # Hash<Symbol, Array<PlatformHandler> >
       @platform_handlers = {}
       # Read all platforms from the config
-      @config.platform_dirs.each do |platform_type, repositories|
-        repositories.each do |repository_path|
+      @config.platforms_info.each do |platform_type, repositories_info|
+        repositories_info.each do |repository_path, repository_info|
           platform_handler = @platform_types[platform_type].new(
             platform_type,
             repository_path,
             logger: @logger,
             logger_stderr: @logger_stderr,
             config: @config,
-            cmd_runner: @cmd_runner
+            cmd_runner: @cmd_runner,
+            name: repository_info[:name]
           )
           # Check that this platform has unique name
           raise "Platform name #{platform_handler.name} is declared several times." if @platform_handlers.values.flatten.any? { |known_platform| known_platform.name == platform_handler.name }

data/lib/hybrid_platforms_conductor/version.rb

@@ -1,5 +1,5 @@
 module HybridPlatformsConductor
 
-  VERSION = '33.8.3'
+  VERSION = '33.9.2'
 
 end

data/spec/hybrid_platforms_conductor_test/api/deployer/deploy_spec.rb

@@ -196,6 +196,50 @@ describe HybridPlatformsConductor::Deployer do
         end
       end
 
+      it 'gets deployment info from log plugins returning UTF-8 characters' do
+        with_test_platform_for_deploy_tests({ nodes: { 'node' => {} } }) do
+          HybridPlatformsConductorTest::TestLogPlugin.mocked_logs = {
+            'node' => {
+              deployment_info: { user: 'test_user' },
+              exit_status: 666,
+              services: %w[unknown],
+              stderr: 'stderrの展開テストログ',
+              stdout: 'stdoutの展開テストログ'
+            }
+          }
+          expect_actions_executor_runs [
+            # Expect the actions to get log files
+            proc do |actions_per_nodes|
+              expect(actions_per_nodes).to eq('node' => [{ bash: 'echo Read logs for node' }])
+              # Simulate the fact that data returned by the ssh system calls can contain UTF-8 chars, but is perceived as binary
+              { 'node' => [42, 'ログファイルはstdoutを読み取ります'.force_encoding('BINARY'), 'ログファイルはstderrを読み取ります'.force_encoding('BINARY')] }
+            end
+          ]
+          expect(test_deployer.deployment_info_from('node')).to eq(
+            'node' => {
+              deployment_info: { user: 'test_user' },
+              exit_status: 666,
+              services: %w[unknown],
+              stderr: 'stderrの展開テストログ',
+              stdout: 'stdoutの展開テストログ'
+            }
+          )
+          expect(HybridPlatformsConductorTest::TestLogPlugin.calls).to eq [
+            {
+              method: :actions_to_read_logs,
+              node: 'node'
+            },
+            {
+              method: :logs_for,
+              node: 'node',
+              exit_status: 42,
+              stdout: 'ログファイルはstdoutを読み取ります',
+              stderr: 'ログファイルはstderrを読み取ります'
+            }
+          ]
+        end
+      end
+
       it 'gets deployment info from log plugins not having actions_to_read_logs' do
         with_test_platform_for_deploy_tests({ nodes: { 'node' => {} } }, additional_config: 'send_logs_to :test_log_no_read') do
           expect(test_deployer.deployment_info_from('node')).to eq(

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

@@ -15,6 +15,10 @@ describe HybridPlatformsConductor::NodesHandler do
           },
           'platform2' => {
             nodes: { 'node4' => {}, 'node5' => { services: %w[service3 service1] }, 'node6' => {} }
+          },
+          'platform3' => {
+            nodes: { 'node7' => {} },
+            name: 'other_platform'
           }
         },
         &block
@@ -24,12 +28,13 @@ describe HybridPlatformsConductor::NodesHandler do
     # List all tests of nodes selectors, and the corresponding nodes list they should be resolved into
     {
       [] => [],
-      [{ all: true }] => %w[node1 node2 node3 node4 node5 node6],
+      [{ all: true }] => %w[node1 node2 node3 node4 node5 node6 node7],
       'node1' => %w[node1],
       '/node[12]/' => %w[node1 node2],
       [{ list: 'nodeslist1' }] => %w[node1 node3],
       [{ list: 'nodeslist2' }] => %w[node1 node2],
       [{ platform: 'platform2' }] => %w[node4 node5 node6],
+      [{ platform: 'other_platform' }] => %w[node7],
       [{ service: 'service1' }] => %w[node2 node5],
       ['/node[12]/', { service: 'service1' }] => %w[node1 node2 node5],
       [{ git_diff: { platform: 'platform2' } }] => %w[node4 node5 node6]
@@ -45,13 +50,13 @@ describe HybridPlatformsConductor::NodesHandler do
 
     it 'fails when selecting unknown nodes' do
       with_test_platform_for_nodes do
-        expect { test_nodes_handler.select_nodes('node1', 'node7') }.to raise_error(RuntimeError, 'Unknown nodes: node7')
+        expect { test_nodes_handler.select_nodes('node1', 'unknown_node') }.to raise_error(RuntimeError, 'Unknown nodes: unknown_node')
       end
     end
 
     it 'ignore unknown nodes when asked' do
       with_test_platform_for_nodes do
-        expect(test_nodes_handler.select_nodes(%w[node1 node7], ignore_unknowns: true).sort).to eq %w[node1 node7].sort
+        expect(test_nodes_handler.select_nodes(%w[node1 unknown_node], ignore_unknowns: true).sort).to eq %w[node1 unknown_node].sort
       end
     end
 
@@ -105,7 +110,7 @@ describe HybridPlatformsConductor::NodesHandler do
 
     it 'considers all nodes for en empty nodes selector stack' do
       with_test_platform_for_nodes do
-        expect(test_nodes_handler.select_from_nodes_selector_stack([]).sort).to eq %w[node1 node2 node3 node4 node5 node6].sort
+        expect(test_nodes_handler.select_from_nodes_selector_stack([]).sort).to eq %w[node1 node2 node3 node4 node5 node6 node7].sort
       end
     end
 

data/spec/hybrid_platforms_conductor_test/api/platform_handlers/serverless_chef/diff_impacts_spec.rb

@@ -235,6 +235,59 @@ describe HybridPlatformsConductor::HpcPlugins::PlatformHandler::ServerlessChef d
       end
     end
 
+    it 'returns impacted service due to a usage of another cookbook\'s recipe using parenthesis' do
+      with_serverless_chef_platforms('recipes') do |platform, repository|
+        File.write("#{repository}/cookbooks/test_cookbook_1/recipes/default.rb", <<~EO_RECIPE)
+          include_recipe('test_cookbook_2::other_recipe')
+        EO_RECIPE
+        expect(platform.impacts_from('cookbooks/test_cookbook_2/recipes/other_recipe.rb' => {})).to eq [
+          [],
+          %w[test_policy_1],
+          false
+        ]
+      end
+    end
+
+    it 'returns impacted service due to a usage of another cookbook\'s recipe using dynamic recipe name' do
+      with_serverless_chef_platforms('recipes') do |platform|
+        expect(platform.impacts_from('cookbooks/test_cookbook_4/recipes/recipe_1.rb' => {})).to eq [
+          [],
+          %w[test_policy_31 test_policy_33 test_policy_35],
+          false
+        ]
+      end
+    end
+
+    it 'returns impacted service due to a usage of another cookbook\'s recipe using dynamic cookbook name' do
+      with_serverless_chef_platforms('recipes') do |platform|
+        expect(platform.impacts_from('cookbooks/test_cookbook_4/recipes/recipe_2.rb' => {})).to eq [
+          [],
+          %w[test_policy_31 test_policy_32 test_policy_33 test_policy_35],
+          false
+        ]
+      end
+    end
+
+    it 'returns impacted service due to a usage of another cookbook\'s recipe using dynamic cookbook and recipe names' do
+      with_serverless_chef_platforms('recipes') do |platform|
+        expect(platform.impacts_from('cookbooks/test_cookbook_4/recipes/recipe_3.rb' => {})).to eq [
+          [],
+          %w[test_policy_31 test_policy_33 test_policy_35],
+          false
+        ]
+      end
+    end
+
+    it 'returns impacted service due to a usage of another cookbook\'s recipe using dynamic or unparsable cookbook and recipe names, using metadata' do
+      with_serverless_chef_platforms('recipes') do |platform|
+        expect(platform.impacts_from('cookbooks/test_cookbook_5/recipes/recipe_1.rb' => {})).to eq [
+          [],
+          %w[test_policy_33 test_policy_35],
+          false
+        ]
+      end
+    end
+
     it 'ignores cookbooks from cookbook paths that are not configured' do
       with_serverless_chef_platforms('several_cookbooks') do |platform, repository|
         File.write("#{repository}/cookbooks/test_cookbook_1/recipes/default.rb", <<~EO_RECIPE)

data/spec/hybrid_platforms_conductor_test/api/platforms_handler_spec.rb

@@ -2,22 +2,22 @@ describe HybridPlatformsConductor::PlatformsHandler do
 
   context 'when checking config specific DSL' do
 
-    it 'returns platform directories along with platform types' do
+    it 'returns platforms info' do
       with_test_platforms(
         {
           'platform1' => { platform_type: :test },
           'platform2' => { platform_type: :test_2 },
-          'platform3' => { platform_type: :test }
+          'platform3' => { platform_type: :test, name: 'other_platform' }
         }
       ) do |repositories|
-        expect(test_config.platform_dirs.keys.sort).to eq %i[test test_2].sort
-        expect(test_config.platform_dirs[:test].sort).to eq [
-          repositories['platform1'],
-          repositories['platform3']
-        ].sort
-        expect(test_config.platform_dirs[:test_2].sort).to eq [
-          repositories['platform2']
-        ].sort
+        expect(test_config.platforms_info.keys.sort).to eq %i[test test_2].sort
+        expect(test_config.platforms_info[:test]).to eq(
+          repositories['platform1'] => {},
+          repositories['platform3'] => { name: 'other_platform' }
+        )
+        expect(test_config.platforms_info[:test_2]).to eq(
+          repositories['platform2'] => {}
+        )
       end
     end
 
@@ -55,27 +55,57 @@ describe HybridPlatformsConductor::PlatformsHandler do
       {
         'platform1' => { platform_type: :test },
         'platform2' => { platform_type: :test_2 },
-        'platform3' => { platform_type: :test }
+        'platform3' => { platform_type: :test, name: 'other_platform' }
       }
     ) do
-      expect(test_platforms_handler.known_platforms.map(&:name).sort).to eq %w[platform1 platform2 platform3].sort
+      expect(test_platforms_handler.known_platforms.map(&:name).sort).to eq %w[platform1 platform2 other_platform].sort
     end
   end
 
   it 'fails if several platforms share the same name' do
     with_repository('platform1') do |repository|
+      FileUtils.mkdir_p "#{repository}/platform1"
       with_test_platforms(
         {
           'platform1' => { platform_type: :test },
           'platform2' => { platform_type: :test_2 }
         },
-        additional_config: "test_2_platform path: \'#{repository}\'"
+        additional_config: "test_2_platform path: \'#{repository}/platform1\'"
       ) do
         expect { test_platforms_handler.known_platforms }.to raise_error 'Platform name platform1 is declared several times.'
       end
     end
   end
 
+  it 'fails if several platforms share the same path' do
+    with_repository('platform1') do |repository|
+      with_test_platforms(
+        {
+          'platform1' => { platform_type: :test },
+          'platform2' => { platform_type: :test_2 }
+        },
+        additional_config: "test_2_platform path: \'#{repository}\', name: 'other_platform'"
+      ) do
+        expect { test_platforms_handler.known_platforms }.to raise_error "Platform repository path #{repository} is declared several times."
+      end
+    end
+  end
+
+  it 'can differentiate several platforms sharing the same path ending but with different explicit names' do
+    with_repository('platform1') do |repository|
+      FileUtils.mkdir_p "#{repository}/platform1"
+      with_test_platforms(
+        {
+          'platform1' => { platform_type: :test },
+          'platform2' => { platform_type: :test_2 }
+        },
+        additional_config: "test_platform path: \'#{repository}/platform1\', name: 'other_platform'"
+      ) do
+        expect(test_platforms_handler.known_platforms.map(&:name).sort).to eq %w[platform1 platform2 other_platform].sort
+      end
+    end
+  end
+
   it 'returns defined platforms filtered by platform type' do
     with_test_platforms(
       {

data/spec/hybrid_platforms_conductor_test/executables/nodes_to_deploy_spec.rb

@@ -190,6 +190,81 @@ describe 'nodes_to_deploy executable' do
     end
   end
 
+  it 'considers nodes having the same invalid commit ids in their logs to be deployed' do
+    with_test_platform_for_nodes_to_deploy do
+      expect(test_deployer).to receive(:deployment_info_from).with(%w[node1 node2]).and_return(
+        'node1' => {
+          services: %w[service1],
+          deployment_info: {
+            repo_name_0: 'platform',
+            commit_id_0: 'abcdef1',
+            exit_status: 0
+          },
+          exit_status: 0,
+          stdout: '',
+          stderr: ''
+        },
+        'node2' => {
+          services: %w[service2],
+          deployment_info: {
+            repo_name_0: 'platform',
+            commit_id_0: 'abcdef1',
+            exit_status: 0
+          },
+          exit_status: 0,
+          stdout: '',
+          stderr: ''
+        }
+      )
+      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
+      exit_code, stdout = run 'nodes_to_deploy'
+      expect(exit_code).to eq 0
+      expect(stdout).to eq <<~EO_STDOUT
+        ===== Nodes to deploy =====
+        node1
+        node2
+      EO_STDOUT
+    end
+  end
+
+  it 'considers nodes having unknown platforms in their logs to be deployed' do
+    with_test_platform_for_nodes_to_deploy do
+      expect(test_deployer).to receive(:deployment_info_from).with(%w[node1 node2]).and_return(
+        'node1' => {
+          services: %w[service1],
+          deployment_info: {
+            repo_name_0: 'unknown_platform',
+            commit_id_0: 'abcdef1',
+            exit_status: 0
+          },
+          exit_status: 0,
+          stdout: '',
+          stderr: ''
+        },
+        'node2' => {
+          services: %w[service2],
+          deployment_info: {
+            repo_name_0: 'platform',
+            commit_id_0: 'abcdef2',
+            exit_status: 0
+          },
+          exit_status: 0,
+          stdout: '',
+          stderr: ''
+        }
+      )
+      expect(test_nodes_handler).to receive(:impacted_nodes_from_git_diff).with('platform', from_commit: 'abcdef2', to_commit: 'master').and_return [%w[], [], [], false]
+      exit_code, stdout = run 'nodes_to_deploy'
+      expect(exit_code).to eq 0
+      expect(stdout).to eq <<~EO_STDOUT
+        ===== Nodes to deploy =====
+        node1
+      EO_STDOUT
+    end
+  end
+
   it 'ignores impacts if asked' do
     with_test_platform_for_nodes_to_deploy do
       exit_code, stdout = run 'nodes_to_deploy', '--ignore-deployed-info'

data/spec/hybrid_platforms_conductor_test/helpers/platforms_handler_helpers.rb

@@ -73,7 +73,9 @@ module HybridPlatformsConductorTest
       # Clean-up at the end.
       #
       # Parameters::
-      # * *platforms_info* (Hash<String,Object>): Platforms info for the test platform
+      # * *platforms_info* (Hash<String,Object>): Platforms info for the test platform:
+      #   * *platform_type* (Symbol): Name of the platform handler plugin for this platform
+      #   * *name* (String): Optional name to give the platform [optional]
       # * *as_git* (Boolean): Do we initialize those repositories as Git repositories? [default: false]
       # * *additional_config* (String): Additional config to be added [default: '']
       # * Proc: Code called with the environment ready
@@ -86,7 +88,7 @@ module HybridPlatformsConductorTest
             repositories.map do |platform, dir|
               platform_type = platforms_info[platform].key?(:platform_type) ? platforms_info[platform][:platform_type] : :test
               platform_types << platform_type unless platform_types.include?(platform_type)
-              "#{platform_type}_platform path: '#{dir}'"
+              "#{platform_type}_platform path: '#{dir}'#{platforms_info[platform].key?(:name) ? ", name: '#{platforms_info[platform][:name]}'" : ''}"
             end.join("\n") + "\n#{additional_config}"
           ) do
             register_platform_handlers(platform_types.map do |platform_type|

data/spec/hybrid_platforms_conductor_test/platform_handler_plugins/test.rb

@@ -200,10 +200,11 @@ module HybridPlatformsConductorTest
       # Result::
       # * Hash<Symbol, Object>: Platform info (check TestPlatformHandler#platforms_info to know about properties)
       def platform_info
+        _repo_base_name, found_platform_info = HybridPlatformsConductorTest::PlatformHandlerPlugins::Test.platforms_info.find { |search_repo_base_name, search_platform_info| (search_platform_info[:name] || search_repo_base_name) == name }
         {
           nodes: {},
           nodes_lists: {}
-        }.merge(HybridPlatformsConductorTest::PlatformHandlerPlugins::Test.platforms_info[name])
+        }.merge(found_platform_info)
       end
 
       # Return the node info of a given node

data/spec/hybrid_platforms_conductor_test/serverless_chef_repositories/recipes/cookbooks/test_cookbook_3/metadata.rb

@@ -0,0 +1,13 @@
+name             'test_cookbook_3'
+maintainer       'Muriel Salvan'
+maintainer_email 'muriel@x-aeon.com'
+supports         'debian'
+chef_version     '>= 14.8'
+source_url       'https://x-aeon.com'
+issues_url       'https://x-aeon.com'
+license          'BSD'
+description      'Installs/Configures test_cookbook_3'
+long_description ''
+version          '0.1.0'
+depends          'test_cookbook_4'
+depends          'test_cookbook_5'

data/spec/hybrid_platforms_conductor_test/serverless_chef_repositories/recipes/cookbooks/test_cookbook_3/recipes/31_unknown_recipe_include.rb

@@ -0,0 +1,2 @@
+recipe_name = 'recipe_1'
+include_recipe "test_cookbook_4::#{recipe_name}"

data/spec/hybrid_platforms_conductor_test/serverless_chef_repositories/recipes/cookbooks/test_cookbook_3/recipes/32_unknown_cookbook_include.rb

@@ -0,0 +1,2 @@
+cookbook_name = 'test_cookbook_4'
+include_recipe "#{cookbook_name}::recipe_2"

data/spec/hybrid_platforms_conductor_test/serverless_chef_repositories/recipes/cookbooks/test_cookbook_3/recipes/33_unknown_include.rb

@@ -0,0 +1,3 @@
+cookbook_name = 'test_cookbook_4'
+recipe_name = 'recipe_3'
+include_recipe "#{cookbook_name}::#{recipe_name}"

data/spec/hybrid_platforms_conductor_test/serverless_chef_repositories/recipes/cookbooks/test_cookbook_3/recipes/34_known_include.rb

@@ -0,0 +1 @@
+include_recipe 'test_cookbook_4::recipe_4'

data/spec/hybrid_platforms_conductor_test/serverless_chef_repositories/recipes/cookbooks/test_cookbook_3/recipes/35_unparsable_include.rb

@@ -0,0 +1,7 @@
+cookbook_name = ENV['cookbook_name']
+recipe_name = ENV['recipe_name']
+# rubocop:disable Style/StringConcatenation
+include_recipe(
+  cookbook_name + '::' + recipe_name
+)
+# rubocop:enable Style/StringConcatenation

data/spec/hybrid_platforms_conductor_test/serverless_chef_repositories/recipes/cookbooks/test_cookbook_4/recipes/recipe_1.rb

@@ -0,0 +1 @@
+# Recipe code

data/spec/hybrid_platforms_conductor_test/serverless_chef_repositories/recipes/cookbooks/test_cookbook_4/recipes/recipe_2.rb

@@ -0,0 +1 @@
+# Recipe code

data/spec/hybrid_platforms_conductor_test/serverless_chef_repositories/recipes/cookbooks/test_cookbook_4/recipes/recipe_3.rb

@@ -0,0 +1 @@
+# Recipe code

data/spec/hybrid_platforms_conductor_test/serverless_chef_repositories/recipes/cookbooks/test_cookbook_4/recipes/recipe_4.rb

@@ -0,0 +1 @@
+# Recipe code

data/spec/hybrid_platforms_conductor_test/serverless_chef_repositories/recipes/cookbooks/test_cookbook_5/recipes/recipe_1.rb

@@ -0,0 +1 @@
+# Recipe code

data/spec/hybrid_platforms_conductor_test/serverless_chef_repositories/recipes/cookbooks/test_cookbook_5/recipes/recipe_2.rb

@@ -0,0 +1 @@
+# Recipe code

data/spec/hybrid_platforms_conductor_test/serverless_chef_repositories/recipes/nodes/node31.json

@@ -0,0 +1,10 @@
+{
+  "name": "node31",
+  "normal": {
+    "description": "Node 31",
+    "image": "debian_9",
+    "private_ips": ["172.16.0.31"]
+  },
+  "policy_name": "test_policy_31",
+  "policy_group": "test_group"
+}

data/spec/hybrid_platforms_conductor_test/serverless_chef_repositories/recipes/nodes/node32.json

@@ -0,0 +1,10 @@
+{
+  "name": "node32",
+  "normal": {
+    "description": "Node 32",
+    "image": "debian_9",
+    "private_ips": ["172.16.0.32"]
+  },
+  "policy_name": "test_policy_32",
+  "policy_group": "test_group"
+}

data/spec/hybrid_platforms_conductor_test/serverless_chef_repositories/recipes/nodes/node33.json

@@ -0,0 +1,10 @@
+{
+  "name": "node33",
+  "normal": {
+    "description": "Node 33",
+    "image": "debian_9",
+    "private_ips": ["172.16.0.33"]
+  },
+  "policy_name": "test_policy_33",
+  "policy_group": "test_group"
+}

data/spec/hybrid_platforms_conductor_test/serverless_chef_repositories/recipes/nodes/node34.json

@@ -0,0 +1,10 @@
+{
+  "name": "node34",
+  "normal": {
+    "description": "Node 34",
+    "image": "debian_9",
+    "private_ips": ["172.16.0.34"]
+  },
+  "policy_name": "test_policy_34",
+  "policy_group": "test_group"
+}

data/spec/hybrid_platforms_conductor_test/serverless_chef_repositories/recipes/nodes/node35.json

@@ -0,0 +1,10 @@
+{
+  "name": "node35",
+  "normal": {
+    "description": "Node 35",
+    "image": "debian_9",
+    "private_ips": ["172.16.0.35"]
+  },
+  "policy_name": "test_policy_35",
+  "policy_group": "test_group"
+}

data/spec/hybrid_platforms_conductor_test/serverless_chef_repositories/recipes/policyfiles/test_policy_31.rb

@@ -0,0 +1,4 @@
+name File.basename(__FILE__, '.rb')
+default_source :supermarket
+default_source :chef_repo, '..'
+run_list 'recipe[test_cookbook_3::31_unknown_recipe_include]'

data/spec/hybrid_platforms_conductor_test/serverless_chef_repositories/recipes/policyfiles/test_policy_32.rb

@@ -0,0 +1,4 @@
+name File.basename(__FILE__, '.rb')
+default_source :supermarket
+default_source :chef_repo, '..'
+run_list 'recipe[test_cookbook_3::32_unknown_cookbook_include]'

data/spec/hybrid_platforms_conductor_test/serverless_chef_repositories/recipes/policyfiles/test_policy_33.rb

@@ -0,0 +1,4 @@
+name File.basename(__FILE__, '.rb')
+default_source :supermarket
+default_source :chef_repo, '..'
+run_list 'recipe[test_cookbook_3::33_unknown_include]'

data/spec/hybrid_platforms_conductor_test/serverless_chef_repositories/recipes/policyfiles/test_policy_34.rb

@@ -0,0 +1,4 @@
+name File.basename(__FILE__, '.rb')
+default_source :supermarket
+default_source :chef_repo, '..'
+run_list 'recipe[test_cookbook_3::34_known_include]'

data/spec/hybrid_platforms_conductor_test/serverless_chef_repositories/recipes/policyfiles/test_policy_35.rb

@@ -0,0 +1,4 @@
+name File.basename(__FILE__, '.rb')
+default_source :supermarket
+default_source :chef_repo, '..'
+run_list 'recipe[test_cookbook_3::35_unparsable_include]'

data/spec/hybrid_platforms_conductor_test/test_log_plugin.rb

@@ -5,7 +5,7 @@ module HybridPlatformsConductorTest
 
     class << self
 
-      attr_accessor :calls
+      attr_accessor(*%i[calls mocked_logs])
 
     end
 
@@ -89,7 +89,7 @@ module HybridPlatformsConductorTest
         stdout: stdout,
         stderr: stderr
       }
-      {
+      TestLogPlugin.mocked_logs[node] || {
         services: %w[unknown],
         deployment_info: {
           user: 'test_user'

data/spec/hybrid_platforms_conductor_test.rb

@@ -145,6 +145,7 @@ module HybridPlatformsConductorTest
         HybridPlatformsConductorTest::TestPlugins::NodeCheck.only_on_nodes = nil
         HybridPlatformsConductorTest::TestPlugins::SeveralChecks.runs = []
         HybridPlatformsConductorTest::TestLogPlugin.calls = []
+        HybridPlatformsConductorTest::TestLogPlugin.mocked_logs = {}
         HybridPlatformsConductorTest::TestLogNoReadPlugin.calls = []
         HybridPlatformsConductorTest::TestSecretsReaderPlugin.calls = []
         HybridPlatformsConductorTest::TestSecretsReaderPlugin.deployer = nil

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hybrid_platforms_conductor
 version: !ruby/object:Gem::Version
-  version: 33.8.3
+  version: 33.9.2
 platform: ruby
 authors:
 - Muriel Salvan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-16 00:00:00.000000000 Z
+date: 2021-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: range_operators
@@ -1003,10 +1003,32 @@ files:
 - spec/hybrid_platforms_conductor_test/serverless_chef_repositories/recipes/cookbooks/test_cookbook_2/recipes/default.rb
 - spec/hybrid_platforms_conductor_test/serverless_chef_repositories/recipes/cookbooks/test_cookbook_2/recipes/other_recipe.rb
 - spec/hybrid_platforms_conductor_test/serverless_chef_repositories/recipes/cookbooks/test_cookbook_2/resources/my_resource.rb
+- spec/hybrid_platforms_conductor_test/serverless_chef_repositories/recipes/cookbooks/test_cookbook_3/metadata.rb
+- spec/hybrid_platforms_conductor_test/serverless_chef_repositories/recipes/cookbooks/test_cookbook_3/recipes/31_unknown_recipe_include.rb
+- spec/hybrid_platforms_conductor_test/serverless_chef_repositories/recipes/cookbooks/test_cookbook_3/recipes/32_unknown_cookbook_include.rb
+- spec/hybrid_platforms_conductor_test/serverless_chef_repositories/recipes/cookbooks/test_cookbook_3/recipes/33_unknown_include.rb
+- spec/hybrid_platforms_conductor_test/serverless_chef_repositories/recipes/cookbooks/test_cookbook_3/recipes/34_known_include.rb
+- spec/hybrid_platforms_conductor_test/serverless_chef_repositories/recipes/cookbooks/test_cookbook_3/recipes/35_unparsable_include.rb
+- spec/hybrid_platforms_conductor_test/serverless_chef_repositories/recipes/cookbooks/test_cookbook_4/recipes/recipe_1.rb
+- spec/hybrid_platforms_conductor_test/serverless_chef_repositories/recipes/cookbooks/test_cookbook_4/recipes/recipe_2.rb
+- spec/hybrid_platforms_conductor_test/serverless_chef_repositories/recipes/cookbooks/test_cookbook_4/recipes/recipe_3.rb
+- spec/hybrid_platforms_conductor_test/serverless_chef_repositories/recipes/cookbooks/test_cookbook_4/recipes/recipe_4.rb
+- spec/hybrid_platforms_conductor_test/serverless_chef_repositories/recipes/cookbooks/test_cookbook_5/recipes/recipe_1.rb
+- spec/hybrid_platforms_conductor_test/serverless_chef_repositories/recipes/cookbooks/test_cookbook_5/recipes/recipe_2.rb
 - spec/hybrid_platforms_conductor_test/serverless_chef_repositories/recipes/nodes/node1.json
 - spec/hybrid_platforms_conductor_test/serverless_chef_repositories/recipes/nodes/node2.json
+- spec/hybrid_platforms_conductor_test/serverless_chef_repositories/recipes/nodes/node31.json
+- spec/hybrid_platforms_conductor_test/serverless_chef_repositories/recipes/nodes/node32.json
+- spec/hybrid_platforms_conductor_test/serverless_chef_repositories/recipes/nodes/node33.json
+- spec/hybrid_platforms_conductor_test/serverless_chef_repositories/recipes/nodes/node34.json
+- spec/hybrid_platforms_conductor_test/serverless_chef_repositories/recipes/nodes/node35.json
 - spec/hybrid_platforms_conductor_test/serverless_chef_repositories/recipes/policyfiles/test_policy_1.rb
 - spec/hybrid_platforms_conductor_test/serverless_chef_repositories/recipes/policyfiles/test_policy_2.rb
+- spec/hybrid_platforms_conductor_test/serverless_chef_repositories/recipes/policyfiles/test_policy_31.rb
+- spec/hybrid_platforms_conductor_test/serverless_chef_repositories/recipes/policyfiles/test_policy_32.rb
+- spec/hybrid_platforms_conductor_test/serverless_chef_repositories/recipes/policyfiles/test_policy_33.rb
+- spec/hybrid_platforms_conductor_test/serverless_chef_repositories/recipes/policyfiles/test_policy_34.rb
+- spec/hybrid_platforms_conductor_test/serverless_chef_repositories/recipes/policyfiles/test_policy_35.rb
 - spec/hybrid_platforms_conductor_test/serverless_chef_repositories/several_cookbooks/config.rb
 - spec/hybrid_platforms_conductor_test/serverless_chef_repositories/several_cookbooks/cookbooks/test_cookbook_1/recipes/default.rb
 - spec/hybrid_platforms_conductor_test/serverless_chef_repositories/several_cookbooks/nodes/node1.json