Add CommandLinePathFactory to CommandEnvironment (bazelbuild#15971)

tjgq · Yannic · ckolli5 · web-flow · commit c5bc34e5f1dd · 2022-07-25T12:57:16.000-05:00
Progress on bazelbuild#15856 Closes bazelbuild#15905. PiperOrigin-RevId: 462369707 Change-Id: If8dd493227b67dd4ffe30c9e0af4d8f71de4fb9f Co-authored-by: Yannic Bonenberger <yannic@engflow.com> Co-authored-by: Chenchu K <ckolli@google.com>
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/CommandEnvironment.java b/src/main/java/com/google/devtools/build/lib/runtime/CommandEnvironment.java
@@ -104,6 +104,7 @@ public class CommandEnvironment {
   private final ImmutableList<Any> commandExtensions;
   private final ImmutableList.Builder<Any> responseExtensions = ImmutableList.builder();
   private final Consumer<String> shutdownReasonConsumer;
+  private final CommandLinePathFactory commandLinePathFactory;
 
   private OutputService outputService;
   private TopDownActionCache topDownActionCache;
@@ -266,6 +267,9 @@ public void exit(AbruptExitException exception) {
         repoEnvFromOptions.put(name, value);
       }
     }
+
+    this.commandLinePathFactory =
+        CommandLinePathFactory.create(runtime.getFileSystem(), directories);
   }
 
   private Path computeWorkingDirectory(CommonCommandOptions commandOptions)
@@ -840,4 +844,8 @@ public ImmutableList<Any> getResponseExtensions() {
   public void addResponseExtensions(Iterable<Any> extensions) {
     responseExtensions.addAll(extensions);
   }
+
+  public CommandLinePathFactory getCommandLinePathFactory() {
+    return commandLinePathFactory;
+  }
 }
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/CommandLinePathFactory.java b/src/main/java/com/google/devtools/build/lib/runtime/CommandLinePathFactory.java
@@ -13,10 +13,12 @@
 // limitations under the License.
 package com.google.devtools.build.lib.runtime;
 
+import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Preconditions;
 import com.google.common.base.Splitter;
 import com.google.common.base.Strings;
 import com.google.common.collect.ImmutableMap;
+import com.google.devtools.build.lib.analysis.BlazeDirectories;
 import com.google.devtools.build.lib.vfs.FileSystem;
 import com.google.devtools.build.lib.vfs.Path;
 import com.google.devtools.build.lib.vfs.PathFragment;
@@ -44,11 +46,27 @@ public final class CommandLinePathFactory {
   private final FileSystem fileSystem;
   private final ImmutableMap<String, Path> roots;
 
+  @VisibleForTesting
   public CommandLinePathFactory(FileSystem fileSystem, ImmutableMap<String, Path> roots) {
     this.fileSystem = Preconditions.checkNotNull(fileSystem);
     this.roots = Preconditions.checkNotNull(roots);
   }
 
+  static CommandLinePathFactory create(FileSystem fileSystem, BlazeDirectories directories) {
+    Preconditions.checkNotNull(fileSystem);
+    Preconditions.checkNotNull(directories);
+
+    ImmutableMap.Builder<String, Path> wellKnownRoots = ImmutableMap.builder();
+
+    // This is necessary because some tests don't have a workspace set.
+    Path workspace = directories.getWorkspace();
+    if (workspace != null) {
+      wellKnownRoots.put("workspace", workspace);
+    }
+
+    return new CommandLinePathFactory(fileSystem, wellKnownRoots.build());
+  }
+
   /** Creates a {@link Path}. */
   public Path create(Map<String, String> env, String value) throws IOException {
     Preconditions.checkNotNull(env);

Original file line number	Diff line number	Diff line change
`@@ -104,6 +104,7 @@ public class CommandEnvironment {`
`104`	`104`	`private final ImmutableList<Any> commandExtensions;`
`105`	`105`	`private final ImmutableList.Builder<Any> responseExtensions = ImmutableList.builder();`
`106`	`106`	`private final Consumer<String> shutdownReasonConsumer;`
	`107`	`+ private final CommandLinePathFactory commandLinePathFactory;`
`107`	`108`
`108`	`109`	`private OutputService outputService;`
`109`	`110`	`private TopDownActionCache topDownActionCache;`
`@@ -266,6 +267,9 @@ public void exit(AbruptExitException exception) {`
`266`	`267`	`repoEnvFromOptions.put(name, value);`
`267`	`268`	`}`
`268`	`269`	`}`
	`270`	`+`
	`271`	`+ this.commandLinePathFactory =`
	`272`	`+ CommandLinePathFactory.create(runtime.getFileSystem(), directories);`
`269`	`273`	`}`
`270`	`274`
`271`	`275`	`private Path computeWorkingDirectory(CommonCommandOptions commandOptions)`
`@@ -840,4 +844,8 @@ public ImmutableList<Any> getResponseExtensions() {`
`840`	`844`	`public void addResponseExtensions(Iterable<Any> extensions) {`
`841`	`845`	`responseExtensions.addAll(extensions);`
`842`	`846`	`}`
	`847`	`+`
	`848`	`+ public CommandLinePathFactory getCommandLinePathFactory() {`
	`849`	`+ return commandLinePathFactory;`
	`850`	`+ }`
`843`	`851`	`}`