Fix NPE in mod show_repo

Fixes #22587 Closes #23125. PiperOrigin-RevId: 657871750 Change-Id: Iab295f330d0b9fcc30207d04a57ad87dacf480b5
bazelbuild · Sep 25, 2024 · dd0e7b8 · dd0e7b8
1 parent e43c933
commit dd0e7b8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/BzlmodRepoRuleFunction.java b/src/main/java/com/google/devtools/build/lib/skyframe/BzlmodRepoRuleFunction.java
@@ -158,7 +158,7 @@ private Optional<RepoSpec> checkRepoFromBazelModules(
     if (moduleKey == null) {
       return Optional.empty();
     }
-    return Optional.of(bazelDepGraphValue.getDepGraph().get(moduleKey).getRepoSpec());
+    return Optional.ofNullable(bazelDepGraphValue.getDepGraph().get(moduleKey).getRepoSpec());
   }
 
   @Nullable

diff --git a/src/test/py/bazel/bzlmod/mod_command_test.py b/src/test/py/bazel/bzlmod/mod_command_test.py
@@ -507,14 +507,15 @@ def testShowRepoThrowsUnusedModule(self):
         stderr,
     )
 
+  # fix for https://github.com/bazelbuild/bazel/issues/22587
   def testShowRepoThrowsNonexistentRepo(self):
     _, _, stderr = self.RunBazel(
-        ['mod', 'show_repo', '@@lol'],
+        ['mod', 'show_repo', '<root>'],
         allow_failure=True,
         rstrip=True,
     )
     self.assertIn(
-        "ERROR: In repo argument @@lol: no such repo. Type 'bazel help mod' "
+        "ERROR: In repo argument <root>: no such repo. Type 'bazel help mod' "
         'for syntax and help.',
         stderr,
     )