Merge pull request #9 from bwhmather/feature/github_content_type
make it possible to configure the content type of a github webhook
This commit is contained in:
commit
2003d79a48
1 changed files with 22 additions and 14 deletions
|
@ -57,6 +57,12 @@ options:
|
||||||
required: false
|
required: false
|
||||||
default: 'yes'
|
default: 'yes'
|
||||||
choices: ['yes', 'no']
|
choices: ['yes', 'no']
|
||||||
|
content_type:
|
||||||
|
description:
|
||||||
|
- Content type to use for requests made to the webhook
|
||||||
|
required: false
|
||||||
|
default: 'json'
|
||||||
|
choices: ['json', 'form']
|
||||||
|
|
||||||
author: Phillip Gentry, CX Inc
|
author: Phillip Gentry, CX Inc
|
||||||
'''
|
'''
|
||||||
|
@ -69,7 +75,7 @@ EXAMPLES = '''
|
||||||
- local_action: github_hooks action=cleanall user={{ gituser }} oauthkey={{ oauthkey }} repo={{ repo }}
|
- local_action: github_hooks action=cleanall user={{ gituser }} oauthkey={{ oauthkey }} repo={{ repo }}
|
||||||
'''
|
'''
|
||||||
|
|
||||||
def list(module, hookurl, oauthkey, repo, user):
|
def _list(module, hookurl, oauthkey, repo, user):
|
||||||
url = "%s/hooks" % repo
|
url = "%s/hooks" % repo
|
||||||
auth = base64.encodestring('%s:%s' % (user, oauthkey)).replace('\n', '')
|
auth = base64.encodestring('%s:%s' % (user, oauthkey)).replace('\n', '')
|
||||||
headers = {
|
headers = {
|
||||||
|
@ -81,38 +87,38 @@ def list(module, hookurl, oauthkey, repo, user):
|
||||||
else:
|
else:
|
||||||
return False, response.read()
|
return False, response.read()
|
||||||
|
|
||||||
def clean504(module, hookurl, oauthkey, repo, user):
|
def _clean504(module, hookurl, oauthkey, repo, user):
|
||||||
current_hooks = list(hookurl, oauthkey, repo, user)[1]
|
current_hooks = _list(hookurl, oauthkey, repo, user)[1]
|
||||||
decoded = json.loads(current_hooks)
|
decoded = json.loads(current_hooks)
|
||||||
|
|
||||||
for hook in decoded:
|
for hook in decoded:
|
||||||
if hook['last_response']['code'] == 504:
|
if hook['last_response']['code'] == 504:
|
||||||
# print "Last response was an ERROR for hook:"
|
# print "Last response was an ERROR for hook:"
|
||||||
# print hook['id']
|
# print hook['id']
|
||||||
delete(module, hookurl, oauthkey, repo, user, hook['id'])
|
_delete(module, hookurl, oauthkey, repo, user, hook['id'])
|
||||||
|
|
||||||
return 0, current_hooks
|
return 0, current_hooks
|
||||||
|
|
||||||
def cleanall(module, hookurl, oauthkey, repo, user):
|
def _cleanall(module, hookurl, oauthkey, repo, user):
|
||||||
current_hooks = list(hookurl, oauthkey, repo, user)[1]
|
current_hooks = _list(hookurl, oauthkey, repo, user)[1]
|
||||||
decoded = json.loads(current_hooks)
|
decoded = json.loads(current_hooks)
|
||||||
|
|
||||||
for hook in decoded:
|
for hook in decoded:
|
||||||
if hook['last_response']['code'] != 200:
|
if hook['last_response']['code'] != 200:
|
||||||
# print "Last response was an ERROR for hook:"
|
# print "Last response was an ERROR for hook:"
|
||||||
# print hook['id']
|
# print hook['id']
|
||||||
delete(module, hookurl, oauthkey, repo, user, hook['id'])
|
_delete(module, hookurl, oauthkey, repo, user, hook['id'])
|
||||||
|
|
||||||
return 0, current_hooks
|
return 0, current_hooks
|
||||||
|
|
||||||
def create(module, hookurl, oauthkey, repo, user):
|
def _create(module, hookurl, oauthkey, repo, user, content_type):
|
||||||
url = "%s/hooks" % repo
|
url = "%s/hooks" % repo
|
||||||
values = {
|
values = {
|
||||||
"active": True,
|
"active": True,
|
||||||
"name": "web",
|
"name": "web",
|
||||||
"config": {
|
"config": {
|
||||||
"url": "%s" % hookurl,
|
"url": "%s" % hookurl,
|
||||||
"content_type": "json"
|
"content_type": "%s" % content_type
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
data = json.dumps(values)
|
data = json.dumps(values)
|
||||||
|
@ -126,7 +132,7 @@ def create(module, hookurl, oauthkey, repo, user):
|
||||||
else:
|
else:
|
||||||
return 0, response.read()
|
return 0, response.read()
|
||||||
|
|
||||||
def delete(module, hookurl, oauthkey, repo, user, hookid):
|
def _delete(module, hookurl, oauthkey, repo, user, hookid):
|
||||||
url = "%s/hooks/%s" % (repo, hookid)
|
url = "%s/hooks/%s" % (repo, hookid)
|
||||||
auth = base64.encodestring('%s:%s' % (user, oauthkey)).replace('\n', '')
|
auth = base64.encodestring('%s:%s' % (user, oauthkey)).replace('\n', '')
|
||||||
headers = {
|
headers = {
|
||||||
|
@ -144,6 +150,7 @@ def main():
|
||||||
repo=dict(required=True),
|
repo=dict(required=True),
|
||||||
user=dict(required=True),
|
user=dict(required=True),
|
||||||
validate_certs=dict(default='yes', type='bool'),
|
validate_certs=dict(default='yes', type='bool'),
|
||||||
|
content_type=dict(default='json', choices=['json', 'form']),
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -152,18 +159,19 @@ def main():
|
||||||
oauthkey = module.params['oauthkey']
|
oauthkey = module.params['oauthkey']
|
||||||
repo = module.params['repo']
|
repo = module.params['repo']
|
||||||
user = module.params['user']
|
user = module.params['user']
|
||||||
|
content_type = module.params['content_type']
|
||||||
|
|
||||||
if action == "list":
|
if action == "list":
|
||||||
(rc, out) = list(module, hookurl, oauthkey, repo, user)
|
(rc, out) = _list(module, hookurl, oauthkey, repo, user)
|
||||||
|
|
||||||
if action == "clean504":
|
if action == "clean504":
|
||||||
(rc, out) = clean504(module, hookurl, oauthkey, repo, user)
|
(rc, out) = _clean504(module, hookurl, oauthkey, repo, user)
|
||||||
|
|
||||||
if action == "cleanall":
|
if action == "cleanall":
|
||||||
(rc, out) = cleanall(module, hookurl, oauthkey, repo, user)
|
(rc, out) = _cleanall(module, hookurl, oauthkey, repo, user)
|
||||||
|
|
||||||
if action == "create":
|
if action == "create":
|
||||||
(rc, out) = create(module, hookurl, oauthkey, repo, user)
|
(rc, out) = _create(module, hookurl, oauthkey, repo, user, content_type)
|
||||||
|
|
||||||
if rc != 0:
|
if rc != 0:
|
||||||
module.fail_json(msg="failed", result=out)
|
module.fail_json(msg="failed", result=out)
|
||||||
|
|
Loading…
Reference in a new issue