Skip to content

Bugzilla EXPECTS a 200--else it's an unhashable response. #52

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 30, 2022
Merged

Bugzilla EXPECTS a 200--else it's an unhashable response. #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/jbi/router.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ def extract_current_action( # pylint: disable=inconsistent-return-statements
def execute_action(request: BugzillaWebhookRequest, action_map, settings):
"""Execute action"""
try:
jbi_logger.info("request: %s", request.json())
Copy link
Contributor

@leplatrem leplatrem May 2, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm curious how this would look like in logs.
You may have to use the extra keyword arg.
https://docs.python.org/3/library/logging.html#logging.debug
I realized that when working on https://github.com/leplatrem/logging-color-formatter/blob/189b21a7bbff3b54091c3d0994553082de2b5460/tests/test_formatter.py#L93-L94

if not request.bug:
raise IgnoreInvalidRequestError("no bug data received")

Expand All @@ -59,13 +60,12 @@ def execute_action(request: BugzillaWebhookRequest, action_map, settings):
callable_action = action_module.init( # type: ignore
**current_action["parameters"]
)
jbi_logger.info("request: %s", request.json())
content = callable_action(payload=request)
jbi_logger.info("request: %s, content: %s", request.json(), content)
return JSONResponse(content=content, status_code=200)
except IgnoreInvalidRequestError as exception:
invalid_logger.debug("ignore-invalid-request: %s", exception)
return JSONResponse(content={"error": str(exception)}, status_code=202)
return JSONResponse(content={"error": str(exception)}, status_code=200)


@api_router.post("/bugzilla_webhook")
Expand Down
12 changes: 6 additions & 6 deletions tests/unit/jbi/test_router.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ def test_request_is_ignored_because_private(
"/bugzilla_webhook", data=invalid_webhook_request_example.json()
)
assert response
assert response.status_code == 202
assert response.status_code == 200
assert response.json()["error"] == "private bugs are not valid"

invalid_request_logs = caplog.records[0]
invalid_request_logs = caplog.records[1]
assert invalid_request_logs.name == "ignored-requests"

assert invalid_request_logs.msg == "ignore-invalid-request: %s"
Expand All @@ -49,10 +49,10 @@ def test_request_is_ignored_because_no_bug(
"/bugzilla_webhook", data=invalid_webhook_request_example.json()
)
assert response
assert response.status_code == 202
assert response.status_code == 200
assert response.json()["error"] == "no bug data received"

invalid_request_logs = caplog.records[0]
invalid_request_logs = caplog.records[1]
assert invalid_request_logs.name == "ignored-requests"

assert invalid_request_logs.msg == "ignore-invalid-request: %s"
Expand All @@ -78,13 +78,13 @@ def test_request_is_ignored_because_no_action(
"/bugzilla_webhook", data=invalid_webhook_request_example.json()
)
assert response
assert response.status_code == 202
assert response.status_code == 200
assert (
response.json()["error"]
== "whiteboard tag not found in configured actions"
)

invalid_request_logs = caplog.records[0]
invalid_request_logs = caplog.records[1]
assert invalid_request_logs.name == "ignored-requests"

assert invalid_request_logs.msg == "ignore-invalid-request: %s"
Expand Down