RepositoryFunction: depend on overrides, even if there is no rule

Not all bazel external repositories are generated by a rule (e.g., they might
be unbound names with the expectation that on override binds them). Still,
even those external repositories depend on changes to the repository override.
Register this dependency.

Change-Id: I900c94f969d08dec82c5776eff28337878379b5e
PiperOrigin-RevId: 200974283

3 files changed, 78 insertions, 1 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryFunction.java b/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryFunction.java
index 565780d478..c5e6d03c29 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryFunction.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/repository/RepositoryFunction.java
@@ -523,6 +523,8 @@ public abstract class RepositoryFunction {
       // first.
       Rule rule = ExternalPackageUtil.getRuleByName(repositoryName, env);
       if (rule == null) {
+        // Still an override might change the content of the repository.
+        RepositoryDelegatorFunction.REPOSITORY_OVERRIDES.get(env);
         return;
       }
 
@@ -549,7 +551,11 @@ public abstract class RepositoryFunction {
       // WORKSPACE file. In that case, the call to RepositoryFunction#getRuleByName(String,
       // Environment)
       // already requested all repository functions from the WORKSPACE file from Skyframe as part
-      // of the resolution. Therefore we are safe to ignore that Exception.
+      // of the resolution.
+      //
+      // Alternatively, the repository might still be provided by an override. Therefore, in
+      // any case, register the dependency on the repository overrides.
+      RepositoryDelegatorFunction.REPOSITORY_OVERRIDES.get(env);
       return;
     } catch (ExternalPackageException ex) {
       // This should never happen.
diff --git a/src/test/shell/bazel/BUILD b/src/test/shell/bazel/BUILD
index 29e10f1937..49f93ffbec 100644
--- a/src/test/shell/bazel/BUILD
+++ b/src/test/shell/bazel/BUILD
@@ -404,6 +404,7 @@ sh_test(
     size = "large",
     srcs = ["workspace_test.sh"],
     data = [":test-deps"],
+    shard_count = 5,
     tags = ["no_windows"],
 )
 
diff --git a/src/test/shell/bazel/workspace_test.sh b/src/test/shell/bazel/workspace_test.sh
index a308c2adb0..d7af19dbdd 100755
--- a/src/test/shell/bazel/workspace_test.sh
+++ b/src/test/shell/bazel/workspace_test.sh
@@ -418,4 +418,74 @@ EOF
       || fail "expected 'y_symbol' in $(cat bazel-genfiles/external/a/result.txt)"
 }
 
+function test_workspace_addition_change_aspect() {
+  mkdir -p repo_one
+  mkdir -p repo_two
+
+
+  touch foo.c
+  cat > BUILD <<EOF
+cc_library(
+    name = "lib",
+    srcs = ["foo.c"],
+)
+EOF
+
+  touch WORKSPACE
+  touch repo_one/BUILD
+  touch repo_two/BUILD
+
+  cat > repo_one/WORKSPACE <<EOF
+workspace(name = "new_repo")
+EOF
+  cat > repo_two/WORKSPACE <<EOF
+workspace(name = "new_repo")
+EOF
+
+
+  cat > repo_one/aspects.bzl <<EOF
+def _print_aspect_impl(target, ctx):
+  # Make sure the rule has a srcs attribute.
+  if hasattr(ctx.rule.attr, 'srcs'):
+    # Output '1' for each file in srcs.
+    for src in ctx.rule.attr.srcs:
+      for f in src.files:
+        print(1)
+  return []
+
+print_aspect = aspect(
+    implementation = _print_aspect_impl,
+    attr_aspects = ['deps'],
+)
+EOF
+  cat > repo_two/aspects.bzl <<EOF
+def _print_aspect_impl(target, ctx):
+  # Make sure the rule has a srcs attribute.
+  if hasattr(ctx.rule.attr, 'srcs'):
+    print(ctx.rule.attr.srcs)
+  return []
+
+print_aspect = aspect(
+    implementation = _print_aspect_impl,
+    attr_aspects = ['deps'],
+)
+EOF
+
+  bazel clean --expunge
+
+  echo; echo "no repo"; echo
+  bazel build //:lib --aspects @new_repo//:aspects.bzl%print_aspect \
+      && fail "Failure expected" || true
+
+  echo; echo "repo_one"; echo
+  bazel build //:lib --override_repository="new_repo=$PWD/repo_one" \
+      --aspects @new_repo//:aspects.bzl%print_aspect \
+      || fail "Expected build to succeed"
+
+  echo; echo "repo_two"; echo
+  bazel build //:lib --override_repository="new_repo=$PWD/repo_two" \
+      --aspects @new_repo//:aspects.bzl%print_aspect \
+      || fail "Expected build to succeed"
+}
+
 run_suite "workspace tests"