From 47c881186c6a6548eab2c575e4f19d6511016107 Mon Sep 17 00:00:00 2001
From: Bitnami Bot <bitnami.bot@broadcom.com>
Date: Tue, 1 Apr 2025 23:32:22 +0200
Subject: [PATCH] [bitnami/harbor-adapter-trivy] Release
 harbor-adapter-trivy-2.12.2-debian-12-r9 (#79295)

Signed-off-by: Bitnami Bot <bitnami.bot@broadcom.com>
---
 bitnami/harbor-adapter-trivy/2/debian-12/Dockerfile  | 10 +++++-----
 .../prebuildfs/opt/bitnami/.bitnami_components.json  |  2 +-
 .../prebuildfs/opt/bitnami/scripts/libvalidations.sh | 12 +-----------
 3 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/bitnami/harbor-adapter-trivy/2/debian-12/Dockerfile b/bitnami/harbor-adapter-trivy/2/debian-12/Dockerfile
index e036d9e89cd5..b93db337f49f 100644
--- a/bitnami/harbor-adapter-trivy/2/debian-12/Dockerfile
+++ b/bitnami/harbor-adapter-trivy/2/debian-12/Dockerfile
@@ -8,10 +8,10 @@ ARG TARGETARCH
 
 LABEL com.vmware.cp.artifact.flavor="sha256:c50c90cfd9d12b445b011e6ad529f1ad3daea45c26d20b00732fae3cd71f6a83" \
       org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \
-      org.opencontainers.image.created="2025-03-15T19:31:45Z" \
+      org.opencontainers.image.created="2025-04-01T20:54:52Z" \
       org.opencontainers.image.description="Application packaged by Broadcom, Inc." \
       org.opencontainers.image.documentation="https://github.com/bitnami/containers/tree/main/bitnami/harbor-adapter-trivy/README.md" \
-      org.opencontainers.image.ref.name="2.12.2-debian-12-r8" \
+      org.opencontainers.image.ref.name="2.12.2-debian-12-r9" \
       org.opencontainers.image.source="https://github.com/bitnami/containers/tree/main/bitnami/harbor-adapter-trivy" \
       org.opencontainers.image.title="harbor-adapter-trivy" \
       org.opencontainers.image.vendor="Broadcom, Inc." \
@@ -26,9 +26,9 @@ COPY prebuildfs /
 SHELL ["/bin/bash", "-o", "errexit", "-o", "nounset", "-o", "pipefail", "-c"]
 # Install required system packages and dependencies
 RUN install_packages ca-certificates curl procps
-RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \
+RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ || exit 1 ; \
     COMPONENTS=( \
-      "harbor-adapter-trivy-2.12.2-4-linux-${OS_ARCH}-debian-12" \
+      "harbor-adapter-trivy-2.12.2-5-linux-${OS_ARCH}-debian-12" \
     ) ; \
     for COMPONENT in "${COMPONENTS[@]}"; do \
       if [ ! -f "${COMPONENT}.tar.gz" ]; then \
@@ -36,7 +36,7 @@ RUN mkdir -p /tmp/bitnami/pkg/cache/ ; cd /tmp/bitnami/pkg/cache/ ; \
         curl -SsLf "https://${DOWNLOADS_URL}/${COMPONENT}.tar.gz.sha256" -O ; \
       fi ; \
       sha256sum -c "${COMPONENT}.tar.gz.sha256" ; \
-      tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner --wildcards '*/files' ; \
+      tar -zxf "${COMPONENT}.tar.gz" -C /opt/bitnami --strip-components=2 --no-same-owner ; \
       rm -rf "${COMPONENT}".tar.gz{,.sha256} ; \
     done
 RUN apt-get autoremove --purge -y curl && \
diff --git a/bitnami/harbor-adapter-trivy/2/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json b/bitnami/harbor-adapter-trivy/2/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
index dc0a6490f524..4da510d5b90a 100644
--- a/bitnami/harbor-adapter-trivy/2/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
+++ b/bitnami/harbor-adapter-trivy/2/debian-12/prebuildfs/opt/bitnami/.bitnami_components.json
@@ -3,6 +3,6 @@
         "arch": "amd64",
         "distro": "debian-12",
         "type": "NAMI",
-        "version": "2.12.2-4"
+        "version": "2.12.2-5"
     }
 }
\ No newline at end of file
diff --git a/bitnami/harbor-adapter-trivy/2/debian-12/prebuildfs/opt/bitnami/scripts/libvalidations.sh b/bitnami/harbor-adapter-trivy/2/debian-12/prebuildfs/opt/bitnami/scripts/libvalidations.sh
index b4084bbe976b..6b392b1d1e5c 100644
--- a/bitnami/harbor-adapter-trivy/2/debian-12/prebuildfs/opt/bitnami/scripts/libvalidations.sh
+++ b/bitnami/harbor-adapter-trivy/2/debian-12/prebuildfs/opt/bitnami/scripts/libvalidations.sh
@@ -277,22 +277,12 @@ validate_string() {
                 return 1
                 ;;
             *)
-                break
+                string="$1"
                 ;;
         esac
         shift
     done
 
-    if [ "$#" -gt 1 ]; then
-        stderr_print "too many arguments provided"
-        return 2
-    elif [ "$#" -eq 0 ]; then
-        stderr_print "missing string"
-        return 1
-    else
-        string=$1
-    fi
-
     if [[ "$min_length" -ge 0 ]] && [[ "${#string}" -lt "$min_length" ]]; then
         echo "string length is less than $min_length"
         return 1