Remove SandboxHelpers.processInputFiles override.
We had two versions of this method, where one was simply munging
parameters before passing them onto the next method. It's clearer if
the callers do this, which also better shows which data are actually
necessary to call this function.
RELNOTES: None.
PiperOrigin-RevId: 300552031
diff --git a/src/main/java/com/google/devtools/build/lib/sandbox/DarwinSandboxedSpawnRunner.java b/src/main/java/com/google/devtools/build/lib/sandbox/DarwinSandboxedSpawnRunner.java
index b7cd5bc..e2a5658 100644
--- a/src/main/java/com/google/devtools/build/lib/sandbox/DarwinSandboxedSpawnRunner.java
+++ b/src/main/java/com/google/devtools/build/lib/sandbox/DarwinSandboxedSpawnRunner.java
@@ -230,6 +230,13 @@
ImmutableSet<Path> extraWritableDirs = getWritableDirs(sandboxExecRoot, environment);
writableDirs.addAll(extraWritableDirs);
+ SandboxInputs inputs =
+ SandboxHelpers.processInputFiles(
+ context.getInputMapping(
+ getSandboxOptions().symlinkedSandboxExpandsTreeArtifactsInRunfilesTree),
+ spawn,
+ context.getArtifactExpander(),
+ execRoot);
SandboxOutputs outputs = SandboxHelpers.getOutputs(spawn);
final Path sandboxConfigPath = sandboxPath.getRelative("sandbox.sb");
@@ -261,13 +268,6 @@
allowNetwork
|| Spawns.requiresNetwork(spawn, getSandboxOptions().defaultSandboxAllowNetwork);
- SandboxInputs inputs =
- SandboxHelpers.processInputFiles(
- spawn,
- context,
- execRoot,
- getSandboxOptions().symlinkedSandboxExpandsTreeArtifactsInRunfilesTree);
-
if (sandboxfsProcess != null) {
return new SandboxfsSandboxedSpawn(
sandboxfsProcess,
diff --git a/src/main/java/com/google/devtools/build/lib/sandbox/DockerSandboxedSpawnRunner.java b/src/main/java/com/google/devtools/build/lib/sandbox/DockerSandboxedSpawnRunner.java
index c969dff..dfda924 100644
--- a/src/main/java/com/google/devtools/build/lib/sandbox/DockerSandboxedSpawnRunner.java
+++ b/src/main/java/com/google/devtools/build/lib/sandbox/DockerSandboxedSpawnRunner.java
@@ -35,6 +35,7 @@
import com.google.devtools.build.lib.runtime.CommandCompleteEvent;
import com.google.devtools.build.lib.runtime.CommandEnvironment;
import com.google.devtools.build.lib.runtime.ProcessWrapperUtil;
+import com.google.devtools.build.lib.sandbox.SandboxHelpers.SandboxInputs;
import com.google.devtools.build.lib.sandbox.SandboxHelpers.SandboxOutputs;
import com.google.devtools.build.lib.shell.Command;
import com.google.devtools.build.lib.shell.CommandException;
@@ -216,7 +217,15 @@
ImmutableMap<String, String> environment =
localEnvProvider.rewriteLocalEnv(spawn.getEnvironment(), binTools, "/tmp");
+ SandboxInputs inputs =
+ SandboxHelpers.processInputFiles(
+ context.getInputMapping(
+ getSandboxOptions().symlinkedSandboxExpandsTreeArtifactsInRunfilesTree),
+ spawn,
+ context.getArtifactExpander(),
+ execRoot);
SandboxOutputs outputs = SandboxHelpers.getOutputs(spawn);
+
Duration timeout = context.getTimeout();
UUID uuid = UUID.randomUUID();
@@ -276,11 +285,7 @@
sandboxExecRoot,
cmdLine.build(),
cmdEnv.getClientEnv(),
- SandboxHelpers.processInputFiles(
- spawn,
- context,
- execRoot,
- getSandboxOptions().symlinkedSandboxExpandsTreeArtifactsInRunfilesTree),
+ inputs,
outputs,
ImmutableSet.of(),
treeDeleter,
diff --git a/src/main/java/com/google/devtools/build/lib/sandbox/LinuxSandboxedSpawnRunner.java b/src/main/java/com/google/devtools/build/lib/sandbox/LinuxSandboxedSpawnRunner.java
index 4c5a2c1..d569c9b 100644
--- a/src/main/java/com/google/devtools/build/lib/sandbox/LinuxSandboxedSpawnRunner.java
+++ b/src/main/java/com/google/devtools/build/lib/sandbox/LinuxSandboxedSpawnRunner.java
@@ -31,6 +31,7 @@
import com.google.devtools.build.lib.profiler.Profiler;
import com.google.devtools.build.lib.profiler.SilentCloseable;
import com.google.devtools.build.lib.runtime.CommandEnvironment;
+import com.google.devtools.build.lib.sandbox.SandboxHelpers.SandboxInputs;
import com.google.devtools.build.lib.sandbox.SandboxHelpers.SandboxOutputs;
import com.google.devtools.build.lib.shell.Command;
import com.google.devtools.build.lib.shell.CommandException;
@@ -158,7 +159,16 @@
localEnvProvider.rewriteLocalEnv(spawn.getEnvironment(), binTools, "/tmp");
ImmutableSet<Path> writableDirs = getWritableDirs(sandboxExecRoot, environment);
+
+ SandboxInputs inputs =
+ SandboxHelpers.processInputFiles(
+ context.getInputMapping(
+ getSandboxOptions().symlinkedSandboxExpandsTreeArtifactsInRunfilesTree),
+ spawn,
+ context.getArtifactExpander(),
+ execRoot);
SandboxOutputs outputs = SandboxHelpers.getOutputs(spawn);
+
Duration timeout = context.getTimeout();
LinuxSandboxUtil.CommandLineBuilder commandLineBuilder =
@@ -197,11 +207,7 @@
workspaceName,
commandLineBuilder.build(),
environment,
- SandboxHelpers.processInputFiles(
- spawn,
- context,
- execRoot,
- getSandboxOptions().symlinkedSandboxExpandsTreeArtifactsInRunfilesTree),
+ inputs,
outputs,
ImmutableSet.of(),
sandboxfsMapSymlinkTargets,
@@ -213,11 +219,7 @@
sandboxExecRoot,
commandLineBuilder.build(),
environment,
- SandboxHelpers.processInputFiles(
- spawn,
- context,
- execRoot,
- getSandboxOptions().symlinkedSandboxExpandsTreeArtifactsInRunfilesTree),
+ inputs,
outputs,
writableDirs,
treeDeleter,
diff --git a/src/main/java/com/google/devtools/build/lib/sandbox/ProcessWrapperSandboxedSpawnRunner.java b/src/main/java/com/google/devtools/build/lib/sandbox/ProcessWrapperSandboxedSpawnRunner.java
index f5ce8ea..489ac89 100644
--- a/src/main/java/com/google/devtools/build/lib/sandbox/ProcessWrapperSandboxedSpawnRunner.java
+++ b/src/main/java/com/google/devtools/build/lib/sandbox/ProcessWrapperSandboxedSpawnRunner.java
@@ -110,10 +110,11 @@
SandboxInputs inputs =
SandboxHelpers.processInputFiles(
+ context.getInputMapping(
+ getSandboxOptions().symlinkedSandboxExpandsTreeArtifactsInRunfilesTree),
spawn,
- context,
- execRoot,
- getSandboxOptions().symlinkedSandboxExpandsTreeArtifactsInRunfilesTree);
+ context.getArtifactExpander(),
+ execRoot);
SandboxOutputs outputs = SandboxHelpers.getOutputs(spawn);
if (sandboxfsProcess != null) {
diff --git a/src/main/java/com/google/devtools/build/lib/sandbox/SandboxHelpers.java b/src/main/java/com/google/devtools/build/lib/sandbox/SandboxHelpers.java
index 64c62f6..5d9ee96 100644
--- a/src/main/java/com/google/devtools/build/lib/sandbox/SandboxHelpers.java
+++ b/src/main/java/com/google/devtools/build/lib/sandbox/SandboxHelpers.java
@@ -25,7 +25,6 @@
import com.google.devtools.build.lib.actions.cache.VirtualActionInput;
import com.google.devtools.build.lib.actions.cache.VirtualActionInput.EmptyActionInput;
import com.google.devtools.build.lib.analysis.test.TestConfiguration;
-import com.google.devtools.build.lib.exec.SpawnRunner.SpawnExecutionContext;
import com.google.devtools.build.lib.vfs.Path;
import com.google.devtools.build.lib.vfs.PathFragment;
import com.google.devtools.common.options.OptionsParsingResult;
@@ -66,27 +65,6 @@
* @throws IOException If any files could not be written.
*/
public static SandboxInputs processInputFiles(
- Spawn spawn,
- SpawnExecutionContext context,
- Path execRoot,
- boolean expandTreeArtifactsInRunfiles)
- throws IOException {
- return processInputFiles(
- context.getInputMapping(expandTreeArtifactsInRunfiles),
- spawn,
- context.getArtifactExpander(),
- execRoot);
- }
-
- /**
- * Returns the inputs of a Spawn as a map of PathFragments relative to an execRoot to paths in the
- * host filesystem where the input files can be found.
- *
- * <p>Also writes any supported {@link VirtualActionInput}s found.
- *
- * @throws IOException If any files could not be written.
- */
- private static SandboxInputs processInputFiles(
Map<PathFragment, ActionInput> inputMap,
Spawn spawn,
ArtifactExpander artifactExpander,
diff --git a/src/main/java/com/google/devtools/build/lib/sandbox/WindowsSandboxedSpawnRunner.java b/src/main/java/com/google/devtools/build/lib/sandbox/WindowsSandboxedSpawnRunner.java
index 01bcc19..ceb0757 100644
--- a/src/main/java/com/google/devtools/build/lib/sandbox/WindowsSandboxedSpawnRunner.java
+++ b/src/main/java/com/google/devtools/build/lib/sandbox/WindowsSandboxedSpawnRunner.java
@@ -64,10 +64,11 @@
SandboxInputs readablePaths =
SandboxHelpers.processInputFiles(
+ context.getInputMapping(
+ getSandboxOptions().symlinkedSandboxExpandsTreeArtifactsInRunfilesTree),
spawn,
- context,
- execRoot,
- getSandboxOptions().symlinkedSandboxExpandsTreeArtifactsInRunfilesTree);
+ context.getArtifactExpander(),
+ execRoot);
ImmutableSet.Builder<Path> writablePaths = ImmutableSet.builder();
writablePaths.addAll(getWritableDirs(execRoot, environment));
diff --git a/src/main/java/com/google/devtools/build/lib/worker/WorkerSpawnRunner.java b/src/main/java/com/google/devtools/build/lib/worker/WorkerSpawnRunner.java
index a11fb63..2499ebd 100644
--- a/src/main/java/com/google/devtools/build/lib/worker/WorkerSpawnRunner.java
+++ b/src/main/java/com/google/devtools/build/lib/worker/WorkerSpawnRunner.java
@@ -170,7 +170,10 @@
SandboxInputs inputFiles =
SandboxHelpers.processInputFiles(
- spawn, context, execRoot, sandboxUsesExpandedTreeArtifactsInRunfiles);
+ context.getInputMapping(sandboxUsesExpandedTreeArtifactsInRunfiles),
+ spawn,
+ context.getArtifactExpander(),
+ execRoot);
SandboxOutputs outputs = SandboxHelpers.getOutputs(spawn);
WorkerKey key =
