Skip to content

Commit 404dffc

Browse files
authored
Merge branch 'dev' into master-into-dev/2.55.4-2.56.0-dev
2 parents 2e08510 + cd49b1d commit 404dffc

83 files changed

Lines changed: 4425 additions & 204 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/build-docker-images-for-testing.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353

5454
- name: Build
5555
id: docker_build
56-
uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
56+
uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6.19.2
5757
timeout-minutes: 15
5858
env:
5959
DOCKER_BUILD_CHECKS_ANNOTATIONS: false

.github/workflows/close-stale.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
runs-on: ubuntu-latest
1717
steps:
1818
- name: Close issues and PRs that are pending closure
19-
uses: actions/stale@997185467fa4f803885201cee163a9f38240193d # v10.1.1
19+
uses: actions/stale@b5d41d4e1d5dceea10e7104786b73624c18a190f # v10.2.0
2020
with:
2121
# Disable automatic stale marking - only close manually labeled items
2222
days-before-stale: -1
@@ -27,7 +27,7 @@ jobs:
2727
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.'
2828

2929
- name: Close stale issues and PRs
30-
uses: actions/stale@997185467fa4f803885201cee163a9f38240193d # v10.1.1
30+
uses: actions/stale@b5d41d4e1d5dceea10e7104786b73624c18a190f # v10.2.0
3131
with:
3232
# Disable automatic stale marking - only close manually labeled items
3333
days-before-stale: -1

.github/workflows/gh-pages.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- name: Setup Node
2525
uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
2626
with:
27-
node-version: '24.13.0' # TODO: Renovate helper might not be needed here - needs to be fully tested
27+
node-version: '24.13.1' # TODO: Renovate helper might not be needed here - needs to be fully tested
2828

2929
- name: Cache dependencies
3030
uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3

.github/workflows/integration-tests.yml

Lines changed: 54 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -11,36 +11,70 @@ jobs:
1111
strategy:
1212
matrix:
1313
test-case: [
14-
"tests/finding_test.py",
15-
"tests/report_builder_test.py",
16-
"tests/notes_test.py",
17-
"tests/regulations_test.py",
18-
"tests/product_type_test.py",
19-
"tests/product_test.py",
14+
"openapi-validatator",
15+
"tests/action_history_test.py",
16+
"tests/alerts_test.py",
17+
"tests/announcement_banner_test.py",
18+
"tests/banner_test.py",
19+
"tests/base_test_class.py",
20+
"tests/benchmark_test.py",
21+
"tests/calendar_test.py",
22+
"tests/check_various_pages.py",
23+
"tests/close_old_findings_dedupe_test.py",
24+
"tests/close_old_findings_test.py",
25+
"tests/credential_test.py",
26+
"tests/dashboard_test.py",
27+
"tests/dedupe_test.py",
28+
"tests/endpoint_extended_test.py",
2029
"tests/endpoint_test.py",
30+
"tests/engagement_checklist_test.py",
31+
"tests/engagement_export_test.py",
32+
"tests/engagement_extended_test.py",
33+
"tests/engagement_presets_test.py",
2134
"tests/engagement_test.py",
2235
"tests/environment_test.py",
23-
"tests/test_test.py",
24-
"tests/user_test.py",
36+
"tests/false_positive_history_test.py",
37+
"tests/file_test.py",
38+
"tests/finding_extended_test.py",
39+
"tests/finding_group_test.py",
40+
"tests/finding_test.py",
2541
"tests/group_test.py",
42+
"tests/login_test.py",
43+
"tests/metrics_extended_test.py",
44+
"tests/note_type_test.py",
45+
"tests/notes_test.py",
46+
"tests/notification_webhook_test.py",
47+
"tests/notifications_test.py",
48+
"tests/object_test.py",
49+
"tests/product_credential_test.py",
2650
"tests/product_group_test.py",
27-
"tests/product_type_group_test.py",
2851
"tests/product_member_test.py",
52+
"tests/product_metadata_test.py",
53+
"tests/product_tag_metrics_test.py",
54+
"tests/product_test.py",
55+
"tests/product_type_group_test.py",
2956
"tests/product_type_member_test.py",
30-
"tests/ibm_appscan_test.py",
57+
"tests/product_type_test.py",
58+
"tests/questionnaire_advanced_test.py",
59+
"tests/questionnaire_test.py",
60+
"tests/regulations_test.py",
61+
"tests/reimport_scan_test.py",
62+
"tests/report_builder_test.py",
63+
"tests/risk_acceptance_test.py",
3164
"tests/search_test.py",
32-
"tests/file_test.py",
33-
"tests/dedupe_test.py",
34-
"tests/announcement_banner_test.py",
35-
"tests/close_old_findings_dedupe_test.py",
36-
"tests/close_old_findings_test.py",
37-
"tests/false_positive_history_test.py",
38-
"tests/check_various_pages.py",
65+
"tests/sla_configuration_test.py",
66+
"tests/system_settings_test.py",
67+
"tests/test_copy_test.py",
68+
"tests/test_test.py",
69+
"tests/test_type_test.py",
70+
"tests/threat_model_test.py",
71+
"tests/tool_config.py",
72+
"tests/tool_product_test.py",
73+
"tests/tool_type_test.py",
74+
"tests/user_profile_test.py",
75+
"tests/user_test.py",
3976
# "tests/import_scanner_test.py",
4077
# "tests/zap.py",
41-
"tests/notifications_test.py",
42-
"tests/tool_config.py",
43-
"openapi-validatator",
4478
]
4579
os: [alpine, debian]
4680
v3_feature_locations: [true, false]

.github/workflows/k8s-tests.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,18 @@ jobs:
1616
# databases, broker and k8s are independent, so we don't need to test each combination
1717
# lastest k8s version (https://kubernetes.io/releases/) and the oldest officially supported version
1818
# are tested (https://kubernetes.io/releases/)
19-
- k8s: 'v1.35.0' # renovate: datasource=github-releases depName=kubernetes/kubernetes versioning=loose
19+
- k8s: 'v1.35.1' # renovate: datasource=github-releases depName=kubernetes/kubernetes versioning=loose
2020
os: debian
21-
- k8s: '1.32.11' # renovate: datasource=custom.endoflife-oldest-maintained depName=kubernetes
21+
- k8s: '1.32.12' # renovate: datasource=custom.endoflife-oldest-maintained depName=kubernetes
2222
os: debian
2323
steps:
2424
- name: Checkout
2525
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2626

2727
- name: Setup Minikube
28-
uses: manusa/actions-setup-minikube@b589f2d61bf96695c546929c72b38563e856059d # v2.14.0
28+
uses: manusa/actions-setup-minikube@8234275e0386fe1cdaf519d28c90f4f03fad89e4 # v2.15.0
2929
with:
30-
minikube version: 'v1.38.0' # renovate: datasource=github-releases depName=kubernetes/minikube
30+
minikube version: 'v1.38.1' # renovate: datasource=github-releases depName=kubernetes/minikube
3131
kubernetes version: ${{ matrix.k8s }}
3232
driver: docker
3333
start args: '--addons=ingress --cni calico'

.github/workflows/release-x-manual-docker-containers.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969
# we cannot set any tags here, those are set on the merged digest in release-x-manual-merge-container-digests.yml
7070
- name: Build and push images
7171
id: build
72-
uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
72+
uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6.19.2
7373
env:
7474
DOCKER_BUILD_CHECKS_ANNOTATIONS: false
7575
with:

.github/workflows/renovate.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ jobs:
2121
uses: suzuki-shunsuke/github-action-renovate-config-validator@ca480cb7ec89a9e1cd8c214ad33bda1617184027 # v2.0.0
2222
with:
2323
strict: "true"
24-
validator_version: 42.92.5 # renovate: datasource=github-releases depName=renovatebot/renovate
24+
validator_version: 43.24.0 # renovate: datasource=github-releases depName=renovatebot/renovate

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ jobs:
2020
with:
2121
ref: ${{ github.ref_name || 'dev'}}
2222

23-
- name: Run binary
23+
- name: Run updater
2424
run: |
25-
./fixture-updater dojo/fixtures/defect_dojo_sample_data.json
25+
scripts/fixture-updater.py dojo/fixtures/defect_dojo_sample_data.json
2626
mv output.json dojo/fixtures/defect_dojo_sample_data.json
2727
2828
- name: Configure git

.github/workflows/validate_docs_build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- name: Setup Node
2020
uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
2121
with:
22-
node-version: '24.13.0' # TODO: Renovate helper might not be needed here - needs to be fully tested
22+
node-version: '24.13.1' # TODO: Renovate helper might not be needed here - needs to be fully tested
2323

2424
- name: Cache dependencies
2525
uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3

Dockerfile.django-alpine

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# Dockerfile.nginx to use the caching mechanism of Docker.
66

77
# Ref: https://devguide.python.org/#branchstatus
8-
FROM python:3.13.11-alpine3.22@sha256:2fd93799bfc6381d078a8f656a5f45d6092e5d11d16f55889b3d5cbfdc64f045 AS base
8+
FROM python:3.13.12-alpine3.22@sha256:41351b07080ccfaa27bf38dde20de79ee6a0ac74a58c00c6d7a7d96ac4e69716 AS base
99
FROM base AS build
1010
WORKDIR /app
1111
RUN \

0 commit comments

Comments
 (0)