Adapt HTTP API test suite expectations

Author: michaelklishin

deps/rabbitmq_management/test/rabbit_mgmt_http_SUITE.erl

@@ -491,43 +491,43 @@ vhosts_trace_test(Config) ->
     passed.
 
 users_test(Config) ->
-    assert_item(#{name => <<"guest">>, tags => <<"administrator">>},
+    assert_item(#{name => <<"guest">>, tags => [<<"administrator">>]},
                 http_get(Config, "/whoami")),
     rabbit_ct_broker_helpers:rpc(Config, 0, application, set_env,
                                  [rabbitmq_management, login_session_timeout, 100]),
     assert_item(#{name => <<"guest">>,
-                  tags => <<"administrator">>,
+                  tags => [<<"administrator">>],
                   login_session_timeout => 100},
                 http_get(Config, "/whoami")),
     http_get(Config, "/users/myuser", ?NOT_FOUND),
     http_put_raw(Config, "/users/myuser", "Something not JSON", ?BAD_REQUEST),
     http_put(Config, "/users/myuser", [{flim, <<"flam">>}], ?BAD_REQUEST),
-    http_put(Config, "/users/myuser", [{tags,     <<"management">>},
+    http_put(Config, "/users/myuser", [{tags,     [<<"management">>]},
                                        {password, <<"myuser">>}],
              {group, '2xx'}),
     http_put(Config, "/users/myuser", [{password_hash, <<"not_hash">>}], ?BAD_REQUEST),
     http_put(Config, "/users/myuser", [{password_hash,
                                         <<"IECV6PZI/Invh0DL187KFpkO5Jc=">>},
                                        {tags, <<"management">>}], {group, '2xx'}),
-    assert_item(#{name => <<"myuser">>, tags => <<"management">>,
+    assert_item(#{name => <<"myuser">>, tags => [<<"management">>],
                   password_hash => <<"IECV6PZI/Invh0DL187KFpkO5Jc=">>,
                   hashing_algorithm => <<"rabbit_password_hashing_sha256">>},
                 http_get(Config, "/users/myuser")),
 
     http_put(Config, "/users/myuser", [{password_hash,
                                         <<"IECV6PZI/Invh0DL187KFpkO5Jc=">>},
                                        {hashing_algorithm, <<"rabbit_password_hashing_md5">>},
-                                       {tags, <<"management">>}], {group, '2xx'}),
-    assert_item(#{name => <<"myuser">>, tags => <<"management">>,
+                                       {tags, [<<"management">>]}], {group, '2xx'}),
+    assert_item(#{name => <<"myuser">>, tags => [<<"management">>],
                   password_hash => <<"IECV6PZI/Invh0DL187KFpkO5Jc=">>,
                   hashing_algorithm => <<"rabbit_password_hashing_md5">>},
                 http_get(Config, "/users/myuser")),
     http_put(Config, "/users/myuser", [{password, <<"password">>},
-                                       {tags, <<"administrator, foo">>}], {group, '2xx'}),
-    assert_item(#{name => <<"myuser">>, tags => <<"administrator,foo">>},
+                                       {tags, [<<"administrator">>, <<"foo">>]}], {group, '2xx'}),
+    assert_item(#{name => <<"myuser">>, tags => [<<"administrator">>, <<"foo">>]},
                 http_get(Config, "/users/myuser")),
-    assert_list(lists:sort([#{name => <<"myuser">>, tags => <<"administrator,foo">>},
-                 #{name => <<"guest">>, tags => <<"administrator">>}]),
+    assert_list(lists:sort([#{name => <<"myuser">>, tags => [<<"administrator">>, <<"foo">>]},
+                 #{name => <<"guest">>, tags => [<<"administrator">>]}]),
                 lists:sort(http_get(Config, "/users"))),
     test_auth(Config, ?OK, [auth_header("myuser", "password")]),
     http_delete(Config, "/users/myuser", {group, '2xx'}),
@@ -536,7 +536,7 @@ users_test(Config) ->
     passed.
 
 without_permissions_users_test(Config) ->
-    assert_item(#{name => <<"guest">>, tags => <<"administrator">>},
+    assert_item(#{name => <<"guest">>, tags => [<<"administrator">>]},
                 http_get(Config, "/whoami")),
     http_put(Config, "/users/myuser", [{password_hash,
                                         <<"IECV6PZI/Invh0DL187KFpkO5Jc=">>},
@@ -546,7 +546,7 @@ without_permissions_users_test(Config) ->
     http_put(Config, "/users/myuserwithoutpermissions", [{password_hash,
                                                           <<"IECV6PZI/Invh0DL187KFpkO5Jc=">>},
                                                          {tags, <<"management">>}], {group, '2xx'}),
-    assert_list([#{name => <<"myuserwithoutpermissions">>, tags => <<"management">>,
+    assert_list([#{name => <<"myuserwithoutpermissions">>, tags => [<<"management">>],
                    hashing_algorithm => <<"rabbit_password_hashing_sha256">>,
                    password_hash => <<"IECV6PZI/Invh0DL187KFpkO5Jc=">>}],
                 http_get(Config, "/users/without-permissions")),
@@ -555,7 +555,7 @@ without_permissions_users_test(Config) ->
     passed.
 
 users_bulk_delete_test(Config) ->
-    assert_item(#{name => <<"guest">>, tags => <<"administrator">>},
+    assert_item(#{name => <<"guest">>, tags => [<<"administrator">>]},
                 http_get(Config, "/whoami")),
     http_put(Config, "/users/myuser1", [{tags, <<"management">>}, {password, <<"myuser">>}],
              {group, '2xx'}),
@@ -584,9 +584,9 @@ users_legacy_administrator_test(Config) ->
     http_put(Config, "/users/myuser2", [{administrator, <<"false">>},
                                         {password,      <<"myuser2">>}],
              {group, '2xx'}),
-    assert_item(#{name => <<"myuser1">>, tags => <<"administrator">>},
+    assert_item(#{name => <<"myuser1">>, tags => [<<"administrator">>]},
                 http_get(Config, "/users/myuser1")),
-    assert_item(#{name => <<"myuser2">>, tags => <<"">>},
+    assert_item(#{name => <<"myuser2">>, tags => []},
                 http_get(Config, "/users/myuser2")),
     http_delete(Config, "/users/myuser1", {group, '2xx'}),
     http_delete(Config, "/users/myuser2", {group, '2xx'}),
@@ -685,7 +685,7 @@ updating_a_user_without_password_or_hash_clears_password_test(Config) ->
     %% clear users' credentials
     http_put(Config, "/users/myuser", [{tags,     <<"management">>}], [?CREATED, ?NO_CONTENT]),
     assert_item(#{name => <<"myuser">>,
-                  tags => <<"management">>,
+                  tags => [<<"management">>],
                   password_hash => <<>>,
                   hashing_algorithm => <<"rabbit_password_hashing_sha256">>},
                 http_get(Config, "/users/myuser")),
@@ -723,21 +723,21 @@ updating_tags_of_a_passwordless_user_test(Config) ->
     %% clear user's password
     http_put(Config, "/users/abc", [{tags,     <<"management">>}], [?CREATED, ?NO_CONTENT]),
     assert_item(#{name => ?NON_GUEST_USERNAME,
-                  tags => <<"management">>,
+                  tags => [<<"management">>],
                   password_hash => <<>>,
                   hashing_algorithm => <<"rabbit_password_hashing_sha256">>},
                 http_get(Config, "/users/abc")),
 
     http_put(Config, "/users/abc", [{tags,     <<"impersonator">>}], [?CREATED, ?NO_CONTENT]),
     assert_item(#{name => ?NON_GUEST_USERNAME,
-                  tags => <<"impersonator">>,
+                  tags => [<<"impersonator">>],
                   password_hash => <<>>,
                   hashing_algorithm => <<"rabbit_password_hashing_sha256">>},
                 http_get(Config, "/users/abc")),
 
     http_put(Config, "/users/abc", [{tags,     <<"">>}], [?CREATED, ?NO_CONTENT]),
     assert_item(#{name => ?NON_GUEST_USERNAME,
-                  tags => <<"">>,
+                  tags => [],
                   password_hash => <<>>,
                   hashing_algorithm => <<"rabbit_password_hashing_sha256">>},
                 http_get(Config, "/users/abc")),
@@ -1613,7 +1613,7 @@ definitions_test(Config) ->
          #{name              => <<"myuser">>,
            password_hash     => <<"WAbU0ZIcvjTpxM3Q3SbJhEAM2tQ=">>,
            hashing_algorithm => <<"rabbit_password_hashing_sha256">>,
-           tags              => <<"management">>}),
+           tags              => [<<"management">>]}),
     defs(Config, vhosts, "/vhosts/myvhost", put,
          #{name => <<"myvhost">>}),
     defs(Config, permissions, "/permissions/%2F/guest", put,
@@ -1788,7 +1788,7 @@ definitions_password_test(Config) ->
     Expected35 = #{name              => <<"myuser">>,
                    password_hash     => <<"WAbU0ZIcvjTpxM3Q3SbJhEAM2tQ=">>,
                    hashing_algorithm => <<"rabbit_password_hashing_md5">>,
-                   tags              => <<"management">>},
+                   tags              => [<<"management">>]},
     http_post(Config, "/definitions", Config35, {group, '2xx'}),
     Definitions35 = http_get(Config, "/definitions", ?OK),
     ct:pal("Definitions35: ~p", [Definitions35]),
@@ -1804,7 +1804,7 @@ definitions_password_test(Config) ->
     Expected36 = #{name              => <<"myuser">>,
                    password_hash     => <<"WAbU0ZIcvjTpxM3Q3SbJhEAM2tQ=">>,
                    hashing_algorithm => <<"rabbit_password_hashing_sha256">>,
-                   tags              => <<"management">>},
+                   tags              => [<<"management">>]},
     http_post(Config, "/definitions", Config36, {group, '2xx'}),
 
     Definitions36 = http_get(Config, "/definitions", ?OK),
@@ -1824,7 +1824,7 @@ definitions_password_test(Config) ->
     ExpectedDefault = #{name              => <<"myuser">>,
                         password_hash     => <<"WAbU0ZIcvjTpxM3Q3SbJhEAM2tQ=">>,
                         hashing_algorithm => <<"rabbit_password_hashing_sha512">>,
-                        tags              => <<"management">>},
+                        tags              => [<<"management">>]},
     http_post(Config, "/definitions", ConfigDefault, {group, '2xx'}),
 
     DefinitionsDefault = http_get(Config, "/definitions", ?OK),