Merge pull request #90 from h0tw1r3/fix-89

FIx and improve hiera.yaml selection

README.md

@@ -28,7 +28,7 @@ Environment variables
 
 ### HIERA_YAML_PATH
 
-The location of the `hiera.yaml` file. Defaults to `/etc/puppetlabs/code/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
 

lib/puppet-lint/plugins/check_ghostbuster_hiera_files.rb

@@ -14,14 +14,23 @@ def load_data(path, content)
 
 PuppetLint.new_check(:ghostbuster_hiera_files) do
   def hiera
-    @hiera ||= YAML.load_file(ENV['HIERA_YAML_PATH'] || '/etc/puppetlabs/code/hiera.yaml')
+    @hiera ||= if (hiera_file = ENV.fetch('HIERA_YAML_PATH', false))
+                 YAML.load_file(hiera_file)
+               else
+                 hiera = ['hiera.yaml', '/etc/puppetlabs/puppet/hiera.yaml'].filter_map do |hf|
+                   YAML.load_file(hf) if hf && File.exist?(hf)
+                 end
+                 hiera[0]
+               end
   end
 
   def default_datadir
-    hiera.dig('defaults', 'datadir') || 'hieradata'
+    hiera.dig('defaults', 'datadir') || 'data'
   end
 
   def path_in_datadirs?(path)
+    return false unless hiera
+
     @data_dirs ||= hiera['hierarchy'].map { |h| (h['datadir'] || default_datadir).chomp('/') }.uniq
     path.match?(%(./#{Regexp.union(@data_dirs)}/))
   end

spec/puppet-lint/plugins/ghostbuster_hiera_files_spec.rb

@@ -99,5 +99,24 @@
         expect(problems).to contain_warning("Hiera File #{path} seems unused")
       end
     end
+
+    context 'when no hiera.yaml exists' do
+      let(:path) { './data/nodes/foo.example.com.yaml' }
+
+      it {
+        allow(File).to receive(:exist?).and_return(false)
+        ENV.delete('HIERA_YAML_PATH')
+        expect(problems.size).to eq(0)
+      }
+    end
+
+    context 'when HIERA_YAML_PATH is set but does not exist' do
+      let(:path) { './data/domain/example.com.yaml' }
+
+      it {
+        ENV['HIERA_YAML_PATH'] = './spec/fixtures/j.yaml'
+        expect { problems }.to raise_error(Errno::ENOENT)
+      }
+    end
   end
 end