'make dialyze' passes past the per-user limit changes

6 files changed, 55 insertions, 25 deletions

diff --git a/src/internal_user.erl b/src/internal_user.erl
index 38511fac74..b2bdcb6785 100644
--- a/src/internal_user.erl
+++ b/src/internal_user.erl
@@ -49,10 +49,10 @@
     limits = #{} :: map() | '_'}).
 
 -type(internal_user_v2() ::
-        #internal_user{username          :: username(),
-                       password_hash     :: password_hash(),
-                       tags              :: [atom()],
-                       hashing_algorithm :: atom(),
+        #internal_user{username          :: username() | '_',
+                       password_hash     :: password_hash() | '_',
+                       tags              :: [atom()] | '_',
+                       hashing_algorithm :: atom() | '_',
                        limits            :: map()}).
 
 -type internal_user_pattern() :: internal_user_v1:internal_user_v1_pattern() |
@@ -77,7 +77,11 @@
 new() ->
     case record_version_to_use() of
         ?record_version ->
-            #internal_user{};
+            #internal_user{
+                username = <<"">>,
+                password_hash = <<"">>,
+                tags = []
+            };
         _ ->
             internal_user_v1:new()
     end.
@@ -86,14 +90,23 @@ new() ->
 new({hashing_algorithm, HashingAlgorithm}) ->
     case record_version_to_use() of
         ?record_version ->
-            #internal_user{hashing_algorithm = HashingAlgorithm};
+            #internal_user{
+                username = <<"">>,
+                password_hash = <<"">>,
+                tags = [],
+                hashing_algorithm = HashingAlgorithm
+            };
         _ ->
             internal_user_v1:new({hashing_algorithm, HashingAlgorithm})
     end;
 new({tags, Tags}) ->
     case record_version_to_use() of
 	?record_version ->
-	    #internal_user{tags = Tags};
+	    #internal_user{
+            username = <<"">>,
+            password_hash = <<"">>,
+            tags = Tags
+        };
 	_ ->
 	    internal_user_v1:new({tags, Tags})
     end.
diff --git a/src/internal_user_v1.erl b/src/internal_user_v1.erl
index 0a290e5c53..edb956436f 100644
--- a/src/internal_user_v1.erl
+++ b/src/internal_user_v1.erl
@@ -69,13 +69,26 @@ record_version_to_use() ->
 
 -spec new() -> internal_user().
 new() ->
-    #internal_user{}.
+    #internal_user{
+        username = <<"">>,
+        password_hash = <<"">>,
+        tags = []
+    }.
 
 -spec new(tuple()) -> internal_user().
 new({hashing_algorithm, HashingAlgorithm}) ->
-    #internal_user{hashing_algorithm = HashingAlgorithm};
+    #internal_user{
+        username = <<"">>,
+        password_hash = <<"">>,
+        hashing_algorithm = HashingAlgorithm,
+        tags = []
+    };
 new({tags, Tags}) ->
-    #internal_user{tags = Tags}.
+    #internal_user{
+        username = <<"">>,
+        password_hash = <<"">>,
+        tags = Tags
+    }.
 
 -spec fields() -> list().
 fields() -> fields(?record_version).
diff --git a/src/rabbit_channel_tracking.erl b/src/rabbit_channel_tracking.erl
index 2dbc4d0cf3..52b84dc90b 100644
--- a/src/rabbit_channel_tracking.erl
+++ b/src/rabbit_channel_tracking.erl
@@ -56,7 +56,8 @@ boot() ->
 -spec update_tracked(term()) -> ok.
 
 update_tracked(Event) ->
-    spawn(?MODULE, handle_cast, [Event]).
+    spawn(?MODULE, handle_cast, [Event]),
+    ok.
 
 %% Asynchronously handle update events
 -spec handle_cast(term()) -> ok.
@@ -163,7 +164,8 @@ count_tracked_items_in({user, Username}) ->
 -spec clear_tracking_tables() -> ok.
 
 clear_tracking_tables() ->
-    clear_tracked_channel_tables_for_this_node().
+    clear_tracked_channel_tables_for_this_node(),
+    ok.
 
 -spec shutdown_tracked_items(list(), term()) -> ok.
 
diff --git a/src/rabbit_channel_tracking_handler.erl b/src/rabbit_channel_tracking_handler.erl
index 83e5343a7e..0cbe02f39e 100644
--- a/src/rabbit_channel_tracking_handler.erl
+++ b/src/rabbit_channel_tracking_handler.erl
@@ -40,20 +40,20 @@ init([]) ->
     {ok, []}.
 
 handle_event(#event{type = channel_created, props = Details}, State) ->
-    _Pid = rabbit_channel_tracking:update_tracked({channel_created, Details}),
+    ok = rabbit_channel_tracking:update_tracked({channel_created, Details}),
     {ok, State};
 handle_event(#event{type = channel_closed, props = Details}, State) ->
-    _Pid = rabbit_channel_tracking:update_tracked({channel_closed, Details}),
+    ok = rabbit_channel_tracking:update_tracked({channel_closed, Details}),
     {ok, State};
 handle_event(#event{type = connection_closed, props = Details}, State) ->
-    _Pid = rabbit_channel_tracking:update_tracked({connection_closed, Details}),
+    ok = rabbit_channel_tracking:update_tracked({connection_closed, Details}),
     {ok, State};
 handle_event(#event{type = user_deleted, props = Details}, State) ->
-    _Pid = rabbit_channel_tracking:update_tracked({user_deleted, Details}),
+    ok = rabbit_channel_tracking:update_tracked({user_deleted, Details}),
     {ok, State};
 %% A node had been deleted from the cluster.
 handle_event(#event{type = node_deleted, props = Details}, State) ->
-    _Pid = rabbit_channel_tracking:update_tracked({node_deleted, Details}),
+    ok = rabbit_channel_tracking:update_tracked({node_deleted, Details}),
     {ok, State};
 handle_event(_Event, State) ->
     {ok, State}.
diff --git a/src/rabbit_connection_tracking.erl b/src/rabbit_connection_tracking.erl
index c1faf6a66e..c0704e6a7c 100644
--- a/src/rabbit_connection_tracking.erl
+++ b/src/rabbit_connection_tracking.erl
@@ -85,7 +85,8 @@ boot() ->
 -spec update_tracked(term()) -> ok.
 
 update_tracked(Event) ->
-    spawn(?MODULE, handle_cast, [Event]).
+    spawn(?MODULE, handle_cast, [Event]),
+    ok.
 
 %% Asynchronously handle update events
 -spec handle_cast(term()) -> ok.
@@ -283,7 +284,8 @@ ensure_per_user_tracked_connections_table_for_node(Node) ->
 
 clear_tracked_connection_tables_for_this_node() ->
     [rabbit_tracking:clear_tracking_table(T)
-        || T <- get_all_tracked_connection_table_names_for_node(node())].
+        || T <- get_all_tracked_connection_table_names_for_node(node())],
+    ok.
 
 -spec delete_tracked_connections_table_for_node(node()) -> ok.
 
diff --git a/src/rabbit_connection_tracking_handler.erl b/src/rabbit_connection_tracking_handler.erl
index 8b9e44445f..17085d805a 100644
--- a/src/rabbit_connection_tracking_handler.erl
+++ b/src/rabbit_connection_tracking_handler.erl
@@ -40,26 +40,26 @@ init([]) ->
     {ok, []}.
 
 handle_event(#event{type = connection_created, props = Details}, State) ->
-    _Pid = rabbit_connection_tracking:update_tracked({connection_created, Details}),
+    ok = rabbit_connection_tracking:update_tracked({connection_created, Details}),
     {ok, State};
 handle_event(#event{type = connection_closed, props = Details}, State) ->
-    _Pid = rabbit_connection_tracking:update_tracked({connection_closed, Details}),
+    ok = rabbit_connection_tracking:update_tracked({connection_closed, Details}),
     {ok, State};
 handle_event(#event{type = vhost_deleted, props = Details}, State) ->
-    _Pid = rabbit_connection_tracking:update_tracked({vhost_deleted, Details}),
+    ok = rabbit_connection_tracking:update_tracked({vhost_deleted, Details}),
     {ok, State};
 %% Note: under normal circumstances this will be called immediately
 %% after the vhost_deleted above. Therefore we should be careful about
 %% what we log and be more defensive.
 handle_event(#event{type = vhost_down, props = Details}, State) ->
-    _Pid = rabbit_connection_tracking:update_tracked({vhost_down, Details}),
+    ok = rabbit_connection_tracking:update_tracked({vhost_down, Details}),
     {ok, State};
 handle_event(#event{type = user_deleted, props = Details}, State) ->
-    _Pid = rabbit_connection_tracking:update_tracked({user_deleted, Details}),
+    ok = rabbit_connection_tracking:update_tracked({user_deleted, Details}),
     {ok, State};
 %% A node had been deleted from the cluster.
 handle_event(#event{type = node_deleted, props = Details}, State) ->
-    _Pid = rabbit_connection_tracking:update_tracked({node_deleted, Details}),
+    ok = rabbit_connection_tracking:update_tracked({node_deleted, Details}),
     {ok, State};
 handle_event(_Event, State) ->
     {ok, State}.