Skip to content

armgit / zulip

Public Imported from GitHub
0

Zulip server and web application. Open-source team chat that helps teams stay productive and focused.

webhooks/gitlab: Ignore deployment events with an unsupported status.

Niloth P43e71b8e9226
diff --git a/zerver/webhooks/gitlab/tests.py b/zerver/webhooks/gitlab/tests.py
index 6c4bdc8fb08..fee2c87c196 100644
--- a/zerver/webhooks/gitlab/tests.py
+++ b/zerver/webhooks/gitlab/tests.py
@@ -752,6 +752,25 @@ A trivial change that should probably be ignored.
custom_payload=payload,
)
+ def test_deployment_event_with_unsupported_status(self) -> None:
+ payload_data = orjson.loads(
+ self.webhook_fixture_data(self.webhook_dir_name, "deployment_hook")
+ )
+ payload_data["status"] = "skipped"
+
+ result = self.client_post(
+ self.url,
+ orjson.dumps(payload_data),
+ content_type="application/json",
+ HTTP_X_GITLAB_EVENT="Deployment Hook",
+ )
+
+ self.assert_json_success(result)
+ self.assert_in_response(
+ "The 'Deployment Hook skipped' event isn't currently supported by the GitLab webhook; ignoring",
+ result,
+ )
+
def test_deployment_approval_event_message(self) -> None:
deployment_url = (
"https://gitlab.com/pritesh-30-group/deployment-webhook-test/-/jobs/15664214926"
diff --git a/zerver/webhooks/gitlab/view.py b/zerver/webhooks/gitlab/view.py
index adf48d79626..b6dc21409fe 100644
--- a/zerver/webhooks/gitlab/view.py
+++ b/zerver/webhooks/gitlab/view.py
@@ -536,6 +536,8 @@ def get_deployment_event_body(payload: WildValue, include_title: bool, realm: Re
"blocked": f"The {deployment_text} is blocked and awaiting manual action.",
}
+ if deployment_status not in deployment_event_body_map:
+ raise UnsupportedWebhookEventTypeError(f"Deployment Hook {deployment_status}")
return deployment_event_body_map[deployment_status]