From c1c450b5dfad53689ede0f43632cea583a0ce3d1 Mon Sep 17 00:00:00 2001
From: Michael Klishin <michael@clojurewerkz.org>
Date: Wed, 19 Apr 2023 09:47:25 +0400
Subject: [PATCH] rabbit/BUILD.bazel: resolve conflicts, bazel run gazelle

---
 deps/rabbit/BUILD.bazel | 17 ++++++-----------
 deps/rabbit/app.bzl     |  7 +++++++
 moduleindex.yaml        |  1 -
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/deps/rabbit/BUILD.bazel b/deps/rabbit/BUILD.bazel
index 49ca679662f2..636b69dceeed 100644
--- a/deps/rabbit/BUILD.bazel
+++ b/deps/rabbit/BUILD.bazel
@@ -762,12 +762,12 @@ rabbitmq_suite(
 
 rabbitmq_suite(
     name = "rabbit_stream_sac_coordinator_SUITE",
-    deps = [
-        "//deps/rabbit_common:erlang_app",
-    ],
     runtime_deps = [
         "@meck//:erlang_app",
     ],
+    deps = [
+        "//deps/rabbit_common:erlang_app",
+    ],
 )
 
 rabbitmq_integration_suite(
@@ -1017,15 +1017,10 @@ rabbitmq_integration_suite(
 rabbitmq_integration_suite(
     name = "vhost_SUITE",
     size = "medium",
-<<<<<<< HEAD
-    flaky = True,
-    additional_srcs = [
-        "test/test_rabbit_event_handler.erl",
-=======
     additional_beam = [
         "test/test_rabbit_event_handler.beam",
->>>>>>> 8de8f59d47 (Use gazelle generated bazel files)
     ],
+    flaky = True,
 )
 
 rabbitmq_suite(
@@ -1116,8 +1111,8 @@ rabbitmq_integration_suite(
 rabbitmq_integration_suite(
     name = "runtime_parameters_SUITE",
     size = "small",
-    additional_srcs = [
-        "test/dummy_runtime_parameters.erl",
+    additional_beam = [
+        "test/dummy_runtime_parameters.beam",
     ],
 )
 
diff --git a/deps/rabbit/app.bzl b/deps/rabbit/app.bzl
index 80efffd73d27..f1e64f11336d 100644
--- a/deps/rabbit/app.bzl
+++ b/deps/rabbit/app.bzl
@@ -1207,3 +1207,10 @@ def test_suite_beam_files(name = "test_suite_beam_files"):
         erlc_opts = "//:test_erlc_opts",
         deps = ["//deps/amqp_client:erlang_app"],
     )
+    erlang_bytecode(
+        name = "runtime_parameters_SUITE_beam_files",
+        testonly = True,
+        srcs = ["test/runtime_parameters_SUITE.erl"],
+        outs = ["test/runtime_parameters_SUITE.beam"],
+        erlc_opts = "//:test_erlc_opts",
+    )
diff --git a/moduleindex.yaml b/moduleindex.yaml
index 8d9b7c854d9b..9f0239b0f464 100755
--- a/moduleindex.yaml
+++ b/moduleindex.yaml
@@ -514,7 +514,6 @@ rabbit:
 - rabbit_cuttlefish
 - rabbit_db
 - rabbit_db_binding
-- rabbit_db_cluster
 - rabbit_db_exchange
 - rabbit_db_maintenance
 - rabbit_db_msup