puppet-syntax 4.0.1 → 4.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 00b51658a2b442427a7acac7c712fb3188d90a66c3d328c5d719b2034b11ad3c
-  data.tar.gz: 33d7cea4918830fd06b91ce02feab1617eaf50a5554cec8d28e59deaff836cd5
+  metadata.gz: a9f7f1ca6475068159902b6dbe227d6ac486336d2fc2ad1c8b00e38b71082597
+  data.tar.gz: 725e830cc518515bf10605391de65a324eb7caafc38c37f32f252cafe1f18ace
 SHA512:
-  metadata.gz: daf199345270be08621d083a76ce169a089dee282a74ebc6de9475c89c36dbef95da3ccf9aac8e4121c267c3d079064e1d0de6f7701a74a4d4d9132b9bb1da72
-  data.tar.gz: 395e92778f90d03e941bf9cd67957cf65fc7ce47cac3816a951f9752e569f6056600a3fa3f42944b086d6e8256ad2596af2bf534f7f3e59fb0d8925f4ba36b3f
+  metadata.gz: a677df82c7a0a758a8184bb8158a422105be48f9552d21bec36f9c1f5f0e67380559318f3dbc6dda464ea18d9e8ed4b515ac68416220bcaf826e2816790f98cf
+  data.tar.gz: 6f9849ab4f2f99ab59f0dbdcff21b31e8c76e0bdc8920c8cf0edabe2d4882e07d4f29e7cdd6b8a4a32e8539b19a7a1b6b4cfa8002e666835ba92ac0358110eb2

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2024-03-08 12:59:05 UTC using RuboCop version 1.61.0.
+# on 2024-03-08 16:09:27 UTC using RuboCop version 1.61.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -86,7 +86,7 @@ RSpec/DescribedClass:
 # Offense count: 7
 # Configuration parameters: CountAsOne.
 RSpec/ExampleLength:
-  Max: 14
+  Max: 17
 
 # Offense count: 4
 # Configuration parameters: Include, CustomTransform, IgnoreMethods, SpecSuffixOnly.
@@ -100,7 +100,7 @@ RSpec/FilePath:
 
 # Offense count: 29
 RSpec/MultipleExpectations:
-  Max: 8
+  Max: 11
 
 # Offense count: 30
 # Configuration parameters: EnforcedStyle, IgnoreSharedExamples.
@@ -244,7 +244,7 @@ Style/SymbolProc:
     - 'lib/puppet-syntax/manifests.rb'
     - 'lib/puppet-syntax/templates.rb'
 
-# Offense count: 2
+# Offense count: 3
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.
 # URISchemes: http, https

data/CHANGELOG.md

@@ -2,6 +2,22 @@
 
 All notable changes to this project will be documented in this file.
 
+## [v4.1.1](https://github.com/voxpupuli/puppet-syntax/tree/v4.1.1) (2024-04-04)
+
+[Full Changelog](https://github.com/voxpupuli/puppet-syntax/compare/v4.1.0...v4.1.1)
+
+**Fixed bugs:**
+
+- fix too greedy regular expression [\#171](https://github.com/voxpupuli/puppet-syntax/pull/171) ([tmu-sprd](https://github.com/tmu-sprd))
+
+## [v4.1.0](https://github.com/voxpupuli/puppet-syntax/tree/v4.1.0) (2024-03-12)
+
+[Full Changelog](https://github.com/voxpupuli/puppet-syntax/compare/v4.0.1...v4.1.0)
+
+**Implemented enhancements:**
+
+- Hiera: Test for wrong interpolation syntax [\#143](https://github.com/voxpupuli/puppet-syntax/pull/143) ([bastelfreak](https://github.com/bastelfreak))
+
 ## [v4.0.1](https://github.com/voxpupuli/puppet-syntax/tree/v4.0.1) (2024-03-12)
 
 [Full Changelog](https://github.com/voxpupuli/puppet-syntax/compare/v4.0.0...v4.0.1)

data/README.md

@@ -85,6 +85,13 @@ This reports common mistakes in key names in Hiera files, such as:
 * Invalid camel casing, such as: `noCamelCase::warning3: true`.
 * Use of hyphens, such as: `no-hyphens::warning4: true`.
 
+
+* To enable a syntax check on Hiera values, set:
+
+```ruby
+PuppetSyntax.check_hiera_data = true
+```
+
 ## Usage
 
 * To enable Puppet::Syntax, include the following in your module's `Rakefile`:
@@ -139,6 +146,21 @@ By default, this rake task looks for all `.yaml` files in a single module under:
 * `hieradata/**/*.yaml`
 * `hiera*.yaml`
 
+It will validate the syntax of each Hiera *key*. for values, it will check if
+the interpolation function syntax is correct. Wrong:
+
+```
+foo:
+  "%{lookup('baz'):3306}": []
+```
+
+correct would be:
+
+```
+foo:
+  "%{lookup('baz')}:3306": []
+```
+
 ### manifests
 
 Checks all `.pp` files in the module for syntax errors.

data/lib/puppet-syntax/hiera.rb

@@ -20,6 +20,16 @@ module PuppetSyntax
       end
     end
 
+    def check_hiera_data(_key, value)
+      # using filter_map to remove nil values
+      # there will be nil values if check_broken_function_call didn't return a string
+      # this is a shorthand for filter.compact
+      # https://blog.saeloun.com/2019/05/25/ruby-2-7-enumerable-filter-map/
+      keys_and_values(value).filter_map do |element|
+        check_broken_function_call(element)
+      end
+    end
+
     # Recurse through complex data structures.  Return on first error.
     def check_eyaml_data(name, val)
       error = nil
@@ -87,6 +97,11 @@ module PuppetSyntax
             key_msg = check_hiera_key(k)
             errors << "WARNING: #{hiera_file}: Key :#{k}: #{key_msg}" if key_msg
           end
+          if PuppetSyntax.check_hiera_data
+            check_hiera_data(k, v).each do |value_msg|
+              errors << "WARNING: #{hiera_file}: Key :#{k}: #{value_msg}"
+            end
+          end
           eyaml_msg = check_eyaml_data(k, v)
           errors << "WARNING: #{hiera_file}: #{eyaml_msg}" if eyaml_msg
         end
@@ -96,5 +111,51 @@ module PuppetSyntax
 
       errors
     end
+
+    private
+
+    # you can call functions in hiera, like this:
+    # "%{lookup('this_is_ok')}"
+    # you can do this in everywhere in a hiera value
+    # you cannot do string concatenation within {}:
+    # "%{lookup('this_is_ok'):3306}"
+    # You can do string concatenation outside of {}:
+    # "%{lookup('this_is_ok')}:3306"
+    def check_broken_function_call(element)
+      'string after a function call but before `}` in the value' if element.is_a?(String) && /%{[^}]+\('[^}]*'\)[^}\s]+}/.match?(element)
+    end
+
+    # gets a hash or array, returns all keys + values as array
+    def flatten_data(data, parent_key = [])
+      if data.is_a?(Hash)
+        data.flat_map do |key, value|
+          current_key = parent_key + [key.to_s]
+          if value.is_a?(Hash) || value.is_a?(Array)
+            flatten_data(value, current_key)
+          else
+            [current_key.join('.'), value]
+          end
+        end
+      elsif data.is_a?(Array) && !data.empty?
+        data.flat_map do |value|
+          if value.is_a?(Hash) || value.is_a?(Array)
+            flatten_data(value, parent_key)
+          else
+            [parent_key.join('.'), value]
+          end
+        end
+      else
+        [parent_key.join('.')]
+      end
+    end
+
+    # gets a string, hash or array, returns all keys + values as flattened + unique array
+    def keys_and_values(value)
+      if value.is_a?(Hash) || value.is_a?(Array)
+        flatten_data(value).flatten.uniq
+      else
+        [value]
+      end
+    end
   end
 end

data/lib/puppet-syntax/version.rb

@@ -1,3 +1,3 @@
 module PuppetSyntax
-  VERSION = '4.0.1'
+  VERSION = '4.1.1'
 end

data/lib/puppet-syntax.rb

@@ -20,6 +20,7 @@ module PuppetSyntax
   ]
   @fail_on_deprecation_notices = true
   @check_hiera_keys = false
+  @check_hiera_data = false
 
   class << self
     attr_accessor :exclude_paths,
@@ -28,6 +29,7 @@ module PuppetSyntax
                   :templates_paths,
                   :fail_on_deprecation_notices,
                   :epp_only,
-                  :check_hiera_keys
+                  :check_hiera_keys,
+                  :check_hiera_data
   end
 end

data/puppet-syntax.gemspec

@@ -24,5 +24,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'pry', '~> 0.14.2'
   spec.add_development_dependency 'rb-readline', '~> 0.5.5'
 
-  spec.add_development_dependency 'voxpupuli-rubocop', '~> 2.5.0'
+  spec.add_development_dependency 'voxpupuli-rubocop', '~> 2.6.0'
 end

data/spec/fixtures/hiera/hiera_badkey.yaml

@@ -3,9 +3,17 @@ 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')}"
 
 typical:typo::warning1:   true
 ::notsotypical::warning2: true
 noCamelCase::warning3:    true
 no-hyphens::warning4:     true
 :picky::warning5:         true
+this_is::warning6:
+  "%{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/puppet-syntax/hiera_spec.rb

@@ -24,11 +24,12 @@ describe PuppetSyntax::Hiera do
   context 'check_hiera_keys = true' do
     before do
       PuppetSyntax.check_hiera_keys = true
+      PuppetSyntax.check_hiera_data = true
     end
 
     it 'returns warnings for invalid keys' do
       hiera_yaml = 'hiera_badkey.yaml'
-      examples = 5
+      examples = 9
       files = fixture_hiera(hiera_yaml)
       res = subject.check(files)
       (1..examples).each do |n|
@@ -40,6 +41,10 @@ describe PuppetSyntax::Hiera do
       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[8]).to match('Key :this_is::warning9: string after a function call but before `}` in the value')
     end
 
     it 'returns warnings for bad eyaml values' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet-syntax
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.1.1
 platform: ruby
 authors:
 - Vox Pupuli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-03-12 00:00:00.000000000 Z
+date: 2024-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: puppet
@@ -78,14 +78,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 2.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 2.6.0
 description: Syntax checks for Puppet manifests and templates
 email:
 - voxpupuli@groups.io