[bitnami/harbor-*] Adapt test to work in all distros

Signed-off-by: Jota Martos <[email protected]>
bitnami · Sep 1, 2023 · 285d5f8 · 285d5f8
1 parent 69562ef
commit 285d5f8
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 13 deletions.
diff --git a/.vib/harbor-adapter-trivy/goss/harbor-adapter-trivy.yaml b/.vib/harbor-adapter-trivy/goss/harbor-adapter-trivy.yaml
@@ -25,5 +25,5 @@ command:
     exit-status: 0
   # Ensure permissions for Internal TLS
   check-permissions-system-certs:
-    exec: ls -l /etc/pki/tls/certs/ca-bundle.crt /etc/pki/tls/certs/ca-bundle.trust.crt /etc/ssl/certs/ca-certificates.crt 2>/dev/null | grep ".*-rw-rw-r--"
+    exec: ls -l /etc/pki/tls/certs/ca-bundle.crt /etc/pki/tls/certs/ca-bundle.trust.crt /etc/ssl/certs/ca-certificates.crt 2>/dev/null | grep "^.\{5\}w.*harbor"
     exit-status: 0
diff --git a/.vib/harbor-core/goss/harbor-core.yaml b/.vib/harbor-core/goss/harbor-core.yaml
@@ -35,5 +35,5 @@ file:
 command:
   # Ensure permissions for Internal TLS
   check-permissions-system-certs:
-    exec: ls -l /etc/pki/tls/certs/ca-bundle.crt /etc/pki/tls/certs/ca-bundle.trust.crt /etc/ssl/certs/ca-certificates.crt 2>/dev/null | grep ".*-rw-rw-r--"
-    exit-status: 0
+    exec: ls -l /etc/pki/tls/certs/ca-bundle.crt /etc/pki/tls/certs/ca-bundle.trust.crt /etc/ssl/certs/ca-certificates.crt 2>/dev/null | grep "^.\{5\}w.*harbor"
+    exit-status: 0
diff --git a/.vib/harbor-exporter/goss/harbor-exporter.yaml b/.vib/harbor-exporter/goss/harbor-exporter.yaml
@@ -22,5 +22,5 @@ command:
     exit-status: 0
   # Ensure permissions for Internal TLS
   check-permissions-system-certs:
-    exec: ls -l /etc/pki/tls/certs/ca-bundle.crt /etc/pki/tls/certs/ca-bundle.trust.crt /etc/ssl/certs/ca-certificates.crt 2>/dev/null | grep ".*-rw-rw-r--"
+    exec: ls -l /etc/pki/tls/certs/ca-bundle.crt /etc/pki/tls/certs/ca-bundle.trust.crt /etc/ssl/certs/ca-certificates.crt 2>/dev/null | grep "^.\{5\}w.*harbor"
     exit-status: 0
diff --git a/.vib/harbor-jobservice/goss/harbor-jobservice.yaml b/.vib/harbor-jobservice/goss/harbor-jobservice.yaml
@@ -22,5 +22,5 @@ command:
     exit-status: 0
   # Ensure permissions for Internal TLS
   check-permissions-system-certs:
-    exec: ls -l /etc/pki/tls/certs/ca-bundle.crt /etc/pki/tls/certs/ca-bundle.trust.crt /etc/ssl/certs/ca-certificates.crt 2>/dev/null | grep ".*-rw-rw-r--"     
-    exit-status: 0
+    exec: ls -l /etc/pki/tls/certs/ca-bundle.crt /etc/pki/tls/certs/ca-bundle.trust.crt /etc/ssl/certs/ca-certificates.crt 2>/dev/null | grep "^.\{5\}w.*harbor"
+    exit-status: 0
diff --git a/.vib/harbor-notary-server/goss/harbor-notary-server.yaml b/.vib/harbor-notary-server/goss/harbor-notary-server.yaml
@@ -16,7 +16,7 @@ file:
 command:
   # Ensure permissions for Internal TLS
   check-permissions-system-certs:
-    exec: ls -l /etc/pki/tls/certs/ca-bundle.crt /etc/pki/tls/certs/ca-bundle.trust.crt /etc/ssl/certs/ca-certificates.crt 2>/dev/null | grep ".*-rw-rw-r--"
+    exec: ls -l /etc/pki/tls/certs/ca-bundle.crt /etc/pki/tls/certs/ca-bundle.trust.crt /etc/ssl/certs/ca-certificates.crt 2>/dev/null | grep "^.\{5\}w.*harbor"
     exit-status: 0
   check-notary-server-binary:
     exec: notary-server -h

diff --git a/.vib/harbor-portal/goss/harbor-portal.yaml b/.vib/harbor-portal/goss/harbor-portal.yaml
@@ -23,9 +23,9 @@ file:
 command:
   # Ensure permissions for Internal TLS
   check-permissions-system-certs:
-    exec: ls -l /etc/pki/tls/certs/ca-bundle.crt /etc/pki/tls/certs/ca-bundle.trust.crt /etc/ssl/certs/ca-certificates.crt 2>/dev/null | grep ".*-rw-rw-r--.*harbor"
+    exec: ls -l /etc/pki/tls/certs/ca-bundle.crt /etc/pki/tls/certs/ca-bundle.trust.crt /etc/ssl/certs/ca-certificates.crt 2>/dev/null | grep "^.\{5\}w.*harbor"
     exit-status: 0
   # Ensure a set of directories exist and the non-root user has write privileges to them
   check-directories-exist-with-user:
     exec: ls -dl /etc/ssl/certs /etc/pki/tls/certs/ 2>/dev/null | grep "drwxrwxr-x.*harbor"
-    exit-status: 0
+    exit-status: 0
diff --git a/.vib/harbor-registry/goss/harbor-registry.yaml b/.vib/harbor-registry/goss/harbor-registry.yaml
@@ -29,5 +29,5 @@ command:
     exit-status: 0
   # Ensure permissions for Internal TLS
   check-permissions-system-certs:
-    exec: ls -l /etc/pki/tls/certs/ca-bundle.crt /etc/pki/tls/certs/ca-bundle.trust.crt /etc/ssl/certs/ca-certificates.crt 2>/dev/null | grep ".*-rw-rw-r--.*harbor"
-    exit-status: 0
+    exec: ls -l /etc/pki/tls/certs/ca-bundle.crt /etc/pki/tls/certs/ca-bundle.trust.crt /etc/ssl/certs/ca-certificates.crt 2>/dev/null | grep "^.\{5\}w.*harbor"
+    exit-status: 0
diff --git a/.vib/harbor-registryctl/goss/harbor-registryctl.yaml b/.vib/harbor-registryctl/goss/harbor-registryctl.yaml
@@ -27,8 +27,8 @@ command:
     exit-status: 0
   # Ensure permissions for Internal TLS
   check-permissions-system-certs:
-    exec: ls -l /etc/pki/tls/certs/ca-bundle.crt /etc/pki/tls/certs/ca-bundle.trust.crt /etc/ssl/certs/ca-certificates.crt 2>/dev/null | grep ".*-rw-rw-r--.*harbor"
+    exec: ls -l /etc/pki/tls/certs/ca-bundle.crt /etc/pki/tls/certs/ca-bundle.trust.crt /etc/ssl/certs/ca-certificates.crt 2>/dev/null | grep "^.\{5\}w.*harbor"
     exit-status: 0
   check-harbor-registryctl-binary:
     exec: harbor_registryctl --help
-    exit-status: 0
+    exit-status: 0