(SUP-4402) pe_status_check fails if hiera.yaml is empty

puppetlabs · Sep 4, 2023 · 4659442 · 4659442
1 parent 51643b8
commit 4659442
Showing 1 changed file with 13 additions and 7 deletions.
diff --git a/lib/facter/pe_status_check.rb b/lib/facter/pe_status_check.rb
@@ -387,16 +387,22 @@
 
   chunk(:S0033) do
     next unless ['primary', 'legacy_primary', 'replica', 'pe_compiler', 'legacy_compiler'].include?(Facter.value('pe_status_check_role'))
-
     hiera_config_path = Puppet.settings['hiera_config']
-    next unless File.exist?(hiera_config_path)
-    hiera_config_file = YAML.load_file(hiera_config_path)
-    hiera_version = hiera_config_file.dig('version')
-    if hiera_version.nil?
+    if File.exist?(hiera_config_path)
+      hiera_config_file = YAML.load_file(hiera_config_path)
+    else
       { S0033: false }
-    # Is Hiera 5 in use?
+    end
+
+    if hiera_config_file.is_a?(Hash) && !hiera_config_file.empty?
+      hiera_version = hiera_config_file.dig('version')
+      if hiera_version.nil?
+        { S0033: false }
+      else
+        { S0033: hiera_version.to_i == 5 }
+      end
     else
-      { S0033: hiera_version.to_i == 5 }
+      { S0033: false }
     end
   end