Skip to content

Commit

Permalink
fix octal rule for time format
Browse files Browse the repository at this point in the history
  • Loading branch information
nicholasmhughes authored and roaldnefs committed Jan 3, 2024
1 parent f6a41f8 commit ec4e8ff
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 2 deletions.
9 changes: 8 additions & 1 deletion saltlint/rules/YamlHasOctalValueRule.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,12 @@ class YamlHasOctalValueRule(Rule):

bracket_regex = re.compile(r"^[^:]+:\s{0,}0[0-9]{1,}\s{0,}((?={#)|(?=#)|(?=$))")

exclude_regex = re.compile(r"[ T]\d\d:\d\d(?:[: ]|$)")

def match(self, file, line):
return self.bracket_regex.search(line)
found = self.bracket_regex.search(line)
if found:
exc = self.exclude_regex.search(found.group(0))
if exc:
return None
return found
13 changes: 12 additions & 1 deletion tests/unit/TestYamlHasOctalValueRule.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,20 @@
# MAC addresses shouldn't be matched, for more information see:
# https://github.com/warpnet/salt-lint/issues/202
infoblox_remove_record:
infoblox_remove_record1:
infoblox_host_record.absent:
- mac: 4c:f2:d3:1b:2e:05
infoblox_remove_record2:
infoblox_host_record.absent:
- mac: 05:f2:d3:1b:2e:4c
# time values should not trigger this rule
some_calendar_entry:
file.managed:
- name: /tmp/my_unit_file
- contents: |
oncalendar=Sun 18:00
'''

BAD_NUMBER_STATE = '''
Expand Down

0 comments on commit ec4e8ff

Please sign in to comment.