Skip to content

Commit 8fcc32b

Browse files
authored
Merge branch 'dev' into Maffooch-patch-6
2 parents ebdde07 + cb57c63 commit 8fcc32b

671 files changed

Lines changed: 46071 additions & 7929 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/pull_request_template.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ This checklist is for your information.
2626
- [ ] Bugfixes should be submitted against the `bugfix` branch.
2727
- [ ] Give a meaningful name to your PR, as it may end up being used in the release notes.
2828
- [ ] Your code is flake8 compliant.
29-
- [ ] Your code is python 3.12 compliant.
29+
- [ ] Your code is python 3.13 compliant.
3030
- [ ] If this is a new feature and not a bug fix, you've included the proper documentation in the docs at https://github.com/DefectDojo/django-DefectDojo/tree/dev/docs as part of this PR.
3131
- [ ] Model changes must include the necessary migrations in the dojo/db_migrations folder.
3232
- [ ] Add applicable tests to the unit tests.

.github/renovate.json

Lines changed: 52 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,65 @@
11
{
22
"extends": [
3-
"config:base"
3+
"config:recommended"
44
],
55
"dependencyDashboard": true,
66
"dependencyDashboardApproval": false,
7-
"baseBranches": ["dev"],
7+
"baseBranchPatterns": ["dev"],
88
"rebaseWhen": "conflicted",
99
"separateMinorPatch": true,
10-
"ignorePaths": ["requirements.txt", "requirements-lint.txt", "components/package.json", "components/package-lock.json", "dojo/components/yarn.lock", "dojo/components/package.json", "Dockerfile**"],
10+
"ignorePaths": [
11+
"requirements.txt",
12+
"requirements-lint.txt",
13+
"components/package.json",
14+
"components/package-lock.json",
15+
"dojo/components/yarn.lock",
16+
"dojo/components/package.json",
17+
"Dockerfile**"
18+
],
1119
"ignoreDeps": [],
1220
"packageRules": [{
13-
"packagePatterns": ["*"],
14-
"commitMessageExtra": "from {{currentVersion}} to {{#if isMajor}}v{{{newMajor}}}{{else}}{{#if isSingleVersion}}v{{{toVersion}}}{{else}}{{{newValue}}}{{/if}}{{/if}}",
21+
"matchPackageNames": ["*"],
22+
"commitMessageExtra": "from {{currentVersion}} to {{#if isMajor}}v{{{newMajor}}}{{else}}{{#if isSingleVersion}}v{{{newVersion}}}{{else}}{{{newValue}}}{{/if}}{{/if}}",
1523
"commitMessageSuffix": "({{packageFile}})",
1624
"labels": ["dependencies"]
25+
},{
26+
"description": "Update renovate weekly (sundays) - They are releasing new versions too often, so it is a bit noisy, and keeping renovating a bit older does not create vulnerabilities in DD",
27+
"matchDatasources": "github-releases",
28+
"matchPackageNames": "renovatebot/renovate",
29+
"schedule": ["* * * * 0"]
30+
},{
31+
"description": "Minikube does not like freshly released k8s. We need to wait some time so it will be adopted",
32+
"matchDatasources": [
33+
"custom.endoflife-oldest-maintained",
34+
"github-releases"
35+
],
36+
"matchPackageNames": [
37+
"kubernetes",
38+
"kubernetes/kubernetes"
39+
],
40+
"minimumReleaseAge": "2 days"
1741
}],
18-
"registryAliases": {
19-
"bitnami": "https://charts.bitnami.com/bitnami"
20-
}
42+
"customDatasources": {
43+
"endoflife-oldest-maintained": {
44+
"defaultRegistryUrlTemplate": "https://endoflife.date/api/v1/products/{{packageName}}",
45+
"format": "json",
46+
"transformTemplates": [
47+
"{ \"releases\": [$.result.releases[isMaintained = true]^(<eolFrom)[0].latest.{\"version\": name, \"releaseTimestamp\": date, \"changelogUrl\": link}], \"sourceUrl\": \"https://github.com/kubernetes/kubernetes\", \"homepage\": \"https://kubernetes.io/\" }"
48+
]
49+
}
50+
},
51+
"customManagers": [
52+
{
53+
"customType": "regex",
54+
"managerFilePatterns": [
55+
"/^.github/workflows//"
56+
],
57+
"matchStrings": [
58+
"\\w*:\\s\"(?<currentValue>\\S+)\"\\s#\\s*renovate:\\s*datasource=(?<datasource>.*?) depName=(?<depName>.*?)( versioning=(?<versioning>.*?))?\\s",
59+
"\\w*:\\s'(?<currentValue>\\S+)'\\s#\\s*renovate:\\s*datasource=(?<datasource>.*?) depName=(?<depName>.*?)( versioning=(?<versioning>.*?))?\\s",
60+
"\\w*:\\s(?<currentValue>\\S+)\\s#\\s*renovate:\\s*datasource=(?<datasource>.*?) depName=(?<depName>.*?)( versioning=(?<versioning>.*?))?\\s"
61+
],
62+
"versioningTemplate": "{{#if versioning}}{{{versioning}}}{{else}}semver{{/if}}"
63+
}
64+
]
2165
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
echo $GITHUB_ENV
4141
4242
- name: Checkout
43-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
43+
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
4444
with:
4545
persist-credentials: false
4646

@@ -67,7 +67,7 @@ jobs:
6767
# export docker images to be used in next jobs below
6868
- name: Upload image ${{ matrix.docker-image }} as artifact
6969
timeout-minutes: 15
70-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
70+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
7171
with:
7272
name: built-docker-image-${{ matrix.docker-image }}-${{ matrix.os }}-${{ env.PLATFORM }}
7373
path: ${{ matrix.docker-image }}-${{ matrix.os }}-${{ env.PLATFORM }}_img

.github/workflows/close-stale.yml

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,24 @@ jobs:
1515
close-stale:
1616
runs-on: ubuntu-latest
1717
steps:
18+
- name: Close issues and PRs that are pending closure
19+
uses: actions/stale@5f858e3efba33a5ca4407a664cc011ad407f2008 # v10.1.0
20+
with:
21+
# Disable automatic stale marking - only close manually labeled items
22+
days-before-stale: -1
23+
days-before-close: 7
24+
stale-issue-label: 'pending-closure'
25+
stale-pr-label: 'pending-closure'
26+
close-issue-message: 'This issue 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.'
27+
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.'
28+
1829
- name: Close stale issues and PRs
19-
uses: actions/stale@3a9db7e6a41a89f618792c92c0e97cc736e1b13f # v10.0.0
30+
uses: actions/stale@5f858e3efba33a5ca4407a664cc011ad407f2008 # v10.1.0
2031
with:
2132
# Disable automatic stale marking - only close manually labeled items
2233
days-before-stale: -1
2334
days-before-close: 7
2435
stale-issue-label: 'stale'
2536
stale-pr-label: 'stale'
26-
close-issue-message: 'This issue 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.'
27-
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.'
37+
close-issue-message: 'This issue has been automatically closed because it was labeled as stale. If you believe this was closed in error, please reopen it and remove the stale label.'
38+
close-pr-message: 'This PR has been automatically closed because it was labeled as stale. If you believe this was closed in error, please reopen it and remove the stale label.'

.github/workflows/detect-merge-conflicts.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
- master
88
- bugfix
99
- release/*
10-
10+
1111
pull_request_target:
1212
types: [synchronize]
1313

@@ -16,6 +16,8 @@ jobs:
1616
runs-on: ubuntu-latest
1717
steps:
1818
- name: check if prs are conflicted
19+
# we experience a high error rate so we allow this to fail but still have the check become green on the PR
20+
continue-on-error: true
1921
uses: eps1lon/actions-label-merge-conflict@1df065ebe6e3310545d4f4c4e862e43bdca146f0 # v3.0.3
2022
with:
2123
dirtyLabel: "conflicts-detected"

.github/workflows/fetch-oas.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
file-type: [yaml, json]
2323
steps:
2424
- name: Checkout
25-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
25+
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
2626
with:
2727
ref: release/${{ env.release_version }}
2828

@@ -51,7 +51,7 @@ jobs:
5151
run: docker compose down
5252

5353
- name: Upload oas.${{ matrix.file-type }} as artifact
54-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
54+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
5555
with:
5656
name: oas-${{ matrix.file-type }}
5757
path: oas.${{ matrix.file-type }}

.github/workflows/gh-pages.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,24 +15,24 @@ jobs:
1515
- name: Setup Hugo
1616
uses: peaceiris/actions-hugo@75d2e84710de30f6ff7268e08f310b60ef14033f # v3.0.0
1717
with:
18-
hugo-version: '0.140.1'
18+
hugo-version: '0.152.2' # renovate: datasource=github-releases depName=gohugoio/hugo
1919
extended: true
2020

2121
- name: Setup Node
22-
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
22+
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
2323
with:
24-
node-version: '22.19.0'
24+
node-version: '24.11.1' # TODO: Renovate helper might not be needed here - needs to be fully tested
2525

2626
- name: Cache dependencies
27-
uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
27+
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
2828
with:
2929
path: ~/.npm
3030
key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
3131
restore-keys: |
3232
${{ runner.os }}-node-
3333
3434
- name: Checkout
35-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
35+
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
3636
with:
3737
submodules: recursive
3838
fetch-depth: 0

.github/workflows/integration-tests.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,18 @@ name: Integration tests
22

33
on:
44
workflow_call:
5+
inputs:
6+
auditlog_type:
7+
type: string
8+
default: "django-auditlog"
59

610
jobs:
711
integration_tests:
812
# run tests with docker compose
913
name: User Interface Tests
1014
runs-on: ubuntu-latest
15+
env:
16+
AUDITLOG_TYPE: ${{ inputs.auditlog_type }}
1117
strategy:
1218
matrix:
1319
test-case: [
@@ -48,11 +54,11 @@ jobs:
4854

4955
steps:
5056
- name: Checkout
51-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
57+
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
5258

5359
# load docker images from build jobs
5460
- name: Load images from artifacts
55-
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
61+
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
5662
with:
5763
path: built-docker-image
5864
pattern: built-docker-image-*
@@ -70,7 +76,7 @@ jobs:
7076
run: ln -s docker-compose.override.integration_tests.yml docker-compose.override.yml
7177

7278
- name: Start Dojo
73-
run: docker compose up --no-deps -d postgres nginx celerybeat celeryworker mailhog uwsgi redis
79+
run: docker compose up --no-deps -d postgres nginx celerybeat celeryworker mailhog uwsgi valkey
7480
env:
7581
DJANGO_VERSION: ${{ matrix.os }}
7682
NGINX_VERSION: alpine

0 commit comments

Comments
 (0)