Merge pull request #7473 from rabbitmq/mergify/bp/v3.10.x/pr-7472

Mark test deps as such (backport #7463) (backport #7471) (backport #7472)

Author: HoloRin

BAZEL.md

@@ -61,14 +61,13 @@ Note: This takes quite some time on a single machine.
 
 ## Add/update an external dependency from hex.pm
 
-1. `bazel run gazelle -- update-repos --verbose --build_files_dir=bazel hex.pm/[email protected]` to generate/update `bazel/BUILD.accept`
-  ~~`bazel run gazelle-update-repos -- -args hex.pm/[email protected]`~~
+1. `bazel run gazelle-update-repos -- -args hex.pm/[email protected]` to generate/update `bazel/BUILD.accept`
 1. `git checkout WORKSPACE` to reset the workspace file
 1. Add/update the entry in MODULE.bazel
 
 ## Add/update an external dependency from github
 
-`bazel run gazelle -- update-repos --verbose --build_files_dir=bazel github.com/extend/ct_helper`
+`bazel run gazelle-update-repos -- -args --testonly github.com/extend/ct_helper`
 
 ## Additional Useful Commands
 

BUILD.bazel

@@ -30,16 +30,17 @@ gazelle(
     gazelle = "@rules_erlang//gazelle:gazelle_erlang_binary",
 )
 
-# gazelle(
-#     name = "gazelle-update-repos",
-#     extra_args = [
-#         "--verbose",
-#         "--build_files_dir=bazel",
-#     ],
-#     command = "update-repos",
-#     data = GAZELLE_ERLANG_RUNTIME_DEPS,
-#     gazelle = "@rules_erlang//gazelle:gazelle_erlang_binary",
-# )
+gazelle(
+    name = "gazelle-update-repos",
+    command = "update-repos",
+    data = GAZELLE_ERLANG_RUNTIME_DEPS,
+    extra_args = [
+        "--verbose",
+        "--build_files_dir=bazel",
+        "--recurse_with=gazelle-update-repos",
+    ],
+    gazelle = "@rules_erlang//gazelle:gazelle_erlang_binary",
+)
 
 bool_flag(
     name = "enable_test_build",

MODULE.bazel

@@ -31,7 +31,7 @@ bazel_dep(
 
 bazel_dep(
     name = "rules_erlang",
-    version = "3.9.5",
+    version = "3.9.9",
 )
 
 erlang_config = use_extension(
@@ -160,12 +160,6 @@ erlang_package.hex_package(
     version = "3.2.0",
 )
 
-erlang_package.git_package(
-    branch = "master",
-    build_file = "@//:bazel/BUILD.ct_helper",
-    repository = "extend/ct_helper",
-)
-
 erlang_package.hex_package(
     name = "cuttlefish",
     build_file = "@rabbitmq-server//bazel:BUILD.cuttlefish",
@@ -180,13 +174,6 @@ erlang_package.hex_package(
     version = "0.3.6",
 )
 
-erlang_package.git_package(
-    name = "emqtt",
-    build_file = "@rabbitmq-server//bazel:BUILD.emqtt",
-    repository = "emqx/emqtt",
-    tag = "1.8.2",
-)
-
 erlang_package.hex_package(
     name = "enough",
     build_file = "@rabbitmq-server//bazel:BUILD.enough",
@@ -215,12 +202,6 @@ erlang_package.hex_package(
     version = "1.3.3",
 )
 
-erlang_package.git_package(
-    name = "inet_tcp_proxy_dist",
-    branch = "master",
-    repository = "rabbitmq/inet_tcp_proxy",
-)
-
 erlang_package.git_package(
     name = "jose",
     build_file = "@//bazel:BUILD.jose",
@@ -235,12 +216,6 @@ erlang_package.hex_package(
     version = "3.1.0",
 )
 
-erlang_package.git_package(
-    branch = "master",
-    build_file = "@rabbitmq-server//bazel:BUILD.meck",
-    repository = "eproxus/meck",
-)
-
 erlang_package.hex_package(
     name = "observer_cli",
     build_file = "@rabbitmq-server//bazel:BUILD.observer_cli",
@@ -268,12 +243,6 @@ erlang_package.hex_package(
     version = "4.10.0",
 )
 
-erlang_package.git_package(
-    branch = "master",
-    build_file = "@rabbitmq-server//bazel:BUILD.proper",
-    repository = "manopapad/proper",
-)
-
 erlang_package.hex_package(
     name = "quantile_estimator",
     build_file = "@rabbitmq-server//bazel:BUILD.quantile_estimator",
@@ -350,21 +319,16 @@ use_repo(
     "cowboy",
     "cowlib",
     "credentials_obfuscation",
-    "ct_helper",
     "cuttlefish",
     "eetcd",
-    "emqtt",
     "gen_batch_server",
     "getopt",
     "gun",
-    "inet_tcp_proxy_dist",
     "jose",
     "jsx",
-    "meck",
     "observer_cli",
     "osiris",
     "prometheus",
-    "proper",
     "ra",
     "ranch",
     "recon",
@@ -376,6 +340,53 @@ use_repo(
     "systemd",
 )
 
+erlang_dev_package = use_extension(
+    "@rules_erlang//bzlmod:extensions.bzl",
+    "erlang_package",
+    dev_dependency = True,
+)
+
+erlang_dev_package.git_package(
+    branch = "master",
+    build_file = "@//:bazel/BUILD.ct_helper",
+    repository = "extend/ct_helper",
+)
+
+erlang_dev_package.git_package(
+    name = "emqtt",
+    build_file = "@rabbitmq-server//bazel:BUILD.emqtt",
+    repository = "emqx/emqtt",
+    tag = "1.8.2",
+)
+
+erlang_dev_package.git_package(
+    name = "inet_tcp_proxy_dist",
+    branch = "master",
+    repository = "rabbitmq/inet_tcp_proxy",
+    testonly = True,
+)
+
+erlang_dev_package.git_package(
+    branch = "master",
+    build_file = "@rabbitmq-server//bazel:BUILD.meck",
+    repository = "eproxus/meck",
+)
+
+erlang_dev_package.git_package(
+    branch = "master",
+    build_file = "@rabbitmq-server//bazel:BUILD.proper",
+    repository = "manopapad/proper",
+)
+
+use_repo(
+    erlang_dev_package,
+    "ct_helper",
+    "emqtt",
+    "inet_tcp_proxy_dist",
+    "meck",
+    "proper",
+)
+
 rbe = use_extension(
     "//bazel/bzlmod:extensions.bzl",
     "rbe",

WORKSPACE

@@ -4,7 +4,7 @@ load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository", "new_git_r
 git_repository(
     name = "rules_erlang",
     remote = "https://github.com/rabbitmq/rules_erlang.git",
-    tag = "3.9.5",
+    tag = "3.9.9",
 )
 
 load("@rules_erlang//:internal_deps.bzl", "rules_erlang_internal_deps")

bazel/BUILD.ct_helper

@@ -17,6 +17,7 @@ erlc_opts(
 
 erlang_bytecode(
     name = "other_beam",
+    testonly = True,
     srcs = [
         "src/ct_helper.erl",
         "src/ct_helper_error_h.erl",
@@ -27,19 +28,19 @@ erlang_bytecode(
         "ebin/ct_helper_error_h.beam",
         "ebin/erl_make_certs.beam",
     ],
-    hdrs = [],
     app_name = "ct_helper",
-    beam = [],
     erlc_opts = "//:erlc_opts",
 )
 
 filegroup(
     name = "beam_files",
+    testonly = True,
     srcs = [":other_beam"],
 )
 
 filegroup(
     name = "srcs",
+    testonly = True,
     srcs = [
         "src/ct_helper.app.src",
         "src/ct_helper.erl",
@@ -50,26 +51,30 @@ filegroup(
 
 filegroup(
     name = "private_hdrs",
-    srcs = [],
+    testonly = True,
 )
 
 filegroup(
     name = "public_hdrs",
-    srcs = [],
+    testonly = True,
 )
 
 filegroup(
     name = "priv",
-    srcs = [],
+    testonly = True,
 )
 
 filegroup(
     name = "licenses",
-    srcs = ["LICENSE"],
+    testonly = True,
+    srcs = [
+        "LICENSE",
+    ],
 )
 
 filegroup(
     name = "public_and_private_hdrs",
+    testonly = True,
     srcs = [
         ":private_hdrs",
         ":public_hdrs",
@@ -78,6 +83,7 @@ filegroup(
 
 filegroup(
     name = "all_srcs",
+    testonly = True,
     srcs = [
         ":public_and_private_hdrs",
         ":srcs",
@@ -86,6 +92,7 @@ filegroup(
 
 erlang_app(
     name = "erlang_app",
+    testonly = True,
     srcs = [":all_srcs"],
     app_name = "ct_helper",
     beam_files = [":beam_files"],