[Integration][bitbucket] Added bitbucket ocean integration #1448
Conversation
…ders and pull request
CI Feedback 🧐(Feedback updated until commit ec7261a)A test triggered by this PR failed. Here is an AI-generated analysis of the failure:
|
|
This pull request is automatically being deployed by Amplify Hosting (learn more). |
|
Qodo Merge was enabled for this repository. To continue using it, please link your Git account with your Qodo account here. PR Reviewer Guide 🔍Here are some key observations to aid the review process:
|
|
Qodo Merge was enabled for this repository. To continue using it, please link your Git account with your Qodo account here. PR Code Suggestions ✨Explore these optional code suggestions:
|
|||||||||||
| except HTTPStatusError as e: | ||
| error_data = e.response.json() | ||
| error_message = error_data.get("error", {}).get("message", str(e)) | ||
| logger.error(f"Bitbucket API error: {error_message}") | ||
|
|
There was a problem hiding this comment.
You've suppressed error propagation entirely here, it won't be possible to catch errors anywhere else
| values = response.get("values", []) | ||
| if values: | ||
| yield values | ||
| next_page = response.get("next") | ||
| if not next_page: | ||
| break | ||
| endpoint = next_page.replace(self.base_url + "/", "") |
There was a problem hiding this comment.
Is values not consistent in all the api responses, if it is, lets be explicit..
There was a problem hiding this comment.
Are there are situation where values is empty yet the next page has resources ?
| break | ||
| endpoint = next_page.replace(self.base_url + "/", "") | ||
|
|
||
| # Project endpoints |
| ): | ||
| yield projects | ||
|
|
||
| # Repository endpoints |
| class ObjectKind(StrEnum): | ||
| PROJECT = "project" | ||
| FOLDER = "folder" | ||
| REPOSITORY = "repository" | ||
| PULL_REQUEST = "pull-request" |
| class AsyncIteratorMock: | ||
| """Helper class to mock async iterators.""" | ||
|
|
||
| def __init__(self, items: Iterator[Any]) -> None: | ||
| self.items = items | ||
|
|
||
| def __aiter__(self) -> "AsyncIteratorMock": | ||
| return self | ||
|
|
||
| async def __anext__(self) -> Any: | ||
| try: | ||
| return next(self.items) | ||
| except StopIteration: | ||
| raise StopAsyncIteration | ||
|
|
| @pytest.mark.asyncio | ||
| async def test_send_api_request_error(mock_client: BitbucketClient) -> None: | ||
| """Test API request with error response.""" | ||
| error_response = Response(400, json={"error": {"message": "Test error"}}) | ||
| mock_error = HTTPStatusError( | ||
| "Test error", request=MagicMock(), response=error_response | ||
| ) | ||
| with patch.object( | ||
| mock_client.client, "request", new_callable=AsyncMock | ||
| ) as mock_request: | ||
| mock_request.side_effect = mock_error | ||
| with pytest.raises(HTTPStatusError) as exc_info: | ||
| await mock_client._send_api_request("test/endpoint") | ||
| assert "Test error" in str(exc_info.value) |
There was a problem hiding this comment.
I'm not sure I understand the goal of this test
The test patches the request method on mock_client.client to immediately raise an HTTPStatusError (via side_effect). This means that the error is raised at the line:
response = await self.client.request(...)
So, the function never even gets a chance to enter the try block where it would normally call response.raise_for_status().
As a result, the error handling code inside the except block (e.g., extracting and logging the error message) isn’t exercised.
Please Reiterate
There was a problem hiding this comment.
Its concerning because your _send_api_request doesn't raise an error at all from its design.
| async def test_send_paginated_api_request(mock_client: BitbucketClient) -> None: | ||
| """Test paginated API request.""" | ||
| page1 = { | ||
| "values": [{"id": 1}, {"id": 2}], | ||
| "next": "https://api.bitbucket.org/2.0/test/endpoint?page=2", | ||
| } | ||
| page2 = {"values": [{"id": 3}], "next": None} | ||
| with patch.object( | ||
| mock_client, "_send_api_request", new_callable=AsyncMock | ||
| ) as mock_request: | ||
| mock_request.side_effect = [page1, page2] | ||
| results = [] | ||
| async for batch in mock_client._send_paginated_api_request("test/endpoint"): | ||
| results.extend(batch) | ||
| assert len(results) == 3 | ||
| assert [item["id"] for item in results] == [1, 2, 3] | ||
| assert mock_request.call_count == 2 |
There was a problem hiding this comment.
also assert that its capable of yielding one page at a time
User description
Description
What - Created a new Ocean integration for Bitbucket that enables ingestion of Bitbucket resources into Port's catalog. The integration supports:
Why - To enable users using Bitbucket cloud version to automatically sync their resources to Port
How -
Type of change
Please leave one option from the following and delete the rest:
All tests should be run against the port production environment(using a testing org).
Core testing checklist
Integration testing checklist
examplesfolder in the integration directory.Preflight checklist
Screenshots
Include screenshots from your environment showing how the resources of the integration will look.
API Documentation
Provide links to the API documentation used for this integration.
PR Type
Enhancement, Tests, Documentation
Description
Added a new Bitbucket integration for syncing resources.
Implemented support for Projects, Repositories, Folders, and Pull Requests.
Included tests for client functionality and API interactions.
Added configuration files, documentation, and examples for integration setup.
Changes walkthrough 📝
4 files
Implement Bitbucket API client for resource fetchingDefine integration configuration and resource selectorsImplement resync logic for Bitbucket resourcesAdd blueprints for Bitbucket resource types1 files
Add debug entry point for integration2 files
Add test fixtures for mocking Bitbucket contextAdd tests for Bitbucket client functionality5 files
Provide example environment variables for integrationDefine mappings for Bitbucket resources in PortAdd integration specification for BitbucketAdd Makefile for integration build and testingAdd SonarQube project configuration3 files
Add changelog for Bitbucket integrationAdd contributing guidelines for Bitbucket integrationAdd README for Bitbucket integration usage and development2 files
Configure virtual environments for integration developmentDefine project dependencies and settings1 files