Merge pull request #10827 from rabbitmq/mergify/bp/v3.13.x/pr-10825

PR #10761 follow ups (backport #10825)
rabbitmq · Mar 21, 2024 · 9de0029 · 9de0029
2 parents c8dd649 + b474452
commit 9de0029
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 26 deletions.
diff --git a/deps/rabbitmq_mqtt/include/rabbit_mqtt.hrl b/deps/rabbitmq_mqtt/include/rabbit_mqtt.hrl
@@ -12,7 +12,6 @@
 -define(PERSISTENT_TERM_EXCHANGE, mqtt_exchange).
 -define(DEFAULT_MQTT_EXCHANGE, <<"amq.topic">>).
 -define(MQTT_GUIDE_URL, <<"https://rabbitmq.com/docs/mqtt/">>).
--define(WEB_MQTT_GUIDE_URL, <<"https://rabbitmq.com/docs/web-mqtt/">>).
 
 -define(MQTT_TCP_PROTOCOL, 'mqtt').
 -define(MQTT_TLS_PROTOCOL, 'mqtt/ssl').

diff --git a/deps/rabbitmq_mqtt/test/command_SUITE.erl b/deps/rabbitmq_mqtt/test/command_SUITE.erl
@@ -56,24 +56,9 @@ end_per_suite(Config) ->
 init_per_group(unit, Config) ->
     Config;
 init_per_group(Group, Config) ->
+    ok = rabbit_ct_broker_helpers:enable_feature_flag(Config, delete_ra_cluster_mqtt_node),
     Config1 = rabbit_ct_helpers:set_config(Config, {mqtt_version, Group}),
-    case Group of
-        v4 ->
-            AllApps = rabbit_ct_broker_helpers:rpc_all(Config1, application, loaded_applications, []),
-            AllAppNames = lists:map(fun (AppList) ->
-               lists:map(fun ({Name, _, _}) -> Name end, AppList)
-            end, AllApps),
-            case lists:all(fun (NodeApps) ->
-                lists:member(rabbit_web_mqtt_app, NodeApps)
-            end, AllAppNames) of
-                true ->
-                    Config1;
-                false ->
-                    {skip, "rabbit_web_mqtt_app not available on all nodes"}
-            end;
-        v5 ->
-            util:maybe_skip_v5(Config1)
-    end.
+    util:maybe_skip_v5(Config1).
 
 end_per_group(_, Config) ->
     Config.

diff --git a/.../rabbitmq_web_mqtt/src/Elixir.RabbitMQ.CLI.Ctl.Commands.ListWebMqttConnectionsCommand.erl b/.../rabbitmq_web_mqtt/src/Elixir.RabbitMQ.CLI.Ctl.Commands.ListWebMqttConnectionsCommand.erl
@@ -59,7 +59,7 @@ usage_additional() ->
     ].
 
 usage_doc_guides() ->
-    [?WEB_MQTT_GUIDE_URL].
+    [<<"https://rabbitmq.com/docs/web-mqtt">>].
 
 run(Args, #{node := NodeName,
             timeout := Timeout,

diff --git a/deps/rabbitmq_web_mqtt/test/command_SUITE.erl b/deps/rabbitmq_web_mqtt/test/command_SUITE.erl
@@ -11,7 +11,9 @@
 -include_lib("eunit/include/eunit.hrl").
 -include_lib("amqp_client/include/amqp_client.hrl").
 -include_lib("rabbitmq_mqtt/include/rabbit_mqtt.hrl").
--import(rabbit_web_mqtt_test_util, [connect/3, connect/4]).
+
+-import(rabbit_web_mqtt_test_util,
+        [connect/3, connect/4]).
 
 -define(COMMAND, 'Elixir.RabbitMQ.CLI.Ctl.Commands.ListWebMqttConnectionsCommand').
 
@@ -53,12 +55,11 @@ end_per_suite(Config) ->
 
 init_per_group(unit, Config) ->
     Config;
-init_per_group(Group, Config) ->
-    case rabbit_ct_helpers:is_mixed_versions() of
-        true ->
-            {skip, "mixed version clusters are not supported"};
-        _ ->
-            rabbit_ct_helpers:set_config(Config, {mqtt_version, Group})
+init_per_group(v5 = V5, Config0) ->
+    Config = rabbit_ct_helpers:set_config(Config0, {mqtt_version, V5}),
+    case rabbit_ct_broker_helpers:enable_feature_flag(Config, mqtt_v5) of
+        ok -> Config;
+        {skip, _} = Skip -> Skip
     end.
 
 end_per_group(_, Config) ->