Skip to content

Commit 033d8c0

Browse files
dcorbachodcorbacho
committed
Rebase fix
Rebuilt .bazel files using gazelle
1 parent 78c64c9 commit 033d8c0

File tree

17 files changed

+341
-37
lines changed

17 files changed

+341
-37
lines changed

‎deps/rabbit/BUILD.bazel

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,8 @@ rabbitmq_app(
211211
priv = [":priv"],
212212
deps = [
213213
"//deps/amqp10_common:erlang_app",
214+
"//deps/khepri:erlang_app",
215+
"//deps/khepri_mnesia_migration:erlang_app",
214216
"//deps/rabbit/apps/rabbitmq_prelaunch:erlang_app",
215217
"//deps/rabbit_common:erlang_app",
216218
"@cuttlefish//:erlang_app",
@@ -572,11 +574,11 @@ rabbitmq_integration_suite(
572574
rabbitmq_integration_suite(
573575
name = "per_vhost_connection_limit_SUITE",
574576
size = "medium",
575-
flaky = True,
576-
shard_count = 10,
577577
additional_beam = [
578578
":cluster_rename_SUITE_beam_files",
579579
],
580+
flaky = True,
581+
shard_count = 10,
580582
)
581583

582584
rabbitmq_integration_suite(
@@ -1136,6 +1138,11 @@ rabbitmq_integration_suite(
11361138
],
11371139
)
11381140

1141+
rabbitmq_integration_suite(
1142+
name = "metadata_store_migration_SUITE",
1143+
size = "small",
1144+
)
1145+
11391146
rabbitmq_integration_suite(
11401147
name = "routing_SUITE",
11411148
size = "small",

‎deps/rabbit/app.bzl

Lines changed: 79 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -79,17 +79,25 @@ def all_beam_files(name = "all_beam_files"):
7979
"src/rabbit_cuttlefish.erl",
8080
"src/rabbit_db.erl",
8181
"src/rabbit_db_binding.erl",
82+
"src/rabbit_db_binding_m2k_converter.erl",
8283
"src/rabbit_db_cluster.erl",
8384
"src/rabbit_db_exchange.erl",
85+
"src/rabbit_db_exchange_m2k_converter.erl",
8486
"src/rabbit_db_maintenance.erl",
87+
"src/rabbit_db_maintenance_m2k_converter.erl",
8588
"src/rabbit_db_msup.erl",
89+
"src/rabbit_db_msup_m2k_converter.erl",
8690
"src/rabbit_db_policy.erl",
8791
"src/rabbit_db_queue.erl",
92+
"src/rabbit_db_queue_m2k_converter.erl",
8893
"src/rabbit_db_rtparams.erl",
94+
"src/rabbit_db_rtparams_m2k_converter.erl",
8995
"src/rabbit_db_topic_exchange.erl",
9096
"src/rabbit_db_user.erl",
97+
"src/rabbit_db_user_m2k_converter.erl",
9198
"src/rabbit_db_vhost.erl",
9299
"src/rabbit_db_vhost_defaults.erl",
100+
"src/rabbit_db_vhost_m2k_converter.erl",
93101
"src/rabbit_dead_letter.erl",
94102
"src/rabbit_definitions.erl",
95103
"src/rabbit_definitions_hashing.erl",
@@ -128,6 +136,7 @@ def all_beam_files(name = "all_beam_files"):
128136
"src/rabbit_global_counters.erl",
129137
"src/rabbit_guid.erl",
130138
"src/rabbit_health_check.erl",
139+
"src/rabbit_khepri.erl",
131140
"src/rabbit_limiter.erl",
132141
"src/rabbit_log_channel.erl",
133142
"src/rabbit_log_connection.erl",
@@ -231,6 +240,8 @@ def all_beam_files(name = "all_beam_files"):
231240
erlc_opts = "//:erlc_opts",
232241
deps = [
233242
"//deps/amqp10_common:erlang_app",
243+
"//deps/khepri:erlang_app",
244+
"//deps/khepri_mnesia_migration:erlang_app",
234245
"//deps/rabbit_common:erlang_app",
235246
"@ra//:erlang_app",
236247
"@ranch//:erlang_app",
@@ -319,17 +330,25 @@ def all_test_beam_files(name = "all_test_beam_files"):
319330
"src/rabbit_cuttlefish.erl",
320331
"src/rabbit_db.erl",
321332
"src/rabbit_db_binding.erl",
333+
"src/rabbit_db_binding_m2k_converter.erl",
322334
"src/rabbit_db_cluster.erl",
323335
"src/rabbit_db_exchange.erl",
336+
"src/rabbit_db_exchange_m2k_converter.erl",
324337
"src/rabbit_db_maintenance.erl",
338+
"src/rabbit_db_maintenance_m2k_converter.erl",
325339
"src/rabbit_db_msup.erl",
340+
"src/rabbit_db_msup_m2k_converter.erl",
326341
"src/rabbit_db_policy.erl",
327342
"src/rabbit_db_queue.erl",
343+
"src/rabbit_db_queue_m2k_converter.erl",
328344
"src/rabbit_db_rtparams.erl",
345+
"src/rabbit_db_rtparams_m2k_converter.erl",
329346
"src/rabbit_db_topic_exchange.erl",
330347
"src/rabbit_db_user.erl",
348+
"src/rabbit_db_user_m2k_converter.erl",
331349
"src/rabbit_db_vhost.erl",
332350
"src/rabbit_db_vhost_defaults.erl",
351+
"src/rabbit_db_vhost_m2k_converter.erl",
333352
"src/rabbit_dead_letter.erl",
334353
"src/rabbit_definitions.erl",
335354
"src/rabbit_definitions_hashing.erl",
@@ -368,6 +387,7 @@ def all_test_beam_files(name = "all_test_beam_files"):
368387
"src/rabbit_global_counters.erl",
369388
"src/rabbit_guid.erl",
370389
"src/rabbit_health_check.erl",
390+
"src/rabbit_khepri.erl",
371391
"src/rabbit_limiter.erl",
372392
"src/rabbit_log_channel.erl",
373393
"src/rabbit_log_connection.erl",
@@ -471,6 +491,8 @@ def all_test_beam_files(name = "all_test_beam_files"):
471491
erlc_opts = "//:test_erlc_opts",
472492
deps = [
473493
"//deps/amqp10_common:erlang_app",
494+
"//deps/khepri:erlang_app",
495+
"//deps/khepri_mnesia_migration:erlang_app",
474496
"//deps/rabbit_common:erlang_app",
475497
"@ra//:erlang_app",
476498
"@ranch//:erlang_app",
@@ -493,6 +515,7 @@ def all_srcs(name = "all_srcs"):
493515
"include/amqqueue.hrl",
494516
"include/amqqueue_v2.hrl",
495517
"include/gm_specs.hrl",
518+
"include/internal_user.hrl",
496519
"include/rabbit_global_counters.hrl",
497520
"include/vhost.hrl",
498521
"include/vhost_v2.hrl",
@@ -509,6 +532,7 @@ def all_srcs(name = "all_srcs"):
509532
filegroup(
510533
name = "private_hdrs",
511534
srcs = [
535+
"src/mirrored_supervisor.hrl",
512536
"src/rabbit_fifo.hrl",
513537
"src/rabbit_fifo_dlx.hrl",
514538
"src/rabbit_fifo_v0.hrl",
@@ -574,17 +598,25 @@ def all_srcs(name = "all_srcs"):
574598
"src/rabbit_cuttlefish.erl",
575599
"src/rabbit_db.erl",
576600
"src/rabbit_db_binding.erl",
601+
"src/rabbit_db_binding_m2k_converter.erl",
577602
"src/rabbit_db_cluster.erl",
578603
"src/rabbit_db_exchange.erl",
604+
"src/rabbit_db_exchange_m2k_converter.erl",
579605
"src/rabbit_db_maintenance.erl",
606+
"src/rabbit_db_maintenance_m2k_converter.erl",
580607
"src/rabbit_db_msup.erl",
608+
"src/rabbit_db_msup_m2k_converter.erl",
581609
"src/rabbit_db_policy.erl",
582610
"src/rabbit_db_queue.erl",
611+
"src/rabbit_db_queue_m2k_converter.erl",
583612
"src/rabbit_db_rtparams.erl",
613+
"src/rabbit_db_rtparams_m2k_converter.erl",
584614
"src/rabbit_db_topic_exchange.erl",
585615
"src/rabbit_db_user.erl",
616+
"src/rabbit_db_user_m2k_converter.erl",
586617
"src/rabbit_db_vhost.erl",
587618
"src/rabbit_db_vhost_defaults.erl",
619+
"src/rabbit_db_vhost_m2k_converter.erl",
588620
"src/rabbit_dead_letter.erl",
589621
"src/rabbit_definitions.erl",
590622
"src/rabbit_definitions_hashing.erl",
@@ -624,6 +656,7 @@ def all_srcs(name = "all_srcs"):
624656
"src/rabbit_global_counters.erl",
625657
"src/rabbit_guid.erl",
626658
"src/rabbit_health_check.erl",
659+
"src/rabbit_khepri.erl",
627660
"src/rabbit_limiter.erl",
628661
"src/rabbit_log_channel.erl",
629662
"src/rabbit_log_connection.erl",
@@ -780,7 +813,7 @@ def test_suite_beam_files(name = "test_suite_beam_files"):
780813
outs = ["test/classic_queue_prop_SUITE.beam"],
781814
app_name = "rabbit",
782815
erlc_opts = "//:test_erlc_opts",
783-
deps = ["//deps/amqp_client:erlang_app", "@proper//:erlang_app"],
816+
deps = ["//deps/amqp_client:erlang_app", "//deps/proper:erlang_app"],
784817
)
785818
erlang_bytecode(
786819
name = "cluster_SUITE_beam_files",
@@ -825,7 +858,7 @@ def test_suite_beam_files(name = "test_suite_beam_files"):
825858
outs = ["test/confirms_rejects_SUITE.beam"],
826859
app_name = "rabbit",
827860
erlc_opts = "//:test_erlc_opts",
828-
deps = ["//deps/amqp_client:erlang_app"],
861+
deps = ["//deps/amqp_client:erlang_app", "//deps/rabbitmq_ct_helpers:erlang_app"],
829862
)
830863
erlang_bytecode(
831864
name = "consumer_timeout_SUITE_beam_files",
@@ -896,7 +929,7 @@ def test_suite_beam_files(name = "test_suite_beam_files"):
896929
outs = ["test/dynamic_ha_SUITE.beam"],
897930
app_name = "rabbit",
898931
erlc_opts = "//:test_erlc_opts",
899-
deps = ["//deps/amqp_client:erlang_app", "//deps/rabbitmq_ct_helpers:erlang_app", "@proper//:erlang_app"],
932+
deps = ["//deps/amqp_client:erlang_app", "//deps/proper:erlang_app", "//deps/rabbitmq_ct_helpers:erlang_app"],
900933
)
901934
erlang_bytecode(
902935
name = "dynamic_qq_SUITE_beam_files",
@@ -985,7 +1018,7 @@ def test_suite_beam_files(name = "test_suite_beam_files"):
9851018
outs = ["test/lqueue_SUITE.beam"],
9861019
app_name = "rabbit",
9871020
erlc_opts = "//:test_erlc_opts",
988-
deps = ["@proper//:erlang_app"],
1021+
deps = ["//deps/proper:erlang_app"],
9891022
)
9901023
erlang_bytecode(
9911024
name = "maintenance_mode_SUITE_beam_files",
@@ -1021,7 +1054,7 @@ def test_suite_beam_files(name = "test_suite_beam_files"):
10211054
outs = ["test/metrics_SUITE.beam"],
10221055
app_name = "rabbit",
10231056
erlc_opts = "//:test_erlc_opts",
1024-
deps = ["//deps/amqp_client:erlang_app", "//deps/rabbit_common:erlang_app", "//deps/rabbitmq_ct_helpers:erlang_app", "@proper//:erlang_app"],
1057+
deps = ["//deps/amqp_client:erlang_app", "//deps/proper:erlang_app", "//deps/rabbit_common:erlang_app", "//deps/rabbitmq_ct_helpers:erlang_app"],
10251058
)
10261059
erlang_bytecode(
10271060
name = "mirrored_supervisor_SUITE_beam_files",
@@ -1253,7 +1286,7 @@ def test_suite_beam_files(name = "test_suite_beam_files"):
12531286
outs = ["test/rabbit_direct_reply_to_prop_SUITE.beam"],
12541287
app_name = "rabbit",
12551288
erlc_opts = "//:test_erlc_opts",
1256-
deps = ["@proper//:erlang_app"],
1289+
deps = ["//deps/proper:erlang_app"],
12571290
)
12581291
erlang_bytecode(
12591292
name = "rabbit_fifo_SUITE_beam_files",
@@ -1301,7 +1334,7 @@ def test_suite_beam_files(name = "test_suite_beam_files"):
13011334
hdrs = ["src/rabbit_fifo.hrl", "src/rabbit_fifo_dlx.hrl"],
13021335
app_name = "rabbit",
13031336
erlc_opts = "//:test_erlc_opts",
1304-
deps = ["//deps/rabbit_common:erlang_app", "@proper//:erlang_app"],
1337+
deps = ["//deps/proper:erlang_app", "//deps/rabbit_common:erlang_app"],
13051338
)
13061339
erlang_bytecode(
13071340
name = "rabbit_fifo_v0_SUITE_beam_files",
@@ -1339,7 +1372,7 @@ def test_suite_beam_files(name = "test_suite_beam_files"):
13391372
outs = ["test/rabbit_stream_queue_SUITE.beam"],
13401373
app_name = "rabbit",
13411374
erlc_opts = "//:test_erlc_opts",
1342-
deps = ["//deps/amqp_client:erlang_app", "//deps/rabbitmq_ct_helpers:erlang_app", "@proper//:erlang_app"],
1375+
deps = ["//deps/amqp_client:erlang_app", "//deps/proper:erlang_app", "//deps/rabbitmq_ct_helpers:erlang_app"],
13431376
)
13441377
erlang_bytecode(
13451378
name = "rabbit_stream_sac_coordinator_SUITE_beam_files",
@@ -1419,7 +1452,7 @@ def test_suite_beam_files(name = "test_suite_beam_files"):
14191452
outs = ["test/term_to_binary_compat_prop_SUITE.beam"],
14201453
app_name = "rabbit",
14211454
erlc_opts = "//:test_erlc_opts",
1422-
deps = ["//deps/rabbit_common:erlang_app", "@proper//:erlang_app"],
1455+
deps = ["//deps/proper:erlang_app", "//deps/rabbit_common:erlang_app"],
14231456
)
14241457
erlang_bytecode(
14251458
name = "test_channel_operation_timeout_test_queue_beam",
@@ -1579,7 +1612,7 @@ def test_suite_beam_files(name = "test_suite_beam_files"):
15791612
outs = ["test/unit_access_control_credential_validation_SUITE.beam"],
15801613
app_name = "rabbit",
15811614
erlc_opts = "//:test_erlc_opts",
1582-
deps = ["@proper//:erlang_app"],
1615+
deps = ["//deps/proper:erlang_app"],
15831616
)
15841617
erlang_bytecode(
15851618
name = "unit_amqp091_content_framing_SUITE_beam_files",
@@ -1936,3 +1969,39 @@ def test_suite_beam_files(name = "test_suite_beam_files"):
19361969
app_name = "rabbit",
19371970
erlc_opts = "//:test_erlc_opts",
19381971
)
1972+
erlang_bytecode(
1973+
name = "metadata_store_clustering_SUITE_beam_files",
1974+
testonly = True,
1975+
srcs = ["test/metadata_store_clustering_SUITE.erl"],
1976+
outs = ["test/metadata_store_clustering_SUITE.beam"],
1977+
app_name = "rabbit",
1978+
erlc_opts = "//:test_erlc_opts",
1979+
deps = ["//deps/amqp_client:erlang_app", "//deps/rabbitmq_ct_helpers:erlang_app"],
1980+
)
1981+
erlang_bytecode(
1982+
name = "metadata_store_migration_SUITE_beam_files",
1983+
testonly = True,
1984+
srcs = ["test/metadata_store_migration_SUITE.erl"],
1985+
outs = ["test/metadata_store_migration_SUITE.beam"],
1986+
app_name = "rabbit",
1987+
erlc_opts = "//:test_erlc_opts",
1988+
deps = ["//deps/amqp_client:erlang_app"],
1989+
)
1990+
erlang_bytecode(
1991+
name = "metadata_store_phase1_SUITE_beam_files",
1992+
testonly = True,
1993+
srcs = ["test/metadata_store_phase1_SUITE.erl"],
1994+
outs = ["test/metadata_store_phase1_SUITE.beam"],
1995+
app_name = "rabbit",
1996+
erlc_opts = "//:test_erlc_opts",
1997+
deps = ["//deps/khepri:erlang_app", "//deps/rabbit_common:erlang_app"],
1998+
)
1999+
erlang_bytecode(
2000+
name = "routing_SUITE_beam_files",
2001+
testonly = True,
2002+
srcs = ["test/routing_SUITE.erl"],
2003+
outs = ["test/routing_SUITE.beam"],
2004+
app_name = "rabbit",
2005+
erlc_opts = "//:test_erlc_opts",
2006+
deps = ["//deps/amqp_client:erlang_app"],
2007+
)

‎deps/rabbit_common/BUILD.bazel

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@ rabbitmq_app(
121121
"xmerl",
122122
"os_mon",
123123
"runtime_tools",
124+
"khepri",
124125
],
125126
license_files = [":license_files"],
126127
priv = [":priv"],
@@ -130,11 +131,6 @@ rabbitmq_app(
130131
"@recon//:erlang_app",
131132
"@thoas//:erlang_app",
132133
],
133-
<<<<<<< HEAD
134-
=======
135-
runtime_deps = RUNTIME_DEPS,
136-
deps = DEPS,
137-
>>>>>>> 0405503343 (Khepri: The One Commit)
138134
)
139135

140136
xref(

‎deps/rabbit_common/app.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@ def test_suite_beam_files(name = "test_suite_beam_files"):
346346
hdrs = ["include/rabbit.hrl", "include/rabbit_memory.hrl", "include/resource.hrl"],
347347
app_name = "rabbit_common",
348348
erlc_opts = "//:test_erlc_opts",
349-
deps = ["@proper//:erlang_app"],
349+
deps = ["//deps/proper:erlang_app"],
350350
)
351351
erlang_bytecode(
352352
name = "unit_priority_queue_SUITE_beam_files",

‎deps/rabbitmq_consistent_hash_exchange/BUILD.bazel

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ rabbitmq_app(
3939
license_files = [":license_files"],
4040
priv = [":priv"],
4141
deps = [
42+
"//deps/khepri:erlang_app",
43+
"//deps/khepri_mnesia_migration:erlang_app",
4244
"//deps/rabbit:erlang_app",
4345
"//deps/rabbit_common:erlang_app",
4446
],
@@ -90,3 +92,5 @@ alias(
9092
actual = ":erlang_app",
9193
visibility = ["//visibility:public"],
9294
)
95+
96+
all_test_beam_files(name = "all_test_beam_files")

‎deps/rabbitmq_consistent_hash_exchange/app.bzl

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,16 @@ def all_beam_files(name = "all_beam_files"):
1111
srcs = [
1212
"src/Elixir.RabbitMQ.CLI.Diagnostics.Commands.ConsistentHashExchangeRingStateCommand.erl",
1313
"src/rabbit_db_ch_exchange.erl",
14+
"src/rabbit_db_ch_exchange_m2k_converter.erl",
1415
"src/rabbit_exchange_type_consistent_hash.erl",
1516
],
1617
hdrs = [":public_and_private_hdrs"],
1718
app_name = "rabbitmq_consistent_hash_exchange",
1819
dest = "ebin",
1920
erlc_opts = "//:erlc_opts",
2021
deps = [
22+
"//deps/khepri:erlang_app",
23+
"//deps/khepri_mnesia_migration:erlang_app",
2124
"//deps/rabbit:erlang_app",
2225
"//deps/rabbit_common:erlang_app",
2326
"//deps/rabbitmq_cli:erlang_app",
@@ -36,13 +39,16 @@ def all_test_beam_files(name = "all_test_beam_files"):
3639
srcs = [
3740
"src/Elixir.RabbitMQ.CLI.Diagnostics.Commands.ConsistentHashExchangeRingStateCommand.erl",
3841
"src/rabbit_db_ch_exchange.erl",
42+
"src/rabbit_db_ch_exchange_m2k_converter.erl",
3943
"src/rabbit_exchange_type_consistent_hash.erl",
4044
],
4145
hdrs = [":public_and_private_hdrs"],
4246
app_name = "rabbitmq_consistent_hash_exchange",
4347
dest = "test",
4448
erlc_opts = "//:test_erlc_opts",
4549
deps = [
50+
"//deps/khepri:erlang_app",
51+
"//deps/khepri_mnesia_migration:erlang_app",
4652
"//deps/rabbit:erlang_app",
4753
"//deps/rabbit_common:erlang_app",
4854
"//deps/rabbitmq_cli:erlang_app",
@@ -68,6 +74,7 @@ def all_srcs(name = "all_srcs"):
6874
srcs = [
6975
"src/Elixir.RabbitMQ.CLI.Diagnostics.Commands.ConsistentHashExchangeRingStateCommand.erl",
7076
"src/rabbit_db_ch_exchange.erl",
77+
"src/rabbit_db_ch_exchange_m2k_converter.erl",
7178
"src/rabbit_exchange_type_consistent_hash.erl",
7279
],
7380
)

‎deps/rabbitmq_ct_client_helpers/BUILD.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ rabbitmq_app(
3333
hdrs = [":public_hdrs"],
3434
app_name = "rabbitmq_ct_client_helpers",
3535
beam_files = [":beam_files"],
36+
extra_apps = ["rabbit_common"],
3637
license_files = [":license_files"],
3738
priv = [":priv"],
3839
deps = [

0 commit comments

Comments
 (0)