[Integration][Bitbucket Server] Delete Old Repo Entity on Move or Rename Webhook (#2907)

# Description

What -
- Fix Bitbucket Server live-events handling so `repo:modified` deletes
the *old* repository entity when a repo is moved between projects or
renamed (slug change), preventing orphan repository entities in Port.
- Make webhook client initialization lazy to avoid requiring Ocean
context during import.

Why -
- Repository identifiers can change when a repo is moved/renamed.
Previously we upserted the “new” repo but never removed the “old” one,
leaving stale/orphan entities until resync (and sometimes even after).

How -
- On `repo:modified`, emit `deleted_raw_results=[old]` only when
`old.slug != new.slug` or `old.project.key != new.project.key`.
- Keep existing behavior for `repo:refs_changed` (no deletes).
- Add tests covering move/rename vs name-only change.

## Type of change

Please leave one option from the following and delete the rest:

- [x] Bug fix (non-breaking change which fixes an issue)


<h4> All tests should be run against the port production
environment(using a testing org). </h4>

### Core testing checklist

- [x] Integration able to create all default resources from scratch
- [x] Resync finishes successfully
- [x] Resync able to create entities
- [x] Resync able to update entities
- [x] Resync able to detect and delete entities
- [x] Scheduled resync able to abort existing resync and start a new one
- [x] Tested with at least 2 integrations from scratch
- [x] Tested with Kafka and Polling event listeners
- [x] Tested deletion of entities that don't pass the selector


### Integration testing checklist

- [x] Integration able to create all default resources from scratch
- [x] Completed a full resync from a freshly installed integration and
it completed successfully
- [x] Resync able to create entities
- [x] Resync able to update entities
- [x] Resync able to detect and delete entities
- [x] Resync finishes successfully
- [x] If new resource kind is added or updated in the integration, add
example raw data, mapping and expected result to the `examples` folder
in the integration directory.
- [x] If resource kind is updated, run the integration with the example
data and check if the expected result is achieved
- [x] If new resource kind is added or updated, validate that
live-events for that resource are working as expected
- [ ] Docs PR link [here](#)

### Preflight checklist

- [ ] Handled rate limiting
- [ ] Handled pagination
- [ ] Implemented the code in async
- [ ] Support Multi account

## 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.

---------

Co-authored-by: Michael Kofi Armah <mikeyarmah@gmail.com>

Author: emekanwaoma

integrations/bitbucket-server/.env.example

@@ -4,7 +4,7 @@ OCEAN__INTEGRATION__IDENTIFIER=bitbucket-server
 OCEAN__PORT__BASE_URL=https://api.getport.io
 OCEAN__EVENT_LISTENER__TYPE=POLLING
 OCEAN__INITIALIZE_PORT_RESOURCES=true
-OCEAN__BITBUCKET__USERNAME=your-bitbucket-username
-OCEAN__BITBUCKET__PASSWORD=your-bitbucket-password
-OCEAN__BITBUCKET__BASE_URL=https://your-bitbucket-server-url
-OCEAN__BITBUCKET__IS_VERSION_8_POINT_7_OR_OLDER=false
+OCEAN__INTEGRATION__CONFIG__BITBUCKET_USERNAME=your-bitbucket-username
+OCEAN__INTEGRATION__CONFIG__BITBUCKET_PASSWORD=your-bitbucket-password
+OCEAN__INTEGRATION__CONFIG__BITBUCKET_BASE_URL=https://your-bitbucket-server-url
+OCEAN__INTEGRATION__CONFIG__BITBUCKET_IS_VERSION8_POINT7_OR_OLDER=false

integrations/bitbucket-server/CHANGELOG.md

@@ -7,6 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 <!-- towncrier release notes start -->
 
+## 0.1.140-beta (2026-03-15)
+
+
+### Bug Fixes
+
+- Delete the old repository entity on `repo:modified` when a repository is moved between projects or renamed, preventing orphan repositories in Port.
+
+
 ## 0.1.139-beta (2026-03-12)
 
 

integrations/bitbucket-server/pyproject.toml

@@ -1,7 +1,7 @@
 [tool.poetry]
 name = "bitbucket-server"
 
-version = "0.1.139-beta"
+version = "0.1.140-beta"
 
 description = "Bitbucket Server integration for Port"
 authors = ["Ayodeji Adeoti <ayodeji.adeoti@getport.io>"]

integrations/bitbucket-server/tests/conftest.py

@@ -7,15 +7,40 @@
 from port_ocean.exceptions.context import PortOceanContextAlreadyInitializedError
 
 
-@pytest.fixture(autouse=True)
-def mock_ocean_context() -> None | MagicMock:
-    """Fixture to initialize the PortOcean context."""
+def _build_mock_ocean_app() -> MagicMock:
     mock_app = MagicMock()
-    mock_app.integration_config = {
-        "bitbucket_server_url": "https://bitbucket.example.com",
+    # Used by init_webhook_client() for callback URL construction
+    mock_app.base_url = "https://app.example.com"
+
+    # PortOceanContext.integration_config reads from app.config.integration.config
+    mock_app.config.integration.config = {
         "bitbucket_username": "test_user",
         "bitbucket_password": "test_password",
+        "bitbucket_base_url": "https://bitbucket.example.com",
+        "bitbucket_webhook_secret": None,
+        "bitbucket_is_version8_point7_or_older": False,
+        "bitbucket_rate_limit_quota": 1000,
+        "bitbucket_rate_limit_window": 3600,
     }
+    return mock_app
+
+
+def _initialize_ocean_context_for_collection() -> None:
+    # Ensure Ocean context exists during test collection/import time.
+    mock_app = _build_mock_ocean_app()
+    try:
+        initialize_port_ocean_context(mock_app)
+    except PortOceanContextAlreadyInitializedError:
+        pass
+
+
+_initialize_ocean_context_for_collection()
+
+
+@pytest.fixture(autouse=True)
+def mock_ocean_context() -> None | MagicMock:
+    """Fixture to initialize the PortOcean context."""
+    mock_app = _build_mock_ocean_app()
     try:
         initialize_port_ocean_context(mock_app)
     except PortOceanContextAlreadyInitializedError:

integrations/bitbucket-server/tests/test_webhook/test_repository_webhook_processor.py

@@ -0,0 +1,106 @@
+from unittest.mock import AsyncMock, MagicMock
+
+import pytest
+
+from webhook_processors.processors.repository_webhook_processor import (
+    RepositoryWebhookProcessor,
+)
+
+
+@pytest.fixture
+def repository_webhook_processor() -> RepositoryWebhookProcessor:
+    processor = RepositoryWebhookProcessor(event=MagicMock())
+    processor._client = MagicMock()
+    processor._client.get_single_repository = AsyncMock()
+    return processor
+
+
+@pytest.mark.asyncio
+class TestRepositoryWebhookProcessor:
+    async def test_repo_modified_emits_deletion_when_slug_changes(
+        self, repository_webhook_processor: RepositoryWebhookProcessor
+    ) -> None:
+        repository_webhook_processor._client.get_single_repository.return_value = {  # type: ignore[attr-defined]
+            "slug": "repo-2",
+            "project": {"key": "PROJ"},
+        }
+
+        payload = {
+            "eventKey": "repo:modified",
+            "old": {"slug": "repo-1", "project": {"key": "PROJ"}},
+            "new": {"slug": "repo-2", "project": {"key": "PROJ"}},
+        }
+
+        result = await repository_webhook_processor.handle_event(payload, MagicMock())
+
+        assert result.updated_raw_results == [
+            {"slug": "repo-2", "project": {"key": "PROJ"}}
+        ]
+        assert result.deleted_raw_results == [
+            {"slug": "repo-1", "project": {"key": "PROJ"}}
+        ]
+
+    async def test_repo_modified_emits_deletion_when_project_changes(
+        self, repository_webhook_processor: RepositoryWebhookProcessor
+    ) -> None:
+        repository_webhook_processor._client.get_single_repository.return_value = {  # type: ignore[attr-defined]
+            "slug": "repo",
+            "project": {"key": "PROJ_B"},
+        }
+
+        payload = {
+            "eventKey": "repo:modified",
+            "old": {"slug": "repo", "project": {"key": "PROJ_A"}},
+            "new": {"slug": "repo", "project": {"key": "PROJ_B"}},
+        }
+
+        result = await repository_webhook_processor.handle_event(payload, MagicMock())
+
+        assert result.updated_raw_results == [
+            {"slug": "repo", "project": {"key": "PROJ_B"}}
+        ]
+        assert result.deleted_raw_results == [
+            {"slug": "repo", "project": {"key": "PROJ_A"}}
+        ]
+
+    async def test_repo_modified_does_not_delete_when_identifier_parts_unchanged(
+        self, repository_webhook_processor: RepositoryWebhookProcessor
+    ) -> None:
+        repository_webhook_processor._client.get_single_repository.return_value = {  # type: ignore[attr-defined]
+            "slug": "repo",
+            "project": {"key": "PROJ"},
+            "name": "New Name",
+        }
+
+        payload = {
+            "eventKey": "repo:modified",
+            "old": {"slug": "repo", "project": {"key": "PROJ"}, "name": "Old Name"},
+            "new": {"slug": "repo", "project": {"key": "PROJ"}, "name": "New Name"},
+        }
+
+        result = await repository_webhook_processor.handle_event(payload, MagicMock())
+
+        assert result.updated_raw_results == [
+            {"slug": "repo", "project": {"key": "PROJ"}, "name": "New Name"}
+        ]
+        assert result.deleted_raw_results == []
+
+    async def test_repo_refs_changed_never_emits_deletion(
+        self, repository_webhook_processor: RepositoryWebhookProcessor
+    ) -> None:
+        repository_webhook_processor._client.get_single_repository.return_value = {  # type: ignore[attr-defined]
+            "slug": "repo",
+            "project": {"key": "PROJ"},
+        }
+
+        payload = {
+            "eventKey": "repo:refs_changed",
+            "repository": {"slug": "repo", "project": {"key": "PROJ"}},
+        }
+
+        result = await repository_webhook_processor.handle_event(payload, MagicMock())
+
+        assert result.updated_raw_results == [
+            {"slug": "repo", "project": {"key": "PROJ"}}
+        ]
+        assert result.deleted_raw_results == []

integrations/bitbucket-server/webhook_processors/processors/repository_webhook_processor.py

@@ -1,3 +1,5 @@
+from typing import Any
+
 from loguru import logger
 from port_ocean.core.handlers.port_app_config.models import ResourceConfig
 from port_ocean.core.handlers.webhook.webhook_event import (
@@ -20,16 +22,23 @@ async def _should_process_event(self, event: WebhookEvent) -> bool:
     async def get_matching_kinds(self, event: WebhookEvent) -> list[str]:
         return [ObjectKind.REPOSITORY]
 
+    async def validate_payload(self, payload: EventPayload) -> bool:
+        return "eventKey" in payload
+
     async def handle_event(
         self, payload: EventPayload, resource: ResourceConfig
     ) -> WebhookEventRawResults:
-        event_key = payload.get("eventKey", "")
-        if event_key == "repo:refs_changed":
-            repository_slug = payload["repository"]["slug"]
-            project_key = payload["repository"]["project"]["key"]
-        else:
-            repository_slug = payload["new"]["slug"]
-            project_key = payload["new"]["project"]["key"]
+        event_key = payload["eventKey"]
+        deleted_raw_results = self._get_deleted_if_renamed_or_moved(payload, event_key)
+
+        repo = (
+            payload["repository"]
+            if event_key == "repo:refs_changed"
+            else payload["new"]
+        )
+
+        project_key = repo["project"]["key"]
+        repository_slug = repo["slug"]
 
         logger.info(
             f"Handling repository webhook event ({event_key}) for project: {project_key} and repository: {repository_slug}"
@@ -41,5 +50,28 @@ async def handle_event(
 
         return WebhookEventRawResults(
             updated_raw_results=[repository],
-            deleted_raw_results=[],
+            deleted_raw_results=deleted_raw_results,
         )
+
+    def _get_deleted_if_renamed_or_moved(
+        self, payload: EventPayload, event_key: str
+    ) -> list[dict[str, Any]]:
+        """Return list with old repo if slug or project key changed (rename / move)."""
+        if event_key != "repo:modified":
+            return []
+
+        old = payload["old"]
+        new = payload["new"]
+
+        old_slug = old.get("slug")
+        old_project = old.get("project", {}).get("key")
+        new_slug = new["slug"]
+        new_project = new["project"]["key"]
+
+        if not (old_slug and old_project):
+            return []
+
+        if old_slug != new_slug or old_project != new_project:
+            return [old]
+
+        return []