Merge pull request #7328 from rabbitmq/rename-cli-tanzu-scope

Author: michaelklishin

.github/SECURITY.md

@@ -63,9 +63,9 @@ When VMware products that depend on RabbitMQ are also affected, the disclosure p
 further to allow those projects to ship patch releases.
 
 
-## Tanzu RabbitMQ
+## VMware RabbitMQ
 
-[Tanzu RabbitMQ](https://tanzu.vmware.com/rabbitmq) is covered by the [VMware Security Response Policy](https://www.vmware.com/support/policies/security_response.html).
+[VMware RabbitMQ](https://www.vmware.com/products/rabbitmq.html) is covered by the [VMware Security Response Policy](https://www.vmware.com/support/policies/security_response.html).
 
-Vulnerabilities found in Tanzu RabbitMQ can be reported to the RabbitMQ core team or
+Vulnerabilities found in VMware RabbitMQ can be reported to the RabbitMQ core team or
 via the [VMware Security Response Center](https://www.vmware.com/security/vsrc.html).

Makefile

@@ -433,7 +433,7 @@ SCRIPTS = rabbitmq-defaults \
 	  rabbitmq-queues \
 	  rabbitmq-upgrade \
 	  rabbitmq-streams \
-		rabbitmq-tanzu
+	  vmware-rabbitmq
 
 AUTOCOMPLETE_SCRIPTS = bash_autocomplete.sh zsh_autocomplete.sh
 
@@ -447,7 +447,7 @@ WINDOWS_SCRIPTS = rabbitmq-defaults.bat \
 		  rabbitmq-service.bat \
 		  rabbitmq-upgrade.bat \
 		  rabbitmq-streams.bat \
-			rabbitmq-tanzu.bat \
+		  vmware-rabbitmq.bat \
 		  rabbitmqctl.bat
 
 UNIX_TO_DOS ?= todos

README.md

@@ -44,7 +44,7 @@ RabbitMQ documentation is also [developed on GitHub](https://github.com/rabbitmq
 
 ## Commercial Features and Support
 
- * [Commercial edition of RabbitMQ](https://tanzu.vmware.com/rabbitmq)
+ * [Commercial edition of RabbitMQ](https://www.vmware.com/products/rabbitmq.html)
  * [Commercial edition for Kubernetes](https://rabbitmq.com/kubernetes/tanzu/installation.html)
  * [Commercial support](https://rabbitmq.com/services.html) from [VMware](https://vmware.com) for open source RabbitMQ
 

deps/rabbit/scripts/rabbitmq-tanzu renamed to deps/rabbit/scripts/vmware-rabbitmq

@@ -20,4 +20,4 @@ set -a
 # shellcheck source=./rabbitmq-env
 . "${0%/*}"/rabbitmq-env
 
-run_escript rabbitmqctl_escript "${ESCRIPT_DIR:?must be defined}"/rabbitmq-tanzu "$@"
+run_escript rabbitmqctl_escript "${ESCRIPT_DIR:?must be defined}"/vmware-rabbitmq "$@"

deps/rabbit/scripts/rabbitmq-tanzu.bat renamed to deps/rabbit/scripts/vmware-rabbitmq.bat

@@ -44,7 +44,7 @@ if not defined ERL_CRASH_DUMP_SECONDS (
 -kernel inet_dist_listen_max !RABBITMQ_CTL_DIST_PORT_MAX! ^
 -run escript start ^
 -escript main rabbitmqctl_escript ^
--extra "%RABBITMQ_HOME%\escript\rabbitmq-tanzu" !STAR!
+-extra "%RABBITMQ_HOME%\escript\vmware-rabbitmq" !STAR!
 
 if ERRORLEVEL 1 (
     exit /B %ERRORLEVEL%

deps/rabbitmq_cli/Makefile

@@ -34,7 +34,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)
 
@@ -44,9 +44,9 @@ rabbitmq-plugins = escript/rabbitmqctl
 rabbitmq-diagnostics = escript/rabbitmqctl
 rabbitmq-queues = escript/rabbitmqctl
 rabbitmq-streams = escript/rabbitmqctl
-rabbitmq-tanzu = escript/rabbitmqctl
 rabbitmq-upgrade = escript/rabbitmqctl
-escript/rabbitmq-plugins escript/rabbitmq-diagnostics escript/rabbitmq-queues escript/rabbitmq-streams escript/rabbitmq-tanzu escript/rabbitmq-upgrade: 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
 
 # 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, :tanzu, :upgrade]
+  def scopes(), do: [:ctl, :diagnostics, :plugins, :queues, :vmware, :upgrade]
   def switches(), do: [list_commands: :boolean]
 
   def distribution(_), do: :none

deps/rabbitmq_cli/mix.exs

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

deps/rabbitmq_prometheus/docker/docker-compose-dist-metrics.yml

@@ -14,8 +14,8 @@ services:
   rmq0-dist-metrics: &rabbitmq
     # https://network.pivotal.io/products/rabbitmq/
     # This is a commercial edition of RabbitMQ that requires a valid Tanzu Network account
-    # Learn more: https://rabbitmq.com/tanzu
-    image: dev.registry.pivotal.io/rabbitmq/vmware-tanzu-rabbitmq:1.0.0
+    # Learn more: https://www.vmware.com/products/rabbitmq.html
+    image: dev.registry.pivotal.io/rabbitmq/vmware-rabbitmq:1.4.2
     networks:
       - "rabbitmq-prometheus"
     ports:

deps/rabbitmq_prometheus/docker/grafana/dashboards/inet_tcp_metrics.json

@@ -129,7 +129,7 @@
         },
         {
           "$$hashKey": "object:3230",
-          "alias": "Tanzu RabbitMQ",
+          "alias": "VMware RabbitMQ",
           "align": "auto",
           "colorMode": null,
           "colors": [

rabbitmq_home.bzl

@@ -117,9 +117,9 @@ 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",
         ],
         allow_files = True,
     ),
@@ -132,9 +132,9 @@ 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",
         ],
         allow_files = True,
     ),