Fix uquery owner behavior around package boudary violations outside of allowlist

Summary:
This diff fixes the `uquery` owner behavior for package boundary violations outside of the allowlist in Buck2. Previously, uquery owner would only look up all parent packages if source file lives in package boundary exception allowlist buckconfig. However, with buck2, we no longer enforce this allowlist, so in order to return all owners of a source file, we should always check all parent packages for owning targets.

Posted here: https://fb.workplace.com/groups/buck2dev/permalink/4249680261986680/

Differential Revision: D92361150

fbshipit-source-id: 1e46885a1044acdc2a919ffef18b38c736592303

Author: Scott Cao

app/buck2_query_impls/src/dice.rs

@@ -16,7 +16,6 @@ use buck2_build_api::configure_targets::load_compatible_patterns_with_modifiers;
 use buck2_common::dice::cells::HasCellResolver;
 use buck2_common::dice::data::HasIoProvider;
 use buck2_common::file_ops::dice::DiceFileComputations;
-use buck2_common::package_boundary::HasPackageBoundaryExceptions;
 use buck2_common::package_listing::dice::DicePackageListingResolver;
 use buck2_common::package_listing::resolver::PackageListingResolver;
 use buck2_common::pattern::resolve::ResolveTargetPatterns;
@@ -28,6 +27,7 @@ use buck2_core::cells::CellResolver;
 use buck2_core::cells::cell_path::CellPath;
 use buck2_core::cells::cell_path_with_allowed_relative_dir::CellPathWithAllowedRelativeDir;
 use buck2_core::cells::name::CellName;
+use buck2_core::cells::paths::CellRelativePath;
 use buck2_core::configuration::compatibility::MaybeCompatible;
 use buck2_core::fs::project::ProjectRoot;
 use buck2_core::fs::project_rel_path::ProjectRelativePath;
@@ -277,30 +277,17 @@ impl UqueryDelegate for DiceQueryDelegate<'_, '_> {
         Ok(ResolveTargetPatterns::resolve(&mut self.ctx.get(), &parsed_patterns).await?)
     }
 
-    // This returns 1 package normally but can return multiple packages if the path is covered under `self.package_boundary_exceptions`.
+    // Returns all packages from immediate enclosing up to cell root that could potentially own the path.
     async fn get_enclosing_packages(
         &self,
         path: &CellPath,
     ) -> buck2_error::Result<Vec<PackageLabel>> {
-        // Without package boundary violations, there is only 1 owning package for a path.
-        // However, with package boundary violations, all parent packages of the enclosing package can also be owners.
-        if let Some(enclosing_violation_path) = self
-            .ctx
-            .get()
-            .get_package_boundary_exception(path.as_ref())
+        let cell_root = CellPath::new(path.cell(), CellRelativePath::empty().to_buf());
+        Ok(DicePackageListingResolver(&mut self.ctx.get())
+            .get_enclosing_packages(path.as_ref(), cell_root.as_ref())
             .await?
-        {
-            return Ok(DicePackageListingResolver(&mut self.ctx.get())
-                .get_enclosing_packages(path.as_ref(), (*enclosing_violation_path).as_ref())
-                .await?
-                .into_iter()
-                .collect());
-        }
-
-        let package = DicePackageListingResolver(&mut self.ctx.get())
-            .get_enclosing_package(path.as_ref())
-            .await?;
-        Ok(vec![package])
+            .into_iter()
+            .collect())
     }
 
     async fn eval_file_literal(&self, literal: &str) -> buck2_error::Result<FileSet> {

tests/core/query/uquery/test_uquery.py

@@ -84,16 +84,6 @@ async def test_uquery_owner(buck: Buck) -> None:
 
 @buck_test(data_dir="bxl_simple")
 async def test_query_owner_with_explicit_package_boundary_violation(buck: Buck) -> None:
-    # This needs to be changed to `expect_failure` once Buck2 is checking path validity
-    # outside of `package_boundary_exceptions`
-    result = await buck.uquery(
-        """owner(package_boundary_violation/bin)""",
-        "-c",
-        "project.package_boundary_exceptions=",
-    )
-    assert "root//package_boundary_violation:bin" in result.stdout
-    assert "root//:package_boundary_violation" not in result.stdout
-
     result = await buck.uquery("""owner(package_boundary_violation/bin)""")
     assert "root//package_boundary_violation:bin" in result.stdout
     assert "root//:package_boundary_violation" in result.stdout