fix: sync common Bazelisk constants and functions to bazelisks.bzl (#464)

Author: cgrindel

bazel_integration_test/bzlmod/bazel_binaries.bzl

@@ -7,6 +7,7 @@ load(
     _bazelisk_binary_repo_rule = "bazelisk_binary",
     _local_bazel_binary_repo_rule = "local_bazel_binary",
 )
+load("//bazel_integration_test/private:bazelisks.bzl", "bazelisks")
 load("//bazel_integration_test/private:no_deps_utils.bzl", "no_deps_utils")
 
 # MARK: - bazel_binaries_helper Repository Rule
@@ -141,9 +142,6 @@ def _declare_local_bazel_binary(local):
     )
     return vi
 
-# TODO(GH184): Make this configurable.
-_BAZELISK_VERSION = "1.25.0"
-
 def _bazel_binaries_impl(module_ctx):
     dep_names = []
     dev_dep_names = []
@@ -160,7 +158,8 @@ def _bazel_binaries_impl(module_ctx):
     bazelisk_repo_name = "bazel_binaries_bazelisk"
     _bazelisk_binary_repo_rule(
         name = bazelisk_repo_name,
-        version = _BAZELISK_VERSION,
+        # TODO(GH184): Make this configurable.
+        version = bazelisks.DEFAULT_VERSION,
     )
     _add_dep_name(bazelisk_repo_name, is_dev_dependency = ext_is_dev_dep)
 

bazel_integration_test/private/BUILD.bazel

@@ -49,6 +49,7 @@ bzl_library(
     name = "bazel_binaries",
     srcs = ["bazel_binaries.bzl"],
     deps = [
+        ":bazelisks",
         ":no_deps_utils",
         "@bazel_skylib//lib:paths",
         "@cgrindel_bazel_starlib//bzllib:defs",
@@ -67,3 +68,8 @@ bzl_library(
         ":bazel_integration_test",
     ],
 )
+
+bzl_library(
+    name = "bazelisks",
+    srcs = ["bazelisks.bzl"],
+)

bazel_integration_test/private/bazel_binaries.bzl

@@ -2,55 +2,18 @@
 
 load("@bazel_skylib//lib:paths.bzl", "paths")
 load("@cgrindel_bazel_starlib//bzllib:defs.bzl", "lists")
+load(":bazelisks.bzl", "bazelisks")
 load(":no_deps_utils.bzl", "no_deps_utils")
 
 # Lovingly inspired by https://github.com/bazelbuild/bazel-integration-testing/blob/master/tools/repositories.bzl.
 
 # MARK: - Helpers
 
-_BAZELISK_URL_TEMPLATE = "https://github.com/bazelbuild/bazelisk/releases/download/v{version}/{filename}"
-
-def _is_linux(os_name):
-    return os_name.startswith("linux")
-
-def _is_macos(os_name):
-    return os_name.startswith("mac os")
-
-def _is_windows(os_name):
-    return os_name.startswith("windows")
-
-def _is_x86_64(arch_name):
-    return arch_name.startswith("amd64") or arch_name.startswith("x86_64")
-
-def _is_arm(arch_name):
-    return arch_name.startswith("aarch64") or arch_name.startswith("arm")
-
 def _download_bazelisk_binary(repository_ctx, version):
-    os_name = repository_ctx.os.name.lower()
-    arch_name = repository_ctx.os.arch.lower()
-
-    if _is_linux(os_name) and _is_x86_64(arch_name):
-        suffix = "linux-amd64"
-    elif _is_linux(os_name) and _is_arm(arch_name):
-        suffix = "linux-arm64"
-    elif _is_macos(os_name) and _is_x86_64(arch_name):
-        suffix = "darwin-amd64"
-    elif _is_macos(os_name) and _is_arm(arch_name):
-        suffix = "darwin-arm64"
-    elif _is_windows(os_name) and _is_x86_64(arch_name):
-        suffix = "windows-amd64.exe"
-    elif _is_windows(os_name) and _is_arm(arch_name):
-        suffix = "windows-arm64.exe"
-    else:
-        fail("Unrecognized os and arch. os: {}, arch: {}".format(
-            os_name,
-            arch_name,
-        ))
-
-    filename = "bazelisk-%s" % suffix
-    url = _BAZELISK_URL_TEMPLATE.format(
+    url = bazelisks.url(
         version = version,
-        filename = filename,
+        os = repository_ctx.os.name,
+        arch = repository_ctx.os.arch,
     )
     repository_ctx.download(
         url = url,
@@ -62,10 +25,10 @@ def get_version_from_file(repository_ctx):
     """Read the Bazel version string from the version file.
 
     Args:
-      repository_ctx: Repository rule context object.
+        repository_ctx: Repository rule context object.
 
     Returns:
-      The first non-empty line of the file with surrounding white space stripped.
+        The first non-empty line of the file with surrounding white space stripped.
     """
     version_file = repository_ctx.attr.version_file
     if repository_ctx.attr.version_file == None:
@@ -276,7 +239,7 @@ that load dependencies via the `WORKSPACE`.\
 
 def bazel_binaries(
         versions,
-        bazelisk_version = "1.18.0",
+        bazelisk_version = bazelisks.DEFAULT_VERSION,
         current = None,
         name = "bazel_binaries"):
     """Download the specified bazel binaries.

bazel_integration_test/private/bazelisks.bzl

@@ -0,0 +1,63 @@
+"""Module containing Bazelisk constants and utility functions."""
+
+_DEFAULT_VERSION = "1.26.0"
+
+_BAZELISK_URL_TEMPLATE = "https://github.com/bazelbuild/bazelisk/releases/download/v{version}/{filename}"
+
+def _is_linux(os_name):
+    return os_name.startswith("linux")
+
+def _is_macos(os_name):
+    return os_name.startswith("mac os")
+
+def _is_windows(os_name):
+    return os_name.startswith("windows")
+
+def _is_x86_64(arch_name):
+    return arch_name.startswith("amd64") or arch_name.startswith("x86_64")
+
+def _is_arm(arch_name):
+    return arch_name.startswith("aarch64") or arch_name.startswith("arm")
+
+def _url(os, arch, version = _DEFAULT_VERSION):
+    """Provide the Bazelisk URL for a specific version, OS, arch.
+
+    Args:
+        os: The OS name as a `string`.
+        arch: The arch as a `string`.
+        version: Optional. The version as a `string`. Uses the default version
+            if not specified.
+
+    Returns:
+        A URl as a `string`.
+    """
+    os_name = os.lower()
+    arch_name = arch.lower()
+    if _is_linux(os_name) and _is_x86_64(arch_name):
+        suffix = "linux-amd64"
+    elif _is_linux(os_name) and _is_arm(arch_name):
+        suffix = "linux-arm64"
+    elif _is_macos(os_name) and _is_x86_64(arch_name):
+        suffix = "darwin-amd64"
+    elif _is_macos(os_name) and _is_arm(arch_name):
+        suffix = "darwin-arm64"
+    elif _is_windows(os_name) and _is_x86_64(arch_name):
+        suffix = "windows-amd64.exe"
+    elif _is_windows(os_name) and _is_arm(arch_name):
+        suffix = "windows-arm64.exe"
+    else:
+        fail("Unrecognized os and arch. os: {}, arch: {}".format(
+            os_name,
+            arch_name,
+        ))
+
+    filename = "bazelisk-%s" % suffix
+    return _BAZELISK_URL_TEMPLATE.format(
+        version = version,
+        filename = filename,
+    )
+
+bazelisks = struct(
+    DEFAULT_VERSION = _DEFAULT_VERSION,
+    url = _url,
+)