From a53236f1bc7cf55cc5ed6dd1ba38b008da076dd1 Mon Sep 17 00:00:00 2001
From: JB <11890531+jb-abbadie@users.noreply.github.com>
Date: Tue, 5 Mar 2024 16:08:09 +0100
Subject: [PATCH] [bitnami/etcd] Stop logging root password (#63437)

---
 .../etcd/3.4/debian-12/rootfs/opt/bitnami/scripts/etcd/run.sh | 3 ++-
 .../etcd/3.5/debian-12/rootfs/opt/bitnami/scripts/etcd/run.sh | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/bitnami/etcd/3.4/debian-12/rootfs/opt/bitnami/scripts/etcd/run.sh b/bitnami/etcd/3.4/debian-12/rootfs/opt/bitnami/scripts/etcd/run.sh
index e9ce00f19e690..a65f26f6530ba 100755
--- a/bitnami/etcd/3.4/debian-12/rootfs/opt/bitnami/scripts/etcd/run.sh
+++ b/bitnami/etcd/3.4/debian-12/rootfs/opt/bitnami/scripts/etcd/run.sh
@@ -18,7 +18,8 @@ set -o pipefail
 # Load etcd environment variables
 . /opt/bitnami/scripts/etcd-env.sh
 
-is_empty_value "$ETCD_ROOT_PASSWORD" && unset ETCD_ROOT_PASSWORD
+# We need to unset ETCD_ROOT_PASSWORD otherwise it will be logged by etcd process
+unset ETCD_ROOT_PASSWORD
 if [[ -f "$ETCD_NEW_MEMBERS_ENV_FILE" ]]; then
     debug "Loading env vars of existing cluster"
     . "$ETCD_NEW_MEMBERS_ENV_FILE"
diff --git a/bitnami/etcd/3.5/debian-12/rootfs/opt/bitnami/scripts/etcd/run.sh b/bitnami/etcd/3.5/debian-12/rootfs/opt/bitnami/scripts/etcd/run.sh
index e9ce00f19e690..2c77865163f14 100755
--- a/bitnami/etcd/3.5/debian-12/rootfs/opt/bitnami/scripts/etcd/run.sh
+++ b/bitnami/etcd/3.5/debian-12/rootfs/opt/bitnami/scripts/etcd/run.sh
@@ -18,7 +18,9 @@ set -o pipefail
 # Load etcd environment variables
 . /opt/bitnami/scripts/etcd-env.sh
 
-is_empty_value "$ETCD_ROOT_PASSWORD" && unset ETCD_ROOT_PASSWORD
+# We need to unset ETCD_ROOT_PASSWORD otherwise it will be logged by etcd process
+unset ETCD_ROOT_PASSWORD
+
 if [[ -f "$ETCD_NEW_MEMBERS_ENV_FILE" ]]; then
     debug "Loading env vars of existing cluster"
     . "$ETCD_NEW_MEMBERS_ENV_FILE"