puppet-lint-check_unsafe_interpolations 0.0.2 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3d2714593f074f68ed3f6007f39ab2ed2d5515d9aeaaae54edd8cf7466e76e8
-  data.tar.gz: 86f891f98659f45310d6d96d6bec2ba69dffa80acea18d5988a510c908f4179b
+  metadata.gz: 7030c967d7f3f39c1829abe1d620bd93c22e556e0ff9238e2197ef65c3faba27
+  data.tar.gz: 6b7397d25a2e92fee44bae25c3b3386b66468d7adf7c6c51f1a3044ae8db00ea
 SHA512:
-  metadata.gz: 1849165b7b86786474856c179cdd7c9f6ac809a18ded4a7fed043d2a98a31c2d299a53134ccf7b3812f3d7d3c0ea07979fb340275519b5f41d58a61a69e3be50
-  data.tar.gz: ba4c9501c985599355ac72ed120bcf2ef41e6120d72cca724c27cc6e63d0a5d85d12c2cb1a77a08c5c9e27e051dae53911317b9c5d55a12aa152f02c3922666f
+  metadata.gz: c91e94e645dae141e93b74324f16c88a4ede801d56e1f501e994500d99ebc4ae418f9c25107c081d513ca23db3040455de97915f7c753bb00ae1481419fd6493
+  data.tar.gz: 93f689e32e264b4aa107a9986d1f17692bd55ec34863263f73cdc642b02d6eff894cedd10bbf8dbf554ca66b1b2e0a636ae1bbb047bbb22dc56ffa799f5bf7f7

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

@@ -1,6 +1,7 @@
 PuppetLint.new_check(:check_unsafe_interpolations) do
   COMMANDS = Array['command', 'onlyif', 'unless']
   INTERPOLATED_STRINGS = Array[:DQPRE, :DQMID]
+  USELESS_CHARS = Array[:WHITESPACE, :COMMA]
   def check
     # Gather any exec commands' resources into an array
     exec_resources = resource_indexes.map { |resource|
@@ -8,14 +9,9 @@ PuppetLint.new_check(:check_unsafe_interpolations) do
       resource if resource[:type].value == 'exec' && !(COMMANDS & resource_parameters).empty?
     }.compact
 
-    # Filter the list of titles returned by get_title_tokens for those contained in an exec
-    exec_title_tokens = get_title_tokens.select { |title|
-      title if title[:resource_type].value == 'exec'
-    }.compact
-
     # Iterate over title tokens and raise a warning if any are variables
-    unless exec_title_tokens.empty?
-      exec_title_tokens.each do |title|
+    unless get_exec_titles.empty?
+      get_exec_titles.each do |title|
         check_unsafe_title(title)
       end
     end
@@ -28,7 +24,7 @@ PuppetLint.new_check(:check_unsafe_interpolations) do
 
   # Iterate over the tokens in a title and raise a warning if an interpolated variable is found
   def check_unsafe_title(title)
-    title[:tokens].each do |token|
+    title.each do |token|
       notify_warning(token.next_code_token) if interpolated?(token)
     end
   end
@@ -83,43 +79,36 @@ PuppetLint.new_check(:check_unsafe_interpolations) do
 
   # This function is a replacement for puppet_lint's title_tokens function which assumes titles have single quotes
   # This function adds a check for titles in double quotes where there could be interpolated variables
-  def get_title_tokens
+  def get_exec_titles
     result = []
     tokens.each_index do |token_idx|
-      next unless tokens[token_idx].type == :COLON
+      next unless ['exec'].include?(tokens[token_idx].value)
+      # We have a resource declaration. Now find the title
       tokens_array = []
       # Check if title is an array
-      if tokens[token_idx - 1].type == :RBRACK
-        array_start_idx = tokens.rindex do |r|
-          r.type == :LBRACK
-        end
-        title_array_tokens = tokens[(array_start_idx + 1)..(token_idx - 2)]
-        tokens_array.concat(title_array_tokens.select do |token|
-          { STRING: true, NAME: true }.include?(token.type)
+      if tokens[token_idx].next_code_token.next_code_token.type == :LBRACK
+        # Get the start and end indices of the array of titles
+        array_start_idx = tokens.rindex { |r| r.type == :LBRACK }
+        array_end_idx = tokens.rindex { |r| r.type == :RBRACK }
+
+        # Grab everything within the array
+        title_array_tokens = tokens[(array_start_idx + 1)..(array_end_idx - 1)]
+        tokens_array.concat(title_array_tokens.reject do |token|
+          USELESS_CHARS.include?(token.type)
         end)
-        result << {
-          tokens: tokens_array,
-          resource_type: tokens[array_start_idx].prev_code_token.prev_code_token
-        }
+        result << tokens_array
       # Check if title is double quotes string
-      elsif tokens[token_idx - 1].type == :DQPOST
-        # Find index of the start of the title
-        title_start_idx = tokens.rindex do |r|
-          r.type == :DQPRE
-        end
-        result << {
-          # Title is tokens from :DQPRE to the index before :COLON
-          tokens: tokens[title_start_idx..(token_idx - 1)],
-          resource_type: tokens[title_start_idx].prev_code_token.prev_code_token
-        }
+      elsif tokens[token_idx].next_code_token.next_code_token.type == :DQPRE
+        # Find the start and end of the title
+        title_start_idx = tokens.rindex { |r| r.type == :DQPRE }
+        title_end_idx = tokens.rindex { |r| r.type == :DQPOST }
+
+        result << tokens[title_start_idx..title_end_idx]
       # Title is in single quotes
       else
-        next_token = tokens[token_idx].next_code_token
-        tokens_array.concat([tokens[token_idx - 1]]) unless next_token.type == :LBRACE
-        result << {
-          tokens: tokens_array,
-          resource_type: tokens[token_idx - 1].prev_code_token.prev_code_token
-        }
+        tokens_array.concat([tokens[token_idx].next_code_token.next_code_token])
+
+        result << tokens_array
       end
     end
     result

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

@@ -1,4 +1,4 @@
 # version of this gem
 class CheckUnsafeInterpolations
-  VERSION ||= '0.0.2'.freeze
+  VERSION ||= '0.0.4'.freeze
 end

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

@@ -160,5 +160,27 @@ describe 'check_unsafe_interpolations' do
         expect(problems).to have(1).problems
       end
     end
+
+    context 'case statement and an exec' do
+      let(:code) do
+        <<-PUPPET
+        class foo {
+          case bar {
+            baz : {
+              echo qux
+            }
+          }
+
+          exec { 'foo':
+            command => "echo bar",
+          }
+        }
+        PUPPET
+      end
+
+      it 'detects zero problems' do
+        expect(problems).to have(0).problems
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet-lint-check_unsafe_interpolations
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
 platform: ruby
 authors:
 - Puppet, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-12-06 00:00:00.000000000 Z
+date: 2022-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: puppet-lint
@@ -54,7 +54,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="