puppet-syntax 7.0.0 → 7.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ceebbdcfd034f93f23ad05b4cfee3f46ddca9706f5123575816dd9828a24f18
-  data.tar.gz: 86ef711394df9cfbe002775ed6c0f8cd4be2dc9dfa97bf69422a2173f16b13ae
+  metadata.gz: c458096b405b193f2744bcc269314df50710bc6f0d6a42c86395cddceb7091ed
+  data.tar.gz: 28c88220e7b0f978a6672590b31e297b3fc4b63b5ce9fdc7c0565d2f8599cb5f
 SHA512:
-  metadata.gz: 5a0420b7318e32b07dc6a7b1a3767fb331e6dff7f93d5be0f472146321564411d893362d9fe7f7b28387d83a84cd9086e275ad72ab417b81a65b43a8ea10dfeb
-  data.tar.gz: e5362a07fe65501abc7529c74fd10d21ff2606530ab893c352ec4cba6b640a888ee04f031a9315a981b803caf46e952cc9b2258ee7d30f8f97fb91a90253b8fe
+  metadata.gz: 975c1f133c087f92b35e173dfa755a9e3f688f9bfaf0f9bbbecb247238db285bb0997edf549091e6303b8ca11cc6e8ef9296bd2c34d7159cdf10dd6fd6f8cbe3
+  data.tar.gz: 02cb4c1027b2307fa4718716956c877cb40f95792d63fcd4535fcffc248648efb5419542eeb7f918f77a907a1d891215a189f1e4584ff326e301ff4386954c85

data/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 All notable changes to this project will be documented in this file.
 
+## [v7.0.1](https://github.com/voxpupuli/puppet-syntax/tree/v7.0.1) (2025-08-14)
+
+[Full Changelog](https://github.com/voxpupuli/puppet-syntax/compare/v7.0.0...v7.0.1)
+
+**Fixed bugs:**
+
+- Update Hiera key regex to Puppet supported values [\#197](https://github.com/voxpupuli/puppet-syntax/pull/197) ([rridge532](https://github.com/rridge532))
+
 ## [v7.0.0](https://github.com/voxpupuli/puppet-syntax/tree/v7.0.0) (2025-08-13)
 
 [Full Changelog](https://github.com/voxpupuli/puppet-syntax/compare/v6.0.0...v7.0.0)

data/lib/puppet-syntax/hiera.rb

@@ -12,7 +12,7 @@ module PuppetSyntax
         elsif !/^[a-z]+$/.match?(key) # we allow Hiera's own configuration
           'Puppet automatic lookup will not look up symbols'
         end
-      elsif !/^[a-z][a-z0-9_]+(::[a-z][a-z0-9_]+)*$/.match?(key)
+      elsif !/^([a-z][a-z0-9_]+::)*[a-z0-9_][a-zA-Z0-9_]+$/.match?(key) # adapted from Puppet docs combining namespaced and un-namespaced regex
         return 'Looks like a missing colon' if /[^:]:[^:]/.match?(key)
 
         # be extra helpful

data/lib/puppet-syntax/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PuppetSyntax
-  VERSION = '7.0.0'
+  VERSION = '7.0.1'
 end

data/spec/fixtures/hiera/hiera_badkey.yaml

@@ -3,17 +3,16 @@ this_is_ok: 0
 this_is_ok::too: 0
 th1s_is_ok::two3: 0
 :eventhis: 0
-this_is_ok::concat_func: "%{lookup('foo')}%{lookup('bar')}"
+good::value_with_CAPS: true
+rootValueWithCaps3:    true
 
-typical:typo::warning1:   true
-::notsotypical::warning2: true
-noCamelCase::warning3:    true
-no-hyphens::warning4:     true
-:picky::warning5:         true
-this_is::warning6:
+typical:typo::warning1:      true
+::notsotypical::warning2:    true
+noCamelCase::warning3:       true
+root::noCamelCase::warning4: true
+Leading_caps_warning5:       true
+namespace::Leading_warning6: true
+no-hyphens::warning7:        true
+:picky::warning8:            true
+this_is::warning9:
   "%{lookup('foobar'):3306}": []
-this_is::warning7:
-  - "%{lookup('foobar'):3306}"
-this_is::warning8:
-  foo: "%{lookup('foobar'):3306}"
-this_is::warning9: "%{lookup('foo'):3306}%{lookup('bar')}"

data/spec/fixtures/hiera/hiera_badvalue.yaml

@@ -0,0 +1,8 @@
+---
+this_is_ok::concat_func: "%{lookup('foo')}%{lookup('bar')}"
+
+this_is::warning1:
+  - "%{lookup('foobar'):3306}"
+this_is::warning2:
+  foo: "%{lookup('foobar'):3306}"
+this_is::warning3: "%{lookup('foo'):3306}%{lookup('bar')}"

data/spec/puppet-syntax/hiera_spec.rb

@@ -43,20 +43,34 @@ describe PuppetSyntax::Hiera do
       files = fixture_hiera(hiera_yaml)
       res = subject.check(files)
       (1..examples).each do |n|
-        expect(res).to include(/::warning#{n}/)
+        expect(res).to include(/warning#{n}:/)
       end
       expect(res.size).to eq examples
       expect(res[0]).to match('Key :typical:typo::warning1: Looks like a missing colon')
       expect(res[1]).to match('Key ::notsotypical::warning2: Puppet automatic lookup will not use leading \'::\'')
       expect(res[2]).to match('Key :noCamelCase::warning3: Not a valid Puppet variable name for automatic lookup')
-      expect(res[3]).to match('Key :no-hyphens::warning4: Not a valid Puppet variable name for automatic lookup')
-      expect(res[4]).to match('Key :picky::warning5: Puppet automatic lookup will not look up symbols')
-      expect(res[5]).to match('Key :this_is::warning6: string after a function call but before `}` in the value')
-      expect(res[6]).to match('Key :this_is::warning7: string after a function call but before `}` in the value')
-      expect(res[7]).to match('Key :this_is::warning8: string after a function call but before `}` in the value')
+      expect(res[3]).to match('Key :root::noCamelCase::warning4: Not a valid Puppet variable name for automatic lookup')
+      expect(res[4]).to match('Key :Leading_caps_warning5: Not a valid Puppet variable name for automatic lookup')
+      expect(res[5]).to match('Key :namespace::Leading_warning6: Not a valid Puppet variable name for automatic lookup')
+      expect(res[6]).to match('Key :no-hyphens::warning7: Not a valid Puppet variable name for automatic lookup')
+      expect(res[7]).to match('Key :picky::warning8: Puppet automatic lookup will not look up symbols')
       expect(res[8]).to match('Key :this_is::warning9: string after a function call but before `}` in the value')
     end
 
+    it 'returns warnings for invalid values' do
+      hiera_yaml = 'hiera_badvalue.yaml'
+      examples = 3
+      files = fixture_hiera(hiera_yaml)
+      res = subject.check(files)
+      (1..examples).each do |n|
+        expect(res).to include(/warning#{n}:/)
+      end
+      expect(res.size).to eq examples
+      expect(res[0]).to match('Key :this_is::warning1: string after a function call but before `}` in the value')
+      expect(res[1]).to match('Key :this_is::warning2: string after a function call but before `}` in the value')
+      expect(res[2]).to match('Key :this_is::warning3: string after a function call but before `}` in the value')
+    end
+
     it 'returns warnings for bad eyaml values' do
       hiera_yaml = 'hiera_bad.eyaml'
       examples = 6

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puppet-syntax
 version: !ruby/object:Gem::Version
-  version: 7.0.0
+  version: 7.0.1
 platform: ruby
 authors:
 - Vox Pupuli
@@ -91,6 +91,7 @@ files:
 - spec/fixtures/hiera/hiera_bad.eyaml
 - spec/fixtures/hiera/hiera_bad.yaml
 - spec/fixtures/hiera/hiera_badkey.yaml
+- spec/fixtures/hiera/hiera_badvalue.yaml
 - spec/fixtures/hiera/hiera_good.yaml
 - spec/fixtures/hiera/hiera_key_empty.yaml
 - spec/fixtures/hiera/hiera_key_no_value.yaml