Skip to content

Commit 50116f0

Browse files
committed
Require MQTT feature flags in 4.0
Require all MQTT feature flags and remove their compatibility code: * delete_ra_cluster_mqtt_node * rabbit_mqtt_qos0_queue * mqtt_v5 These feature flags were introduced in or before 3.13.0.
1 parent 6b6cf58 commit 50116f0

31 files changed

+144
-1421
lines changed

deps/rabbitmq_mqtt/BUILD.bazel

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@ rabbitmq_app(
8484
"//deps/amqp10_common:erlang_app",
8585
"//deps/rabbit:erlang_app",
8686
"//deps/rabbit_common:erlang_app",
87-
"@ra//:erlang_app",
8887
"@ranch//:erlang_app",
8988
],
9089
)
@@ -178,16 +177,6 @@ rabbitmq_integration_suite(
178177
name = "config_schema_SUITE",
179178
)
180179

181-
rabbitmq_integration_suite(
182-
name = "ff_SUITE",
183-
additional_beam = [
184-
":test_util_beam",
185-
],
186-
runtime_deps = [
187-
"@emqtt//:erlang_app",
188-
],
189-
)
190-
191180
rabbitmq_integration_suite(
192181
name = "java_SUITE",
193182
additional_beam = [
@@ -197,11 +186,6 @@ rabbitmq_integration_suite(
197186
sharding_method = "group",
198187
)
199188

200-
rabbitmq_suite(
201-
name = "mqtt_machine_SUITE",
202-
size = "small",
203-
)
204-
205189
rabbitmq_suite(
206190
name = "processor_SUITE",
207191
size = "small",

deps/rabbitmq_mqtt/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ BUILD_WITHOUT_QUIC=1
4444
export BUILD_WITHOUT_QUIC
4545

4646
LOCAL_DEPS = ssl
47-
DEPS = ranch rabbit_common rabbit ra amqp10_common
47+
DEPS = ranch rabbit_common rabbit amqp10_common
4848
TEST_DEPS = emqtt ct_helper rabbitmq_ct_helpers rabbitmq_ct_client_helpers rabbitmq_management rabbitmq_web_mqtt amqp_client rabbitmq_consistent_hash_exchange rabbitmq_amqp_client rabbitmq_stomp rabbitmq_stream
4949

5050
PLT_APPS += rabbitmqctl elixir

deps/rabbitmq_mqtt/app.bzl

Lines changed: 3 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,9 @@ def all_beam_files(name = "all_beam_files"):
1717
erlang_bytecode(
1818
name = "other_beam",
1919
srcs = [
20-
"src/Elixir.RabbitMQ.CLI.Ctl.Commands.DecommissionMqttNodeCommand.erl",
2120
"src/Elixir.RabbitMQ.CLI.Ctl.Commands.ListMqttConnectionsCommand.erl",
2221
"src/mc_mqtt.erl",
23-
"src/mqtt_machine.erl",
24-
"src/mqtt_machine_v0.erl",
25-
"src/mqtt_node.erl",
2622
"src/rabbit_mqtt.erl",
27-
"src/rabbit_mqtt_collector.erl",
2823
"src/rabbit_mqtt_confirms.erl",
2924
"src/rabbit_mqtt_ff.erl",
3025
"src/rabbit_mqtt_internal_event_handler.erl",
@@ -46,7 +41,7 @@ def all_beam_files(name = "all_beam_files"):
4641
beam = [":behaviours"],
4742
dest = "ebin",
4843
erlc_opts = "//:erlc_opts",
49-
deps = ["//deps/amqp10_common:erlang_app", "//deps/rabbit:erlang_app", "//deps/rabbit_common:erlang_app", "//deps/rabbitmq_cli:erlang_app", "@ra//:erlang_app", "@ranch//:erlang_app"],
44+
deps = ["//deps/amqp10_common:erlang_app", "//deps/rabbit:erlang_app", "//deps/rabbit_common:erlang_app", "//deps/rabbitmq_cli:erlang_app", "@ranch//:erlang_app"],
5045
)
5146

5247
def all_test_beam_files(name = "all_test_beam_files"):
@@ -68,14 +63,9 @@ def all_test_beam_files(name = "all_test_beam_files"):
6863
name = "test_other_beam",
6964
testonly = True,
7065
srcs = [
71-
"src/Elixir.RabbitMQ.CLI.Ctl.Commands.DecommissionMqttNodeCommand.erl",
7266
"src/Elixir.RabbitMQ.CLI.Ctl.Commands.ListMqttConnectionsCommand.erl",
7367
"src/mc_mqtt.erl",
74-
"src/mqtt_machine.erl",
75-
"src/mqtt_machine_v0.erl",
76-
"src/mqtt_node.erl",
7768
"src/rabbit_mqtt.erl",
78-
"src/rabbit_mqtt_collector.erl",
7969
"src/rabbit_mqtt_confirms.erl",
8070
"src/rabbit_mqtt_ff.erl",
8171
"src/rabbit_mqtt_internal_event_handler.erl",
@@ -102,7 +92,6 @@ def all_test_beam_files(name = "all_test_beam_files"):
10292
"//deps/rabbit:erlang_app",
10393
"//deps/rabbit_common:erlang_app",
10494
"//deps/rabbitmq_cli:erlang_app",
105-
"@ra//:erlang_app",
10695
"@ranch//:erlang_app",
10796
],
10897
)
@@ -127,14 +116,9 @@ def all_srcs(name = "all_srcs"):
127116
filegroup(
128117
name = "srcs",
129118
srcs = [
130-
"src/Elixir.RabbitMQ.CLI.Ctl.Commands.DecommissionMqttNodeCommand.erl",
131119
"src/Elixir.RabbitMQ.CLI.Ctl.Commands.ListMqttConnectionsCommand.erl",
132120
"src/mc_mqtt.erl",
133-
"src/mqtt_machine.erl",
134-
"src/mqtt_machine_v0.erl",
135-
"src/mqtt_node.erl",
136121
"src/rabbit_mqtt.erl",
137-
"src/rabbit_mqtt_collector.erl",
138122
"src/rabbit_mqtt_confirms.erl",
139123
"src/rabbit_mqtt_ff.erl",
140124
"src/rabbit_mqtt_internal_event_handler.erl",
@@ -156,8 +140,6 @@ def all_srcs(name = "all_srcs"):
156140
filegroup(
157141
name = "public_hdrs",
158142
srcs = [
159-
"include/mqtt_machine.hrl",
160-
"include/mqtt_machine_v0.hrl",
161143
"include/rabbit_mqtt.hrl",
162144
"include/rabbit_mqtt_packet.hrl",
163145
],
@@ -213,15 +195,7 @@ def test_suite_beam_files(name = "test_suite_beam_files"):
213195
app_name = "rabbitmq_mqtt",
214196
erlc_opts = "//:test_erlc_opts",
215197
)
216-
erlang_bytecode(
217-
name = "mqtt_machine_SUITE_beam_files",
218-
testonly = True,
219-
srcs = ["test/mqtt_machine_SUITE.erl"],
220-
outs = ["test/mqtt_machine_SUITE.beam"],
221-
hdrs = ["include/mqtt_machine.hrl"],
222-
app_name = "rabbitmq_mqtt",
223-
erlc_opts = "//:test_erlc_opts",
224-
)
198+
225199
erlang_bytecode(
226200
name = "processor_SUITE_beam_files",
227201
testonly = True,
@@ -280,14 +254,7 @@ def test_suite_beam_files(name = "test_suite_beam_files"):
280254
app_name = "rabbitmq_mqtt",
281255
erlc_opts = "//:test_erlc_opts",
282256
)
283-
erlang_bytecode(
284-
name = "ff_SUITE_beam_files",
285-
testonly = True,
286-
srcs = ["test/ff_SUITE.erl"],
287-
outs = ["test/ff_SUITE.beam"],
288-
app_name = "rabbitmq_mqtt",
289-
erlc_opts = "//:test_erlc_opts",
290-
)
257+
291258
erlang_bytecode(
292259
name = "shared_SUITE_beam_files",
293260
testonly = True,

deps/rabbitmq_mqtt/include/mqtt_machine.hrl

Lines changed: 0 additions & 25 deletions
This file was deleted.

deps/rabbitmq_mqtt/include/mqtt_machine_v0.hrl

Lines changed: 0 additions & 8 deletions
This file was deleted.

deps/rabbitmq_mqtt/src/Elixir.RabbitMQ.CLI.Ctl.Commands.DecommissionMqttNodeCommand.erl

Lines changed: 0 additions & 67 deletions
This file was deleted.

0 commit comments

Comments
 (0)