Merge branch 'dev' into world-class-docs

Author: paulOsinski

.github/workflows/close-stale.yml

@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Close issues and PRs that are pending closure
-        uses: actions/stale@997185467fa4f803885201cee163a9f38240193d # v10.1.1
+        uses: actions/stale@b5d41d4e1d5dceea10e7104786b73624c18a190f # v10.2.0
         with:
           # Disable automatic stale marking - only close manually labeled items
           days-before-stale: -1
@@ -27,7 +27,7 @@ jobs:
           close-pr-message: 'This PR has been automatically closed because it was manually labeled as stale. If you believe this was closed in error, please reopen it and remove the stale label.'
 
       - name: Close stale issues and PRs
-        uses: actions/stale@997185467fa4f803885201cee163a9f38240193d # v10.1.1
+        uses: actions/stale@b5d41d4e1d5dceea10e7104786b73624c18a190f # v10.2.0
         with:
           # Disable automatic stale marking - only close manually labeled items
           days-before-stale: -1

.github/workflows/integration-tests.yml

@@ -11,36 +11,70 @@ jobs:
     strategy:
       matrix:
         test-case: [
-          "tests/finding_test.py",
-          "tests/report_builder_test.py",
-          "tests/notes_test.py",
-          "tests/regulations_test.py",
-          "tests/product_type_test.py",
-          "tests/product_test.py",
+          "openapi-validatator",
+          "tests/action_history_test.py",
+          "tests/alerts_test.py",
+          "tests/announcement_banner_test.py",
+          "tests/banner_test.py",
+          "tests/base_test_class.py",
+          "tests/benchmark_test.py",
+          "tests/calendar_test.py",
+          "tests/check_various_pages.py",
+          "tests/close_old_findings_dedupe_test.py",
+          "tests/close_old_findings_test.py",
+          "tests/credential_test.py",
+          "tests/dashboard_test.py",
+          "tests/dedupe_test.py",
+          "tests/endpoint_extended_test.py",
           "tests/endpoint_test.py",
+          "tests/engagement_checklist_test.py",
+          "tests/engagement_export_test.py",
+          "tests/engagement_extended_test.py",
+          "tests/engagement_presets_test.py",
           "tests/engagement_test.py",
           "tests/environment_test.py",
-          "tests/test_test.py",
-          "tests/user_test.py",
+          "tests/false_positive_history_test.py",
+          "tests/file_test.py",
+          "tests/finding_extended_test.py",
+          "tests/finding_group_test.py",
+          "tests/finding_test.py",
           "tests/group_test.py",
+          "tests/login_test.py",
+          "tests/metrics_extended_test.py",
+          "tests/note_type_test.py",
+          "tests/notes_test.py",
+          "tests/notification_webhook_test.py",
+          "tests/notifications_test.py",
+          "tests/object_test.py",
+          "tests/product_credential_test.py",
           "tests/product_group_test.py",
-          "tests/product_type_group_test.py",
           "tests/product_member_test.py",
+          "tests/product_metadata_test.py",
+          "tests/product_tag_metrics_test.py",
+          "tests/product_test.py",
+          "tests/product_type_group_test.py",
           "tests/product_type_member_test.py",
-          "tests/ibm_appscan_test.py",
+          "tests/product_type_test.py",
+          "tests/questionnaire_advanced_test.py",
+          "tests/questionnaire_test.py",
+          "tests/regulations_test.py",
+          "tests/reimport_scan_test.py",
+          "tests/report_builder_test.py",
+          "tests/risk_acceptance_test.py",
           "tests/search_test.py",
-          "tests/file_test.py",
-          "tests/dedupe_test.py",
-          "tests/announcement_banner_test.py",
-          "tests/close_old_findings_dedupe_test.py",
-          "tests/close_old_findings_test.py",
-          "tests/false_positive_history_test.py",
-          "tests/check_various_pages.py",
+          "tests/sla_configuration_test.py",
+          "tests/system_settings_test.py",
+          "tests/test_copy_test.py",
+          "tests/test_test.py",
+          "tests/test_type_test.py",
+          "tests/threat_model_test.py",
+          "tests/tool_config.py",
+          "tests/tool_product_test.py",
+          "tests/tool_type_test.py",
+          "tests/user_profile_test.py",
+          "tests/user_test.py",
           # "tests/import_scanner_test.py",
           # "tests/zap.py",
-          "tests/notifications_test.py",
-          "tests/tool_config.py",
-          "openapi-validatator",
         ]
         os: [alpine, debian]
         v3_feature_locations: [true, false]

.github/workflows/k8s-tests.yml

@@ -27,7 +27,7 @@ jobs:
       - name: Setup Minikube
         uses: manusa/actions-setup-minikube@8234275e0386fe1cdaf519d28c90f4f03fad89e4 # v2.15.0
         with:
-          minikube version: 'v1.38.0' # renovate: datasource=github-releases depName=kubernetes/minikube
+          minikube version: 'v1.38.1' # renovate: datasource=github-releases depName=kubernetes/minikube
           kubernetes version: ${{ matrix.k8s }}
           driver: docker
           start args: '--addons=ingress --cni calico'

.github/workflows/release-2-tag-docker-push.yml

@@ -71,7 +71,7 @@ jobs:
     secrets: inherit
 
   release-drafter:
-    needs: publish-container-digests
+    needs: [publish-container-digests, release-helm-chart]
     uses: ./.github/workflows/release-drafter.yml
     with:
       version: ${{ inputs.release_number }}

.github/workflows/renovate.yaml

@@ -21,4 +21,4 @@ jobs:
         uses: suzuki-shunsuke/github-action-renovate-config-validator@ca480cb7ec89a9e1cd8c214ad33bda1617184027 # v2.0.0
         with:
           strict: "true"
-          validator_version: 43.24.0 # renovate: datasource=github-releases depName=renovatebot/renovate
+          validator_version: 43.31.7 # renovate: datasource=github-releases depName=renovatebot/renovate

.github/workflows/update-sample-data.yml

@@ -20,9 +20,9 @@ jobs:
         with:
           ref: ${{ github.ref_name || 'dev'}}
 
-      - name: Run binary
+      - name: Run updater
         run: |
-          ./fixture-updater dojo/fixtures/defect_dojo_sample_data.json
+          scripts/fixture-updater.py dojo/fixtures/defect_dojo_sample_data.json
           mv output.json dojo/fixtures/defect_dojo_sample_data.json
 
       - name: Configure git

docker-compose.yml

@@ -120,8 +120,9 @@ services:
           source: ./docker/extra_settings
           target: /app/docker/extra_settings
   postgres:
-    image: postgres:18.2-alpine@sha256:88f300be8635fe8a9ed4c18a68ba497fb6df1215fd2b074895afd027bd3e1006
+    image: postgres:18.2-alpine@sha256:035b9ab53cfa147d7202b61f5f7782b939ae815b7d6bc81c96b7b42ff1fca950
     environment:
+      PGDATA: /var/lib/postgresql/data
       POSTGRES_DB: ${DD_DATABASE_NAME:-defectdojo}
       POSTGRES_USER: ${DD_DATABASE_USER:-defectdojo}
       POSTGRES_PASSWORD: ${DD_DATABASE_PASSWORD:-defectdojo}