Fix puppet classes import filter when using Ruby >=3.1 and Regexp/Sym…

…bol in YAML file
theforeman · Dec 7, 2024 · 944c7f5 · 944c7f5
1 parent 6f8266d
commit 944c7f5
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/app/services/foreman_puppet/puppet_class_importer.rb b/app/services/foreman_puppet/puppet_class_importer.rb
@@ -229,7 +229,13 @@ def ignored_file_path
     end
 
     def load_ignored_file
-      File.exist?(ignored_file_path) ? YAML.load_file(ignored_file_path) : {}
+      if Psych::VERSION < '4.0.0'
+        # NOTE: This could be dropped when this gem will require Ruby >=3.1 which is bundled with Psych 4.x
+        # https://www.ctrl.blog/entry/ruby-psych4.html
+        File.exist?(ignored_file_path) ? YAML.load_file(ignored_file_path) : {}
+      else
+        File.exist?(ignored_file_path) ? YAML.load_file(ignored_file_path, permitted_classes: [Symbol, Regexp]) : {}
+      end
     end
 
     def ignored_file