hybrid_platforms_conductor 33.8.3 → 33.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 80a9228f00ac63d2ddf325f1fd4faeab83af8d7bbf73c43ff46d4632883462a4
-  data.tar.gz: 225b174fb0107a743e4daeda8a65148b8ce7d0ea81fb0862066a3626e60b7571
+  metadata.gz: b18c3901744a84b3c1c820a8bc8af074cecdc78d56b7802186d9d6751c5b78ed
+  data.tar.gz: ef312bf22ddcdd7473d3c606d665e3eec5760a842822b0fb36dedf7ce840fa6b
 SHA512:
-  metadata.gz: cc3c6a8c0a245a1929481f2e5482fdc3b9100dc24dab7a98bfbc026a294a8ef88b359060608cafb5c9937197ad89fc39630e3b56265888f5c913be9435960a3b
-  data.tar.gz: c82665286ed8c6783b02640e4122eb08d555c0d04fecbc49a688194caf828144f63f243824e28be8a120f41a331cd5194497b9ede07630d9347e8888383187b9
+  metadata.gz: 543a74c57e08edde95103dff97af8c90360908e87e2d7be1c1c79a53dc85cb314f26b23b8591dabaeb88efb6415c2b3a5909ed8ca392a2dc0e3a61dabfb3b781
+  data.tar.gz: 87f5bb43a345cb9373d43211ffbea8e47c08de26a7256f0f2b51ff2660b6021bc251a448ba51006c34ca02c88d442d88c2d027d1b15638a7e2fb396c2336423f

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+# [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/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/version.rb

@@ -1,5 +1,5 @@
 module HybridPlatformsConductor
 
-  VERSION = '33.8.3'
+  VERSION = '33.8.4'
 
 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/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]'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hybrid_platforms_conductor
 version: !ruby/object:Gem::Version
-  version: 33.8.3
+  version: 33.8.4
 platform: ruby
 authors:
 - Muriel Salvan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-16 00:00:00.000000000 Z
+date: 2021-08-20 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