Restore the tanzu cli scope

This allows a transitionary period where both scopes are valid for the
v3.11.x/v3.10.x series

Makefile

@@ -441,6 +441,7 @@ SCRIPTS = rabbitmq-defaults \
 	  rabbitmq-queues \
 	  rabbitmq-upgrade \
 	  rabbitmq-streams \
+	  rabbitmq-tanzu \
 	  vmware-rabbitmq
 
 AUTOCOMPLETE_SCRIPTS = bash_autocomplete.sh zsh_autocomplete.sh
@@ -455,6 +456,7 @@ WINDOWS_SCRIPTS = rabbitmq-defaults.bat \
 		  rabbitmq-service.bat \
 		  rabbitmq-upgrade.bat \
 		  rabbitmq-streams.bat \
+		  rabbitmq-tanzu.bat \
 		  vmware-rabbitmq.bat \
 		  rabbitmqctl.bat
 

deps/rabbit/scripts/rabbitmq-tanzu

@@ -0,0 +1,23 @@
+#!/bin/sh
+##  This Source Code Form is subject to the terms of the Mozilla Public
+##  License, v. 2.0. If a copy of the MPL was not distributed with this
+##  file, You can obtain one at https://mozilla.org/MPL/2.0/.
+##
+##  Copyright (c) 2007-2023 VMware, Inc. or its affiliates.  All rights reserved.
+##
+
+# Exit immediately if a pipeline, which may consist of a single simple command,
+# a list, or a compound command returns a non-zero status
+set -e
+
+# Each variable or function that is created or modified is given the export
+# attribute and marked for export to the environment of subsequent commands.
+set -a
+
+# shellcheck source=/dev/null
+#
+# TODO: when shellcheck adds support for relative paths, change to
+# shellcheck source=./rabbitmq-env
+. "${0%/*}"/rabbitmq-env
+
+run_escript rabbitmqctl_escript "${ESCRIPT_DIR:?must be defined}"/rabbitmq-tanzu "$@"

deps/rabbit/scripts/rabbitmq-tanzu.bat

@@ -0,0 +1,56 @@
+@echo off
+REM  This Source Code Form is subject to the terms of the Mozilla Public
+REM  License, v. 2.0. If a copy of the MPL was not distributed with this
+REM  file, You can obtain one at https://mozilla.org/MPL/2.0/.
+REM
+REM  Copyright (c) 2007-2023 VMware, Inc. or its affiliates.  All rights reserved.
+REM
+
+REM Scopes the variables to the current batch file
+setlocal
+
+rem Preserve values that might contain exclamation marks before
+rem enabling delayed expansion
+set TDP0=%~dp0
+set STAR=%*
+setlocal enabledelayedexpansion
+
+REM Get default settings with user overrides for (RABBITMQ_)<var_name>
+REM Non-empty defaults should be set in rabbitmq-env
+call "%TDP0%\rabbitmq-env.bat" %~n0
+
+if not exist "!ERLANG_HOME!\bin\erl.exe" (
+    echo.
+    echo ******************************
+    echo ERLANG_HOME not set correctly.
+    echo ******************************
+    echo.
+    echo Please either set ERLANG_HOME to point to your Erlang installation or place the
+    echo RabbitMQ server distribution in the Erlang lib folder.
+    echo.
+    exit /B 1
+)
+
+REM Disable erl_crash.dump by default for control scripts.
+if not defined ERL_CRASH_DUMP_SECONDS (
+    set ERL_CRASH_DUMP_SECONDS=0
+)
+
+"!ERLANG_HOME!\bin\erl.exe" +B ^
+-boot !CLEAN_BOOT_FILE! ^
+-noinput -noshell -hidden -smp enable ^
+!RABBITMQ_CTL_ERL_ARGS! ^
+-kernel inet_dist_listen_min !RABBITMQ_CTL_DIST_PORT_MIN! ^
+-kernel inet_dist_listen_max !RABBITMQ_CTL_DIST_PORT_MAX! ^
+-run escript start ^
+-escript main rabbitmqctl_escript ^
+-extra "%RABBITMQ_HOME%\escript\rabbitmq-tanzu" !STAR!
+
+if ERRORLEVEL 1 (
+    exit /B %ERRORLEVEL%
+)
+
+EXIT /B 0
+
+endlocal
+endlocal

deps/rabbitmq_cli/Makefile

@@ -37,6 +37,7 @@ LINKED_ESCRIPTS = escript/rabbitmq-plugins \
 		  escript/rabbitmq-diagnostics \
 		  escript/rabbitmq-queues \
 		  escript/rabbitmq-streams \
+			escript/rabbitmq-tanzu \
 			escript/vmware-rabbitmq \
       escript/rabbitmq-upgrade
 ESCRIPTS = $(ACTUAL_ESCRIPTS) $(LINKED_ESCRIPTS)
@@ -48,8 +49,9 @@ rabbitmq-diagnostics = escript/rabbitmqctl
 rabbitmq-queues = escript/rabbitmqctl
 rabbitmq-streams = escript/rabbitmqctl
 rabbitmq-upgrade = escript/rabbitmqctl
+rabbitmq-tanzu = escript/rabbitmqctl
 vmware-rabbitmq = escript/rabbitmqctl
-escript/rabbitmq-plugins escript/rabbitmq-diagnostics escript/rabbitmq-queues escript/rabbitmq-streams escript/rabbitmq-upgrade escript/vmware-rabbitmq: escript/rabbitmqctl
+escript/rabbitmq-plugins escript/rabbitmq-diagnostics escript/rabbitmq-queues escript/rabbitmq-streams escript/rabbitmq-upgrade escript/rabbitmq-tanzu escript/vmware-rabbitmq: escript/rabbitmqctl
 
 # We use hardlinks or symlinks in the `escript` directory and
 # install's PREFIX when a single escript can have several names (eg.

deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/help_command.ex

@@ -14,7 +14,7 @@ defmodule RabbitMQ.CLI.Ctl.Commands.HelpCommand do
 
   @behaviour RabbitMQ.CLI.CommandBehaviour
 
-  def scopes(), do: [:ctl, :diagnostics, :plugins, :queues, :streams, :vmware, :upgrade]
+  def scopes(), do: [:ctl, :diagnostics, :plugins, :queues, :streams, :tanzu, :vmware, :upgrade]
   def switches(), do: [list_commands: :boolean]
 
   def distribution(_), do: :none

deps/rabbitmq_cli/mix.exs

@@ -62,6 +62,7 @@ defmodule RabbitMQCtl.MixfileBase do
           "rabbitmq-queues": :queues,
           "rabbitmq-streams": :streams,
           "rabbitmq-upgrade": :upgrade,
+          "rabbitmq-tanzu": :tanzu,
           "vmware-rabbitmq": :vmware
         ]
       ]

rabbitmq_home.bzl

@@ -117,6 +117,7 @@ RABBITMQ_HOME_ATTRS = {
             "//deps/rabbit:scripts/rabbitmq-queues",
             "//deps/rabbit:scripts/rabbitmq-server",
             "//deps/rabbit:scripts/rabbitmq-streams",
+            "//deps/rabbit:scripts/rabbitmq-tanzu",
             "//deps/rabbit:scripts/rabbitmq-upgrade",
             "//deps/rabbit:scripts/rabbitmqctl",
             "//deps/rabbit:scripts/vmware-rabbitmq",
@@ -132,6 +133,7 @@ RABBITMQ_HOME_ATTRS = {
             "//deps/rabbit:scripts/rabbitmq-queues.bat",
             "//deps/rabbit:scripts/rabbitmq-server.bat",
             "//deps/rabbit:scripts/rabbitmq-streams.bat",
+            "//deps/rabbit:scripts/rabbitmq-tanzu.bat",
             "//deps/rabbit:scripts/rabbitmq-upgrade.bat",
             "//deps/rabbit:scripts/rabbitmqctl.bat",
             "//deps/rabbit:scripts/vmware-rabbitmq.bat",