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

Fixing a bug when passing pillar values to aliases for the Slack engine. Cleaned up the formatting of the results, color codes don't translate well into Slack output. For any state runs, eg. highstate. apply, sls, we run the output through the highstate formater. For anything else run it though the yaml outputer. Running it though highstate causes errors when the output does match what the highstate output is expecting.

Browse source
This commit is contained in:
Gareth J. Greenaway 2018-04-17 18:23:55 -07:00
parent 1947ffdf56
commit e846df7409
No known key found for this signature in database
GPG key ID: 10B62F8A7CAD7A41
1 changed files with 25 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
salt/engines/slack.py
View file

@ -120,6 +120,7 @@ import salt.utils.json
import salt.utils.slack
import salt.utils.yaml
import salt.output.highstate
import salt.output.yaml_out
from salt.ext import six
__virtualname__ = 'slack'
@ -356,6 +357,9 @@ class SlackClient(object):
use_cmdline = cmdline
target = self.get_target(permitted_group, cmdline, use_cmdline)
# Include any additional elements from cmdline
use_cmdline.extend(cmdline[1:])
return (True, target, use_cmdline)
def message_text(self, m_data):
@ -565,15 +569,21 @@ class SlackClient(object):
# emulate the yaml_out output formatter. It relies on a global __opts__ object which we can't
# obviously pass in
def format_return_text(self, data, **kwargs): # pylint: disable=unused-argument
def format_return_text(self, data, function, **kwargs): # pylint: disable=unused-argument
'''
Print out YAML using the block mode
'''
try:
salt.output.highstate.__opts__ = __opts__
if 'color' not in salt.output.highstate.__opts__:
salt.output.highstate.__opts__.update({"color": ""})
return salt.output.highstate.output(data)
# Format results from state runs with highstate output
if function.startswith('state'):
salt.output.highstate.__opts__ = __opts__
# Disable colors
salt.output.highstate.__opts__.update({"color": False})
return salt.output.highstate.output(data)
# Format results from everything else with yaml output
else:
salt.output.yaml_out.__opts__ = __opts__
return salt.output.yaml_out.output(data)
# pylint: disable=broad-except
except Exception as exc:
import pprint
@ -623,12 +633,16 @@ class SlackClient(object):
for jid in outstanding_jids:
# results[jid] = runner.cmd('jobs.lookup_jid', [jid])
if self.master_minion.returners['{}.get_jid'.format(source)](jid):
jid_result = runner.cmd('jobs.list_job', [jid]).get('Result', {})
job_result = runner.cmd('jobs.list_job', [jid])
jid_result = job_result.get('Result', {})
jid_function = job_result.get('Function', {})
# emulate lookup_jid's return, which is just minion:return
# pylint is tripping
# pylint: disable=missing-whitespace-after-comma
job_data = salt.utils.json.dumps({key:val['return'] for key, val in jid_result.items()})
results[jid] = salt.utils.yaml.safe_load(job_data)
results[jid] = {}
results[jid]['data'] = salt.utils.yaml.safe_load(job_data)
results[jid]['function'] = jid_function
return results
@ -675,13 +689,15 @@ class SlackClient(object):
start_time = time.time()
job_status = self.get_jobs_from_runner(outstanding.keys()) # dict of job_ids:results are returned
log.trace('Getting %s jobs status took %s seconds', len(job_status), time.time() - start_time)
for jid, result in job_status.items():
for jid in job_status:
result = job_status[jid]['data']
function = job_status[jid]['function']
if result:
log.debug('ret to send back is %s', result)
# formatting function?
this_job = outstanding[jid]
channel = self.sc.server.channels.find(this_job['channel'])
return_text = self.format_return_text(result)
return_text = self.format_return_text(result, function)
return_prefix = "@{}'s job `{}` (id: {}) (target: {}) returned".format(
this_job['user_name'], this_job['cmdline'], jid, this_job['target'])
channel.send_message(return_prefix)