Merge pull request #7891 from rabbitmq/mergify/bp/v3.11.x/pr-7888

Author: michaelklishin

MODULE.bazel

@@ -475,3 +475,13 @@ use_repo(
     secondary_umbrella,
     "rabbitmq-server-generic-unix-3.10",
 )
+
+hex = use_extension(
+    "//bazel/bzlmod:extensions.bzl",
+    "hex",
+)
+
+use_repo(
+    hex,
+    "hex",
+)

WORKSPACE

@@ -206,10 +206,3 @@ git_repository(
     branch = "linux-rbe",
     remote = "https://github.com/rabbitmq/rbe-erlang-platform.git",
 )
-
-http_archive(
-    name = "hex",
-    strip_prefix = "hex-2.0.5",
-    urls = ["https://github.com/hexpm/hex/archive/refs/tags/v2.0.5.zip"],
-    build_file = "@rabbitmq-server//bazel:BUILD.hex",
-)

bazel/BUILD.hex

@@ -1,3 +1,4 @@
+load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
 load(
     ":secondary_umbrella.bzl",
@@ -137,3 +138,32 @@ def _secondary_umbrella(ctx):
 secondary_umbrella = module_extension(
     implementation = _secondary_umbrella,
 )
+
+def _hex(ctx):
+    http_archive(
+        name = "hex",
+        sha256 = "0e3e3290d0fcbdc6bb0526b73ca174d68dcff4d53ee86015c49ad0493e39ee65",
+        strip_prefix = "hex-2.0.5",
+        urls = ["https://github.com/hexpm/hex/archive/refs/tags/v2.0.5.zip"],
+        build_file_content = """\
+load(
+    "@rabbitmq-server//bazel/elixir:mix_archive_build.bzl",
+    "mix_archive_build",
+)
+
+mix_archive_build(
+    name = "archive",
+    srcs = [
+        "mix.exs",
+    ] + glob([
+        "lib/**/*",
+    ]),
+    out = "hex.ez",
+    visibility = ["//visibility:public"],
+)
+""",
+    )
+
+hex = module_extension(
+    implementation = _hex,
+)

bazel/bzlmod/extensions.bzl

@@ -29,10 +29,10 @@ def _impl(ctx):
     for src in ctx.files.srcs:
         dest = additional_file_dest_relative_path(ctx.label, src)
         copy_srcs_commands.extend([
-            "mkdir -p $(dirname ${{MIX_INVOCATION_DIR}}/{dest})".format(
+            'mkdir -p "$(dirname ${{MIX_INVOCATION_DIR}}/{dest})"'.format(
                 dest = dest,
             ),
-            "cp {flags}{src} ${{MIX_INVOCATION_DIR}}/{dest}".format(
+            'cp {flags}"{src}" "${{MIX_INVOCATION_DIR}}/{dest}"'.format(
                 flags = "-r " if src.is_directory else "",
                 src = src.path,
                 dest = dest,
@@ -49,7 +49,7 @@ else
     ABS_ELIXIR_HOME=$PWD/{elixir_home}
 fi
 
-ABS_OUT_PATH=$PWD/{out}
+ABS_OUT_PATH="$PWD/{out}"
 
 export PATH="$ABS_ELIXIR_HOME"/bin:"{erlang_home}"/bin:${{PATH}}
 
@@ -60,11 +60,11 @@ MIX_INVOCATION_DIR="{mix_invocation_dir}"
 
 {copy_srcs_commands}
 
-cd ${{MIX_INVOCATION_DIR}}
-export HOME=${{PWD}}
+cd "${{MIX_INVOCATION_DIR}}"
+export HOME="${{PWD}}"
 export MIX_ENV=prod
 export ERL_COMPILER_OPTIONS=deterministic
-"${{ABS_ELIXIR_HOME}}"/bin/mix archive.build -o ${{ABS_OUT_PATH}}
+"${{ABS_ELIXIR_HOME}}"/bin/mix archive.build -o "${{ABS_OUT_PATH}}"
 
 # remove symlinks from the _build directory since it
 # is an unused output, and bazel does not allow them

bazel/elixir/mix_archive_build.bzl

@@ -1,4 +1,3 @@
-load("@bazel_skylib//rules:select_file.bzl", "select_file")
 load("@rules_erlang//:dialyze.bzl", "dialyze", "plt")
 load(":rabbitmqctl.bzl", "rabbitmqctl")
 load(":rabbitmqctl_check_formatted.bzl", "rabbitmqctl_check_formatted_test")
@@ -33,13 +32,6 @@ rabbitmqctl(
     },
 )
 
-select_file(
-    name = "fetched_srcs",
-    srcs = ":rabbitmqctl",
-    subpath = "deps.tar",
-    visibility = ["//visibility:public"],
-)
-
 rabbitmq_home(
     name = "broker-for-cli-tests-home",
     testonly = True,

deps/rabbitmq_cli/BUILD.bazel

@@ -1,3 +1,4 @@
+load("@bazel_skylib//lib:shell.bzl", "shell")
 load(
     "@rules_erlang//:erlang_app_info.bzl",
     "ErlangAppInfo",
@@ -148,7 +149,7 @@ find . -type l -delete
         escript_path = escript.path,
         ebin_dir = ebin.path,
         consolidated_dir = consolidated.path,
-        archives = "".join([a.path for a in ctx.files.archives]),
+        archives = "".join([shell.quote(a.path) for a in ctx.files.archives]),
         precompiled_deps = " ".join([
             dep[ErlangAppInfo].app_name
             for dep in ctx.attr.deps

deps/rabbitmq_cli/rabbitmqctl.bzl

@@ -1,3 +1,4 @@
+load("@bazel_skylib//lib:shell.bzl", "shell")
 load(
     "@rules_erlang//:erlang_app_info.bzl",
     "ErlangAppInfo",
@@ -138,7 +139,7 @@ set -x
             elixir_home = elixir_home,
             package_dir = package_dir,
             deps_dir = deps_dir,
-            archives = "".join([a.short_path for a in ctx.files.archives]),
+            archives = "".join([shell.quote(a.short_path) for a in ctx.files.archives]),
             precompiled_deps = precompiled_deps,
             rabbitmq_run_cmd = ctx.attr.rabbitmq_run[DefaultInfo].files_to_run.executable.short_path,
         )
@@ -195,7 +196,7 @@ exit /b 1
             elixir_home = windows_path(elixir_home),
             package_dir = windows_path(ctx.label.package),
             deps_dir = deps_dir,
-            archives = "".join([a.short_path for a in ctx.files.archives]),
+            archives = "".join([shell.quote(a.short_path) for a in ctx.files.archives]),
             precompiled_deps = precompiled_deps,
             rabbitmq_run_cmd = ctx.attr.rabbitmq_run[DefaultInfo].files_to_run.executable.short_path,
         )

deps/rabbitmq_cli/rabbitmqctl_test.bzl

@@ -344,13 +344,23 @@ def source_archive(
         prefix = "deps/csv",
     )
 
+    pkg_files(
+        name = "parallel_stream-files",
+        srcs = [
+            "@parallel_stream//:sources",
+        ],
+        strip_prefix = "",
+        prefix = "deps/parallel_stream",
+    )
+
     pkg_tar(
         name = name,
         extension = "tar.xz",
         srcs = [
             ":deps-files",
             ":json-files",
             ":csv-files",
+            ":parallel_stream-files",
             Label("@rabbitmq-server//:root-licenses"),
         ],
         visibility = ["//visibility:public"],