From fe07f4c930829eb66028a33aa370e7be1c40d307 Mon Sep 17 00:00:00 2001 From: Rin Kuryloski Date: Mon, 16 Oct 2023 16:17:44 +0200 Subject: [PATCH 1/8] Always reference seshat 0.6.1 Which is code-wise identical to 0.6.0 --- MODULE.bazel | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index bedd3b1fbc3e..d7b44ee7e3c5 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -334,12 +334,11 @@ erlang_package.hex_package( version = "2.7.0", ) -erlang_package.hex_package( +erlang_package.git_package( name = "seshat_alt", build_file = "@rabbitmq-server//bazel:BUILD.seshat", - pkg = "seshat", - sha256 = "7cef700f92831dd7cae6a6dd223ccc55ac88ecce0631ee9ab0f2b5fb70e79b90", - version = "0.6.0", + repository = "rabbitmq/seshat", + tag = "v0.6.1", ) erlang_package.hex_package( From ac1e6cc1cba027ccde016e83da22ffc920a84fdc Mon Sep 17 00:00:00 2001 From: Rin Kuryloski Date: Mon, 16 Oct 2023 16:20:18 +0200 Subject: [PATCH 2/8] Add khepri dep to rabbitmq_consistent_hash_exchange in Make --- deps/rabbit/Makefile | 2 -- deps/rabbitmq_consistent_hash_exchange/Makefile | 2 +- rabbitmq-components.mk | 2 ++ 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/deps/rabbit/Makefile b/deps/rabbit/Makefile index 36cd659633c0..5b89f72006ba 100644 --- a/deps/rabbit/Makefile +++ b/deps/rabbit/Makefile @@ -152,8 +152,6 @@ dep_osiris = git https://github.com/rabbitmq/osiris v1.6.9 dep_systemd = hex 0.6.1 dep_seshat = git https://github.com/rabbitmq/seshat v0.6.1 -dep_khepri = hex 0.8.0 -dep_khepri_mnesia_migration = hex 0.1.1 define usage_xml_to_erl $(subst __,_,$(patsubst $(DOCS_DIR)/rabbitmq%.1.xml, src/rabbit_%_usage.erl, $(subst -,_,$(1)))) diff --git a/deps/rabbitmq_consistent_hash_exchange/Makefile b/deps/rabbitmq_consistent_hash_exchange/Makefile index 4d02f402ccb5..f0e0d01d4d63 100644 --- a/deps/rabbitmq_consistent_hash_exchange/Makefile +++ b/deps/rabbitmq_consistent_hash_exchange/Makefile @@ -5,7 +5,7 @@ define PROJECT_APP_EXTRA_KEYS {broker_version_requirements, []} endef -DEPS = rabbit_common rabbit +DEPS = rabbit_common rabbit khepri khepri_mnesia_migration TEST_DEPS = rabbitmq_ct_helpers rabbitmq_ct_client_helpers amqp_client DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-plugin.mk diff --git a/rabbitmq-components.mk b/rabbitmq-components.mk index 0bc398d0088f..e4c969a0bb6c 100644 --- a/rabbitmq-components.mk +++ b/rabbitmq-components.mk @@ -114,6 +114,8 @@ dep_accept = hex 0.3.5 dep_cowboy = hex 2.10.0 dep_cowlib = hex 2.12.1 dep_credentials_obfuscation = hex 3.4.0 +dep_khepri = hex 0.8.0 +dep_khepri_mnesia_migration = hex 0.1.1 dep_looking_glass = git https://github.com/rabbitmq/looking_glass.git main dep_prometheus = hex 4.10.0 dep_ra = hex 2.7.0 From e4eaf0b80696d7ab1fbcb6eb490ea349d6ff014c Mon Sep 17 00:00:00 2001 From: Rin Kuryloski Date: Mon, 16 Oct 2023 16:21:23 +0200 Subject: [PATCH 3/8] Add khepri to rabbitmq_jms_topic_exchange deps --- deps/rabbitmq_jms_topic_exchange/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/rabbitmq_jms_topic_exchange/Makefile b/deps/rabbitmq_jms_topic_exchange/Makefile index 7d1dd52bfecf..6d4512bf8744 100644 --- a/deps/rabbitmq_jms_topic_exchange/Makefile +++ b/deps/rabbitmq_jms_topic_exchange/Makefile @@ -1,7 +1,7 @@ PROJECT = rabbitmq_jms_topic_exchange PROJECT_DESCRIPTION = RabbitMQ JMS topic selector exchange plugin -DEPS = rabbit_common rabbit +DEPS = rabbit_common rabbit khepri khepri_mnesia_migration TEST_DEPS = rabbitmq_ct_helpers rabbitmq_ct_client_helpers amqp_client DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-plugin.mk From 513e2668c5a86276e50aa0357e4177f00b3c3199 Mon Sep 17 00:00:00 2001 From: Rin Kuryloski Date: Mon, 16 Oct 2023 16:22:11 +0200 Subject: [PATCH 4/8] Add khepri to rabbitmq_recent_history_exchange deps --- deps/rabbitmq_recent_history_exchange/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/rabbitmq_recent_history_exchange/Makefile b/deps/rabbitmq_recent_history_exchange/Makefile index d4b71fdc4f00..9ee096ea9290 100644 --- a/deps/rabbitmq_recent_history_exchange/Makefile +++ b/deps/rabbitmq_recent_history_exchange/Makefile @@ -5,7 +5,7 @@ define PROJECT_APP_EXTRA_KEYS {broker_version_requirements, []} endef -DEPS = rabbit_common rabbit +DEPS = rabbit_common rabbit khepri khepri_mnesia_migration TEST_DEPS = rabbitmq_ct_helpers rabbitmq_ct_client_helpers amqp_client DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-plugin.mk From 3e8101536a7907e626ba550433ea44f30d23ad98 Mon Sep 17 00:00:00 2001 From: Rin Kuryloski Date: Mon, 16 Oct 2023 16:34:26 +0200 Subject: [PATCH 5/8] Remove mnesia from rabbitmq_management_agent deps in bazel it's not required and is not listed in the LOCAL_DEPS in the Makefile --- deps/rabbitmq_management_agent/BUILD.bazel | 2 -- 1 file changed, 2 deletions(-) diff --git a/deps/rabbitmq_management_agent/BUILD.bazel b/deps/rabbitmq_management_agent/BUILD.bazel index 32711733d9e6..775e8bad97a7 100644 --- a/deps/rabbitmq_management_agent/BUILD.bazel +++ b/deps/rabbitmq_management_agent/BUILD.bazel @@ -43,7 +43,6 @@ all_srcs(name = "all_srcs") test_suite_beam_files(name = "test_suite_beam_files") # gazelle:erlang_app_extra_app xmerl -# gazelle:erlang_app_extra_app mnesia # gazelle:erlang_app_extra_app ssl # gazelle:erlang_app_extra_app crypto # gazelle:erlang_app_extra_app public_key @@ -62,7 +61,6 @@ rabbitmq_app( beam_files = [":beam_files"], extra_apps = [ "crypto", - "mnesia", "public_key", "ssl", "xmerl", From 558b8d03f426a7d36cb28ef526cd496997796ee3 Mon Sep 17 00:00:00 2001 From: Rin Kuryloski Date: Mon, 16 Oct 2023 17:37:54 +0200 Subject: [PATCH 6/8] Remove mnesia from rabbitmq_management_agent deps in bazel it's not required and is not listed in the LOCAL_DEPS in the Makefile --- deps/rabbitmq_management/BUILD.bazel | 2 -- 1 file changed, 2 deletions(-) diff --git a/deps/rabbitmq_management/BUILD.bazel b/deps/rabbitmq_management/BUILD.bazel index 2de82451af80..67a3bc961f19 100644 --- a/deps/rabbitmq_management/BUILD.bazel +++ b/deps/rabbitmq_management/BUILD.bazel @@ -56,7 +56,6 @@ all_srcs(name = "all_srcs") test_suite_beam_files(name = "test_suite_beam_files") -# gazelle:erlang_app_extra_app mnesia # gazelle:erlang_app_extra_app ssl # gazelle:erlang_app_extra_app crypto # gazelle:erlang_app_extra_app public_key @@ -75,7 +74,6 @@ rabbitmq_app( beam_files = [":beam_files"], extra_apps = [ "crypto", - "mnesia", "public_key", "ssl", ], From 8404f0b4787eee5df0642221b7514b368fb8d0d8 Mon Sep 17 00:00:00 2001 From: Rin Kuryloski Date: Mon, 16 Oct 2023 17:38:50 +0200 Subject: [PATCH 7/8] Add osiris to rabbitmq_stream_management deps in Make --- deps/rabbitmq_stream_management/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/rabbitmq_stream_management/Makefile b/deps/rabbitmq_stream_management/Makefile index abd95655144e..cb2b4b0ff9cc 100644 --- a/deps/rabbitmq_stream_management/Makefile +++ b/deps/rabbitmq_stream_management/Makefile @@ -8,7 +8,7 @@ define PROJECT_ENV endef -DEPS = rabbit rabbitmq_management rabbitmq_stream +DEPS = rabbit rabbitmq_management rabbitmq_stream osiris TEST_DEPS = rabbitmq_ct_helpers rabbitmq_ct_client_helpers DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-plugin.mk From 887f2155459454b905399cf0d0316ddd84970630 Mon Sep 17 00:00:00 2001 From: Rin Kuryloski Date: Mon, 16 Oct 2023 18:10:50 +0200 Subject: [PATCH 8/8] Add mnesia to LOCAL_DEPS in rabbitmq_jms_topic_exchange it is present in the Bazel build, and if removed from the bazel side causes :dialyze to fail --- deps/rabbitmq_jms_topic_exchange/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/deps/rabbitmq_jms_topic_exchange/Makefile b/deps/rabbitmq_jms_topic_exchange/Makefile index 6d4512bf8744..d30c8823199c 100644 --- a/deps/rabbitmq_jms_topic_exchange/Makefile +++ b/deps/rabbitmq_jms_topic_exchange/Makefile @@ -3,6 +3,7 @@ PROJECT_DESCRIPTION = RabbitMQ JMS topic selector exchange plugin DEPS = rabbit_common rabbit khepri khepri_mnesia_migration TEST_DEPS = rabbitmq_ct_helpers rabbitmq_ct_client_helpers amqp_client +LOCAL_DEPS = mnesia DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-plugin.mk DEP_PLUGINS = rabbit_common/mk/rabbitmq-plugin.mk