Shovels: return hosting node in terminated shovel status

Fixes deletion and restart

Author: dcorbacho

deps/rabbitmq_shovel/src/Elixir.RabbitMQ.CLI.Ctl.Commands.DeleteShovelCommand.erl

@@ -82,7 +82,8 @@ run([Name], #{node := Node, vhost := VHost, force := Force}) ->
                     {error, rabbit_data_coercion:to_binary(ErrMsg)};
                 {{_Name, _VHost}, _Type, {terminated, _}, _Metrics, _Timestamp} ->
                     delete_shovel(ErrMsg, VHost, Name, ActingUser, Node, Node);
-                {{_Name, _VHost}, _Type, {terminated, HostingNode, _}, _Metrics, _Timestamp} ->
+                {{_Name, _VHost}, _Type, {terminated, Opts, _}, _Metrics, _Timestamp} ->
+                    HostingNode = proplists:get_value(node, Opts, Node),
                     delete_shovel(ErrMsg, VHost, Name, ActingUser, HostingNode, Node);
                 {{_Name, _VHost}, _Type, {_State, Opts}, _Metrics, _Timestamp} ->
                     HostingNode = proplists:get_value(node, Opts, Node),

deps/rabbitmq_shovel/src/Elixir.RabbitMQ.CLI.Ctl.Commands.RestartShovelCommand.erl

@@ -62,6 +62,8 @@ run([Name], #{node := Node, vhost := VHost}) ->
             case rabbit_shovel_status:find_matching_shovel(VHost, Name, Xs) of
                 undefined ->
                     {error, rabbit_data_coercion:to_binary(ErrMsg)};
+                {{_Name, _VHost}, _Type, {terminated, Opts, _}, _Metrics, _Timestamp} ->
+                    restart_shovel(ErrMsg, Name, VHost, Opts);
                 {{_Name, _VHost}, _Type, {_State, Opts}, _Metrics, _Timestamp} ->
                     restart_shovel(ErrMsg, Name, VHost, Opts);
                 {{_Name, _VHost}, _Type, {_State, Opts}, _Timestamp} ->

deps/rabbitmq_shovel/src/rabbit_shovel_status.erl

@@ -44,7 +44,7 @@
               | {terminated, term()}.
 -type info_with_node() :: starting
                         | {running, proplists:proplist()}
-                        | {terminated, node(), term()}.
+                        | {terminated, proplists:proplist(), term()}.
 -type blocked_status() :: running | flow | blocked.
 -type shovel_status() :: blocked_status() | ignore.
 
@@ -219,7 +219,7 @@ inject_node_info(Node, Shovels) ->
              {Name, Type, {State, Opts}, Metrics, Timestamp};
            %% terminated
            ({Name, Type, {terminated, Reason}, Metrics, Timestamp}) ->
-             {Name, Type, {terminated, Node, Reason}, Metrics, Timestamp};
+             {Name, Type, {terminated, [{node, Node}], Reason}, Metrics, Timestamp};
             %% running
            ({Name, Type, {State, Opts}, Metrics, Timestamp}) ->
              Opts1 = Opts ++ [{node, Node}],