Skip to content

[OJ-54730] Catch HTTPError when fetching BB Cloud PR merge commit #454

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
lheureuxe13 merged 3 commits into from
May 18, 2026
Merged

[OJ-54730] Catch HTTPError when fetching BB Cloud PR merge commit #454

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
250b858
[OJ-54730] Catch HTTPError when fetching BB Cloud PR merge commit
lheureuxe13 May 18, 2026
08c794a
[OJ-54730] Add regression test for BB Cloud merge commit 404 handling
lheureuxe13 May 18, 2026
c73250a
[OJ-54730] Address SonarCloud warnings on regression test
lheureuxe13 May 18, 2026
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
24 changes: 14 additions & 10 deletions jf_agent/git/bitbucket_cloud_adapter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -514,16 +514,20 @@ def _standardize_pr(
and api_pr['merge_commit']
and api_pr['merge_commit'].get('hash')
):
api_merge_commit = client.get_commit(
repo.project.id, repo_slug, api_pr['merge_commit']['hash']
)
merge_commit = _standardize_commit(
api_merge_commit,
repo,
api_pr['destination']['branch']['name'],
strip_text_content,
redact_names_and_urls,
)
merge_commit_hash = api_pr['merge_commit']['hash']
try:
api_merge_commit = client.get_commit(repo.project.id, repo_slug, merge_commit_hash)
merge_commit = _standardize_commit(
api_merge_commit,
repo,
api_pr['destination']['branch']['name'],
strip_text_content,
redact_names_and_urls,
)
except requests.exceptions.HTTPError as e:
logger.info(
f'For merge commit {merge_commit_hash} received a {e.response.status_code} while retrieving PR commits'
Comment on lines +528 to +529

@lheureuxe13 lheureuxe13 May 18, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Added a regression test in commit 08c794a: test_get_prs_merge_commit_404_does_not_skip_pr stubs client.get_commit to raise HTTPError(404) and asserts the PR is still returned with merge_commit=None.

)

# Repo links
base_repo = _standardize_short_form_repo(
Expand Down
Loading