From c397b7dc255f1d01ec1da215d7c451ae90470995 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami-bot@vmware.com>
Date: Wed, 30 Aug 2023 14:15:01 +0200
Subject: [PATCH] [bitnami/kafka] Release 3.5.1-debian-11-r35 (#46664)

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
---
 bitnami/kafka/3.5/debian-11/Dockerfile        |  4 ++--
 .../opt/bitnami/scripts/libvalidations.sh     |  8 +++----
 .../debian-11/prebuildfs/usr/sbin/run-script  | 24 +++++++++++++++++++
 .../rootfs/opt/bitnami/scripts/libkafka.sh    | 12 +++++-----
 4 files changed, 36 insertions(+), 12 deletions(-)
 create mode 100755 bitnami/kafka/3.5/debian-11/prebuildfs/usr/sbin/run-script

diff --git a/bitnami/kafka/3.5/debian-11/Dockerfile b/bitnami/kafka/3.5/debian-11/Dockerfile
index c8e43a567b8f..0686afac9685 100644
--- a/bitnami/kafka/3.5/debian-11/Dockerfile
+++ b/bitnami/kafka/3.5/debian-11/Dockerfile
@@ -8,10 +8,10 @@ ARG TARGETARCH
 
 LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \
       org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \
-      org.opencontainers.image.created="2023-08-21T13:49:31Z" \
+      org.opencontainers.image.created="2023-08-29T22:30:44Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="3.5.1-debian-11-r27" \
+      org.opencontainers.image.ref.name="3.5.1-debian-11-r35" \
       org.opencontainers.image.title="kafka" \
       org.opencontainers.image.vendor="VMware, Inc." \
       org.opencontainers.image.version="3.5.1"
diff --git a/bitnami/kafka/3.5/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh b/bitnami/kafka/3.5/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh
index 54987abca42a..16183f62d080 100644
--- a/bitnami/kafka/3.5/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh
+++ b/bitnami/kafka/3.5/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh
@@ -4,7 +4,7 @@
 #
 # Validation functions library
 
-# shellcheck disable=SC1091
+# shellcheck disable=SC1091,SC2086
 
 # Load Generic Libraries
 . /opt/bitnami/scripts/liblog.sh
@@ -203,7 +203,7 @@ validate_ipv6() {
     if [[ $ip =~ $full_address_regex || $ip =~ $short_address_regex || $ip == "::" ]]; then
         stat=0
     fi
-    return "$stat"
+    return $stat
 }
 
 ########################
@@ -223,7 +223,7 @@ validate_ipv4() {
             && ${ip_array[2]} -le 255 && ${ip_array[3]} -le 255 ]]
         stat=$?
     fi
-    return "$stat"
+    return $stat
 }
 
 ########################
@@ -242,7 +242,7 @@ validate_ip() {
     else
         stat=$(validate_ipv6 "$ip")
     fi
-    return "$stat"
+    return $stat
 }
 
 ########################
diff --git a/bitnami/kafka/3.5/debian-11/prebuildfs/usr/sbin/run-script b/bitnami/kafka/3.5/debian-11/prebuildfs/usr/sbin/run-script
new file mode 100755
index 000000000000..4ca0f897277e
--- /dev/null
+++ b/bitnami/kafka/3.5/debian-11/prebuildfs/usr/sbin/run-script
@@ -0,0 +1,24 @@
+#!/bin/sh
+# Copyright VMware, Inc.
+# SPDX-License-Identifier: APACHE-2.0
+set -u
+
+if [ $# -eq 0 ]; then
+    >&2 echo "No arguments provided"
+    exit 1
+fi
+
+script=$1
+exit_code="${2:-96}"
+fail_if_not_present="${3:-n}"
+
+if test -f "$script"; then
+  sh $script
+
+  if [ $? -ne 0 ]; then
+    exit $((exit_code))
+  fi
+elif [ "$fail_if_not_present" = "y" ]; then
+  >&2 echo "script not found: $script"
+  exit 127
+fi
diff --git a/bitnami/kafka/3.5/debian-11/rootfs/opt/bitnami/scripts/libkafka.sh b/bitnami/kafka/3.5/debian-11/rootfs/opt/bitnami/scripts/libkafka.sh
index 58c804901e3c..20c923f3e60e 100644
--- a/bitnami/kafka/3.5/debian-11/rootfs/opt/bitnami/scripts/libkafka.sh
+++ b/bitnami/kafka/3.5/debian-11/rootfs/opt/bitnami/scripts/libkafka.sh
@@ -777,12 +777,12 @@ kafka_zookeeper_configure_tls() {
     fi
 
     kafka_server_conf_set "zookeeper.clientCnxnSocket" "org.apache.zookeeper.ClientCnxnSocketNetty"
-    kafka_server_conf_set "zookeeper.client.secure" "true"
-    ! is_empty_value "${keystore_location:-}" && kafka_server_conf_set "zookeeper.ssl.keyStore.location" "${keystore_location}"
-    ! is_empty_value "${KAFKA_ZOOKEEPER_TLS_KEYSTORE_PASSWORD:-}" && kafka_server_conf_set "zookeeper.ssl.keyStore.password" "${KAFKA_ZOOKEEPER_TLS_KEYSTORE_PASSWORD}"
-    ! is_empty_value "${kafka_zk_truststore_location:-}" && kafka_server_conf_set "zookeeper.ssl.trustStore.location" "${kafka_zk_truststore_location}"
-    ! is_empty_value "${KAFKA_ZOOKEEPER_TLS_TRUSTSTORE_PASSWORD:-}" && kafka_server_conf_set "zookeeper.ssl.trustStore.password" "${KAFKA_ZOOKEEPER_TLS_TRUSTSTORE_PASSWORD}"
-    ! is_empty_value "${KAFKA_ZOOKEEPER_TLS_VERIFY_HOSTNAME:-}" && kafka_server_conf_set "zookeeper.ssl.hostnameVerification" "${KAFKA_ZOOKEEPER_TLS_VERIFY_HOSTNAME}"
+    kafka_server_conf_set "zookeeper.ssl.client.enable" "true"
+    is_boolean_yes "${KAFKA_ZOOKEEPER_TLS_VERIFY_HOSTNAME:-}" && kafka_server_conf_set "zookeeper.ssl.endpoint.identification.algorithm" "HTTPS"
+    ! is_empty_value "${keystore_location:-}" && kafka_server_conf_set "zookeeper.ssl.keystore.location" "${keystore_location}"
+    ! is_empty_value "${KAFKA_ZOOKEEPER_TLS_KEYSTORE_PASSWORD:-}" && kafka_server_conf_set "zookeeper.ssl.keystore.password" "${KAFKA_ZOOKEEPER_TLS_KEYSTORE_PASSWORD}"
+    ! is_empty_value "${kafka_zk_truststore_location:-}" && kafka_server_conf_set "zookeeper.ssl.truststore.location" "${kafka_zk_truststore_location}"
+    ! is_empty_value "${KAFKA_ZOOKEEPER_TLS_TRUSTSTORE_PASSWORD:-}" && kafka_server_conf_set "zookeeper.ssl.truststore.password" "${KAFKA_ZOOKEEPER_TLS_TRUSTSTORE_PASSWORD}"
     true # Avoid the function to fail due to the check above
 }