SERVER-103205: Remove Linux v4 cc mongo toolchain files. (#34989)

GitOrigin-RevId: 0b38fa0899548366c1d164b6525d9a90e30d1201

Author: patricearruda84

MODULE.bazel.lock

@@ -231,7 +231,7 @@ def resolve_latest_version(version_history, offset):
     if offset >= len(version_history):
         version = "latest-{}".format(offset) if offset else "latest"
         raise Exception(
-            'Cannot resolve version "{}": There are only {} Bazel ' "releases.".format(
+            'Cannot resolve version "{}": There are only {} Bazel releases.'.format(
                 version, len(version_history)
             )
         )

bazel/bazelisk.py

@@ -26,17 +26,17 @@ compiler_type = rule(
 # mongo_toolchain_version
 # =========
 
-mongo_toolchain_version_values = ["v4", "v5"]
+mongo_toolchain_version_values = ["v5"]
 
 mongo_toolchain_version_provider = provider(
-    doc = "Select the mongo toolchain version (e.g.: v4)",
-    fields = {"mongo_toolchain_version": "Choose one of [v4, v5]"},
+    doc = "Select the mongo toolchain version (e.g.: v5)",
+    fields = {"mongo_toolchain_version": "Choose one of " + ".".join(mongo_toolchain_version_values)},
 )
 
 def mongo_toolchain_version_impl(ctx):
     mongo_toolchain_version_value = ctx.build_setting_value
     if mongo_toolchain_version_value not in mongo_toolchain_version_values:
-        fail(str(ctx.label) + " mongo_toolchain_version allowed to take values {" + ", ".join(mongo_toolchain_version_value) + "} but was set to unallowed value " + mongo_toolchain_version_value)
+        fail(str(ctx.label) + " mongo_toolchain_version allowed to take values {" + ", ".join(mongo_toolchain_version_values) + "} but was set to unallowed value " + mongo_toolchain_version_value)
     return mongo_toolchain_version_provider(mongo_toolchain_version = mongo_toolchain_version_value)
 
 mongo_toolchain_version = rule(

bazel/config/configs.bzl

@@ -119,7 +119,7 @@ toolchain_download = repository_rule(
             doc = "Host architecture.",
         ),
         "version": attr.string(
-            values = ["v4", "v5"],
+            values = ["v5"],
             doc = "Mongodbtoolchain version.",
             mandatory = True,
         ),
@@ -135,20 +135,13 @@ toolchain_download = repository_rule(
 )
 
 def setup_mongo_toolchains():
-    toolchain_download(
-        name = "mongo_toolchain_v4",
-        version = "v4",
-        flags_tpl = "//bazel/toolchains/cc/mongo_linux:mongo_toolchain_flags_v4.bzl",
-    )
-
     toolchain_download(
         name = "mongo_toolchain_v5",
         version = "v5",
         flags_tpl = "//bazel/toolchains/cc/mongo_linux:mongo_toolchain_flags_v5.bzl",
     )
 
     native.register_toolchains(
-        "@mongo_toolchain_v4//:all",
         "@mongo_toolchain_v5//:all",
     )
 
@@ -170,11 +163,8 @@ def setup_mongo_toolchain_aliases():
     for target in toolchain_targets:
         selects[target] = {}
 
-    for version in ("v4", "v5"):
-        toolchain_name = "mongo_toolchain_{}".format(version)
-        option_name = "//bazel/config:mongo_toolchain_{}".format(version)
-        for target in toolchain_targets:
-            selects[target][option_name] = "@{}//:{}".format(toolchain_name, target)
+    for target in toolchain_targets:
+        selects[target]["//bazel/config:mongo_toolchain_v5"] = "@mongo_toolchain_v5//:{}".format(target)
 
     for target, local_alias in toolchain_targets.items():
         native.alias(

bazel/toolchains/cc/mongo_linux/mongo_toolchain.bzl

@@ -1,7 +1,5 @@
-load("//bazel/toolchains/cc/mongo_linux:mongo_toolchain_version_v4.bzl", "TOOLCHAIN_MAP_V4")
 load("//bazel/toolchains/cc/mongo_linux:mongo_toolchain_version_v5.bzl", "TOOLCHAIN_MAP_V5")
 
 TOOLCHAIN_MAP = {
-    "v4": TOOLCHAIN_MAP_V4,
     "v5": TOOLCHAIN_MAP_V5,
 }

bazel/toolchains/cc/mongo_linux/mongo_toolchain_flags_v4.bzl

@@ -0,0 +1,5 @@
+load("//bazel/toolchains/cc:mongo_toolchain_version_v5.bzl", "TOOLCHAIN_MAP_V5")
+
+TOOLCHAIN_MAP = {
+    "v5": TOOLCHAIN_MAP_V5,
+}

bazel/toolchains/cc/mongo_linux/mongo_toolchain_version.bzl

@@ -4,6 +4,9 @@
 from pathlib import Path
 from typing import Optional
 
+sys.path.append("bazel")
+from bazelisk import get_bazel_path, make_bazel_cmd
+
 # WARNING: this file is imported from outside of any virtual env so the main import block MUST NOT
 # import any third-party non-std libararies. Libraries needed when running as a script can be
 # conditionally imported below.
@@ -13,7 +16,7 @@
     sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(os.path.realpath(__file__)))))
 
 
-SUPPORTED_VERSIONS = ("v4", "v5")
+SUPPORTED_VERSIONS = "v5"
 
 
 class MongoToolchainError(RuntimeError):
@@ -76,13 +79,20 @@ def _get_lib_dir_path(self) -> Path:
         return self._root_dir / "lib"
 
 
-def _run_command(cmd: str) -> str:
-    return subprocess.check_output(cmd, shell=True, text=True).strip()
+def _execute_bazel(argv):
+    bazel_cmd = make_bazel_cmd(get_bazel_path(), argv)
+    cmd = f"{bazel_cmd['exec']} {' '.join(bazel_cmd['args'])}"
+    return subprocess.check_output(
+        cmd,
+        env=bazel_cmd["env"],
+        shell=True,
+        text=True,
+    ).strip()
 
 
 def _fetch_bazel_toolchain(version: str) -> None:
     try:
-        _run_command(f"bazel build --config=local @mongo_toolchain_{version}//:all")
+        _execute_bazel(["build", "--config=local", f"@mongo_toolchain_{version}//:all"])
     except subprocess.CalledProcessError as e:
         raise MongoToolchainNotFoundError(
             f"Failed to fetch bazel toolchain: `{e.cmd}` exited with code {e.returncode}"
@@ -91,13 +101,12 @@ def _fetch_bazel_toolchain(version: str) -> None:
 
 def _get_bazel_execroot() -> Path:
     try:
-        execroot_str = _run_command("bazel info execution_root")
+        execroot_str = _execute_bazel(["info", "execution_root"])
     except subprocess.CalledProcessError as e:
         raise MongoToolchainNotFoundError(
             f"Couldn't find bazel execroot: `{e.cmd}` exited with code {e.returncode}"
         )
-    execroot = Path(execroot_str)
-    return execroot
+    return Path(execroot_str)
 
 
 def _get_bazel_toolchain_path(version: str) -> Path:
@@ -139,15 +148,15 @@ def get_mongo_toolchain(
     if toolchain_path is not None:
         return _get_toolchain_from_path(toolchain_path)
 
-    # If no version given, look in the environment or default to v4.
+    # If no version given, look in the environment or default to v5.
     if version is None:
-        version = os.environ.get("MONGO_TOOLCHAIN_VERSION", "v4")
+        version = os.environ.get("MONGO_TOOLCHAIN_VERSION", "v5")
     assert version is not None
     if version not in SUPPORTED_VERSIONS:
         raise MongoToolchainNotFoundError(f"Unknown toolchain version {version}")
 
-    # If from_bazel is unspecified. Look in the environment or fall back to a default based on
-    # the version (v4 -> not from bazel, v5 -> from bazel).
+    # If from_bazel is unspecified, let's query from bazel where querying toolchain
+    # version is supported since v5.
     def _parse_from_bazel_envvar(value: str) -> bool:
         v = value.lower()
         if v in ("true", "1"):
@@ -158,8 +167,7 @@ def _parse_from_bazel_envvar(value: str) -> bool:
             raise ValueError(f"Invalid value {value} for MONGO_TOOLCHAIN_FROM_BAZEL")
 
     if from_bazel is None:
-        from_bazel_default = "false" if version == "v4" else "true"
-        from_bazel_value = os.environ.get("MONGO_TOOLCHAIN_FROM_BAZEL", from_bazel_default)
+        from_bazel_value = os.environ.get("MONGO_TOOLCHAIN_FROM_BAZEL", "true")
         from_bazel = _parse_from_bazel_envvar(from_bazel_value)
 
     if from_bazel: