Revert QQ grow-to-N in original grow command

Author: Ayanda-D

deps/rabbitmq_cli/lib/rabbitmq/cli/queues/commands/grow_command.ex

@@ -33,17 +33,7 @@ defmodule RabbitMQ.CLI.Queues.Commands.GrowCommand do
     {:validation_failure, :too_many_args}
   end
 
-  def validate(args = [n, s], opts) do
-    case Integer.parse(n) do
-      {cluster_size, _} when is_integer(cluster_size) ->
-        do_validate([cluster_size, s], opts)
-
-      :error ->
-        do_validate(args, opts)
-    end
-  end
-
-  def do_validate([_, s], _)
+  def validate([_, s], _)
       when not (s == "all" or
                   s == "even") do
     {:validation_failure, "strategy '#{s}' is not recognised."}
@@ -56,23 +46,15 @@ defmodule RabbitMQ.CLI.Queues.Commands.GrowCommand do
     {:validation_failure, "voter status '#{m}' is not recognised."}
   end
 
-  def do_validate(_, _) do
+  def validate(_, _) do
     :ok
   end
 
   def validate_execution_environment(args, opts) do
     Validators.chain(
       [
         &Validators.rabbit_is_running/2,
-        fn args = [n, _], opts ->
-          case Integer.parse(n) do
-            {cluster_size, _} when is_integer(cluster_size) ->
-              :ok
-
-            :error ->
-              Validators.existing_cluster_member(args, opts)
-          end
-        end
+        &Validators.existing_cluster_member/2
       ],
       [args, opts]
     )
@@ -85,7 +67,6 @@ defmodule RabbitMQ.CLI.Queues.Commands.GrowCommand do
         membership: membership,
         errors_only: errors_only
       }) do
-
     args = [to_atom(node), vhost_pat, queue_pat, to_atom(strategy)]
 
     args =
@@ -155,14 +136,8 @@ defmodule RabbitMQ.CLI.Queues.Commands.GrowCommand do
     do:
       "Grows quorum queue clusters by adding a member (replica) on the specified node for all matching queues"
 
-  def banner([node_or_quorum_cluster_size, strategy], %{queue_pattern: queue_pattern}) do
-      case Integer.parse(node_or_quorum_cluster_size) do
-        {cluster_size, _} when is_integer(cluster_size) ->
-          "Growing #{strategy} quorum queues matching '#{queue_pattern}' to a target cluster size of '#{cluster_size}'..."
-
-        :error ->
-          "Growing #{strategy} quorum queues matching '#{queue_pattern}' to #{node_or_quorum_cluster_size}..."
-      end
+  def banner([node, strategy], _) do
+    "Growing #{strategy} quorum queues on #{node}..."
   end
 
   #

deps/rabbitmq_cli/test/queues/grow_command_test.exs

@@ -82,29 +82,6 @@ defmodule RabbitMQ.CLI.Queues.Commands.GrowCommandTest do
              {:validation_failure, "voter status 'banana' is not recognised."}
   end
 
-  test "validate: when target quorum cluster size greater than zero and membership is voter, returns a success" do
-    assert @command.validate(["7", "all"], %{membership: "voter", queue_pattern: "qq.*"}) == :ok
-  end
-
-  test "validate: when target quorum cluster size greater than zero and membership is promotable, returns a success" do
-    assert @command.validate(["5", "all"], %{membership: "promotable", queue_pattern: "qq.*"}) == :ok
-  end
-
-  test "validate: when target quorum cluster size is zero, returns failure" do
-    assert @command.validate(["0", "all"], %{membership: "voter", queue_pattern: "qq.*"}) ==
-             {:validation_failure, "target quorum cluster size '0' must be greater than 0."}
-  end
-
-  test "validate: when target quorum cluster size is less than zero, returns failure" do
-    assert @command.validate(["-1", "all"], %{membership: "voter", queue_pattern: "qq.*"}) ==
-             {:validation_failure, "target quorum cluster size '-1' must be greater than 0."}
-  end
-
-  test "validate: when target quorum cluster size is provided and membership is not voter, returns failure" do
-    assert @command.validate(["5", "all"], %{membership: "non_voter", queue_pattern: "qq.*"}) ==
-             {:validation_failure, "voter status 'non_voter' must be 'voter' or 'promotable' to grow to target quorum cluster size '5'."}
-  end
-
   @tag test_timeout: 3000
   test "run: targeting an unreachable node throws a badrpc when growing to a target node", context do
     assert match?(
@@ -115,15 +92,4 @@ defmodule RabbitMQ.CLI.Queues.Commands.GrowCommandTest do
              )
            )
   end
-
-  @tag test_timeout: 3000
-  test "run: targeting an unreachable node throws a badrpc when growing to a target quorum cluster size", context do
-    assert match?(
-             {:badrpc, _},
-             @command.run(
-               ["5", "all"],
-               Map.merge(context[:opts], %{node: :jake@thedog, queue_pattern: "qq.*"})
-             )
-           )
-  end
 end