make it correct

Author: kcons

src/sentry/workflow_engine/models/data_source.py

@@ -75,20 +75,11 @@ def normalize_before_relocation_import(
             old_source_id = int(self.source_id)
             new_source_id = pk_map.get_pk(model_name, old_source_id)
 
-            if new_source_id is not None:
-                self.source_id = str(new_source_id)
-            else:
-                # Referenced model not in pk_map. This may be correct (reset_pks=False) or broken
-                # (reset_pks=True but referenced model was filtered out or failed to import).
-                logger.warning(
-                    "DataSource source_id not remapped - referenced model not in pk_map",
-                    extra={
-                        "data_source_id": old_pk,
-                        "type": self.type,
-                        "source_id": old_source_id,
-                        "model": str(model_name),
-                    },
-                )
+            if new_source_id is None:
+                # Referenced model not in pk_map - the source was filtered out or failed to import.
+                return None
+
+            self.source_id = str(new_source_id)
         except Exception:
             logger.exception(
                 "DataSource.normalize_before_relocation_import failed",

tests/sentry/workflow_engine/models/test_data_source.py

@@ -24,7 +24,6 @@ def test_data_source_valid_type(self) -> None:
         assert data_source.type == "test"
 
     def test_normalize_before_relocation_import(self) -> None:
-        """Test that normalize_before_relocation_import correctly maps source_id"""
         monitor = self.create_monitor(project=self.project)
         data_source = self.create_data_source(
             type=DATA_SOURCE_CRON_MONITOR,
@@ -63,16 +62,13 @@ def test_normalize_before_relocation_import(self) -> None:
         assert data_source.pk is None
 
     def test_normalize_before_relocation_import_missing_source(self) -> None:
-        """Test that normalize_before_relocation_import succeeds but doesn't update source_id if mapping not found"""
         monitor = self.create_monitor(project=self.project)
         data_source = self.create_data_source(
             type=DATA_SOURCE_CRON_MONITOR,
             source_id=str(monitor.id),
             organization_id=self.organization.id,
         )
 
-        old_source_id = data_source.source_id
-        old_data_source_id = data_source.id
         old_org_id = data_source.organization_id
 
         # Create a PrimaryKeyMap without the monitor mapping
@@ -88,7 +84,5 @@ def test_normalize_before_relocation_import_missing_source(self) -> None:
             pk_map, ImportScope.Organization, ImportFlags()
         )
 
-        # Should succeed but leave source_id unchanged
-        assert result == old_data_source_id
-        assert data_source.source_id == old_source_id
-        assert data_source.pk is None
+        # Should return None when the referenced source is not in pk_map
+        assert result is None