Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

webhooks/gitlab: Replace "Build Hook" with "Job Hook". 

At some point, GitLab decided to change the name of the event for
CI notifications from "Build Hook" to "Job Hook" and we started
running into errors in webhook-logger.log.
This commit is contained in:
Eeshan Garg 2018-02-23 22:37:57 -03:30 committed by showell
parent 6ddc0b75ac
commit fbbdc0110a
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
zerver/webhooks/gitlab/tests.py
View File

@ -316,7 +316,7 @@ class GitlabHookTests(WebhookTestCase):
'build_created', 'build_created',
expected_subject, expected_subject,
expected_message, expected_message,
HTTP_X_GITLAB_EVENT="Build Hook" HTTP_X_GITLAB_EVENT="Job Hook"
) )
def test_build_started_event_message(self) -> None: def test_build_started_event_message(self) -> None:
@ -327,7 +327,7 @@ class GitlabHookTests(WebhookTestCase):
'build_started', 'build_started',
expected_subject, expected_subject,
expected_message, expected_message,
HTTP_X_GITLAB_EVENT="Build Hook" HTTP_X_GITLAB_EVENT="Job Hook"
) )
def test_build_succeeded_event_message(self) -> None: def test_build_succeeded_event_message(self) -> None:
@ -338,7 +338,7 @@ class GitlabHookTests(WebhookTestCase):
'build_succeeded', 'build_succeeded',
expected_subject, expected_subject,
expected_message, expected_message,
HTTP_X_GITLAB_EVENT="Build Hook" HTTP_X_GITLAB_EVENT="Job Hook"
) )
def test_pipeline_succeeded_event_message(self) -> None: def test_pipeline_succeeded_event_message(self) -> None:

4
zerver/webhooks/gitlab/view.py
View File

@ -261,7 +261,7 @@ EVENT_FUNCTION_MAPPER = {
'Merge Request Hook reopen': partial(get_merge_request_event_body, action='reopened'), 'Merge Request Hook reopen': partial(get_merge_request_event_body, action='reopened'),
'Wiki Page Hook create': partial(get_wiki_page_event_body, action='created'), 'Wiki Page Hook create': partial(get_wiki_page_event_body, action='created'),
'Wiki Page Hook update': partial(get_wiki_page_event_body, action='updated'), 'Wiki Page Hook update': partial(get_wiki_page_event_body, action='updated'),
'Build Hook': get_build_hook_event_body, 'Job Hook': get_build_hook_event_body,
'Pipeline Hook': get_pipeline_event_body, 'Pipeline Hook': get_pipeline_event_body,
} }
@ -286,7 +286,7 @@ def get_body_based_on_event(event: str) -> Any:
def get_subject_based_on_event(event: str, payload: Dict[str, Any]) -> Text: def get_subject_based_on_event(event: str, payload: Dict[str, Any]) -> Text:
if event == 'Push Hook': if event == 'Push Hook':
return u"{} / {}".format(get_repo_name(payload), get_branch_name(payload)) return u"{} / {}".format(get_repo_name(payload), get_branch_name(payload))
elif event == 'Build Hook': elif event == 'Job Hook':
return u"{} / {}".format(payload['repository'].get('name'), get_branch_name(payload)) return u"{} / {}".format(payload['repository'].get('name'), get_branch_name(payload))
elif event == 'Pipeline Hook': elif event == 'Pipeline Hook':
return u"{} / {}".format( return u"{} / {}".format(