Further annotate test deps with new rules_erlang 3.9.9 features

12 files changed, 105 insertions, 54 deletions

diff --git a/BAZEL.md b/BAZEL.md
index f67052252b..d0eff0dd1c 100644
--- a/BAZEL.md
+++ b/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/accept@0.3.5` to generate/update `bazel/BUILD.accept`
-  ~~`bazel run gazelle-update-repos -- -args hex.pm/accept@0.3.5`~~
+1. `bazel run gazelle-update-repos -- -args hex.pm/accept@0.3.5` 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
 
diff --git a/BUILD.bazel b/BUILD.bazel
index 44e41ef762..9b31143c6e 100644
--- a/BUILD.bazel
+++ b/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",
diff --git a/MODULE.bazel b/MODULE.bazel
index efdde211d4..b846263d54 100644
--- a/MODULE.bazel
+++ b/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(
@@ -174,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",
@@ -320,7 +313,6 @@ use_repo(
     "credentials_obfuscation",
     "cuttlefish",
     "eetcd",
-    "emqtt",
     "gen_batch_server",
     "getopt",
     "gun",
@@ -353,9 +345,17 @@ erlang_dev_package.git_package(
 )
 
 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(
@@ -373,6 +373,7 @@ erlang_dev_package.git_package(
 use_repo(
     erlang_dev_package,
     "ct_helper",
+    "emqtt",
     "inet_tcp_proxy_dist",
     "meck",
     "proper",
diff --git a/WORKSPACE b/WORKSPACE
index d580e6772b..959fea0e9e 100644
--- a/WORKSPACE
+++ b/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")
diff --git a/bazel/BUILD.ct_helper b/bazel/BUILD.ct_helper
index 435aebd6d4..a2d897798c 100644
--- a/bazel/BUILD.ct_helper
+++ b/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"],
diff --git a/bazel/BUILD.emqtt b/bazel/BUILD.emqtt
index 80d8673210..b5dec34804 100644
--- a/bazel/BUILD.emqtt
+++ b/bazel/BUILD.emqtt
@@ -1,6 +1,8 @@
 load("@rules_erlang//:erlang_bytecode2.bzl", "erlang_bytecode", "erlc_opts")
 load("@rules_erlang//:erlang_app.bzl", "erlang_app")
 
+# gazelle:erlang_erlc_opt -DBUILD_WITHOUT_QUIC
+
 erlc_opts(
     name = "erlc_opts",
     values = select({
@@ -11,7 +13,7 @@ erlc_opts(
             "+warn_shadow_vars",
             "+warn_unused_import",
             "+warn_unused_vars",
-            "-DBUILD_WITHOUT_QUIC",  # keep
+            "-DBUILD_WITHOUT_QUIC",
         ],
         "//conditions:default": [
             "+debug_info",
@@ -21,7 +23,7 @@ erlc_opts(
             "+warn_shadow_vars",
             "+warn_unused_import",
             "+warn_unused_vars",
-            "-DBUILD_WITHOUT_QUIC",  # keep
+            "-DBUILD_WITHOUT_QUIC",
         ],
     }),
     visibility = [":__subpackages__"],
@@ -29,6 +31,7 @@ erlc_opts(
 
 erlang_bytecode(
     name = "other_beam",
+    testonly = True,
     srcs = [
         "src/emqtt.erl",
         "src/emqtt_cli.erl",
@@ -36,6 +39,8 @@ erlang_bytecode(
         "src/emqtt_inflight.erl",
         "src/emqtt_props.erl",
         "src/emqtt_quic.erl",
+        "src/emqtt_quic_connection.erl",
+        "src/emqtt_quic_stream.erl",
         "src/emqtt_secret.erl",
         "src/emqtt_sock.erl",
         "src/emqtt_ws.erl",
@@ -47,6 +52,8 @@ erlang_bytecode(
         "ebin/emqtt_inflight.beam",
         "ebin/emqtt_props.beam",
         "ebin/emqtt_quic.beam",
+        "ebin/emqtt_quic_connection.beam",
+        "ebin/emqtt_quic_stream.beam",
         "ebin/emqtt_secret.beam",
         "ebin/emqtt_sock.beam",
         "ebin/emqtt_ws.beam",
@@ -56,17 +63,18 @@ erlang_bytecode(
         "include/logger.hrl",
     ],
     app_name = "emqtt",
-    beam = [],
     erlc_opts = "//:erlc_opts",
 )
 
 filegroup(
     name = "beam_files",
+    testonly = True,
     srcs = [":other_beam"],
 )
 
 filegroup(
     name = "srcs",
+    testonly = True,
     srcs = [
         "src/emqtt.app.src",
         "src/emqtt.erl",
@@ -75,6 +83,8 @@ filegroup(
         "src/emqtt_inflight.erl",
         "src/emqtt_props.erl",
         "src/emqtt_quic.erl",
+        "src/emqtt_quic_connection.erl",
+        "src/emqtt_quic_stream.erl",
         "src/emqtt_secret.erl",
         "src/emqtt_sock.erl",
         "src/emqtt_ws.erl",
@@ -83,11 +93,12 @@ filegroup(
 
 filegroup(
     name = "private_hdrs",
-    srcs = [],
+    testonly = True,
 )
 
 filegroup(
     name = "public_hdrs",
+    testonly = True,
     srcs = [
         "include/emqtt.hrl",
         "include/logger.hrl",
@@ -96,16 +107,20 @@ filegroup(
 
 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",
@@ -114,6 +129,7 @@ filegroup(
 
 filegroup(
     name = "all_srcs",
+    testonly = True,
     srcs = [
         ":public_and_private_hdrs",
         ":srcs",
@@ -122,6 +138,7 @@ filegroup(
 
 erlang_app(
     name = "erlang_app",
+    testonly = True,
     srcs = [":all_srcs"],
     hdrs = [":public_hdrs"],
     app_name = "emqtt",
diff --git a/bazel/BUILD.getopt b/bazel/BUILD.getopt
index e3a21b833d..820955c3e3 100644
--- a/bazel/BUILD.getopt
+++ b/bazel/BUILD.getopt
@@ -20,7 +20,6 @@ erlc_opts(
             "+warn_unused_import",
             "+warn_unused_record",
             "+warn_unused_vars",
-            "+{platform_define,\"^2\",unicode_str}",
         ],
         "//conditions:default": [
             "+debug_info",
@@ -39,7 +38,6 @@ erlc_opts(
             "+warn_unused_import",
             "+warn_unused_record",
             "+warn_unused_vars",
-            "+{platform_define,\"^2\",unicode_str}",
         ],
     }),
     visibility = [":__subpackages__"],
diff --git a/bazel/BUILD.meck b/bazel/BUILD.meck
index 1b773079e8..885c1f8af4 100644
--- a/bazel/BUILD.meck
+++ b/bazel/BUILD.meck
@@ -17,6 +17,7 @@ erlc_opts(
 
 erlang_bytecode(
     name = "other_beam",
+    testonly = True,
     srcs = [
         "src/meck.erl",
         "src/meck_args_matcher.erl",
@@ -43,19 +44,22 @@ erlang_bytecode(
         "ebin/meck_ret_spec.beam",
         "ebin/meck_util.beam",
     ],
-    hdrs = ["src/meck.hrl"],
+    hdrs = [
+        "src/meck.hrl",
+    ],
     app_name = "meck",
-    beam = [],
     erlc_opts = "//:erlc_opts",
 )
 
 filegroup(
     name = "beam_files",
+    testonly = True,
     srcs = [":other_beam"],
 )
 
 filegroup(
     name = "srcs",
+    testonly = True,
     srcs = [
         "src/meck.app.src",
         "src/meck.erl",
@@ -74,26 +78,33 @@ filegroup(
 
 filegroup(
     name = "private_hdrs",
-    srcs = ["src/meck.hrl"],
+    testonly = True,
+    srcs = [
+        "src/meck.hrl",
+    ],
 )
 
 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",
@@ -102,6 +113,7 @@ filegroup(
 
 filegroup(
     name = "all_srcs",
+    testonly = True,
     srcs = [
         ":public_and_private_hdrs",
         ":srcs",
@@ -110,6 +122,7 @@ filegroup(
 
 erlang_app(
     name = "erlang_app",
+    testonly = True,
     srcs = [":all_srcs"],
     app_name = "meck",
     beam_files = [":beam_files"],
diff --git a/bazel/BUILD.observer_cli b/bazel/BUILD.observer_cli
index 937e8fe44a..7c77f4de96 100644
--- a/bazel/BUILD.observer_cli
+++ b/bazel/BUILD.observer_cli
@@ -20,7 +20,6 @@ erlc_opts(
             "+warn_unused_import",
             "+warn_unused_record",
             "+warn_unused_vars",
-            "+{src_dirs,[\"src\",\"test\"]}",
         ],
         "//conditions:default": [
             "+debug_info",
@@ -39,7 +38,6 @@ erlc_opts(
             "+warn_unused_import",
             "+warn_unused_record",
             "+warn_unused_vars",
-            "+{src_dirs,[\"src\",\"test\"]}",
         ],
     }),
     visibility = [":__subpackages__"],
diff --git a/bazel/BUILD.prometheus b/bazel/BUILD.prometheus
index f079fa941e..06b4e8a627 100644
--- a/bazel/BUILD.prometheus
+++ b/bazel/BUILD.prometheus
@@ -19,7 +19,6 @@ erlc_opts(
             "+warn_unused_record",
             "+warn_unused_vars",
             "+warnings_as_errors",
-            "+{platform_define,\"^(2|3)\",recent_otp}",
         ],
         "//conditions:default": [
             "+debug_info",
@@ -37,7 +36,6 @@ erlc_opts(
             "+warn_unused_record",
             "+warn_unused_vars",
             "+warnings_as_errors",
-            "+{platform_define,\"^(2|3)\",recent_otp}",
         ],
     }),
     visibility = [":__subpackages__"],
diff --git a/bazel/BUILD.proper b/bazel/BUILD.proper
index ce93fc2a22..018c1f30c3 100644
--- a/bazel/BUILD.proper
+++ b/bazel/BUILD.proper
@@ -33,8 +33,13 @@ erlc_opts(
 
 erlang_bytecode(
     name = "parse_transforms",
-    srcs = ["src/vararg.erl"],
-    outs = ["ebin/vararg.beam"],
+    testonly = True,
+    srcs = [
+        "src/vararg.erl",
+    ],
+    outs = [
+        "ebin/vararg.beam",
+    ],
     hdrs = [
         "include/proper.hrl",
         "include/proper_common.hrl",
@@ -47,8 +52,13 @@ erlang_bytecode(
 
 erlang_bytecode(
     name = "behaviours",
-    srcs = ["src/proper_target.erl"],
-    outs = ["ebin/proper_target.beam"],
+    testonly = True,
+    srcs = [
+        "src/proper_target.erl",
+    ],
+    outs = [
+        "ebin/proper_target.beam",
+    ],
     hdrs = [
         "include/proper.hrl",
         "include/proper_common.hrl",
@@ -62,6 +72,7 @@ erlang_bytecode(
 
 erlang_bytecode(
     name = "other_beam",
+    testonly = True,
     srcs = [
         "src/proper.erl",
         "src/proper_arith.erl",
@@ -130,6 +141,7 @@ erlang_bytecode(
 
 filegroup(
     name = "beam_files",
+    testonly = True,
     srcs = [
         ":behaviours",
         ":other_beam",
@@ -139,6 +151,7 @@ filegroup(
 
 filegroup(
     name = "srcs",
+    testonly = True,
     srcs = [
         "src/proper.app.src",
         "src/proper.erl",
@@ -172,11 +185,12 @@ filegroup(
 
 filegroup(
     name = "private_hdrs",
-    srcs = [],
+    testonly = True,
 )
 
 filegroup(
     name = "public_hdrs",
+    testonly = True,
     srcs = [
         "include/proper.hrl",
         "include/proper_common.hrl",
@@ -187,16 +201,17 @@ filegroup(
 
 filegroup(
     name = "priv",
-    srcs = [],
+    testonly = True,
 )
 
 filegroup(
     name = "licenses",
-    srcs = [],
+    testonly = True,
 )
 
 filegroup(
     name = "public_and_private_hdrs",
+    testonly = True,
     srcs = [
         ":private_hdrs",
         ":public_hdrs",
@@ -205,6 +220,7 @@ filegroup(
 
 filegroup(
     name = "all_srcs",
+    testonly = True,
     srcs = [
         ":public_and_private_hdrs",
         ":srcs",
@@ -213,6 +229,7 @@ filegroup(
 
 erlang_app(
     name = "erlang_app",
+    testonly = True,
     srcs = [":all_srcs"],
     hdrs = [":public_hdrs"],
     app_name = "proper",
diff --git a/moduleindex.yaml b/moduleindex.yaml
index 07be87d077..f7ce13088d 100755
--- a/moduleindex.yaml
+++ b/moduleindex.yaml
@@ -135,6 +135,8 @@ emqtt:
 - emqtt_inflight
 - emqtt_props
 - emqtt_quic
+- emqtt_quic_connection
+- emqtt_quic_stream
 - emqtt_secret
 - emqtt_sock
 - emqtt_ws