File tree Expand file tree Collapse file tree 2 files changed +3
-8
lines changed
lib/puppet-lint/plugins/legacy_facts
spec/unit/puppet-lint/plugins/legacy_facts Expand file tree Collapse file tree 2 files changed +3
-8
lines changed Original file line number Diff line number Diff line change @@ -115,14 +115,9 @@ def check
115115 tokens . select { |x | LEGACY_FACTS_VAR_TYPES . include? ( x . type ) } . each do |token |
116116 fact_name = ''
117117
118- # This matches legacy facts defined in the fact hash that use the top scope
119- # fact assignment.
120- if token . value . match ( %r{::facts\[ '(.*)'\] } )
121- fact_name = token . value . match ( %r{::facts\[ '(.*)'\] } ) [ 1 ]
122-
123118 # This matches legacy facts defined in the fact hash.
124- elsif token . value . match ( %r{facts\[ '(.*)'\] } )
125- fact_name = token . value . match ( %r{facts \[ '(.*)' \] } ) [ 1 ]
119+ if ( match = ( token . value . match ( %r{(::)? facts\[ '(.*)'\] } ) || token . value . match ( %r{(::)?facts \[ (.*) \] } ) ) )
120+ fact_name = match [ 2 ]
126121
127122 # This matches using legacy facts in a the new structured fact. For
128123 # example this would match 'uuid' in $facts['uuid'] so it can be converted
Original file line number Diff line number Diff line change 126126 let ( :code ) { '$::facts[osfamily]' }
127127
128128 it 'detects a single problem' do
129- expect ( problems ) . to have ( 0 ) . problem
129+ expect ( problems ) . to have ( 1 ) . problem
130130 end
131131 end
132132 end
You can’t perform that action at this time.
0 commit comments