runfiles: preserve external repository aliases

Author: tonyredondo

modules/dotnet/topt_dotnet_infer.bzl

@@ -144,7 +144,11 @@ def _topt_dotnet_payloads_selector_impl(ctx):
     )
     return [DefaultInfo(
         files = depset(payload.files),
-        runfiles = ctx.runfiles(files = payload.files, symlinks = payload.symlinks),
+        runfiles = ctx.runfiles(
+            files = payload.files,
+            root_symlinks = payload.root_symlinks,
+            symlinks = payload.symlinks,
+        ),
     )]
 
 topt_dotnet_payloads_selector = rule(

modules/go/topt_go_infer.bzl

@@ -196,7 +196,11 @@ def _topt_go_payloads_selector_impl(ctx):
     )
     return [DefaultInfo(
         files = depset(payload.files),
-        runfiles = ctx.runfiles(files = payload.files, symlinks = payload.symlinks),
+        runfiles = ctx.runfiles(
+            files = payload.files,
+            root_symlinks = payload.root_symlinks,
+            symlinks = payload.symlinks,
+        ),
     )]
 
 def _topt_go_bazel_metadata_impl(ctx):

modules/java/topt_java_infer.bzl

@@ -160,7 +160,11 @@ def _topt_java_payloads_selector_impl(ctx):
     )
     return [DefaultInfo(
         files = depset(payload.files),
-        runfiles = ctx.runfiles(files = payload.files, symlinks = payload.symlinks),
+        runfiles = ctx.runfiles(
+            files = payload.files,
+            root_symlinks = payload.root_symlinks,
+            symlinks = payload.symlinks,
+        ),
     )]
 
 topt_java_payloads_selector = rule(

modules/nodejs/topt_nodejs_infer.bzl

@@ -144,7 +144,11 @@ def _topt_nodejs_payloads_selector_impl(ctx):
     )
     return [DefaultInfo(
         files = depset(payload.files),
-        runfiles = ctx.runfiles(files = payload.files, symlinks = payload.symlinks),
+        runfiles = ctx.runfiles(
+            files = payload.files,
+            root_symlinks = payload.root_symlinks,
+            symlinks = payload.symlinks,
+        ),
     )]
 
 topt_nodejs_payloads_selector = rule(

modules/python/tests/BUILD.bazel

@@ -76,6 +76,8 @@ load(
     "selector_explicit_namespaced_test",
     "selector_explicit_precedence_target",
     "selector_explicit_precedence_test",
+    "selector_external_module_runfiles_target",
+    "selector_external_module_runfiles_test",
     "selector_fallback_target",
     "selector_fallback_test",
     "selector_imports_precedence_target",
@@ -193,6 +195,16 @@ selector_omits_flaky_tests_test(
     target_under_test = ":selector_omits_flaky_tests_target",
 )
 
+selector_external_module_runfiles_target(
+    name = "selector_external_module_runfiles_target",
+    tags = ["manual"],
+)
+
+selector_external_module_runfiles_test(
+    name = "selector_external_module_runfiles_test",
+    target_under_test = ":selector_external_module_runfiles_target",
+)
+
 selector_explicit_precedence_target(
     name = "selector_explicit_precedence_target",
     tags = ["manual"],
@@ -702,6 +714,7 @@ test_suite(
         ":selector_explicit_miss_failure_test",
         ":selector_explicit_namespaced_test",
         ":selector_explicit_precedence_test",
+        ":selector_external_module_runfiles_test",
         ":selector_fallback_test",
         ":selector_imports_precedence_test",
         ":selector_include_disabled_test",

modules/python/tests/test_payloads_selector.bzl

@@ -286,6 +286,21 @@ def selector_omits_flaky_tests_target(name, tags = None):
         tags = tags,
     )
 
+def selector_external_module_runfiles_target(name, tags = None):
+    topt_py_payloads_selector(
+        name = name,
+        explicit_identifier = "example/python/pkg",
+        imports = [],
+        deps = [],
+        attribute_candidates = [],
+        fallback_identifier = "example/python/pkg",
+        full_files = "@test_optimization_data_python//:test_optimization_files",
+        module_group_names = ["module_example_python_pkg"],
+        module_groups = ["@test_optimization_data_python//:module_example_python_pkg"],
+        include_per_module = True,
+        tags = tags,
+    )
+
 def _has_fragment(items, fragment):
     for item in items:
         if fragment in item:
@@ -403,6 +418,20 @@ def _selector_omits_flaky_tests_test_impl(ctx):
     asserts.false(env, _has_suffix(symlink_paths, "/flaky_tests.json"), "unexpected flaky_tests.json symlink: %s" % symlink_paths)
     return analysistest.end(env)
 
+def _selector_external_module_runfiles_test_impl(ctx):
+    env = analysistest.begin(ctx)
+    target = analysistest.target_under_test(env)
+    symlink_paths = [s.path for s in target[DefaultInfo].default_runfiles.symlinks.to_list()]
+    root_symlink_paths = [s.path for s in target[DefaultInfo].default_runfiles.root_symlinks.to_list()]
+    _assert_core_cache_symlinks(env, root_symlink_paths)
+    asserts.equals(env, [], symlink_paths)
+    asserts.false(
+        env,
+        _has_suffix(root_symlink_paths, "/flaky_tests.json"),
+        "unexpected flaky_tests.json root symlink: %s" % root_symlink_paths,
+    )
+    return analysistest.end(env)
+
 selector_explicit_precedence_test = analysistest.make(
     _selector_explicit_precedence_test_impl,
 )
@@ -444,3 +473,6 @@ selector_override_miss_failure_test = analysistest.make(
 selector_omits_flaky_tests_test = analysistest.make(
     _selector_omits_flaky_tests_test_impl,
 )
+selector_external_module_runfiles_test = analysistest.make(
+    _selector_external_module_runfiles_test_impl,
+)

modules/python/topt_py_infer.bzl

@@ -161,7 +161,11 @@ def _topt_py_payloads_selector_impl(ctx):
     )
     return [DefaultInfo(
         files = depset(payload.files),
-        runfiles = ctx.runfiles(files = payload.files, symlinks = payload.symlinks),
+        runfiles = ctx.runfiles(
+            files = payload.files,
+            root_symlinks = payload.root_symlinks,
+            symlinks = payload.symlinks,
+        ),
     )]
 
 topt_py_payloads_selector = rule(

modules/ruby/topt_ruby_infer.bzl

@@ -144,7 +144,11 @@ def _topt_ruby_payloads_selector_impl(ctx):
     )
     return [DefaultInfo(
         files = depset(payload.files),
-        runfiles = ctx.runfiles(files = payload.files, symlinks = payload.symlinks),
+        runfiles = ctx.runfiles(
+            files = payload.files,
+            root_symlinks = payload.root_symlinks,
+            symlinks = payload.symlinks,
+        ),
     )]
 
 topt_ruby_payloads_selector = rule(

tools/core/topt_selection_utils.bzl

@@ -71,7 +71,7 @@ def select_module_group_name(
     return ""
 
 def selected_payload_runfiles(files, include_flaky_tests = False):
-    """Return selected payload files and canonical cache/http symlinks."""
+    """Return selected payload files and canonical cache/http runfiles aliases."""
     selected_files = []
     settings_file = None
     known_tests_file = None
@@ -93,23 +93,31 @@ def selected_payload_runfiles(files, include_flaky_tests = False):
             flaky_tests_file = file
 
     if settings_file == None:
-        return struct(files = selected_files, symlinks = {})
+        return struct(files = selected_files, root_symlinks = {}, symlinks = {})
 
     cache_http_dir = "/".join(settings_file.short_path.split("/")[:-1])
     if not cache_http_dir:
-        return struct(files = selected_files, symlinks = {})
+        return struct(files = selected_files, root_symlinks = {}, symlinks = {})
 
+    root_symlinks = {}
     symlinks = {}
 
     def maybe_add(filename, file):
         if file == None:
             return
         canonical_path = cache_http_dir + "/" + filename
         if file.short_path != canonical_path:
-            symlinks[canonical_path] = file
+            if canonical_path.startswith("../"):
+                root_symlinks[canonical_path[3:]] = file
+            else:
+                symlinks[canonical_path] = file
 
     maybe_add("known_tests.json", known_tests_file)
     maybe_add("test_management.json", test_management_file)
     if include_flaky_tests:
         maybe_add("flaky_tests.json", flaky_tests_file)
-    return struct(files = selected_files, symlinks = symlinks)
+    return struct(
+        files = selected_files,
+        root_symlinks = root_symlinks,
+        symlinks = symlinks,
+    )