reorg: make rules ready for release

When releasing library the best practices recommend that the entire public directory should be buildable without any dev dependencies. This breaks the API as those consuming the library need to change the paths they're using, but it's not that much of a change.
bookingcom · Aug 28, 2024 · afb8402 · afb8402
1 parent 43b4866
commit afb8402
Show file tree

Hide file tree

Showing 21 changed files with 16 additions and 11 deletions.
diff --git a/BUILD.bazel b/BUILD.bazel
@@ -1,5 +1,5 @@
 load("@buildifier_prebuilt//:rules.bzl", "buildifier")
-load(":workspace_status.bzl", "workspace_status")
+load("@rules_booking//booking:workspace_status.bzl", "workspace_status")
 
 buildifier(
     name = "buildifier",

diff --git a/MODULE.bazel b/MODULE.bazel
@@ -10,7 +10,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1")
 bazel_dep(name = "rules_java", version = "6.5.2")
 bazel_dep(name = "rules_pkg", version = "1.0.1")
 
-extra_dependencies = use_extension("//:module.bzl", "extra_dependencies")
+extra_dependencies = use_extension("//booking:module.bzl", "extra_dependencies")
 use_repo(
     extra_dependencies,
     "bazel_version",

diff --git a/repo/BUILD.bazel → booking/BUILD.bazel b/repo/BUILD.bazel → booking/BUILD.bazel
diff --git a/dependencies.bzl → booking/dependencies.bzl b/dependencies.bzl → booking/dependencies.bzl
@@ -1,8 +1,8 @@
 load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")
 load("@rules_java//java:repositories.bzl", "rules_java_dependencies", "rules_java_toolchains")
 load("@rules_pkg//:deps.bzl", "rules_pkg_dependencies")
-load("//:repositories.bzl", "bazel_version")
-load("//dependency_check:deps.bzl", _dependency_check = "dependencies")
+load("//booking:repositories.bzl", "bazel_version")
+load("//booking/dependency_check:deps.bzl", _dependency_check = "dependencies")
 
 def dependencies():
     bazel_skylib_workspace()

diff --git a/dependency_check/BUILD.bazel → booking/dependency_check/BUILD.bazel b/dependency_check/BUILD.bazel → booking/dependency_check/BUILD.bazel
diff --git a/dependency_check/BUILD.dependency_check → ...g/dependency_check/BUILD.dependency_check b/dependency_check/BUILD.dependency_check → ...g/dependency_check/BUILD.dependency_check
diff --git a/dependency_check/deps.bzl → booking/dependency_check/deps.bzl b/dependency_check/deps.bzl → booking/dependency_check/deps.bzl
@@ -10,5 +10,5 @@ def dependencies():
         urls = [
             "https://github.com/jeremylong/DependencyCheck/releases/download/v8.4.0/dependency-check-8.4.0-release.zip",
         ],
-        build_file = "@rules_booking//dependency_check:BUILD.dependency_check",
+        build_file = "@rules_booking//booking/dependency_check:BUILD.dependency_check",
     )
diff --git a/dependency_check/rules.bzl → booking/dependency_check/rules.bzl b/dependency_check/rules.bzl → booking/dependency_check/rules.bzl
diff --git a/gitlab.bzl → booking/gitlab.bzl b/gitlab.bzl → booking/gitlab.bzl
diff --git a/module.bzl → booking/module.bzl b/module.bzl → booking/module.bzl
@@ -5,7 +5,7 @@ This dependency is internal for rules_booking
 """
 
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
-load("//:repositories.bzl", "bazel_version")
+load("//booking:repositories.bzl", "bazel_version")
 
 def _extra_dependencies_impl(ctx):
     # OWASP Dependencies Check tool
@@ -18,7 +18,7 @@ def _extra_dependencies_impl(ctx):
         urls = [
             "https://github.com/jeremylong/DependencyCheck/releases/download/v8.4.3/dependency-check-8.4.3-release.zip",
         ],
-        build_file = "//dependency_check:BUILD.dependency_check",
+        build_file = "//booking/dependency_check:BUILD.dependency_check",
     )
 
     bazel_version(name = "bazel_version")

diff --git a/booking/repo/BUILD.bazel b/booking/repo/BUILD.bazel
diff --git a/repo/git.bzl → booking/repo/git.bzl b/repo/git.bzl → booking/repo/git.bzl
diff --git a/repo/git_worker.bzl → booking/repo/git_worker.bzl b/repo/git_worker.bzl → booking/repo/git_worker.bzl
diff --git a/repositories.bzl → booking/repositories.bzl b/repositories.bzl → booking/repositories.bzl
diff --git a/tar.bzl → booking/tar.bzl b/tar.bzl → booking/tar.bzl
diff --git a/workspace_status.bzl → booking/workspace_status.bzl b/workspace_status.bzl → booking/workspace_status.bzl
diff --git a/workspace_status.sh → booking/workspace_status.sh b/workspace_status.sh → booking/workspace_status.sh
diff --git a/dependency_check_test/BUILD.bazel b/dependency_check_test/BUILD.bazel
@@ -1,4 +1,4 @@
-load("@rules_booking//dependency_check:rules.bzl", "cache", "dependency_check")
+load("@rules_booking//booking/dependency_check:rules.bzl", "cache", "dependency_check")
 load("@rules_java//java:defs.bzl", "java_binary")
 
 java_binary(

diff --git a/e2e/non-bzlmod/BUILD.bazel b/e2e/non-bzlmod/BUILD.bazel
@@ -0,0 +1,5 @@
+load("@rules_booking//booking:workspace_status.bzl", "workspace_status")
+
+workspace_status(
+    name = "workspace_status",
+)
diff --git a/e2e/non-bzlmod/WORKSPACE b/e2e/non-bzlmod/WORKSPACE
@@ -4,14 +4,14 @@ local_repository(
 )
 
 load(
-    "@rules_booking//:repositories.bzl",
+    "@rules_booking//booking:repositories.bzl",
     "repositories",
 )
 
 repositories()
 
 load(
-    "@rules_booking//:dependencies.bzl",
+    "@rules_booking//booking:dependencies.bzl",
     "dependencies",
 )
 

diff --git a/remap_tar_test/BUILD.bazel b/remap_tar_test/BUILD.bazel
@@ -1,4 +1,4 @@
-load("@rules_booking//:tar.bzl", "remap_tar")
+load("@rules_booking//booking:tar.bzl", "remap_tar")
 load("@rules_pkg//pkg:verify_archive.bzl", "verify_archive_test")
 
 remap_tar(