Return empty hash if yaml file is empty. (#104)

Fixes #103
betadots · Nov 8, 2022 · f54beeb · f54beeb
1 parent 19e382f
commit f54beeb
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/app/models/hiera_data/yaml_file.rb b/app/models/hiera_data/yaml_file.rb
@@ -25,7 +25,7 @@ def keys
 
     def content
       return nil unless exist?
-      @content ||= YAML.load(File.read(path))
+      @content ||= (YAML.load(File.read(path)) || {})
     end
 
     def [](key)

diff --git a/test/fixtures/files/puppet/environments/development/data/nodes/empty.yaml b/test/fixtures/files/puppet/environments/development/data/nodes/empty.yaml
diff --git a/test/models/hiera_data/yaml_file_test.rb b/test/models/hiera_data/yaml_file_test.rb
@@ -32,6 +32,12 @@ class HieraData::YamlFileTest < ActiveSupport::TestCase
     assert_equal expected_keys, file.keys
   end
 
+  test "#content returns empty hash when file is empty" do
+    file = HieraData::YamlFile.new(path: config_dir.join("nodes/empty.yaml"))
+
+    assert_equal({}, file.content)
+  end
+
   test "#content_for_key returns nil for unknown file and key" do
     file = HieraData::YamlFile.new(path: config_dir.join("role/hdm_test-development.yaml"))
     assert_nil file.content_for_key('noop_mode')