puppet-lint-wmf_styleguide-check 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7980b85ac1476eb1cfd7107a024a8d01f56d3aaa13bc4adf6542b52edeb862a8
-  data.tar.gz: f5b71a6c23db3e26deec5d4f2a2d036ad4dbaeb26e0aa80d2049bf6e95e830eb
+  metadata.gz: 899c8c3526bd03b42700fe80c845fc590fc60876ef10410e1216fcab6e4ac7e5
+  data.tar.gz: 4ed16c3cff59cfa2c72b6dca1af26210daca111ff92e984c999087acd5c44b62
 SHA512:
-  metadata.gz: 814e0b269f85a970e883534f42a12f201e0afaf530f47474e7bbfaf685dd0ae549a529de9c639768c6e34f11d53bb66425e7c31a4a25cf0d6bb6d60f9c614238
-  data.tar.gz: 8b85af51045fc558202c404ce87f20c0ca14dc76538ea30bde1abd68c3eac4ac154e1a77a309ff08b9e96ed93aca6945e870d117553259a68aa09d45d7b68b91
+  metadata.gz: b550d1bf27ecffec3b069cf131367232a0b65dc8da3c6296054aa6d1c634b655bd291cece4bf6c71fbb4a2e41939f6455c86a8a594e36d1fe486178f24eec3b8
+  data.tar.gz: d0641b8fd0fe54e5430a1fab4f5e0b40d24d97243ceed0d8195d9faeaa2c57700b91597af050c962b959aed2c0fba6edb4600badc66286d91440df31a57e9110

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

@@ -493,6 +493,15 @@ PuppetLint.new_check(:wmf_styleguide) do
       # If we're not within a node definition, skip this token
       next unless in_node_def
       case token.type
+      when :REGEX
+        if !token.value.start_with?('^') || !token.value.end_with?('$')
+          msg = {
+            message: "wmf-style: regex node matching must match the whole string (^...$), got: #{token.value}",
+            line: token.line,
+            column: token.column
+          }
+          notify :error, msg
+        end
       when :LBRACE
         title_tokens = tokens[start + 1..(i - 1)].select(&:node_def?) if braces_level.zero?
         braces_level += 1

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

@@ -88,7 +88,7 @@ define foo::fixme ($a=hiera('something')) {
 EOF
 
 node_ok = <<-EOF
-node /^test1.*\.example\.com$/ {
+node /^test1.*\\.example\\.com$/ {
      role(spare::system)
 }
 EOF
@@ -106,6 +106,24 @@ node 'fixme' {
 }
 EOF
 
+node_regex_missing_start = <<-EOF
+node /test1.*\\.example\\.com$/ {
+     role(spare::system)
+}
+EOF
+
+node_regex_missing_end = <<-EOF
+node /^test1.*\\.example\\.com/ {
+     role(spare::system)
+}
+EOF
+
+node_regex_missing_both = <<-EOF
+node /test1.*\\.example\\.com/ {
+     role(spare::system)
+}
+EOF
+
 deprecation_ko = <<-EOF
 define test() {
    base::service_unit{ 'test2': }
@@ -240,6 +258,25 @@ describe 'wmf_styleguide' do
     end
   end
 
+  context 'node regex with start violation' do
+    let(:code) { node_regex_missing_start }
+    it 'should start the regex with ^' do
+      expect(problems).to contain_error('wmf-style: regex node matching must match the whole string (^...$), got: test1.*\\.example\\.com$')
+    end
+  end
+  context 'node regex with end violation' do
+    let(:code) { node_regex_missing_end }
+    it 'should end the regex with $' do
+      expect(problems).to contain_error('wmf-style: regex node matching must match the whole string (^...$), got: ^test1.*\\.example\\.com')
+    end
+  end
+  context 'node regex with start and end violations' do
+    let(:code) { node_regex_missing_both }
+    it 'should start the regex with ^ and end it with $' do
+      expect(problems).to contain_error('wmf-style: regex node matching must match the whole string (^...$), got: test1.*\\.example\\.com')
+    end
+  end
+
   context 'defined type with deprecations' do
     let(:code) { deprecation_ko }
     it 'should not' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet-lint-wmf_styleguide-check
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Giuseppe Lavagetto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-15 00:00:00.000000000 Z
+date: 2023-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: puppet-lint
@@ -163,8 +163,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.2.5
 signing_key: 
 specification_version: 4
 summary: A puppet-lint plugin to check code adheres to the WMF coding guidelines