puppet-ghostbuster 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 527ccfac3b00bdcd6f58c17d2825332810f1c954089e596ba1eaf9d0a5015bb6
-  data.tar.gz: df8b761531f84a9a14527516b508229f35efe27abd1483549f062b6e8efd6eff
+  metadata.gz: 833a968929238772dc7ddd1f8fe1df5f7f6619ac35ebd8728dc80a84a81f9797
+  data.tar.gz: 66ae42129a1dc62b2db60f26a2579d67317f4c23c20dc2035bcf6b495efb2b14
 SHA512:
-  metadata.gz: cbe6f1914075e0f685db3f6252005149c62fd865abb90535823b37a8c9b94780f464583daaf131dce84699853af4b0a7af220c3758cd030bdcb0a167c824b7a4
-  data.tar.gz: cf926a7365b382b714cc1e32b2ab4cd86cb4bfc4278278374a6ccef61bc4f11b165d6c932d3bc1b86ac5bcb282460240fa0f3f43636cbae24542fcc3dd093f12
+  metadata.gz: 65462ffe20fb495d3db8c3742f73dd82e5b6514720d7c821c6b4294d4afeeee3763074bfa401eb6f6d8b1ac7eb81904210a4075b192299f80f94c911bfb424af
+  data.tar.gz: 7dc4843877ceee379a1a4e58d046cb21bac6fbf168aad0f036c93d9d1a97b87e4c117c104bf04929e755c3763cdcbbdb882edfae3bbc1f75f65d77a11f47b2b1

data/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 All notable changes to this project will be documented in this file.
 
+## [1.2.1](https://github.com/voxpupuli/puppet-ghostbuster/tree/1.2.1) (2024-02-09)
+
+[Full Changelog](https://github.com/voxpupuli/puppet-ghostbuster/compare/1.2.0...1.2.1)
+
+**Fixed bugs:**
+
+- Fix and improve hiera.yaml selection [\#90](https://github.com/voxpupuli/puppet-ghostbuster/pull/90) ([h0tw1r3](https://github.com/h0tw1r3))
+
 ## [1.2.0](https://github.com/voxpupuli/puppet-ghostbuster/tree/1.2.0) (2024-01-29)
 
 [Full Changelog](https://github.com/voxpupuli/puppet-ghostbuster/compare/1.1.0...1.2.0)

data/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
 

data/lib/puppet-ghostbuster/version.rb

@@ -1,3 +1,3 @@
 class PuppetGhostbuster
-  VERSION = '1.2.0'
+  VERSION = '1.2.1'
 end

data/lib/puppet-lint/plugins/check_ghostbuster_hiera_files.rb

@@ -14,14 +14,23 @@ end
 
 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

data/spec/puppet-lint/plugins/ghostbuster_hiera_files_spec.rb

@@ -99,5 +99,24 @@ describe 'ghostbuster_hiera_files' do
         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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puppet-ghostbuster
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Camptocamp
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-01-29 00:00:00.000000000 Z
+date: 2024-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coveralls