From 229b22589d04cc8b2d876a455e80a6930f80f972 Mon Sep 17 00:00:00 2001
From: Fabian Meumertzheim <fabian@meumertzhe.im>
Date: Thu, 18 Apr 2024 11:57:45 +0200
Subject: [PATCH] Add missing repo boundary files (#1222)

---
 buildifier/integration_test.sh | 7 ++++---
 wspace/workspace.go            | 2 ++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/buildifier/integration_test.sh b/buildifier/integration_test.sh
index 2db6cc32c..8d8d509b4 100755
--- a/buildifier/integration_test.sh
+++ b/buildifier/integration_test.sh
@@ -384,7 +384,7 @@ test_dir/to_fix_tmp.bzl: applied fixes, 2 warnings left
 fixed test_dir/to_fix_tmp.bzl
 EOF
 
-error_bzl="test_dir/to_fix_tmp.bzl:1: bzl-visibility: Module \"//foo/bar/internal/baz:module.bzl\" can only be loaded from files located inside \"//foo/bar\", not from \"//test_dir/to_fix_tmp.bzl\". (https://github.com/bazelbuild/buildtools/blob/master/WARNINGS.md#bzl-visibility)"
+error_bzl="test_dir/to_fix_tmp.bzl:1: bzl-visibility: Module \"//foo/bar/internal/baz:module.bzl\" can only be loaded from files located inside \"//foo/bar\", not from \"//to_fix_tmp.bzl\". (https://github.com/bazelbuild/buildtools/blob/master/WARNINGS.md#bzl-visibility)"
 error_docstring="test_dir/to_fix_tmp.bzl:1: module-docstring: The file has no module docstring."$'\n'"A module docstring is a string literal (not a comment) which should be the first statement of a file (it may follow comment lines). (https://github.com/bazelbuild/buildtools/blob/master/WARNINGS.md#module-docstring)"
 error_integer="test_dir/to_fix_tmp.bzl:4: integer-division: The \"/\" operator for integer division is deprecated in favor of \"//\". (https://github.com/bazelbuild/buildtools/blob/master/WARNINGS.md#integer-division)"
 error_dict="test_dir/to_fix_tmp.bzl:5: unsorted-dict-items: Dictionary items are out of their lexicographical order. (https://github.com/bazelbuild/buildtools/blob/master/WARNINGS.md#unsorted-dict-items)"
@@ -394,7 +394,8 @@ test_lint () {
   ret=0
   cp test_dir/to_fix.bzl test_dir/to_fix_tmp.bzl
   echo "$4" > golden/error_golden
-  echo "${4//test_dir/another_test_dir}" > golden/error_golden_another
+  with_replaced_dir="${4//test_dir/another_test_dir}"
+  echo "${with_replaced_dir//\/\/to_fix_tmp.bzl///another_test_dir/to_fix_tmp.bzl}" > golden/error_golden_another
 
   cat > golden/fix_report_golden <<EOF
 test_dir/to_fix_tmp.bzl: applied fixes, $5 warnings left
@@ -483,7 +484,7 @@ cat > golden/json_report_golden <<EOF
                     "category": "bzl-visibility",
                     "actionable": true,
                     "autoFixable": false,
-                    "message": "Module \"//foo/bar/internal/baz:module.bzl\" can only be loaded from files located inside \"//foo/bar\", not from \"//test_dir/json/to_fix.bzl\".",
+                    "message": "Module \"//foo/bar/internal/baz:module.bzl\" can only be loaded from files located inside \"//foo/bar\", not from \"//json/to_fix.bzl\".",
                     "url": "https://github.com/bazelbuild/buildtools/blob/master/WARNINGS.md#bzl-visibility"
                 },
                 {
diff --git a/wspace/workspace.go b/wspace/workspace.go
index 2899d564e..92b199b0c 100644
--- a/wspace/workspace.go
+++ b/wspace/workspace.go
@@ -55,6 +55,8 @@ func isExecutable(fi os.FileInfo) bool {
 var repoRootFiles = map[string]func(os.FileInfo) bool{
 	workspaceFile:            isFile,
 	workspaceFile + ".bazel": isFile,
+	"MODULE.bazel":           isFile,
+	"REPO.bazel":             isFile,
 	".buckconfig":            isFile,
 	"pants":                  isExecutable,
 }