fix: remove resource_mapping

Author: ikemilian-lewis

src/orb/application/services/machine_sync_service.py

@@ -71,23 +71,16 @@ async def fetch_provider_machines(
             # machines being returned — not resource-level discovery which returns all
             # ASG/fleet instances including unrelated ones.
             if request.request_type.value == "return" and request.machine_ids:
-                resource_mapping = self._build_return_resource_mapping(request, db_machines)
-                resource_ids = {
-                    resource_id
-                    for resource_id, _ordinal in resource_mapping.values()
-                    if resource_id not in (None, "")
-                }
+                resource_id = self._resolve_return_resource_id(request, db_machines)
                 operation_type = ProviderOperationType.GET_INSTANCE_STATUS
                 parameters = {
                     "instance_ids": request.machine_ids,
                     "provider_api": request.provider_api,
                     "template_id": request.template_id,
                     "request_metadata": self._build_request_metadata(request),
                 }
-                if resource_mapping:
-                    parameters["resource_mapping"] = resource_mapping
-                if len(resource_ids) == 1:
-                    parameters["resource_id"] = next(iter(resource_ids))
+                if resource_id:
+                    parameters["resource_id"] = resource_id
             # Use resource-level discovery for acquire requests (handles scaling/replacement)
             elif request.resource_ids:
                 operation_type = ProviderOperationType.DESCRIBE_RESOURCE_INSTANCES
@@ -212,27 +205,28 @@ def _resolve_instance_resource_id(
                 return str(resource_id)
         return ""
 
-    def _build_return_resource_mapping(
+    def _resolve_return_resource_id(
         self,
         request: Request,
         db_machines: list[Machine],
-    ) -> dict[str, tuple[str, int]]:
-        """Map return-request machine IDs to resource IDs using DB state and follow-up context."""
-        mapping: dict[str, tuple[str, int]] = {}
+    ) -> str:
+        """Resolve the single resource ID for a return status request."""
+        resource_ids: set[str] = set()
+        requested_ids = {str(machine_id) for machine_id in request.machine_ids}
 
         for machine in db_machines:
             resource_id = machine.resource_id
             machine_id = machine.machine_id.value
             if resource_id in (None, "") or machine_id in (None, ""):
                 continue
-            mapping[str(machine_id)] = (str(resource_id), 1)
+            if str(machine_id) in requested_ids:
+                resource_ids.add(str(resource_id))
 
         request_metadata = self._build_request_metadata(request)
         termination_requests = request_metadata.get("termination_requests")
         if not isinstance(termination_requests, list):
-            return mapping
+            return next(iter(resource_ids)) if len(resource_ids) == 1 else ""
 
-        requested_ids = {str(machine_id) for machine_id in request.machine_ids}
         for termination_request in termination_requests:
             if not isinstance(termination_request, dict):
                 continue
@@ -251,9 +245,9 @@ def _build_return_resource_mapping(
             for machine_id in pending_machine_ids:
                 machine_id_str = str(machine_id)
                 if machine_id_str and machine_id_str in requested_ids:
-                    mapping.setdefault(machine_id_str, (str(resource_id), 1))
+                    resource_ids.add(str(resource_id))
 
-        return mapping
+        return next(iter(resource_ids)) if len(resource_ids) == 1 else ""
 
     def _create_machine_from_processed_data(
         self, processed_data: dict, request: Request

tests/unit/application/services/test_machine_sync_service.py

@@ -64,7 +64,7 @@ async def test_fetch_provider_machines_replays_persisted_request_metadata():
 @pytest.mark.unit
 @pytest.mark.application
 @pytest.mark.asyncio
-async def test_fetch_provider_machines_for_return_forwards_azure_resource_mapping():
+async def test_fetch_provider_machines_for_return_forwards_resource_id():
     command_bus = MagicMock()
     uow_factory = MagicMock()
     config_port = MagicMock()
@@ -105,14 +105,14 @@ async def test_fetch_provider_machines_for_return_forwards_azure_resource_mappin
     assert operation.operation_type == OperationType.GET_INSTANCE_STATUS
     assert operation.parameters["provider_api"] == "VMSS"
     assert operation.parameters["resource_id"] == "vmss-demo"
-    assert operation.parameters["resource_mapping"] == {"vmss-demo_000001": ("vmss-demo", 1)}
+    assert "resource_mapping" not in operation.parameters
     assert operation.parameters["request_metadata"]["resource_group"] == "orb-test-rg"
 
 
 @pytest.mark.unit
 @pytest.mark.application
 @pytest.mark.asyncio
-async def test_fetch_provider_machines_for_return_rebuilds_vmss_mapping_from_follow_up_context():
+async def test_fetch_provider_machines_for_return_resolves_resource_id_from_follow_up_context():
     command_bus = MagicMock()
     uow_factory = MagicMock()
     config_port = MagicMock()
@@ -163,9 +163,10 @@ async def test_fetch_provider_machines_for_return_rebuilds_vmss_mapping_from_fol
     assert operation.operation_type == OperationType.GET_INSTANCE_STATUS
     assert operation.parameters["provider_api"] == "VMSS"
     assert operation.parameters["resource_id"] == "vmss-demo"
-    assert operation.parameters["resource_mapping"] == {"vmss-demo_000001": ("vmss-demo", 1)}
+    assert "resource_mapping" not in operation.parameters
     assert operation.parameters["request_metadata"]["resource_group"] == "orb-test-rg"
 
+
 @pytest.mark.unit
 @pytest.mark.application
 @pytest.mark.asyncio