Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Be more precise about where to read the URL rewriter config from #22770

Closed
wants to merge 2 commits into from
Closed

Be more precise about where to read the URL rewriter config from #22770

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
75e0327
Be more precise about where to read the URL rewriter config from
shs96c Jun 17, 2024
ebda2c3
Respond to review comment
shs96c Jun 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/com/google/devtools/build/lib/bazel/BazelRepositoryModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,7 @@ public void beforeCommand(CommandEnvironment env) throws AbruptExitException {
}
try {
UrlRewriter rewriter =
UrlRewriter.getDownloaderUrlRewriter(repoOptions.downloaderConfig, env.getReporter());
UrlRewriter.getDownloaderUrlRewriter(env.getWorkspace(), repoOptions.downloaderConfig, env.getReporter());
downloadManager.setUrlRewriter(rewriter);
} catch (UrlRewriterParseException e) {
// It's important that the build stops ASAP, because this config file may be required for
Expand Down
14 changes: 11 additions & 3 deletions src/main/java/com/google/devtools/build/lib/bazel/repository/downloader/UrlRewriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
import java.net.URISyntaxException;
import java.net.URL;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.Base64;
import java.util.Collection;
import java.util.HashMap;
Expand Down Expand Up @@ -85,7 +84,7 @@ public class UrlRewriter {
* @param configPath Path to the config file to use. May be null.
* @param reporter Used for logging when URLs are rewritten.
*/
public static UrlRewriter getDownloaderUrlRewriter(String configPath, Reporter reporter)
public static UrlRewriter getDownloaderUrlRewriter(Path workspaceRoot, String configPath, Reporter reporter)
throws UrlRewriterParseException {
Consumer<String> log = str -> reporter.handle(Event.info(str));

Expand All @@ -94,7 +93,16 @@ public static UrlRewriter getDownloaderUrlRewriter(String configPath, Reporter r
return new UrlRewriter(log, "", new StringReader(""));
}

try (BufferedReader reader = Files.newBufferedReader(Paths.get(configPath))) {
// There have been reports (eg. https://github.com/bazelbuild/bazel/issues/22104) that
// there are occasional errors when `configFile` can't be found, and when this happens
// investigation suggests that the current working directory isn't the workspace root.
Path actualConfigPath = workspaceRoot.getRelative(configPath);

if (!actualConfigPath.exists()) {
throw new UrlRewriterParseException(String.format("Unable to find downloader config file %s", configPath));
}

try (BufferedReader reader = Files.newBufferedReader(actualConfigPath.getPathFile().toPath())) {
return new UrlRewriter(log, configPath, reader);
} catch (IOException e) {
throw new UrlRewriterParseException(e.getMessage());
Expand Down
Loading