Remote: Make --incompatible_remote_build_event_upload_respect_no_cache working with alias.

coeuvre · coeuvre · commit b50f2c66038e · 2021-12-23T14:33:59.000Z
Fixes #14456. Closes #14461. PiperOrigin-RevId: 417637635
diff --git a/src/main/java/com/google/devtools/build/lib/remote/RemoteModule.java b/src/main/java/com/google/devtools/build/lib/remote/RemoteModule.java
@@ -754,6 +754,9 @@ private void parseNoCacheOutputs(AnalysisResult analysisResult) {
     }
 
     for (ConfiguredTarget configuredTarget : analysisResult.getTargetsToBuild()) {
+      // This will either dereference an alias chain, or return the final ConfiguredTarget.
+      configuredTarget = configuredTarget.getActual();
+
       if (configuredTarget instanceof RuleConfiguredTarget) {
         RuleConfiguredTarget ruleConfiguredTarget = (RuleConfiguredTarget) configuredTarget;
         for (ActionAnalysisMetadata action : ruleConfiguredTarget.getActions()) {
diff --git a/src/test/shell/bazel/remote/remote_execution_test.sh b/src/test/shell/bazel/remote/remote_execution_test.sh
@@ -3318,6 +3318,33 @@ EOF
   expect_log "command.profile.gz.*bytestream://" || fail "should upload profile data"
 }
 
+function test_uploader_alias_action_respect_no_cache() {
+  mkdir -p a
+  cat > a/BUILD <<EOF
+genrule(
+  name = 'foo',
+  outs = ["foo.txt"],
+  cmd = "echo \"foo bar\" > \$@",
+  tags = ["no-cache"],
+)
+
+alias(
+  name = 'foo-alias',
+  actual = '//a:foo',
+)
+EOF
+
+  bazel build \
+      --remote_cache=grpc://localhost:${worker_port} \
+      --incompatible_remote_build_event_upload_respect_no_cache \
+      --build_event_json_file=bep.json \
+      //a:foo-alias >& $TEST_log || fail "Failed to build"
+
+  cat bep.json > $TEST_log
+  expect_not_log "a:foo.*bytestream://"
+  expect_log "command.profile.gz.*bytestream://"
+}
+
 function test_uploader_respect_no_cache_trees() {
   mkdir -p a
   cat > a/output_dir.bzl <<'EOF'

Original file line number	Diff line number	Diff line change
`@@ -754,6 +754,9 @@ private void parseNoCacheOutputs(AnalysisResult analysisResult) {`
`754`	`754`	`}`
`755`	`755`
`756`	`756`	`for (ConfiguredTarget configuredTarget : analysisResult.getTargetsToBuild()) {`
	`757`	`+ // This will either dereference an alias chain, or return the final ConfiguredTarget.`
	`758`	`+ configuredTarget = configuredTarget.getActual();`
	`759`	`+`
`757`	`760`	`if (configuredTarget instanceof RuleConfiguredTarget) {`
`758`	`761`	`RuleConfiguredTarget ruleConfiguredTarget = (RuleConfiguredTarget) configuredTarget;`
`759`	`762`	`for (ActionAnalysisMetadata action : ruleConfiguredTarget.getActions()) {`