saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #52345 from garethgreenaway/52197_incron_cannot_have_comments

Browse source 
[2018.3] removing use of comments from incron modules
This commit is contained in:
Gareth J. Greenaway 2019-03-28 11:03:02 -07:00 • committed by GitHub
commit e88d3ba2a2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
salt/modules/incron.py
View file

@ -53,11 +53,10 @@ def _render_tab(lst):
for pre in lst['pre']:
ret.append('{0}\n'.format(pre))
for cron in lst['crons']:
ret.append('{0} {1} {2} {3}\n'.format(cron['path'],
cron['mask'],
cron['cmd'],
TAG
)
ret.append('{0} {1} {2}\n'.format(cron['path'],
cron['mask'],
cron['cmd'],
)
)
return ret
@ -191,23 +190,18 @@ def list_tab(user):
'pre': []
}
flag = False
comment = None
tag = '# Line managed by Salt, do not edit'
for line in data.splitlines():
if line.endswith(tag):
if len(line.split()) > 3:
# Appears to be a standard incron line
comps = line.split()
path = comps[0]
mask = comps[1]
(cmd, comment) = ' '.join(comps[2:]).split(' # ')
if len(line.split()) > 3:
# Appears to be a standard incron line
comps = line.split()
path = comps[0]
mask = comps[1]
cmd = ' '.join(comps[2:])
dat = {'path': path,
'mask': mask,
'cmd': cmd,
'comment': comment}
ret['crons'].append(dat)
comment = None
dat = {'path': path,
'mask': mask,
'cmd': cmd}
ret['crons'].append(dat)
else:
ret['pre'].append(line)
return ret

5
salt/states/incron.py
View file

@ -44,6 +44,9 @@ then a new cron job will be added to the user's crontab.
# Import Python libs
from __future__ import absolute_import, print_function, unicode_literals
import logging
log = logging.getLogger(__name__)
def _check_cron(user,
path,
@ -56,6 +59,8 @@ def _check_cron(user,
arg_mask.sort()
lst = __salt__['incron.list_tab'](user)
if cmd.endswith('\n'):
cmd = cmd[:-1]
for cron in lst['crons']:
if path == cron['path'] and cron['cmd'] == cmd:
cron_mask = cron['mask'].split(',')

4
tests/unit/modules/test_incron.py
View file

@ -102,7 +102,7 @@ class IncronTestCase(TestCase, LoaderModuleMockMixin):
val = {'pre': [], 'crons': [{'path': '/home/cybage',
'mask': 'IN_MODIFY',
'cmd': 'echo "SALT"', 'comment': ''}]}
'cmd': 'echo "SALT"'}]}
with patch.object(incron, 'list_tab',
MagicMock(return_value=val)):
self.assertEqual(incron.set_job('cybage', '/home/cybage',
@ -135,7 +135,7 @@ class IncronTestCase(TestCase, LoaderModuleMockMixin):
val = {'pre': [], 'crons': [{'path': '/home/cybage',
'mask': 'IN_MODIFY,IN_DELETE',
'cmd': 'echo "SALT"', 'comment': ''}]}
'cmd': 'echo "SALT"'}]}
with patch.object(incron, 'list_tab',
MagicMock(return_value=val)):
mock = MagicMock(return_value='incrontab')