Merge pull request dbca-wa#416 from ropable/master

Remove HTML template fragment caching, additiona cache config settings.

.github/workflows/image-build-scan.yml

@@ -80,6 +80,7 @@ jobs:
         uses: aquasecurity/trivy-action@master
         with:
           scan-type: 'image'
+          scanners: 'vuln'
           image-ref: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
           vuln-type: 'os,library'
           severity: 'HIGH,CRITICAL'

.github/workflows/secret-scan.yml

@@ -0,0 +1,25 @@
+name: "Scan project for secrets & sensitive information"
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  secret-scan:
+    name: Scan project for secrets
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+    - name: Secret scanning
+      uses: trufflesecurity/trufflehog@main
+      with:
+        base: ""
+        head: ${{ github.ref_name }}
+        extra_args: --only-verified

.pre-commit-config.yaml

@@ -8,4 +8,4 @@ repos:
       # For running trufflehog in docker, use the following entry instead:
       # entry: bash -c 'docker run --rm -v "$(pwd):/workdir" -i --rm trufflesecurity/trufflehog:latest git file:///workdir --since-commit HEAD --only-verified --fail'
       language: system
-      stages: ["commit", "push"]
+      stages: ["pre-commit", "pre-push"]

kustomize/overlays/prod/deployment_patch.yaml

@@ -168,3 +168,13 @@ spec:
             secretKeyRef:
               name: prs-env-prod
               key: REDIS_CACHE_HOST
+        - name: API_RESPONSE_CACHE_SECONDS
+          valueFrom:
+            secretKeyRef:
+              name: prs-env-prod
+              key: API_RESPONSE_CACHE_SECONDS
+        - name: CACHE_MIDDLEWARE_SECONDS
+          valueFrom:
+            secretKeyRef:
+              name: prs-env-prod
+              key: CACHE_MIDDLEWARE_SECONDS

kustomize/overlays/prod/kustomization.yaml

@@ -26,4 +26,4 @@ patches:
   - path: typesense_service_patch.yaml
 images:
   - name: ghcr.io/dbca-wa/prs
-    newTag: 2.5.58
+    newTag: 2.5.59

kustomize/overlays/uat/deployment_patch.yaml

@@ -167,3 +167,13 @@ spec:
             secretKeyRef:
               name: prs-env-uat
               key: REDIS_CACHE_HOST
+        - name: API_RESPONSE_CACHE_SECONDS
+          valueFrom:
+            secretKeyRef:
+              name: prs-env-uat
+              key: API_RESPONSE_CACHE_SECONDS
+        - name: CACHE_MIDDLEWARE_SECONDS
+          valueFrom:
+            secretKeyRef:
+              name: prs-env-uat
+              key: CACHE_MIDDLEWARE_SECONDS