From 1a2261e4b1ba7eade833b09977b8c2c231b58a3c Mon Sep 17 00:00:00 2001
From: Iliia Khaprov - VMware by Broadcom <ikhaprov@vmware.com>
Date: Wed, 12 Feb 2025 14:39:16 +0100
Subject: [PATCH] Fix Elixir.RabbitMQ.CLI.Ctl.Commands.DeleteShovelCommand

rabbit_shovel_dyn_worker_sup_sup doesn't export stop_and_delete_child

It exports stop_child which in turn calls stop_and_delete_child.

(cherry picked from commit a92a04cfb1584b93f9b9a24f173d1d3d68519029)
---
 ...Elixir.RabbitMQ.CLI.Ctl.Commands.DeleteShovelCommand.erl | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/deps/rabbitmq_shovel/src/Elixir.RabbitMQ.CLI.Ctl.Commands.DeleteShovelCommand.erl b/deps/rabbitmq_shovel/src/Elixir.RabbitMQ.CLI.Ctl.Commands.DeleteShovelCommand.erl
index 105854157897..0529e6a207c1 100644
--- a/deps/rabbitmq_shovel/src/Elixir.RabbitMQ.CLI.Ctl.Commands.DeleteShovelCommand.erl
+++ b/deps/rabbitmq_shovel/src/Elixir.RabbitMQ.CLI.Ctl.Commands.DeleteShovelCommand.erl
@@ -84,10 +84,6 @@ run([Name], #{node := Node, vhost := VHost}) ->
                         {badrpc, _} = Error ->
                             Error;
                         {error, not_found} ->
-                            ErrMsg = rabbit_misc:format("Shovel with the given name was not found "
-                                                        "on the target node '~ts' and/or virtual host '~ts'. "
-                                                        "It may be failing to connect and report its state, will delete its runtime parameter...",
-                                                        [Node, VHost]),
                             try_force_removing(HostingNode, VHost, Name, ActingUser),
                             {error, rabbit_data_coercion:to_binary(ErrMsg)};
                         ok ->
@@ -117,4 +113,4 @@ try_clearing_runtime_parameter(Node, VHost, ShovelName, ActingUser) ->
     _ = rabbit_misc:rpc_call(Node, rabbit_runtime_parameters, clear, [VHost, <<"shovel">>, ShovelName, ActingUser]).
 
 try_stopping_child_process(Node, VHost, ShovelName) ->
-    _ = rabbit_misc:rpc_call(Node, rabbit_shovel_dyn_worker_sup_sup, stop_and_delete_child, [{VHost, ShovelName}]).
+    _ = rabbit_misc:rpc_call(Node, rabbit_shovel_dyn_worker_sup_sup, stop_child, [{VHost, ShovelName}]).