From 68ce5b62e7a6336baaba027fa01b90e8d637d25b Mon Sep 17 00:00:00 2001
From: David Gomez <dgomezleon@vmware.com>
Date: Fri, 18 Oct 2024 13:48:02 +0200
Subject: [PATCH] [bitnami/grafana] Fix check-app-version GOSS test (#73403)

Signed-off-by: David Gomez <dgomezleon@vmware.com>
---
 .vib/grafana/goss/vars.yaml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.vib/grafana/goss/vars.yaml b/.vib/grafana/goss/vars.yaml
index 2b44256bbffa2..0d0caec143b31 100644
--- a/.vib/grafana/goss/vars.yaml
+++ b/.vib/grafana/goss/vars.yaml
@@ -2,10 +2,9 @@ binaries:
   - grafana
 root_dir: /opt/bitnami
 version:
-  # HACK: Temporary fix for Grafana 11.1.3 which had an incorrect version set
-  # https://github.com/grafana/grafana/issues/90947
+  # HACK: Fix for Grafana X.Y.Z+security-N releases
   bin_name: bash
-  flag: -c "if [[ \"$APP_VERSION\" = \"11.1.3\" ]]; then echo 11.1.3; else grafana --version; fi"
+  flag: -c "if [[ \"$APP_VERSION\" =~ -[0-9]+ ]]; then echo "${APP_VERSION//-[0-9]*/}"; else grafana --version; fi"
 files:
   - mode: "0664"
     paths: