[7.0.0] Polish lockfile error message (#20191)

Changed "Lock file" to "MODULE.bazel.lock" so that it's more specific. RELNOTES: None Commit 65f847a PiperOrigin-RevId: 581976554 Change-Id: Ib29d9f0ef0e9fd5535ce90d36dc2b89cdc159429 Co-authored-by: Googler <pcloudy@google.com>
bazelbuild · Nov 14, 2023 · d2ca99b · d2ca99b
1 parent 4f78ae1
commit d2ca99b
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 16 deletions.
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/BazelDepGraphFunction.java b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/BazelDepGraphFunction.java
@@ -97,7 +97,7 @@ public SkyValue compute(SkyKey skyKey, Environment env)
         throw new BazelDepGraphFunctionException(
             ExternalDepsException.withMessage(
                 Code.BAD_MODULE,
-                "Lock file is no longer up-to-date because: %s. "
+                "MODULE.bazel.lock is no longer up-to-date because: %s. "
                     + "Please run `bazel mod deps --lockfile_mode=update` to update your lockfile.",
                 String.join(", ", diffLockfile)),
             Transience.PERSISTENT);

diff --git a/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/SingleExtensionEvalFunction.java b/src/main/java/com/google/devtools/build/lib/bazel/bzlmod/SingleExtensionEvalFunction.java
@@ -286,7 +286,7 @@ private SingleExtensionEvalValue tryGettingValueFromLockFile(
       throw new SingleExtensionEvalFunctionException(
           ExternalDepsException.withMessage(
               Code.BAD_MODULE,
-              "Lock file is no longer up-to-date because: %s. "
+              "MODULE.bazel.lock is no longer up-to-date because: %s. "
                   + "Please run `bazel mod deps --lockfile_mode=update` to update your lockfile.",
               String.join(", ", extDiff)),
           Transience.PERSISTENT);

diff --git a/src/test/py/bazel/bzlmod/bazel_lockfile_test.py b/src/test/py/bazel/bzlmod/bazel_lockfile_test.py
@@ -203,10 +203,10 @@ def testLockfileErrorMode(self):
     self.AssertExitCode(exit_code, 48, stderr)
     self.assertIn(
         (
-            'ERROR: Error computing the main repository mapping: Lock file is'
-            ' no longer up-to-date because: the root MODULE.bazel has been'
-            ' modified, the value of --check_direct_dependencies flag has'
-            ' been modified. Please run'
+            'ERROR: Error computing the main repository mapping:'
+            ' MODULE.bazel.lock is no longer up-to-date because: the root'
+            ' MODULE.bazel has been modified, the value of'
+            ' --check_direct_dependencies flag has been modified. Please run'
             ' `bazel mod deps --lockfile_mode=update` to update your lockfile.'
         ),
         stderr,
@@ -248,10 +248,11 @@ def testLocalOverrideWithErrorMode(self):
     self.AssertExitCode(exit_code, 48, stderr)
     self.assertIn(
         (
-            'ERROR: Error computing the main repository mapping: Lock file is'
-            ' no longer up-to-date because: The MODULE.bazel file has changed'
-            ' for the overriden module: bar. Please run'
-            ' `bazel mod deps --lockfile_mode=update` to update your lockfile.'
+            'ERROR: Error computing the main repository mapping:'
+            ' MODULE.bazel.lock is no longer up-to-date because: The'
+            ' MODULE.bazel file has changed for the overriden module: bar.'
+            ' Please run `bazel mod deps --lockfile_mode=update` to update your'
+            ' lockfile.'
         ),
         stderr,
     )
@@ -575,7 +576,7 @@ def testUpdateModuleExtensionErrorMode(self):
     self.AssertExitCode(exit_code, 48, stderr)
     self.assertIn(
         (
-            'ERROR: Lock file is no longer up-to-date because: The '
+            'ERROR: MODULE.bazel.lock is no longer up-to-date because: The '
             'implementation of the extension '
             "'ModuleExtensionId{bzlFileLabel=//:extension.bzl, "
             "extensionName=lockfile_ext, isolationKey=Optional.empty}' or one "
@@ -762,8 +763,8 @@ def testChangeEnvVariableInErrorMode(self):
     self.AssertExitCode(exit_code, 48, stderr)
     self.assertIn(
         (
-            'ERROR: Lock file is no longer up-to-date because: The environment'
-            ' variables the extension'
+            'ERROR: MODULE.bazel.lock is no longer up-to-date because: The'
+            ' environment variables the extension'
             " 'ModuleExtensionId{bzlFileLabel=//:extension.bzl,"
             " extensionName=lockfile_ext, isolationKey=Optional.empty}' depends"
             ' on (or their values) have changed. Please run'
@@ -842,9 +843,9 @@ def testOldVersion(self):
     self.AssertExitCode(exit_code, 48, stderr)
     self.assertIn(
         (
-            'ERROR: Error computing the main repository mapping: Lock file is'
-            ' no longer up-to-date because: the version of the lockfile is not'
-            ' compatible with the current Bazel. Please run'
+            'ERROR: Error computing the main repository mapping:'
+            ' MODULE.bazel.lock is no longer up-to-date because: the version of'
+            ' the lockfile is not compatible with the current Bazel. Please run'
             ' `bazel mod deps --lockfile_mode=update` to update your lockfile.'
         ),
         stderr,