From 6f00ef9bcc27e452916d45091f27c30b6fbc1534 Mon Sep 17 00:00:00 2001
From: Francisco de Paz Galan <fdepaz@vmware.com>
Date: Thu, 13 Apr 2023 17:29:00 +0200
Subject: [PATCH] [bitnami/*] Update app-version tests (#30100)

Signed-off-by: FraPazGal <fdepaz@vmware.com>
---
 .vib/cosign/goss/cosign.yaml     | 5 -----
 .vib/cosign/goss/goss.yaml       | 1 +
 .vib/cosign/goss/vars.yaml       | 3 +++
 .vib/nginx/goss/goss.yaml        | 1 +
 .vib/nginx/goss/nginx.yaml       | 5 -----
 .vib/openldap/goss/goss.yaml     | 1 +
 .vib/openldap/goss/openldap.yaml | 5 -----
 7 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/.vib/cosign/goss/cosign.yaml b/.vib/cosign/goss/cosign.yaml
index 28e95c3304ec..a6b6ce040624 100644
--- a/.vib/cosign/goss/cosign.yaml
+++ b/.vib/cosign/goss/cosign.yaml
@@ -1,9 +1,4 @@
 command:
-  check-app-version:
-    exec: cosign version 2>&1
-    exit-status: 0
-    stdout:
-    - {{ .Env.APP_VERSION }}
   initialize-sigstore:
     exec: cosign initialize
     exit-status: 0
diff --git a/.vib/cosign/goss/goss.yaml b/.vib/cosign/goss/goss.yaml
index 1203d0afcfe6..a0b1ad0f2f78 100644
--- a/.vib/cosign/goss/goss.yaml
+++ b/.vib/cosign/goss/goss.yaml
@@ -2,6 +2,7 @@ gossfile:
   # Goss tests exclusive to the current container
   ../../cosign/goss/cosign.yaml: {}
   # Load scripts from .vib/common/goss/templates
+  ../../common/goss/templates/check-app-version.yaml: {}
   ../../common/goss/templates/check-binaries.yaml: {}
   ../../common/goss/templates/check-broken-symlinks.yaml: {}
   ../../common/goss/templates/check-ca-certs.yaml: {}
diff --git a/.vib/cosign/goss/vars.yaml b/.vib/cosign/goss/vars.yaml
index ecb379a354b9..119607990f96 100644
--- a/.vib/cosign/goss/vars.yaml
+++ b/.vib/cosign/goss/vars.yaml
@@ -1,3 +1,6 @@
 binaries:
   - cosign
 root_dir: /opt/bitnami
+version:
+  bin_name: cosign
+  flag: version
diff --git a/.vib/nginx/goss/goss.yaml b/.vib/nginx/goss/goss.yaml
index 67c9c66b6639..b2fbf4ebd2d8 100644
--- a/.vib/nginx/goss/goss.yaml
+++ b/.vib/nginx/goss/goss.yaml
@@ -2,6 +2,7 @@ gossfile:
   # Goss tests exclusive to the current container
   ../../nginx/goss/nginx.yaml: {}
   # Load scripts from .vib/common/goss/templates
+  ../../common/goss/templates/check-app-version.yaml: {}
   ../../common/goss/templates/check-binaries.yaml: {}
   ../../common/goss/templates/check-broken-symlinks.yaml: {}
   ../../common/goss/templates/check-ca-certs.yaml: {}
diff --git a/.vib/nginx/goss/nginx.yaml b/.vib/nginx/goss/nginx.yaml
index f05342846d22..2e6f25a2c666 100644
--- a/.vib/nginx/goss/nginx.yaml
+++ b/.vib/nginx/goss/nginx.yaml
@@ -33,11 +33,6 @@ file:
     contains:
       - /Unset.*HTTP_PROXY/
 command:
-  check-app-version:
-    exec: {{ .Vars.version.bin_name }} {{ .Vars.version.flag }} 2>&1
-    exit-status: 0
-    stdout:
-    - {{ .Env.APP_VERSION }}
   test-config:
     exec: nginx -t
     exit-status: 0
diff --git a/.vib/openldap/goss/goss.yaml b/.vib/openldap/goss/goss.yaml
index 05c7d1e32a28..e321e2527024 100644
--- a/.vib/openldap/goss/goss.yaml
+++ b/.vib/openldap/goss/goss.yaml
@@ -2,6 +2,7 @@ gossfile:
   # Goss tests exclusive to the current container
   ../../openldap/goss/openldap.yaml: {}
   # Load scripts from .vib/common/goss/templates
+  ../../common/goss/templates/check-app-version.yaml: {}
   ../../common/goss/templates/check-binaries.yaml: {}
   ../../common/goss/templates/check-broken-symlinks.yaml: {}
   ../../common/goss/templates/check-ca-certs.yaml: {}
diff --git a/.vib/openldap/goss/openldap.yaml b/.vib/openldap/goss/openldap.yaml
index fc5c69fa30a4..4a92e21107e4 100644
--- a/.vib/openldap/goss/openldap.yaml
+++ b/.vib/openldap/goss/openldap.yaml
@@ -18,11 +18,6 @@ file:
     exists: true
   {{ end }}
 command:
-  check-app-version:
-    exec: {{ .Vars.version.bin_name }} {{ .Vars.version.flag }} 2>&1
-    exit-status: 0
-    stdout:
-      - {{ .Env.APP_VERSION }}
   check-enabled-backends:
     exec: slapd -VVV 2>&1
     exit-status: 0