prefer cwd hiera.yaml if exists

ghostbuster only works properly when run from the control repo with a very specific find command. it only makes sense to use the control repo's hiera.yaml file by default, and fallback to global.
voxpupuli · Feb 7, 2024 · c06ab71 · c06ab71
1 parent b6ef365
commit c06ab71
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -28,7 +28,7 @@ Environment variables
 
 ### HIERA_YAML_PATH
 
-The location of the `hiera.yaml` file. Defaults to `/etc/puppetlabs/puppet/hiera.yaml`
+The location of the `hiera.yaml` file. Defaults to `./hiera.yaml` or `/etc/puppetlabs/puppet/hiera.yaml` whichever is found first.
 
 ### PUPPETDB_URL
 

diff --git a/lib/puppet-lint/plugins/check_ghostbuster_hiera_files.rb b/lib/puppet-lint/plugins/check_ghostbuster_hiera_files.rb
@@ -17,7 +17,7 @@ def hiera
     @hiera ||= if (hiera_file = ENV.fetch('HIERA_YAML_PATH', false))
                  YAML.load_file(hiera_file)
                else
-                 hiera = ['/etc/puppetlabs/puppet/hiera.yaml'].filter_map do |hf|
+                 hiera = ['hiera.yaml', '/etc/puppetlabs/puppet/hiera.yaml'].filter_map do |hf|
                    YAML.load_file(hf) if hf && File.exist?(hf)
                  end
                  hiera[0]