Various Bazel/v3.8.x corrections

8 files changed, 46 insertions, 80 deletions

diff --git a/deps/rabbit/BUILD.bazel b/deps/rabbit/BUILD.bazel
index 47e97eefd4..c552a10bb9 100644
--- a/deps/rabbit/BUILD.bazel
+++ b/deps/rabbit/BUILD.bazel
@@ -89,7 +89,7 @@ _APP_ENV = """[
 	    %% rabbitmq-server#949, rabbitmq-server#1098
 	    {credit_flow_default_credit, {400, 200}},
 	    {quorum_commands_soft_limit, 32},
-	    {quorum_cluster_size, 5},
+	    {quorum_cluster_size, 3},
 	    %% see rabbitmq-server#248
 	    %% and rabbitmq-server#667
 	    {channel_operation_timeout, 15000},
@@ -126,26 +126,27 @@ _APP_ENV = """[
 	    {writer_gc_threshold, 1000000000},
 	    %% interval at which connection/channel tracking executes post operations
 	    {tracking_execution_timeout, 15000},
-	    {stream_messages_soft_limit, 256},
         {track_auth_attempt_source, false}
 	  ]
 """
 
+BUILD_DEPS = [
+    "//deps/rabbitmq_cli:rabbitmqctl",
+    "@syslog//:bazel_erlang_lib",
+]
+
 DEPS = [
-    "//deps/amqp10_common:bazel_erlang_lib",
     "//deps/rabbit_common:bazel_erlang_lib",
     "@lager//:bazel_erlang_lib",
     "@ra//:bazel_erlang_lib",
     "@ranch//:bazel_erlang_lib",
     "@stdout_formatter//:bazel_erlang_lib",
-    "@syslog//:bazel_erlang_lib",
 ]
 
 RUNTIME_DEPS = [
     "//deps/rabbit/apps/rabbitmq_prelaunch:bazel_erlang_lib",
     "@cuttlefish//:bazel_erlang_lib",
     "@observer_cli//:bazel_erlang_lib",
-    "@osiris//:bazel_erlang_lib",
     "@recon//:bazel_erlang_lib",
     "@sysmon_handler//:bazel_erlang_lib",
 ]
@@ -160,7 +161,6 @@ APP_REGISTERED = [
 
 EXTRA_APPS = [
     "sasl",
-    "rabbitmq_prelaunch",
     "os_mon",
     "inets",
     "compiler",
@@ -190,6 +190,7 @@ erlang_lib(
     app_name = "rabbit",
     app_registered = APP_REGISTERED,
     app_version = APP_VERSION,
+    build_deps = BUILD_DEPS,
     erlc_opts = ERLC_OPTS,
     extra_apps = EXTRA_APPS,
     first_srcs = FIRST_SRCS,
@@ -204,6 +205,10 @@ test_erlang_lib(
     app_name = "rabbit",
     app_registered = APP_REGISTERED,
     app_version = APP_VERSION,
+    build_deps = [
+        "//deps/rabbitmq_cli:rabbitmqctl",
+        "@syslog//:bazel_erlang_lib",
+    ],
     erlc_opts = ERLC_OPTS + RABBITMQ_TEST_ERLC_OPTS,
     extra_apps = EXTRA_APPS,
     first_srcs = FIRST_SRCS,
@@ -211,18 +216,15 @@ test_erlang_lib(
         "//deps/rabbit/apps/rabbitmq_prelaunch:test_bazel_erlang_lib",  # <- test version
         "@cuttlefish//:bazel_erlang_lib",
         "@observer_cli//:bazel_erlang_lib",
-        "@osiris//:bazel_erlang_lib",
         "@recon//:bazel_erlang_lib",
         "@sysmon_handler//:bazel_erlang_lib",
     ],
     deps = [
-        "//deps/amqp10_common:bazel_erlang_lib",
         "//deps/rabbit_common:test_bazel_erlang_lib",
         "@lager//:bazel_erlang_lib",
         "@ra//:test_bazel_erlang_lib",  # <- test version
         "@ranch//:bazel_erlang_lib",
         "@stdout_formatter//:bazel_erlang_lib",
-        "@syslog//:bazel_erlang_lib",
     ],
 )
 
@@ -640,7 +642,6 @@ rabbitmq_integration_suite(
         "quorum_queue",
         "quorum_queue_in_memory_limit",
         "quorum_queue_in_memory_bytes",
-        "stream_queue",
     ],
     suite_name = "queue_parallel_SUITE",
     runtime_deps = [
@@ -650,12 +651,6 @@ rabbitmq_integration_suite(
 )
 
 rabbitmq_integration_suite(
-    size = "medium",
-    suite_name = "queue_type_SUITE",
-    deps = DEPS,
-)
-
-rabbitmq_integration_suite(
     size = "large",
     additional_beam = [
         ":quorum_queue_utils",
@@ -672,18 +667,6 @@ rabbitmq_integration_suite(
     deps = DEPS,
 )
 
-ct_suite(
-    size = "small",
-    erlc_opts = RABBITMQ_TEST_ERLC_OPTS,
-    suite_name = "rabbit_confirms_SUITE",
-    test_env = {
-        "RABBITMQ_CT_SKIP_AS_ERROR": "true",
-    },
-    deps = [
-        "//deps/rabbit_common:bazel_erlang_lib",
-    ],
-)
-
 rabbitmq_integration_suite(
     size = "medium",
     suite_name = "rabbit_core_metrics_gc_SUITE",
@@ -788,39 +771,6 @@ ct_suite(
     ],
 )
 
-ct_suite(
-    size = "medium",
-    erlc_opts = RABBITMQ_TEST_ERLC_OPTS,
-    suite_name = "rabbit_msg_record_SUITE",
-    test_env = {
-        "RABBITMQ_CT_SKIP_AS_ERROR": "true",
-    },
-    deps = [
-        "//deps/amqp10_common:bazel_erlang_lib",
-        "//deps/rabbit_common:bazel_erlang_lib",
-    ],
-)
-
-rabbitmq_integration_suite(
-    size = "large",
-    additional_beam = [
-        ":quorum_queue_utils",
-    ],
-    groups = [
-        "single_node",
-        "cluster_size_2",
-        "cluster_size_3",
-        "unclustered_size_3_1",
-        "unclustered_size_3_2",
-        "unclustered_size_3_3",
-        "cluster_size_3_1",
-    ],
-    suite_name = "rabbit_stream_queue_SUITE",
-    deps = DEPS + [
-        "@proper//:bazel_erlang_lib",
-    ],
-)
-
 rabbitmq_integration_suite(
     size = "medium",
     suite_name = "rabbitmq_queues_cli_integration_SUITE",
@@ -1017,6 +967,15 @@ ct_suite(
     ],
 )
 
+ct_suite(
+    size = "small",
+    erlc_opts = RABBITMQ_TEST_ERLC_OPTS,
+    suite_name = "unit_log_config_SUITE",
+    runtime_deps = [
+        "@syslog//:bazel_erlang_lib",
+    ],
+)
+
 rabbitmq_integration_suite(
     size = "small",
     suite_name = "unit_log_management_SUITE",
diff --git a/deps/rabbitmq_auth_backend_ldap/BUILD.bazel b/deps/rabbitmq_auth_backend_ldap/BUILD.bazel
index 4aaeaef069..702e4e167e 100644
--- a/deps/rabbitmq_auth_backend_ldap/BUILD.bazel
+++ b/deps/rabbitmq_auth_backend_ldap/BUILD.bazel
@@ -44,11 +44,6 @@ DEPS = [
 
 RUNTIME_DEPS = [
     "//deps/rabbit:bazel_erlang_lib",
-    # "//deps/amqp_client:bazel_erlang_lib",
-]
-
-FIRST_SRCS = [
-    # "src/rabbit_auth_cache.erl",
 ]
 
 erlang_lib(
@@ -58,7 +53,6 @@ erlang_lib(
     app_name = APP_NAME,
     app_version = APP_VERSION,
     extra_apps = EXTRA_APPS,
-    first_srcs = FIRST_SRCS,
     runtime_deps = RUNTIME_DEPS,
     deps = DEPS,
 )
@@ -69,7 +63,6 @@ test_erlang_lib(
     app_module = APP_MODULE,
     app_name = APP_NAME,
     app_version = APP_VERSION,
-    first_srcs = FIRST_SRCS,
     runtime_deps = RUNTIME_DEPS,
     deps = DEPS,
 )
diff --git a/deps/rabbitmq_federation/BUILD.bazel b/deps/rabbitmq_federation/BUILD.bazel
index 493d706868..6d28632267 100644
--- a/deps/rabbitmq_federation/BUILD.bazel
+++ b/deps/rabbitmq_federation/BUILD.bazel
@@ -5,6 +5,11 @@ APP_ENV = """[
 	    {internal_exchange_check_interval, 90000}
 	  ]"""
 
+BUILD_DEPS = [
+    "//deps/rabbitmq_cli:rabbitmqctl",
+    "@lager//:bazel_erlang_lib",
+]
+
 DEPS = [
     "//deps/rabbit_common:bazel_erlang_lib",
     "//deps/rabbit:bazel_erlang_lib",
@@ -17,8 +22,6 @@ rabbitmq_lib(
     app_module = "rabbit_federation_app",
     app_name = "rabbitmq_federation",
     app_version = APP_VERSION,
-    build_deps = [
-        "//deps/rabbitmq_cli:rabbitmqctl",
-    ],
+    build_deps = BUILD_DEPS,
     deps = DEPS,
 )
diff --git a/deps/rabbitmq_management/BUILD.bazel b/deps/rabbitmq_management/BUILD.bazel
index ba72408709..e8fb6bdbdd 100644
--- a/deps/rabbitmq_management/BUILD.bazel
+++ b/deps/rabbitmq_management/BUILD.bazel
@@ -18,6 +18,9 @@ rabbitmq_lib(
     app_env = APP_ENV,
     app_module = "rabbit_mgmt_app",
     app_name = "rabbitmq_management",
+    build_deps = [
+        "@lager//:bazel_erlang_lib",
+    ],
     extra_apps = [
         "mnesia",
         "ranch",
diff --git a/deps/rabbitmq_management_agent/BUILD.bazel b/deps/rabbitmq_management_agent/BUILD.bazel
index 369fec180d..1db8dd852b 100644
--- a/deps/rabbitmq_management_agent/BUILD.bazel
+++ b/deps/rabbitmq_management_agent/BUILD.bazel
@@ -17,6 +17,7 @@ rabbitmq_lib(
     app_name = "rabbitmq_management_agent",
     build_deps = [
         "//deps/rabbitmq_cli:rabbitmqctl",
+        "@lager//:bazel_erlang_lib",
     ],
     extra_apps = [
         "xmerl",
diff --git a/deps/rabbitmq_stomp/BUILD.bazel b/deps/rabbitmq_stomp/BUILD.bazel
index 90832dd3e6..34538c811c 100644
--- a/deps/rabbitmq_stomp/BUILD.bazel
+++ b/deps/rabbitmq_stomp/BUILD.bazel
@@ -22,11 +22,16 @@ APP_ENV = """[
 	    {proxy_protocol, false}
 	  ]"""
 
+BUILD_DEPS = [
+    "//deps/rabbitmq_cli:rabbitmqctl",
+    "@lager//:bazel_erlang_lib",
+]
+
 DEPS = [
-    "@ranch//:bazel_erlang_lib",
-    "//deps/rabbit_common:bazel_erlang_lib",
-    "//deps/rabbit:bazel_erlang_lib",
     "//deps/amqp_client:bazel_erlang_lib",
+    "//deps/rabbit:bazel_erlang_lib",
+    "//deps/rabbit_common:bazel_erlang_lib",
+    "@ranch//:bazel_erlang_lib",
 ]
 
 rabbitmq_lib(
@@ -35,8 +40,6 @@ rabbitmq_lib(
     app_module = "rabbit_stomp",
     app_name = "rabbitmq_stomp",
     app_version = APP_VERSION,
-    build_deps = [
-        "//deps/rabbitmq_cli:rabbitmqctl",
-    ],
+    build_deps = BUILD_DEPS,
     deps = DEPS,
 )
diff --git a/deps/rabbitmq_web_dispatch/BUILD.bazel b/deps/rabbitmq_web_dispatch/BUILD.bazel
index fa3baabebb..df4e02c8ee 100644
--- a/deps/rabbitmq_web_dispatch/BUILD.bazel
+++ b/deps/rabbitmq_web_dispatch/BUILD.bazel
@@ -5,6 +5,9 @@ rabbitmq_lib(
     app_description = "RabbitMQ Web Dispatcher",
     app_module = "rabbit_web_dispatch_app",
     app_name = "rabbitmq_web_dispatch",
+    build_deps = [
+        "@lager//:bazel_erlang_lib",
+    ],
     extra_apps = [
         "inets",
     ],
diff --git a/workspace_helpers.bzl b/workspace_helpers.bzl
index bf48613796..399aab9442 100644
--- a/workspace_helpers.bzl
+++ b/workspace_helpers.bzl
@@ -1,5 +1,6 @@
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 load("@bazel-erlang//:github.bzl", "github_bazel_erlang_lib")
+load("@bazel-erlang//:hex_archive.bzl", "hex_archive")
 load("@bazel-erlang//:hex_pm.bzl", "hex_pm_bazel_erlang_lib")
 load("//:rabbitmq.bzl", "APP_VERSION")
 
@@ -115,11 +116,11 @@ def rabbitmq_external_deps(rabbitmq_workspace = "@rabbitmq-server"):
         org = "manopapad",
     )
 
-    http_archive(
+    hex_archive(
         name = "ra",
+        version = "1.1.8",
+        sha256 = "d7e399f8a09c8420bc90953f3464127063e53cef39f27e0af452ec51ad26ea9e",
         build_file = rabbitmq_workspace + "//:BUILD.ra",
-        strip_prefix = "ra-master",
-        urls = ["https://github.com/rabbitmq/ra/archive/master.zip"],
     )
 
     hex_pm_bazel_erlang_lib(