Allow Bzlmod downloads with --registry_disable_download

bazelbuild · May 7, 2024 · 14ecf1d · 14ecf1d
1 parent ac73e15
commit 14ecf1d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 10 deletions.
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/IndexRegistry.java b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/IndexRegistry.java
@@ -159,7 +159,8 @@ private Optional<byte[]> doGrabFile(
     try (SilentCloseable c =
         Profiler.instance().profile(ProfilerTask.BZLMOD, () -> "download file: " + url)) {
       return Optional.of(
-          downloadManager.downloadAndReadOneUrl(new URL(url), eventHandler, clientEnv, checksum));
+          downloadManager.downloadAndReadOneUrlForBzlmod(
+              new URL(url), eventHandler, clientEnv, checksum));
     } catch (FileNotFoundException e) {
       return Optional.empty();
     } catch (IOException e) {

diff --git a/src/main/java/com/google/devtools/build/lib/bazel/repository/downloader/DownloadManager.java b/src/main/java/com/google/devtools/build/lib/bazel/repository/downloader/DownloadManager.java
@@ -375,6 +375,9 @@ private Path downloadInExecutor(
   /**
    * Downloads the contents of one URL and reads it into a byte array.
    *
+   * <p>This is only meant to be used for Bzlmod registry downloads as it ignores the value of
+   * <code>--repository_disable_download</code>.
+   *
    * <p>If the checksum and path to the repository cache is specified, attempt to load the file from
    * the {@link RepositoryCache}. If it doesn't exist, proceed to download the file and load it into
    * the cache prior to returning the value.
@@ -388,7 +391,7 @@ private Path downloadInExecutor(
    * @throws IOException if download was attempted and ended up failing
    * @throws InterruptedException if this thread is being cast into oblivion
    */
-  public byte[] downloadAndReadOneUrl(
+  public byte[] downloadAndReadOneUrlForBzlmod(
       URL originalUrl,
       ExtendedEventHandler eventHandler,
       Map<String, String> clientEnv,
@@ -439,11 +442,6 @@ public byte[] downloadAndReadOneUrl(
       authHeaders = rewriter.updateAuthHeaders(rewrittenUrlMappings, authHeaders, netrcCreds);
     }
 
-    if (disableDownload) {
-      throw new IOException(
-          String.format("Failed to download %s: download is disabled.", originalUrl));
-    }
-
     if (rewrittenUrls.isEmpty()) {
       throw new IOException(getRewriterBlockedAllUrlsMessage(ImmutableList.of(originalUrl)));
     }

diff --git a/src/test/shell/bazel/starlark_repository_test.sh b/src/test/shell/bazel/starlark_repository_test.sh
@@ -2327,9 +2327,6 @@ genrule(
 )
 EOF
 
-  # Ensure that all Bzlmod-related downloads have happened before disabling
-  # downloads.
-  bazel mod deps || fail "Failed to cache Bazel modules"
   bazel build --repository_disable_download //:it > "${TEST_log}" 2>&1 \
       && fail "Expected failure" || :
   expect_log "Failed to download repository @.*: download is disabled"