Test updated, and make use of binary type in cuttlefish to avoid conversions

Author: SimonUnge

deps/rabbit/priv/schema/rabbit.schema

@@ -2689,7 +2689,7 @@ fun(Conf) ->
 end}.
 
 {mapping, "cluster_tags.$tag", "rabbit.cluster_tags", [
-    {datatype, [string]}
+    {datatype, [binary]}
 ]}.
 
 {translation, "rabbit.cluster_tags",
@@ -2698,7 +2698,7 @@ fun(Conf) ->
         none -> [];
         _ ->
             Settings = cuttlefish_variable:filter_by_prefix("cluster_tags", Conf),
-            [ {K, V} || {[_, K], V} <- Settings]
+            [ {list_to_binary(K), V} || {[_, K], V} <- Settings]
     end
 end}.
 

deps/rabbitmq_management/src/rabbit_mgmt_wm_overview.erl

@@ -188,9 +188,6 @@ cluster_tags() ->
     case application:get_env(rabbit, cluster_tags) of
         undefined ->
             [];
-       {ok, Tags} ->
-            lists:map(fun({K, V}) ->
-                              {list_to_binary(K), list_to_binary(V)}
-                      end,
-                      Tags)
+        {ok, Tags} ->
+            Tags
     end.

deps/rabbitmq_management/test/rabbit_mgmt_http_SUITE.erl

@@ -106,6 +106,7 @@ definitions_group4_tests() ->
 
 
 all_tests() -> [
+                cluster_tags_test,
     cli_redirect_test,
     api_redirect_test,
     stats_redirect_test,
@@ -283,6 +284,11 @@ init_per_testcase(Testcase = disabled_qq_replica_opers_test, Config) ->
     rabbit_ct_broker_helpers:rpc_all(Config,
       application, set_env, [rabbitmq_management, restrictions, Restrictions]),
     rabbit_ct_helpers:testcase_started(Config, Testcase);
+init_per_testcase(Testcase = cluster_tags_test, Config) ->
+    Tags = [{<<"az">>, <<"us-east-3">>}, {<<"region">>,<<"us-east">>}, {<<"environment">>,<<"production">>}],
+    rabbit_ct_broker_helpers:rpc_all(Config,
+      application, set_env, [rabbit, cluster_tags, Tags]),
+    rabbit_ct_helpers:testcase_started(Config, Testcase);
 init_per_testcase(queues_detailed_test, Config) ->
     IsEnabled = rabbit_ct_broker_helpers:is_feature_flag_enabled(
                   Config, detailed_queues_endpoint),
@@ -3721,6 +3727,14 @@ rates_test(Config) ->
     http_delete(Config, "/queues/%2F/myqueue", ?NO_CONTENT),
     passed.
 
+cluster_tags_test(Config) ->
+    Overview = http_get(Config, "/overview"),
+    Tags = maps:get(cluster_tags, Overview),
+    ExpectedTags = #{az => <<"us-east-3">>,environment => <<"production">>,
+                     region => <<"us-east">>},
+    ?assertEqual(ExpectedTags, Tags),
+    passed.
+
 cli_redirect_test(Config) ->
     assert_permanent_redirect(Config, "cli", "/cli/index.html"),
     passed.