Add message_containers_SUITE to bazel

and regen bazel files with gazelle from rules_erlang@main
rabbitmq · Apr 24, 2023 · 5f83a53 · 5f83a53
1 parent 15e6754
commit 5f83a53
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 29 deletions.
diff --git a/BUILD.bazel b/BUILD.bazel
@@ -56,7 +56,6 @@ exports_files([
 # gazelle:exclude deps/prometheus
 # gazelle:exclude deps/quantile_estimator
 # gazelle:exclude deps/ra
-# gazelle:exclude deps/rabbitmq_cli
 # gazelle:exclude deps/ranch
 # gazelle:exclude deps/recon
 # gazelle:exclude deps/redbug

diff --git a/deps/rabbit/BUILD.bazel b/deps/rabbit/BUILD.bazel
@@ -508,6 +508,11 @@ rabbitmq_integration_suite(
     size = "medium",
 )
 
+rabbitmq_integration_suite(
+    name = "message_containers_SUITE",
+    size = "medium",
+)
+
 rabbitmq_integration_suite(
     name = "metrics_SUITE",
     size = "medium",

diff --git a/deps/rabbit/app.bzl b/deps/rabbit/app.bzl
@@ -24,7 +24,7 @@ def all_beam_files(name = "all_beam_files"):
         app_name = "rabbit",
         dest = "ebin",
         erlc_opts = "//:erlc_opts",
-        deps = ["//deps/rabbit_common:erlang_app"],
+        deps = ["//deps/amqp10_common:erlang_app", "//deps/rabbit_common:erlang_app"],
     )
     erlang_bytecode(
         name = "other_beam",
@@ -82,7 +82,7 @@ def all_test_beam_files(name = "all_test_beam_files"):
         app_name = "rabbit",
         dest = "test",
         erlc_opts = "//:test_erlc_opts",
-        deps = ["//deps/rabbit_common:erlang_app"],
+        deps = ["//deps/amqp10_common:erlang_app", "//deps/rabbit_common:erlang_app"],
     )
     erlang_bytecode(
         name = "test_other_beam",
@@ -765,7 +765,6 @@ def test_suite_beam_files(name = "test_suite_beam_files"):
         hdrs = ["src/rabbit_stream_sac_coordinator.hrl"],
         app_name = "rabbit",
         erlc_opts = "//:test_erlc_opts",
-        deps = ["//deps/rabbit:erlang_app"],
     )
     erlang_bytecode(
         name = "rabbitmq_queues_cli_integration_SUITE_beam_files",

diff --git a/deps/rabbitmq_cli/BUILD.bazel b/deps/rabbitmq_cli/BUILD.bazel
@@ -15,21 +15,21 @@ rabbitmqctl(
     ] + glob([
         "lib/**/*.ex",
     ]),
-    license_files = glob(["LICENSE*"]),
-    visibility = ["//visibility:public"],
-    deps = [
-        "//deps/rabbit_common:erlang_app",
-        "@observer_cli//:erlang_app",
-        "@stdout_formatter//:erlang_app",
-    ],
     archives = [
         "@hex//:archive",
     ],
+    license_files = glob(["LICENSE*"]),
     source_deps = {
         "@csv//:sources": "csv",
         "@json//:sources": "json",
-        "@parallel_stream//:sources": "parallel_stream", # transitive dep of csv 2.x
+        "@parallel_stream//:sources": "parallel_stream",  # transitive dep of csv 2.x
     },
+    visibility = ["//visibility:public"],
+    deps = [
+        "//deps/rabbit_common:erlang_app",
+        "@observer_cli//:erlang_app",
+        "@stdout_formatter//:erlang_app",
+    ],
 )
 
 rabbitmq_home(
@@ -84,13 +84,13 @@ plt(
         "public_key",
         "runtime_tools",
     ],
+    ignore_warnings = True,
     libs = [":elixir"],
     deps = [
         ":elixir",
         "//deps/rabbit:erlang_app",
         "//deps/rabbit_common:erlang_app",
     ],
-    ignore_warnings = True,
 )
 
 dialyze(
@@ -114,29 +114,29 @@ rabbitmqctl_test(
         "lib/**/*.ex",
         "test/**/*.exs",
     ]),
-    data = glob(["test/fixtures/**/*"]),
-    flaky = True,
-    rabbitmq_run = ":rabbitmq-for-cli-tests-run",
-    tags = [STARTS_BACKGROUND_BROKER_TAG],
-    deps = [
-        "//deps/amqp_client:erlang_app",
-        "//deps/rabbit:erlang_app",
-        "//deps/rabbit_common:erlang_app",
-        "@observer_cli//:erlang_app",
-        "@stdout_formatter//:erlang_app",
-    ],
     archives = [
         "@hex//:archive",
     ],
+    data = glob(["test/fixtures/**/*"]),
+    flaky = True,
+    rabbitmq_run = ":rabbitmq-for-cli-tests-run",
     source_deps = {
         "@amqp//:sources": "amqp",
         "@csv//:sources": "csv",
         "@dialyxir//:sources": "dialyxir",
         "@json//:sources": "json",
-        "@parallel_stream//:sources": "parallel_stream", # transitive dep of csv 2.x
+        "@parallel_stream//:sources": "parallel_stream",  # transitive dep of csv 2.x
         "@temp//:sources": "temp",
         "@x509//:sources": "x509",
     },
+    tags = [STARTS_BACKGROUND_BROKER_TAG],
+    deps = [
+        "//deps/amqp_client:erlang_app",
+        "//deps/rabbit:erlang_app",
+        "//deps/rabbit_common:erlang_app",
+        "@observer_cli//:erlang_app",
+        "@stdout_formatter//:erlang_app",
+    ],
 )
 
 test_suite(

diff --git a/deps/rabbitmq_ct_client_helpers/BUILD.bazel b/deps/rabbitmq_ct_client_helpers/BUILD.bazel
@@ -33,7 +33,6 @@ rabbitmq_app(
     hdrs = [":public_hdrs"],
     app_name = "rabbitmq_ct_client_helpers",
     beam_files = [":beam_files"],
-    extra_apps = ["rabbit_common"],
     license_files = [":license_files"],
     priv = [":priv"],
     deps = [

diff --git a/deps/rabbitmq_ct_helpers/BUILD.bazel b/deps/rabbitmq_ct_helpers/BUILD.bazel
@@ -39,13 +39,12 @@ rabbitmq_app(
     hdrs = [":public_hdrs"],
     app_name = "rabbitmq_ct_helpers",
     beam_files = [":beam_files"],
-    extra_apps = ["inet_tcp_proxy"],
     license_files = [":license_files"],
     priv = [":priv"],
     deps = [
-        "//deps/meck:erlang_app",
-        "//deps/proper:erlang_app",
         "//deps/rabbit_common:erlang_app",
+        "@meck//:erlang_app",
+        "@proper//:erlang_app",
     ],
 )