Skip to content

Commit 41e34e5

Browse files
Merge pull request #52 from mozilla/status-code-update
Bugzilla EXPECTS a 200--else it's an unhashable response.
2 parents 9fd1a45 + 9215511 commit 41e34e5

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

src/jbi/router.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ def extract_current_action( # pylint: disable=inconsistent-return-statements
4040
def execute_action(request: BugzillaWebhookRequest, action_map, settings):
4141
"""Execute action"""
4242
try:
43+
jbi_logger.info("request: %s", request.json())
4344
if not request.bug:
4445
raise IgnoreInvalidRequestError("no bug data received")
4546

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

7070

7171
@api_router.post("/bugzilla_webhook")

tests/unit/jbi/test_router.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ def test_request_is_ignored_because_private(
2424
"/bugzilla_webhook", data=invalid_webhook_request_example.json()
2525
)
2626
assert response
27-
assert response.status_code == 202
27+
assert response.status_code == 200
2828
assert response.json()["error"] == "private bugs are not valid"
2929

30-
invalid_request_logs = caplog.records[0]
30+
invalid_request_logs = caplog.records[1]
3131
assert invalid_request_logs.name == "ignored-requests"
3232

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

55-
invalid_request_logs = caplog.records[0]
55+
invalid_request_logs = caplog.records[1]
5656
assert invalid_request_logs.name == "ignored-requests"
5757

5858
assert invalid_request_logs.msg == "ignore-invalid-request: %s"
@@ -78,13 +78,13 @@ def test_request_is_ignored_because_no_action(
7878
"/bugzilla_webhook", data=invalid_webhook_request_example.json()
7979
)
8080
assert response
81-
assert response.status_code == 202
81+
assert response.status_code == 200
8282
assert (
8383
response.json()["error"]
8484
== "whiteboard tag not found in configured actions"
8585
)
8686

87-
invalid_request_logs = caplog.records[0]
87+
invalid_request_logs = caplog.records[1]
8888
assert invalid_request_logs.name == "ignored-requests"
8989

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

0 commit comments

Comments
 (0)