Fix for emtpy defaults section #204 (#212)

Merging hiera's defaults did not work when `defaults` was given in `hiera.yaml`, but empty (== `nil`).
betadots · Nov 2, 2023 · 6198d21 · 6198d21
1 parent b69d7d6
commit 6198d21
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 0 deletions.
diff --git a/app/models/hiera_data/config.rb b/app/models/hiera_data/config.rb
@@ -22,6 +22,7 @@ def load_content
                else
                  {}
                end
+      config['defaults'] ||= {}
       defaults.deep_merge(config)
     rescue => error
       raise Hdm::Error, error

diff --git a/test/fixtures/files/puppet/environments/empty_defaults/hiera.yaml b/test/fixtures/files/puppet/environments/empty_defaults/hiera.yaml
@@ -0,0 +1,7 @@
+---
+version: 5
+defaults:
+hierarchy:
+  - name: "common settings"
+    paths:
+      - "common.yaml"
diff --git a/test/models/environment_test.rb b/test/models/environment_test.rb
@@ -5,6 +5,7 @@ class EnvironmentTest < ActiveSupport::TestCase
     expected_environments = %w(
       development
       dynamic_datadir
+      empty_defaults
       eyaml
       globs
       hdm

diff --git a/test/models/hiera_data/config_test.rb b/test/models/hiera_data/config_test.rb
@@ -56,4 +56,16 @@ def base_path
       Pathname.new(Rails.configuration.hdm["config_dir"]).join("environments", "multiple_hierarchies")
     end
   end
+
+  class HieraData::ConfigWithEmptyDefaultsTest < ActiveSupport::TestCase
+    test "empty defaults get replaced" do
+      config = HieraData::Config.new(base_path)
+      assert_not_nil config.content["defaults"]
+      assert_equal Puppet::Pops::Lookup::HieraConfigV5::DEFAULT_CONFIG_HASH["defaults"], config.content["defaults"]
+    end
+
+    def base_path
+      Pathname.new(Rails.configuration.hdm["config_dir"]).join("environments", "empty_defaults")
+    end
+  end
 end