From 79327b693e314e2c42c25f9919261cd33f082553 Mon Sep 17 00:00:00 2001
From: ju217q <ju217q@att.com>
Date: Wed, 6 Apr 2022 15:16:03 -0400
Subject: [PATCH] [RabbitMQ] Remove guest admin account

Added removal of guest user account for security and best practices.

Change-Id: I5ae1c184c0cf092e4300d081d8a1cb3c7418a935
---
 rabbitmq/Chart.yaml                                      | 2 +-
 rabbitmq/templates/bin/_rabbitmq-wait-for-cluster.sh.tpl | 7 +++++++
 releasenotes/notes/rabbitmq.yaml                         | 1 +
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/rabbitmq/Chart.yaml b/rabbitmq/Chart.yaml
index 59f036e84..3ccfc89e7 100644
--- a/rabbitmq/Chart.yaml
+++ b/rabbitmq/Chart.yaml
@@ -15,6 +15,6 @@ apiVersion: v1
 appVersion: v3.9.0
 description: OpenStack-Helm RabbitMQ
 name: rabbitmq
-version: 0.1.21
+version: 0.1.22
 home: https://github.com/rabbitmq/rabbitmq-server
 ...
diff --git a/rabbitmq/templates/bin/_rabbitmq-wait-for-cluster.sh.tpl b/rabbitmq/templates/bin/_rabbitmq-wait-for-cluster.sh.tpl
index 215e5b905..142088a03 100644
--- a/rabbitmq/templates/bin/_rabbitmq-wait-for-cluster.sh.tpl
+++ b/rabbitmq/templates/bin/_rabbitmq-wait-for-cluster.sh.tpl
@@ -78,3 +78,10 @@ if test "$(active_rabbit_nodes)" -gt "$RABBIT_REPLICA_COUNT"; then
     echo "Updated cluster:"
     rabbitmqctl -l -n "${PRIMARY_NODE}" cluster_status
 fi
+
+# Delete guest admin user
+echo "Removing Guest admin user account"
+rabbitmqctl -l -n "${PRIMARY_NODE}" delete_user guest || true
+# List users
+echo "List user accounts"
+rabbitmqctl -l -n "${PRIMARY_NODE}" list_users || true
diff --git a/releasenotes/notes/rabbitmq.yaml b/releasenotes/notes/rabbitmq.yaml
index cbfab7d76..b7a57d8c3 100644
--- a/releasenotes/notes/rabbitmq.yaml
+++ b/releasenotes/notes/rabbitmq.yaml
@@ -21,4 +21,5 @@ rabbitmq:
   - 0.1.19 Enable taint toleration for Openstack services jobs
   - 0.1.20 Bump Rabbitmq version to 3.9.0
   - 0.1.21 Updated naming for subchart compatibility
+  - 0.1.22 Remove guest admin account
 ...