Merge pull request #8151 from rabbitmq/mergify/bp/v3.12.x/pr-8148

rabbitmq_cli dialyze enhancements (backport #8148)

Author: michaelklishin

.github/workflows/test-mixed-versions.yaml

@@ -135,7 +135,9 @@ jobs:
       uses: actions/[email protected]
       with:
         path: "/home/runner/repo-cache/"
-        key: repo-cache
+        key: ${{ runner.os }}-repo-cache-${{ hashFiles('MODULE.bazel','WORKSPACE','bazel/bzlmod/secondary_umbrella.bzl') }}
+        restore-keys: |
+          ${{ runner.os }}-repo-cache-
     - name: CONFIGURE BAZEL
       run: |
         if [ -n "${{ secrets.BUILDBUDDY_API_KEY }}" ]; then
@@ -183,7 +185,9 @@ jobs:
       uses: actions/[email protected]
       with:
         path: "/home/runner/repo-cache/"
-        key: repo-cache
+        key: ${{ runner.os }}-repo-cache-${{ hashFiles('MODULE.bazel','WORKSPACE','bazel/bzlmod/secondary_umbrella.bzl') }}
+        restore-keys: |
+          ${{ runner.os }}-repo-cache-
     - name: CONFIGURE BAZEL
       run: |
         ERLANG_HOME="$(dirname $(dirname $(which erl)))"

.github/workflows/test-selenium.yaml

@@ -50,7 +50,9 @@ jobs:
       uses: actions/[email protected]
       with:
         path: "/home/runner/repo-cache/"
-        key: repo-cache
+        key: ${{ runner.os }}-repo-cache-${{ hashFiles('MODULE.bazel','WORKSPACE','bazel/bzlmod/secondary_umbrella.bzl') }}
+        restore-keys: |
+          ${{ runner.os }}-repo-cache-
 
     - name: Configure Bazel
       run: |

.github/workflows/test.yaml

@@ -44,7 +44,9 @@ jobs:
       uses: actions/[email protected]
       with:
         path: "/home/runner/repo-cache/"
-        key: repo-cache
+        key: ${{ runner.os }}-repo-cache-${{ hashFiles('MODULE.bazel','WORKSPACE','bazel/bzlmod/secondary_umbrella.bzl') }}
+        restore-keys: |
+          ${{ runner.os }}-repo-cache-
     - name: CONFIGURE BAZEL
       run: |
         if [ -n "${{ secrets.BUILDBUDDY_API_KEY }}" ]; then
@@ -96,7 +98,9 @@ jobs:
       uses: actions/[email protected]
       with:
         path: "/home/runner/repo-cache/"
-        key: repo-cache
+        key: ${{ runner.os }}-repo-cache-${{ hashFiles('MODULE.bazel','WORKSPACE','bazel/bzlmod/secondary_umbrella.bzl') }}
+        restore-keys: |
+          ${{ runner.os }}-repo-cache-
     - name: CONFIGURE BAZEL
       run: |
         ERLANG_HOME="$(dirname $(dirname $(which erl)))"

BUILD.bazel

@@ -3,7 +3,7 @@ load(
     "bool_flag",
     "string_flag",
 )
-load("@rules_pkg//:mappings.bzl", "pkg_files", "strip_prefix")
+load("@rules_pkg//pkg:mappings.bzl", "pkg_files")
 load("@bazel_gazelle//:def.bzl", "gazelle")
 load("@rules_erlang//gazelle:def.bzl", "GAZELLE_ERLANG_RUNTIME_DEPS")
 load("@rules_erlang//:erlang_bytecode2.bzl", "erlc_opts")

MODULE.bazel

@@ -5,7 +5,7 @@ module(
 
 bazel_dep(
     name = "rules_pkg",
-    version = "0.5.1",
+    version = "0.9.1",
 )
 
 bazel_dep(
@@ -31,7 +31,7 @@ bazel_dep(
 
 bazel_dep(
     name = "rules_erlang",
-    version = "3.9.14",
+    version = "3.10.0",
 )
 
 erlang_config = use_extension(
@@ -110,20 +110,20 @@ use_repo(
 )
 
 register_toolchains(
-    "@erlang_config//24:toolchain",
-    "@erlang_config//24:toolchain2",
-    "@erlang_config//25_0:toolchain",
-    "@erlang_config//25_0:toolchain2",
-    "@erlang_config//25_1:toolchain",
-    "@erlang_config//25_1:toolchain2",
-    "@erlang_config//25_2:toolchain",
-    "@erlang_config//25_2:toolchain2",
-    "@erlang_config//25_3:toolchain",
-    "@erlang_config//25_3:toolchain2",
-    "@erlang_config//26:toolchain",
-    "@erlang_config//26:toolchain2",
-    "@erlang_config//git_master:toolchain",
-    "@erlang_config//git_master:toolchain2",
+    "@erlang_config//24:toolchain_major",
+    "@erlang_config//24:toolchain_major_minor",
+    "@erlang_config//25_0:toolchain_major",
+    "@erlang_config//25_0:toolchain_major_minor",
+    "@erlang_config//25_1:toolchain_major",
+    "@erlang_config//25_1:toolchain_major_minor",
+    "@erlang_config//25_2:toolchain_major",
+    "@erlang_config//25_2:toolchain_major_minor",
+    "@erlang_config//25_3:toolchain_major",
+    "@erlang_config//25_3:toolchain_major_minor",
+    "@erlang_config//26:toolchain_major",
+    "@erlang_config//26:toolchain_major_minor",
+    "@erlang_config//git_master:toolchain_major",
+    "@erlang_config//git_master:toolchain_major_minor",
     "@elixir_config//external:toolchain",
     "@elixir_config//1_13:toolchain",
     "@elixir_config//1_14:toolchain",

WORKSPACE

@@ -3,10 +3,23 @@ workspace(name = "rabbitmq-server")
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive", "http_file")
 load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository", "new_git_repository")
 
+http_archive(
+    name = "rules_pkg",
+    urls = [
+        "https://mirror.bazel.build/github.com/bazelbuild/rules_pkg/releases/download/0.9.1/rules_pkg-0.9.1.tar.gz",
+        "https://github.com/bazelbuild/rules_pkg/releases/download/0.9.1/rules_pkg-0.9.1.tar.gz",
+    ],
+    sha256 = "8f9ee2dc10c1ae514ee599a8b42ed99fa262b757058f65ad3c384289ff70c4b8",
+)
+
+load("@rules_pkg//:deps.bzl", "rules_pkg_dependencies")
+
+rules_pkg_dependencies()
+
 git_repository(
     name = "rules_erlang",
     remote = "https://github.com/rabbitmq/rules_erlang.git",
-    tag = "3.9.14",
+    tag = "3.10.0",
 )
 
 load("@rules_erlang//:internal_deps.bzl", "rules_erlang_internal_deps")

bazel/elixir/BUILD.bazel

@@ -12,3 +12,15 @@ elixir_as_app(
     name = "erlang_app",
     visibility = ["//visibility:public"],
 )
+
+elixir_as_app(
+    name = "logger",
+    app = "logger",
+    visibility = ["//visibility:public"],
+)
+
+elixir_as_app(
+    name = "iex",
+    app = "iex",
+    visibility = ["//visibility:public"],
+)

bazel/elixir/elixir_as_app.bzl

@@ -2,13 +2,17 @@ load(
     "@rules_erlang//:erlang_app_info.bzl",
     "ErlangAppInfo",
 )
+load(
+    "@rules_erlang//:util.bzl",
+    "path_join",
+)
 load(
     ":elixir_toolchain.bzl",
     "elixir_dirs",
 )
 
 def _impl(ctx):
-    ebin = ctx.actions.declare_directory("ebin")
+    ebin = ctx.actions.declare_directory(path_join(ctx.label.name, "ebin"))
 
     (elixir_home, elixir_runfiles) = elixir_dirs(ctx)
 
@@ -17,17 +21,18 @@ def _impl(ctx):
         outputs = [ebin],
         command = """set -euo pipefail
 
-cp -r "{elixir_home}"/lib/elixir/ebin/* {ebin}
+cp -r "{elixir_home}"/lib/{app}/ebin/* {ebin}
 """.format(
             elixir_home = elixir_home,
+            app = ctx.attr.app,
             ebin = ebin.path,
         ),
     )
 
     return [
         DefaultInfo(files = depset([ebin])),
         ErlangAppInfo(
-            app_name = "elixir",
+            app_name = ctx.attr.app,
             include = [],
             beam = [ebin],
             priv = [],
@@ -39,6 +44,9 @@ cp -r "{elixir_home}"/lib/elixir/ebin/* {ebin}
 
 elixir_as_app = rule(
     implementation = _impl,
+    attrs = {
+        "app": attr.string(default = "elixir"),
+    },
     toolchains = [":toolchain_type"],
     provides = [ErlangAppInfo],
 )

bazel/elixir/mix_archive_build.bzl

@@ -1,7 +1,4 @@
-load(
-    "@rules_erlang//:util.bzl",
-    "path_join",
-)
+load("@bazel_skylib//lib:shell.bzl", "shell")
 load(
     "@rules_erlang//private:util.bzl",
     "additional_file_dest_relative_path",
@@ -20,24 +17,20 @@ def _impl(ctx):
     out = ctx.actions.declare_file(ctx.attr.out.name)
     mix_invocation_dir = ctx.actions.declare_directory("{}_mix".format(ctx.label.name))
 
-    package_dir = path_join(
-        ctx.label.workspace_root,
-        ctx.label.package,
-    )
-
     copy_srcs_commands = []
-    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(
-                dest = dest,
-            ),
-            'cp {flags}"{src}" "${{MIX_INVOCATION_DIR}}/{dest}"'.format(
-                flags = "-r " if src.is_directory else "",
-                src = src.path,
-                dest = dest,
-            ),
-        ])
+    for src in ctx.attr.srcs:
+        for src_file in src[DefaultInfo].files.to_list():
+            dest = additional_file_dest_relative_path(src.label, src_file)
+            copy_srcs_commands.extend([
+                'mkdir -p "$(dirname ${{MIX_INVOCATION_DIR}}/{dest})"'.format(
+                    dest = dest,
+                ),
+                'cp {flags}"{src}" "${{MIX_INVOCATION_DIR}}/{dest}"'.format(
+                    flags = "-r " if src_file.is_directory else "",
+                    src = src_file.path,
+                    dest = dest,
+                ),
+            ])
 
     script = """set -euo pipefail
 
@@ -60,11 +53,23 @@ MIX_INVOCATION_DIR="{mix_invocation_dir}"
 
 {copy_srcs_commands}
 
+ORIGINAL_DIR=$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}}"
+for archive in {archives}; do
+    "${{ABS_ELIXIR_HOME}}"/bin/mix archive.install --force $ORIGINAL_DIR/$archive
+done
+if [[ -n "{ez_deps}" ]]; then
+    mkdir -p _build/${{MIX_ENV}}/lib
+    for ez_dep in {ez_deps}; do
+        unzip -q $ORIGINAL_DIR/$ez_dep -d _build/${{MIX_ENV}}/lib
+    done
+fi
+"${{ABS_ELIXIR_HOME}}"/bin/mix archive.build \\
+    --no-deps-check \\
+    -o "${{ABS_OUT_PATH}}"
 
 # remove symlinks from the _build directory since it
 # is an unused output, and bazel does not allow them
@@ -75,7 +80,8 @@ find . -type l -delete
         elixir_home = elixir_home,
         mix_invocation_dir = mix_invocation_dir.path,
         copy_srcs_commands = "\n".join(copy_srcs_commands),
-        package_dir = package_dir,
+        archives = " ".join([shell.quote(a.path) for a in ctx.files.archives]),
+        ez_deps = " ".join([shell.quote(a.path) for a in ctx.files.ez_deps]),
         out = out.path,
     )
 
@@ -84,6 +90,8 @@ find . -type l -delete
         transitive = [
             erlang_runfiles.files,
             elixir_runfiles.files,
+            depset(ctx.files.archives),
+            depset(ctx.files.ez_deps),
         ],
     )
 
@@ -110,6 +118,12 @@ mix_archive_build = rule(
             mandatory = True,
             allow_files = True,
         ),
+        "archives": attr.label_list(
+            allow_files = [".ez"],
+        ),
+        "ez_deps": attr.label_list(
+            allow_files = [".ez"],
+        ),
         "out": attr.output(),
     },
     toolchains = [

deps/rabbitmq_cli/BUILD.bazel

@@ -5,6 +5,34 @@ load(":rabbitmqctl_test.bzl", "rabbitmqctl_test")
 load("//:rabbitmq_home.bzl", "rabbitmq_home")
 load("//:rabbitmq_run.bzl", "rabbitmq_run")
 load("//:rabbitmq.bzl", "RABBITMQ_DIALYZER_OPTS", "STARTS_BACKGROUND_BROKER_TAG", "without")
+load(
+    "@rabbitmq-server//bazel/elixir:mix_archive_build.bzl",
+    "mix_archive_build",
+)
+
+mix_archive_build(
+    name = "parallel_stream_ez",
+    srcs = ["@parallel_stream//:sources"],
+    archives = ["@hex//:archive"],
+    out = "parallel_stream.ez",
+)
+
+mix_archive_build(
+    name = "csv_ez",
+    srcs = ["@csv//:sources"],
+    archives = ["@hex//:archive"],
+    ez_deps = [
+        ":parallel_stream_ez",
+    ],
+    out = "csv.ez",
+)
+
+mix_archive_build(
+    name = "json_ez",
+    srcs = ["@json//:sources"],
+    archives = ["@hex//:archive"],
+    out = "json.ez",
+)
 
 # Note: All the various rabbitmq-* scripts are just copies of rabbitmqctl
 rabbitmqctl(
@@ -88,9 +116,15 @@ plt(
     libs = [":elixir"],
     deps = [
         ":elixir",
+        "//bazel/elixir:logger",
         "//deps/rabbit:erlang_app",
         "//deps/rabbit_common:erlang_app",
     ],
+    ez_deps = [
+        ":parallel_stream_ez",
+        ":csv_ez",
+        ":json_ez",
+    ],
 )
 
 dialyze(