From 188b4ef8b742223a25b1f94b4f0c567cdbd829df Mon Sep 17 00:00:00 2001
From: Googler <tjgq@google.com>
Date: Wed, 31 May 2023 15:10:29 -0700
Subject: [PATCH] Use the "no-remote" execution requirement instead of "local"
 for the coverage action.

The latter is frowned upon, as it disables sandboxing.

PiperOrigin-RevId: 536835602
Change-Id: Id77daf2b9fae53c55fcc7d1987bdb979bb2087df
---
 .../java/com/google/devtools/build/lib/bazel/coverage/BUILD    | 1 +
 .../build/lib/bazel/coverage/CoverageReportActionBuilder.java  | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/google/devtools/build/lib/bazel/coverage/BUILD b/src/main/java/com/google/devtools/build/lib/bazel/coverage/BUILD
index df78e695d91173..5e18b61b0b5395 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/coverage/BUILD
+++ b/src/main/java/com/google/devtools/build/lib/bazel/coverage/BUILD
@@ -20,6 +20,7 @@ java_library(
         "//src/main/java/com/google/devtools/build/lib/actions:action_lookup_key",
         "//src/main/java/com/google/devtools/build/lib/actions:artifact_owner",
         "//src/main/java/com/google/devtools/build/lib/actions:artifacts",
+        "//src/main/java/com/google/devtools/build/lib/actions:execution_requirements",
         "//src/main/java/com/google/devtools/build/lib/actions:localhost_capacity",
         "//src/main/java/com/google/devtools/build/lib/analysis:actions/compression",
         "//src/main/java/com/google/devtools/build/lib/analysis:analysis_cluster",
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/coverage/CoverageReportActionBuilder.java b/src/main/java/com/google/devtools/build/lib/bazel/coverage/CoverageReportActionBuilder.java
index 699294dbab2ec0..90ec1531ba54af 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/coverage/CoverageReportActionBuilder.java
+++ b/src/main/java/com/google/devtools/build/lib/bazel/coverage/CoverageReportActionBuilder.java
@@ -35,6 +35,7 @@
 import com.google.devtools.build.lib.actions.ArtifactRoot;
 import com.google.devtools.build.lib.actions.BaseSpawn;
 import com.google.devtools.build.lib.actions.ExecException;
+import com.google.devtools.build.lib.actions.ExecutionRequirements;
 import com.google.devtools.build.lib.actions.NotifyOnActionCacheHit;
 import com.google.devtools.build.lib.actions.ResourceSet;
 import com.google.devtools.build.lib.actions.RunfilesSupplier;
@@ -129,7 +130,7 @@ public ActionResult execute(ActionExecutionContext actionExecutionContext)
         throws ActionExecutionException, InterruptedException {
       try {
         ImmutableMap<String, String> executionInfo =
-            remotable ? ImmutableMap.of() : ImmutableMap.of("local", "");
+            remotable ? ImmutableMap.of() : ImmutableMap.of(ExecutionRequirements.NO_REMOTE, "");
         Spawn spawn =
             new BaseSpawn(
                 command, ImmutableMap.of(), executionInfo, runfilesSupplier, this, LOCAL_RESOURCES);