RemoteExecutionService: Action.Command to set output_paths

sluongng · copybara-github · commit d3fb04748392 · 2023-04-27T06:33:38.000-07:00
This is a follow-up to #18198 Make Bazel compatible with newer version of Remote Api by setting output_paths along-side output_directories and output_files. The latter 2 are deprecated in newer REAPI specification. Closes #18202. PiperOrigin-RevId: 527560509 Change-Id: I14c80d69aa9a5e9bf29a8c5694412ecd58ea17bf
diff --git a/src/main/java/com/google/devtools/build/lib/remote/RemoteExecutionService.java b/src/main/java/com/google/devtools/build/lib/remote/RemoteExecutionService.java
@@ -225,18 +225,22 @@ static Command buildCommand(
     Command.Builder command = Command.newBuilder();
     ArrayList<String> outputFiles = new ArrayList<>();
     ArrayList<String> outputDirectories = new ArrayList<>();
+    ArrayList<String> outputPaths = new ArrayList<>();
     for (ActionInput output : outputs) {
       String pathString = decodeBytestringUtf8(remotePathResolver.localPathToOutputPath(output));
       if (output.isDirectory()) {
         outputDirectories.add(pathString);
       } else {
         outputFiles.add(pathString);
       }
+      outputPaths.add(pathString);
     }
     Collections.sort(outputFiles);
     Collections.sort(outputDirectories);
+    Collections.sort(outputPaths);
     command.addAllOutputFiles(outputFiles);
     command.addAllOutputDirectories(outputDirectories);
+    command.addAllOutputPaths(outputPaths);
 
     if (platform != null) {
       command.setPlatform(platform);
diff --git a/src/test/java/com/google/devtools/build/lib/remote/RemoteExecutionServiceTest.java b/src/test/java/com/google/devtools/build/lib/remote/RemoteExecutionServiceTest.java
@@ -193,6 +193,7 @@ public void buildRemoteAction_withRegularFileAsOutput() throws Exception {
     RemoteAction remoteAction = service.buildRemoteAction(spawn, context);
 
     assertThat(remoteAction.getCommand().getOutputFilesList()).containsExactly(execPath.toString());
+    assertThat(remoteAction.getCommand().getOutputPathsList()).containsExactly(execPath.toString());
     assertThat(remoteAction.getCommand().getOutputDirectoriesList()).isEmpty();
   }
 
@@ -228,6 +229,7 @@ public void buildRemoteAction_withUnresolvedSymlinkAsOutput() throws Exception {
 
     assertThat(remoteAction.getCommand().getOutputFilesList()).containsExactly("path/to/link");
     assertThat(remoteAction.getCommand().getOutputDirectoriesList()).isEmpty();
+    assertThat(remoteAction.getCommand().getOutputPathsList()).containsExactly("path/to/link");
   }
 
   @Test
diff --git a/src/test/java/com/google/devtools/build/lib/remote/RemoteSpawnRunnerWithGrpcRemoteExecutorTest.java b/src/test/java/com/google/devtools/build/lib/remote/RemoteSpawnRunnerWithGrpcRemoteExecutorTest.java
@@ -342,6 +342,7 @@ public int maxConcurrency() {
                     .setValue("value")
                     .build())
             .addAllOutputFiles(ImmutableList.of("bar", "foo"))
+            .addAllOutputPaths(ImmutableList.of("bar", "foo"))
             .build();
     cmdDigest = DIGEST_UTIL.compute(command);
     channel.release();

Original file line number	Diff line number	Diff line change
`@@ -193,6 +193,7 @@ public void buildRemoteAction_withRegularFileAsOutput() throws Exception {`
`193`	`193`	`RemoteAction remoteAction = service.buildRemoteAction(spawn, context);`
`194`	`194`
`195`	`195`	`assertThat(remoteAction.getCommand().getOutputFilesList()).containsExactly(execPath.toString());`
	`196`	`+ assertThat(remoteAction.getCommand().getOutputPathsList()).containsExactly(execPath.toString());`
`196`	`197`	`assertThat(remoteAction.getCommand().getOutputDirectoriesList()).isEmpty();`
`197`	`198`	`}`
`198`	`199`
`@@ -228,6 +229,7 @@ public void buildRemoteAction_withUnresolvedSymlinkAsOutput() throws Exception {`
`228`	`229`
`229`	`230`	`assertThat(remoteAction.getCommand().getOutputFilesList()).containsExactly("path/to/link");`
`230`	`231`	`assertThat(remoteAction.getCommand().getOutputDirectoriesList()).isEmpty();`
	`232`	`+ assertThat(remoteAction.getCommand().getOutputPathsList()).containsExactly("path/to/link");`
`231`	`233`	`}`
`232`	`234`
`233`	`235`	`@Test`