Merge pull request #15583 from github/redsun82/bzlmod

redsun82 · web-flow · commit 6c5e5966c31f · 2024-02-22T17:06:59.000+01:00
Bazel: use bzlmod
diff --git a/.bazelrc b/.bazelrc
@@ -1,4 +1,12 @@
 common --enable_platform_specific_config
+common --enable_bzlmod
+# because we use --override_module with `%workspace%`, the lock file is not stable
+common --lockfile_mode=off
+
+# when building from this repository in isolation, the internal repository will not be found at ..
+# where `MODULE.bazel` looks for it. The following will get us past the module loading phase, so
+# that we can build things that do not rely on that
+common --override_module=semmle_code=%workspace%/misc/bazel/semmle_code_stub
 
 build --repo_env=CC=clang --repo_env=CXX=clang++
 
diff --git a/.bazelversion b/.bazelversion
@@ -1 +1 @@
-6.3.1
+6.5.0
diff --git a/CODEOWNERS b/CODEOWNERS
@@ -25,6 +25,7 @@
 
 # Bazel (excluding BUILD.bazel files)
 WORKSPACE.bazel @github/codeql-ci-reviewers
+MODULE.bazel @github/codeql-ci-reviewers
 .bazelversion @github/codeql-ci-reviewers
 .bazelrc @github/codeql-ci-reviewers
 **/*.bzl @github/codeql-ci-reviewers
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -0,0 +1,53 @@
+module(
+    name = "codeql",
+    version = "0.0",
+)
+
+# this points to our internal repository when `codeql` is checked out as a submodule thereof
+# when building things from `codeql` independently this is stubbed out in `.bazelrc`
+bazel_dep(name = "semmle_code", version = "0.0")
+local_path_override(
+    module_name = "semmle_code",
+    path = "..",
+)
+
+# see https://registry.bazel.build/ for a list of available packages
+
+bazel_dep(name = "platforms", version = "0.0.8")
+bazel_dep(name = "rules_pkg", version = "0.9.1")
+bazel_dep(name = "rules_nodejs", version = "6.0.3")
+bazel_dep(name = "rules_python", version = "0.31.0")
+bazel_dep(name = "bazel_skylib", version = "1.5.0")
+bazel_dep(name = "abseil-cpp", version = "20240116.0", repo_name = "absl")
+bazel_dep(name = "nlohmann_json", version = "3.11.3", repo_name = "json")
+bazel_dep(name = "fmt", version = "10.0.0")
+
+pip = use_extension("@rules_python//python/extensions:pip.bzl", "pip")
+pip.parse(
+    hub_name = "codegen_deps",
+    python_version = "3.11",
+    requirements_lock = "//misc/codegen:requirements_lock.txt",
+)
+use_repo(pip, "codegen_deps")
+
+swift_deps = use_extension("//swift/third_party:load.bzl", "swift_deps")
+use_repo(
+    swift_deps,
+    "binlog",
+    "picosha2",
+    "swift_prebuilt_darwin_x86_64",
+    "swift_prebuilt_linux",
+    "swift_toolchain_linux",
+    "swift_toolchain_macos",
+)
+
+node = use_extension("@rules_nodejs//nodejs:extensions.bzl", "node")
+node.toolchain(
+    name = "nodejs",
+    node_version = "18.15.0",
+)
+use_repo(node, "nodejs", "nodejs_toolchains")
+
+register_toolchains(
+    "@nodejs_toolchains//:all",
+)
diff --git a/WORKSPACE.bazel b/WORKSPACE.bazel
@@ -1,12 +1,2 @@
-# Please notice that any bazel targets and definitions in this repository are currently experimental
-# and for internal use only.
-
-workspace(name = "codeql")
-
-load("//misc/bazel:workspace.bzl", "codeql_workspace")
-
-codeql_workspace()
-
-load("//misc/bazel:workspace_deps.bzl", "codeql_workspace_deps")
-
-codeql_workspace_deps()
+# please use MODULE.bazel to add dependencies
+# this empty file is required by internal repositories, don't remove it
diff --git a/javascript/BUILD.bazel b/javascript/BUILD.bazel
@@ -1,6 +1,6 @@
-load("@//:dist.bzl", "dist")
+load("@semmle_code//:dist.bzl", "dist")
 load("@rules_pkg//pkg:mappings.bzl", "pkg_files")
-load("@//buildutils-internal:zipmerge.bzl", "zipmerge")
+load("@semmle_code//buildutils-internal:zipmerge.bzl", "zipmerge")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -30,7 +30,7 @@ dist(
         "//javascript/downgrades",
         "//javascript/externs",
         "//javascript/extractor:tools-extractor",
-        "@//language-packs/javascript:resources",
+        "@semmle_code//language-packs/javascript:resources",
     ],
     prefix = "javascript",
 )
diff --git a/javascript/downgrades/BUILD.bazel b/javascript/downgrades/BUILD.bazel
@@ -1,4 +1,4 @@
-load("@//:dist.bzl", "pack_zip")
+load("@semmle_code//:dist.bzl", "pack_zip")
 
 pack_zip(
     name = "downgrades",
diff --git a/javascript/externs/BUILD.bazel b/javascript/externs/BUILD.bazel
@@ -1,4 +1,4 @@
-load("@//:dist.bzl", "pack_zip")
+load("@semmle_code//:dist.bzl", "pack_zip")
 
 pack_zip(
     name = "externs",
diff --git a/javascript/extractor/BUILD.bazel b/javascript/extractor/BUILD.bazel
@@ -1,21 +1,21 @@
-load("@//:common.bzl", "codeql_fat_jar", "codeql_java_project")
+load("@semmle_code//:common.bzl", "codeql_fat_jar", "codeql_java_project")
 load("@rules_pkg//pkg:mappings.bzl", "pkg_files")
 
 java_library(
     name = "deps",
     visibility = [":__subpackages__"],
     exports = [
-        "@//extractor:html",
-        "@//extractor:yaml",
-        "@//resources/lib/java:commons-compress",
-        "@//resources/lib/java:gson",
-        "@//resources/lib/java:jericho-html",
-        "@//resources/lib/java:slf4j-api",
-        "@//resources/lib/java:snakeyaml",
-        "@//third_party:jackson",
-        "@//third_party:logback",
-        "@//util-java7",
-        "@//util-java8",
+        "@semmle_code//extractor:html",
+        "@semmle_code//extractor:yaml",
+        "@semmle_code//resources/lib/java:commons-compress",
+        "@semmle_code//resources/lib/java:gson",
+        "@semmle_code//resources/lib/java:jericho-html",
+        "@semmle_code//resources/lib/java:slf4j-api",
+        "@semmle_code//resources/lib/java:snakeyaml",
+        "@semmle_code//third_party:jackson",
+        "@semmle_code//third_party:logback",
+        "@semmle_code//util-java7",
+        "@semmle_code//util-java8",
     ],
 )
 
@@ -36,18 +36,18 @@ codeql_fat_jar(
     name = "extractor-javascript",
     srcs = [
         ":extractor",
-        "@//extractor:html",
-        "@//extractor:xml-trap-writer",
-        "@//extractor:yaml",
-        "@//resources/lib/java:commons-compress",
-        "@//resources/lib/java:gson",
-        "@//resources/lib/java:jericho-html",
-        "@//resources/lib/java:slf4j-api",
-        "@//resources/lib/java:snakeyaml",
-        "@//third_party:jackson",
-        "@//third_party:logback",
-        "@//util-java7",
-        "@//util-java8",
+        "@semmle_code//extractor:html",
+        "@semmle_code//extractor:xml-trap-writer",
+        "@semmle_code//extractor:yaml",
+        "@semmle_code//resources/lib/java:commons-compress",
+        "@semmle_code//resources/lib/java:gson",
+        "@semmle_code//resources/lib/java:jericho-html",
+        "@semmle_code//resources/lib/java:slf4j-api",
+        "@semmle_code//resources/lib/java:snakeyaml",
+        "@semmle_code//third_party:jackson",
+        "@semmle_code//third_party:logback",
+        "@semmle_code//util-java7",
+        "@semmle_code//util-java8",
     ],
     files = [":javascript-extractor-resources"],
     main_class = "com.semmle.js.extractor.Main",
diff --git a/javascript/extractor/lib/typescript/BUILD.bazel b/javascript/extractor/lib/typescript/BUILD.bazel
@@ -1,4 +1,4 @@
-load("@//:common.bzl", "on_windows")
+load("@semmle_code//:common.bzl", "on_windows")
 
 # Builds a zip file of the compiled typscript-parser-wrapper and its dependencies.
 genrule(
diff --git a/javascript/extractor/test/com/semmle/js/extractor/test/BUILD.bazel b/javascript/extractor/test/com/semmle/js/extractor/test/BUILD.bazel
@@ -7,15 +7,15 @@ java_test(
         "//javascript/extractor/tests",
         "@nodejs//:node_bin",
     ],
+    env = {
+        "NODE_BIN": "$(rlocationpath @nodejs//:node_bin)",
+        "TS_WRAPPER_ZIP": "$(rlocationpath //javascript/extractor/lib/typescript)",
+    },
     test_class = "com.semmle.js.extractor.test.AllTests",
     deps = [
         "//javascript/extractor",
         "//javascript/extractor:deps",
-        "@//resources/lib/java/DO_NOT_DISTRIBUTE:junit",
         "@bazel_tools//tools/java/runfiles",
+        "@semmle_code//resources/lib/java/DO_NOT_DISTRIBUTE:junit",
     ],
-    env = {
-        "NODE_BIN": "$(rlocationpath @nodejs//:node_bin)",
-        "TS_WRAPPER_ZIP": "$(rlocationpath //javascript/extractor/lib/typescript)",
-    },
 )
diff --git a/javascript/extractor/tests/project-layout b/javascript/extractor/tests/project-layout
@@ -1 +1 @@
-**/ql/javascript/extractor/tests/*/input//
+**/*ql*/javascript/extractor/tests/*/input//
diff --git a/misc/bazel/cmake/cmake.bzl b/misc/bazel/cmake/cmake.bzl
@@ -22,7 +22,9 @@ CmakeInfo = provider(
 )
 
 def _cmake_name(label):
-    ret = ("%s_%s_%s" % (label.workspace_name, label.package, label.name)).replace("/", "_")
+    # strip away the bzlmod module version for now
+    workspace_name, _, _ = label.workspace_name.partition("~")
+    ret = ("%s_%s_%s" % (workspace_name, label.package, label.name)).replace("/", "_")
     internal_transition_suffix = "_INTERNAL_TRANSITION"
     if ret.endswith(internal_transition_suffix):
         ret = ret[:-len(internal_transition_suffix)]
@@ -120,7 +122,6 @@ def _cmake_aspect_impl(target, ctx):
                 prefix,  # source
                 "${BAZEL_EXEC_ROOT}/%s/%s" % (ctx.var["BINDIR"], prefix),  # generated
             ]
-
     deps = [dep[CmakeInfo] for dep in deps if CmakeInfo in dep]
 
     # by the book this should be done with depsets, but so far the performance implication is negligible
diff --git a/misc/bazel/cmake/setup.cmake b/misc/bazel/cmake/setup.cmake
@@ -19,8 +19,7 @@ endmacro()
 bazel(info workspace OUTPUT_VARIABLE BAZEL_WORKSPACE)
 
 bazel(info output_base OUTPUT_VARIABLE BAZEL_OUTPUT_BASE)
-string(REPLACE "-" "_" BAZEL_EXEC_ROOT ${PROJECT_NAME})
-set(BAZEL_EXEC_ROOT ${BAZEL_OUTPUT_BASE}/execroot/${BAZEL_EXEC_ROOT})
+set(BAZEL_EXEC_ROOT ${BAZEL_OUTPUT_BASE}/execroot/_main)
 
 macro(include_generated BAZEL_TARGET)
     bazel(build ${BAZEL_TARGET})
diff --git a/misc/bazel/semmle_code_stub/MODULE.bazel b/misc/bazel/semmle_code_stub/MODULE.bazel
@@ -0,0 +1,4 @@
+module(
+    name = "semmle_code",
+    version = "0.0",
+)
diff --git a/misc/bazel/semmle_code_stub/WORKSPACE.bazel b/misc/bazel/semmle_code_stub/WORKSPACE.bazel
diff --git a/misc/bazel/workspace.bzl b/misc/bazel/workspace.bzl
@@ -3,7 +3,7 @@ load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
 load("//swift/third_party:load.bzl", load_swift_dependencies = "load_dependencies")
 
 def codeql_workspace(repository_name = "codeql"):
-    load_swift_dependencies(repository_name)
+    load_swift_dependencies(repository_name = repository_name)
     maybe(
         repo_rule = http_archive,
         name = "rules_pkg",
diff --git a/misc/bazel/workspace_deps.bzl b/misc/bazel/workspace_deps.bzl
@@ -5,7 +5,7 @@ load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")
 def codeql_workspace_deps(repository_name = "codeql"):
     pip_install(
         name = "codegen_deps",
-        requirements = "@%s//misc/codegen:requirements.txt" % repository_name,
+        requirements = "@%s//misc/codegen:requirements_lock.txt" % repository_name,
     )
     bazel_skylib_workspace()
     rules_pkg_dependencies()
diff --git a/misc/codegen/requirements_in.txt b/misc/codegen/requirements_in.txt
diff --git a/misc/codegen/requirements_lock.txt b/misc/codegen/requirements_lock.txt
@@ -0,0 +1,22 @@
+#
+# This file is autogenerated by pip-compile with Python 3.11
+# by the following command:
+#
+#    pip-compile --output-file=misc/codegen/requirements_lock.txt misc/codegen/requirements_in.txt
+#
+inflection==0.5.1
+    # via -r misc/codegen/requirements_in.txt
+iniconfig==2.0.0
+    # via pytest
+packaging==23.2
+    # via pytest
+pluggy==1.4.0
+    # via pytest
+pystache==0.6.5
+    # via -r misc/codegen/requirements_in.txt
+pytest==8.0.0
+    # via -r misc/codegen/requirements_in.txt
+pyyaml==6.0.1
+    # via -r misc/codegen/requirements_in.txt
+toposort==1.10
+    # via -r misc/codegen/requirements_in.txt
diff --git a/swift/extractor/remapping/SwiftFileInterception.cpp b/swift/extractor/remapping/SwiftFileInterception.cpp
@@ -8,6 +8,7 @@
 #include <mutex>
 #include <optional>
 #include <cassert>
+#include <cstdarg>
 #include <iostream>
 
 #include <picosha2.h>
diff --git a/swift/third_party/BUILD.picosha2.bazel b/swift/third_party/BUILD.picosha2.bazel
@@ -1,6 +1,6 @@
 cc_library(
     name = "picosha2",
     hdrs = glob(["*.h"]),
-    strip_include_prefix = ".",
+    includes = ["."],
     visibility = ["//visibility:public"],
 )
diff --git a/swift/third_party/load.bzl b/swift/third_party/load.bzl

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-load("@//:dist.bzl", "pack_zip")`
	`1`	`+load("@semmle_code//:dist.bzl", "pack_zip")`
`2`	`2`
`3`	`3`	`pack_zip(`
`4`	`4`	`name = "downgrades",`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-load("@//:common.bzl", "on_windows")`
	`1`	`+load("@semmle_code//:common.bzl", "on_windows")`
`2`	`2`
`3`	`3`	`# Builds a zip file of the compiled typscript-parser-wrapper and its dependencies.`
`4`	`4`	`genrule(`