Fix crash on multiple output symlinks with BwoB

fmeum · copybara-github · commit 519eef48ee16 · 2023-04-25T22:03:58.000-07:00
Fixes an issue introduced by ca30372. Fixes bazel-contrib/rules_go#3545 Closes #18207. PiperOrigin-RevId: 527160752 Change-Id: I8baa3b8f855e22226ba83155e56fd9889a1f2051
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
@@ -1308,7 +1308,7 @@ private boolean shouldDownloadOutputsFor(
               String.format(
                   "Symlinks in action outputs are not yet supported by --remote_download_minimal,"
                       + " falling back to downloading all action outputs due to output symlink %s",
-                  Iterables.getOnlyElement(metadata.symlinks()).path())));
+                  Iterables.get(metadata.symlinks(), 0).path())));
       return true;
     }
     return false;
diff --git a/src/test/shell/bazel/remote/build_without_the_bytes_test.sh b/src/test/shell/bazel/remote/build_without_the_bytes_test.sh
@@ -418,8 +418,8 @@ EOF
 genrule(
   name = "foo",
   srcs = ["input.txt"],
-  outs = ["output.txt", "output_symlink"],
-  cmd = "cp $< $(location :output.txt) && ln -s output.txt $(location output_symlink)",
+  outs = ["output.txt", "output_symlink", "output_symlink_2"],
+  cmd = "cp $< $(location :output.txt) && ln -s output.txt $(location output_symlink) && ln -s output.txt $(location output_symlink_2)",
 )
 EOF
 

Original file line number	Diff line number	Diff line change
`@@ -1308,7 +1308,7 @@ private boolean shouldDownloadOutputsFor(`
`1308`	`1308`	`String.format(`
`1309`	`1309`	`"Symlinks in action outputs are not yet supported by --remote_download_minimal,"`
`1310`	`1310`	`+ " falling back to downloading all action outputs due to output symlink %s",`
`1311`		`- Iterables.getOnlyElement(metadata.symlinks()).path())));`
	`1311`	`+ Iterables.get(metadata.symlinks(), 0).path())));`
`1312`	`1312`	`return true;`
`1313`	`1313`	`}`
`1314`	`1314`	`return false;`