From ef2b01e7413d13701d5eed7e976649380451c6f4 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami-bot@vmware.com>
Date: Thu, 20 Jul 2023 16:32:36 +0200
Subject: [PATCH] [bitnami/pgbouncer] Release 1.20.0-debian-11-r0 (#41463)

Signed-off-by: Bitnami Containers <bitnami-bot@vmware.com>
---
 bitnami/pgbouncer/1/debian-11/Dockerfile      | 13 +++---
 .../opt/bitnami/.bitnami_components.json      |  2 +-
 .../opt/bitnami/scripts/libvalidations.sh     | 40 ++++++++++++++++++-
 bitnami/pgbouncer/1/debian-11/tags-info.yaml  |  2 +-
 4 files changed, 48 insertions(+), 9 deletions(-)

diff --git a/bitnami/pgbouncer/1/debian-11/Dockerfile b/bitnami/pgbouncer/1/debian-11/Dockerfile
index f11dd975b3bd..5e4323f72cc5 100644
--- a/bitnami/pgbouncer/1/debian-11/Dockerfile
+++ b/bitnami/pgbouncer/1/debian-11/Dockerfile
@@ -5,14 +5,15 @@ FROM docker.io/bitnami/minideb:bullseye
 
 ARG TARGETARCH
 
-LABEL org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \
-      org.opencontainers.image.created="2023-07-15T14:17:46Z" \
+LABEL com.vmware.cp.artifact.flavor="sha256:1e1b4657a77f0d47e9220f0c37b9bf7802581b93214fff7d1bd2364c8bf22e8e" \
+      org.opencontainers.image.base.name="docker.io/bitnami/minideb:bullseye" \
+      org.opencontainers.image.created="2023-07-20T13:47:58Z" \
       org.opencontainers.image.description="Application packaged by VMware, Inc" \
       org.opencontainers.image.licenses="Apache-2.0" \
-      org.opencontainers.image.ref.name="1.19.1-debian-11-r16" \
+      org.opencontainers.image.ref.name="1.20.0-debian-11-r0" \
       org.opencontainers.image.title="pgbouncer" \
       org.opencontainers.image.vendor="VMware, Inc." \
-      org.opencontainers.image.version="1.19.1"
+      org.opencontainers.image.version="1.20.0"
 
 ENV HOME="/" \
     OS_ARCH="${TARGETARCH:-amd64}" \
@@ -28,7 +29,7 @@ RUN mkdir -p /tmp/bitnami/pkg/cache/ && cd /tmp/bitnami/pkg/cache/ && \
       "wait-for-port-1.0.6-9-linux-${OS_ARCH}-debian-11" \
       "postgresql-client-14.8.0-1-linux-${OS_ARCH}-debian-11" \
       "ini-file-1.4.5-6-linux-${OS_ARCH}-debian-11" \
-      "pgbouncer-1.19.1-0-linux-${OS_ARCH}-debian-11" \
+      "pgbouncer-1.20.0-0-linux-${OS_ARCH}-debian-11" \
     ) && \
     for COMPONENT in "${COMPONENTS[@]}"; do \
       if [ ! -f "${COMPONENT}.tar.gz" ]; then \
@@ -52,7 +53,7 @@ RUN echo 'en_US.UTF-8 UTF-8' >> /etc/locale.gen && locale-gen
 COPY rootfs /
 RUN /opt/bitnami/scripts/locales/add-extra-locales.sh
 RUN /opt/bitnami/scripts/pgbouncer/postunpack.sh
-ENV APP_VERSION="1.19.1" \
+ENV APP_VERSION="1.20.0" \
     BITNAMI_APP_NAME="pgbouncer" \
     LANG="en_US.UTF-8" \
     LANGUAGE="en_US:en" \
diff --git a/bitnami/pgbouncer/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/pgbouncer/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
index b8ce47cdbdf4..90677ea6230c 100644
--- a/bitnami/pgbouncer/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/pgbouncer/1/debian-11/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -9,7 +9,7 @@
         "arch": "amd64",
         "distro": "debian-11",
         "type": "NAMI",
-        "version": "1.19.1-0"
+        "version": "1.20.0-0"
     },
     "postgresql-client": {
         "arch": "amd64",
diff --git a/bitnami/pgbouncer/1/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh b/bitnami/pgbouncer/1/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh
index 3c6a4109c2c5..54987abca42a 100644
--- a/bitnami/pgbouncer/1/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh
+++ b/bitnami/pgbouncer/1/debian-11/prebuildfs/opt/bitnami/scripts/libvalidations.sh
@@ -187,6 +187,25 @@ validate_port() {
     fi
 }
 
+########################
+# Validate if the provided argument is a valid IPv6 address
+# Arguments:
+#   $1 - IP to validate
+# Returns:
+#   Boolean
+#########################
+validate_ipv6() {
+    local ip="${1:?ip is missing}"
+    local stat=1
+    local full_address_regex='^([0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}$'
+    local short_address_regex='^((([0-9a-fA-F]{1,4}:){0,6}[0-9a-fA-F]{1,4}){0,6}::(([0-9a-fA-F]{1,4}:){0,6}[0-9a-fA-F]{1,4}){0,6})$'
+
+    if [[ $ip =~ $full_address_regex || $ip =~ $short_address_regex || $ip == "::" ]]; then
+        stat=0
+    fi
+    return "$stat"
+}
+
 ########################
 # Validate if the provided argument is a valid IPv4 address
 # Arguments:
@@ -204,7 +223,26 @@ validate_ipv4() {
             && ${ip_array[2]} -le 255 && ${ip_array[3]} -le 255 ]]
         stat=$?
     fi
-    return $stat
+    return "$stat"
+}
+
+########################
+# Validate if the provided argument is a valid IPv4 or IPv6 address
+# Arguments:
+#   $1 - IP to validate
+# Returns:
+#   Boolean
+#########################
+validate_ip() {
+    local ip="${1:?ip is missing}"
+    local stat=1
+
+    if validate_ipv4 "$ip"; then
+        stat=0
+    else
+        stat=$(validate_ipv6 "$ip")
+    fi
+    return "$stat"
 }
 
 ########################
diff --git a/bitnami/pgbouncer/1/debian-11/tags-info.yaml b/bitnami/pgbouncer/1/debian-11/tags-info.yaml
index 19e9a08cdc73..e917bc422d3a 100644
--- a/bitnami/pgbouncer/1/debian-11/tags-info.yaml
+++ b/bitnami/pgbouncer/1/debian-11/tags-info.yaml
@@ -1,5 +1,5 @@
 rolling-tags:
 - "1"
 - 1-debian-11
-- 1.19.1
+- 1.20.0
 - latest