fix: add project filter to apply_data_source in shared registry

mailtoboggavarapu-coder · mailtoboggavarapu-coder · commit 7243af383bb1 · 2026-04-20T11:17:32.000-04:00
Fixes #6206 The apply_data_source method was matching data sources by name only, without filtering by project. In a shared registry scenario where multiple projects have data sources with the same name (e.g. the default "vals_to_add"), this caused cross-project overwriting. Fixed by adding the project field check to mirror the pattern already used in apply_entity, apply_feature_service, and apply_feature_view.
diff --git a/sdk/python/feast/infra/registry/registry.py b/sdk/python/feast/infra/registry/registry.py
@@ -394,7 +394,10 @@ def apply_data_source(
         registry = self._prepare_registry_for_changes(project)
 
         for idx, existing_data_source_proto in enumerate(registry.data_sources):
-            if existing_data_source_proto.name == data_source.name:
+            if (
+                    existing_data_source_proto.name == data_source.name
+                    and existing_data_source_proto.project == project
+                ):
                 existing_data_source = DataSource.from_proto(existing_data_source_proto)
                 # Check if the data source has actually changed
                 if existing_data_source == data_source:
@@ -688,13 +691,13 @@ def apply_feature_view(
 
         if not is_latest:
             # Explicit version: check if it exists (pin/revert) or not (forward declaration).
-            # Note: The file registry is last-write-wins for true concurrent races —
+            # Note: The file registry is last-write-wins for true concurrent races â
             # this is a pre-existing limitation for all file registry operations.
             # For multi-client environments, use the SQL registry.
             record = self._get_version_record(feature_view.name, project, pin_version)
 
             if record is not None:
-                # Version exists → pin/revert to that snapshot
+                # Version exists â pin/revert to that snapshot
                 # Check that the user hasn't also modified the definition.
                 # Compare user's FV (with version="latest") against active FV.
                 self._prepare_registry_for_changes(project)
@@ -735,7 +738,7 @@ def apply_feature_view(
                 # Apply the restored FV using the standard path below
                 feature_view = restored_fv
             else:
-                # Version doesn't exist → forward declaration: create it
+                # Version doesn't exist â forward declaration: create it
                 feature_view.current_version_number = pin_version
                 feature_view_proto = feature_view.to_proto()
                 feature_view_proto.spec.project = project
