valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Switching slack module and slack returner to using salt.utils.http

Browse Source
This commit is contained in:
Gareth J. Greenaway 2015-06-02 17:26:00 -07:00
parent ca2b7320bb
commit b480e89688
3 changed files with 84 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
salt/modules/slack_notify.py
View File

@ -19,6 +19,7 @@ Module for sending messages to Slack
# Import Python libs
from __future__ import absolute_import
import logging
import urllib
# Import 3rd-party libs
# pylint: disable=import-error,no-name-in-module,redefined-builtin
@ -27,13 +28,6 @@ from salt.ext.six.moves import range
import salt.ext.six.moves.http_client
# pylint: enable=import-error,no-name-in-module
try:
import requests
from requests.exceptions import ConnectionError
ENABLED = True
except ImportError:
ENABLED = False
log = logging.getLogger(__name__)
__virtualname__ = 'slack'
@ -44,12 +38,15 @@ def __virtual__():
:return: The virtual name of the module.
'''
if not ENABLED:
return False
return __virtualname__
def _query(function, api_key=None, method='GET', data=None):
def _query(function,
api_key=None,
args=None,
method='GET',
header_dict=None,
data=None):
'''
Slack object method function to construct and execute on the API URL.
@ -59,12 +56,8 @@ def _query(function, api_key=None, method='GET', data=None):
:param data: The data to be sent for POST method.
:return: The json response from the API call or False.
'''
headers = {}
query_params = {}
if data is None:
data = {}
ret = {'message': '',
'res': True}
@ -98,43 +91,50 @@ def _query(function, api_key=None, method='GET', data=None):
base_url = _urljoin(api_url, '/api/')
path = slack_functions.get(function).get('request')
url = _urljoin(base_url, path, False)
if not isinstance(args, dict):
query_params = {}
query_params['token'] = api_key
try:
result = requests.request(
method=method,
url=url,
headers=headers,
params=query_params,
data=data,
verify=True,
)
except ConnectionError as e:
ret['message'] = e
ret['res'] = False
return ret
if header_dict is None:
header_dict = {}
if result.status_code == salt.ext.six.moves.http_client.OK:
result = result.json()
if method != 'POST':
header_dict['Accept'] = 'application/json'
result = salt.utils.http.query(
url,
method,
params=query_params,
data=data,
decode=True,
status=True,
header_dict=header_dict,
opts=__opts__,
)
if result.get('status', None) == salt.ext.six.moves.http_client.OK:
_result = result['dict']
response = slack_functions.get(function).get('response')
if 'error' in result:
ret['message'] = result['error']
if 'error' in _result:
ret['message'] = _result['error']
ret['res'] = False
return ret
ret['message'] = result.get(response)
ret['message'] = _result.get(response)
return ret
elif result.status_code == salt.ext.six.moves.http_client.NO_CONTENT:
elif result.get('status', None) == salt.ext.six.moves.http_client.NO_CONTENT:
return True
else:
log.debug(url)
log.debug(query_params)
log.debug(data)
log.debug(result)
if 'error' in result:
_result = result['dict']
if 'error' in _result:
ret['message'] = result['error']
ret['res'] = False
return ret
ret['message'] = result
ret['message'] = _result.get(response)
return ret
@ -265,15 +265,18 @@ def post_message(channel,
if not from_name:
log.error('from_name is a required option.')
parameters = dict()
parameters['channel'] = channel
parameters['username'] = from_name
parameters['text'] = message
parameters = {
'channel': channel,
'username': from_name,
'text': message
}
# Slack wants the body on POST to be urlencoded.
result = _query(function='message',
api_key=api_key,
method='POST',
data=parameters)
header_dict={'Content-Type': 'application/x-www-form-urlencoded'},
data=urllib.urlencode(parameters))
if result['res']:
return True

67
salt/returners/slack_returner.py
View File

@ -63,6 +63,7 @@ from __future__ import absolute_import
# Import Python libs
import pprint
import logging
import urllib
# Import 3rd-party libs
try:
@ -129,7 +130,12 @@ def __virtual__():
return __virtualname__
def _query(function, api_key=None, method='GET', data=None):
def _query(function,
api_key=None,
args=None,
method='GET',
header_dict=None,
data=None):
'''
Slack object method function to construct and execute on the API URL.
@ -139,12 +145,8 @@ def _query(function, api_key=None, method='GET', data=None):
:param data: The data to be sent for POST method.
:return: The json response from the API call or False.
'''
headers = {}
query_params = {}
if data is None:
data = {}
ret = {'message': '',
'res': True}
@ -178,43 +180,50 @@ def _query(function, api_key=None, method='GET', data=None):
base_url = _urljoin(api_url, '/api/')
path = slack_functions.get(function).get('request')
url = _urljoin(base_url, path, False)
if not isinstance(args, dict):
query_params = {}
query_params['token'] = api_key
try:
result = requests.request(
method=method,
url=url,
headers=headers,
params=query_params,
data=data,
verify=True,
)
except ConnectionError as e:
ret['message'] = e
ret['res'] = False
return ret
if header_dict is None:
header_dict = {}
if result.status_code == salt.ext.six.moves.http_client.OK:
result = result.json()
if method != 'POST':
header_dict['Accept'] = 'application/json'
result = salt.utils.http.query(
url,
method,
params=query_params,
data=data,
decode=True,
status=True,
header_dict=header_dict,
opts=__opts__,
)
if result.get('status', None) == salt.ext.six.moves.http_client.OK:
_result = result['dict']
response = slack_functions.get(function).get('response')
if 'error' in result:
ret['message'] = result['error']
if 'error' in _result:
ret['message'] = _result['error']
ret['res'] = False
return ret
ret['message'] = result.get(response)
ret['message'] = _result.get(response)
return ret
elif result.status_code == salt.ext.six.moves.http_client.NO_CONTENT:
elif result.get('status', None) == salt.ext.six.moves.http_client.NO_CONTENT:
return True
else:
log.debug(url)
log.debug(query_params)
log.debug(data)
log.debug(result)
if 'error' in result:
ret['message'] = result['error']
_result = result['dict']
if 'error' in _result:
ret['message'] = _result['error']
ret['res'] = False
return ret
ret['message'] = result
ret['message'] = _result.get(response)
return ret
@ -240,10 +249,12 @@ def _post_message(channel,
parameters['as_user'] = as_user
parameters['text'] = '```' + message + '```' # pre-formatted, fixed-width text
# Slack wants the body on POST to be urlencoded.
result = _query(function='message',
api_key=api_key,
method='POST',
data=parameters)
header_dict={'Content-Type': 'application/x-www-form-urlencoded'},
data=urllib.urlencode(parameters))
log.debug('result {0}'.format(result))
if result:

3
salt/utils/http.py
View File

@ -170,7 +170,6 @@ def query(url,
data_file, data_render, data_renderer, template_dict, opts
)
log.debug('Using {0} Method'.format(method))
if method == 'POST':
log.trace('POST Data: {0}'.format(pprint.pformat(data)))
@ -273,6 +272,7 @@ def query(url,
log.error('The client-side certificate path that was passed is '
'not valid: {0}'.format(cert))
log.debug('data type {0}'.format(type(data)))
result = sess.request(
method, url, params=params, data=data, **req_kwargs
)
@ -281,6 +281,7 @@ def query(url,
return {'handle': result}
log.debug(result.url)
log.debug(result.request.__dict__)
log.trace(data)
result_status_code = result.status_code