Skip to content

Commit a69d0fe

Browse files
valentijnscholtenvalentijnscholten
committed
Sync helm-charts with master (preserve index.yaml)
2 parents fb0bcf7 + 16ab93d commit a69d0fe

3,119 files changed

Lines changed: 1657794 additions & 147789 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.

‎.dryrunsecurity.yaml‎

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
---
2+
sensitiveCodepaths:
3+
- 'dojo/object/urls.py'
4+
- 'dojo/object/views.py'
5+
- 'dojo/announcement/*.py'
6+
- 'dojo/api_v2/*.py'
7+
- 'dojo/api_v2/**/*.py'
8+
- 'dojo/authorization/*.py'
9+
- 'dojo/db_migrations/*.py'
10+
- 'dojo/endpoint/*.py'
11+
- 'dojo/engagement/*.py'
12+
- 'dojo/finding/*.py'
13+
- 'dojo/finding_group/*.py'
14+
- 'dojo/group/*.py'
15+
- 'dojo/importers/*.py'
16+
- 'dojo/importers/**/*.py'
17+
- 'dojo/jira_link/*.py'
18+
- 'dojo/metrics/*.py'
19+
- 'dojo/note_type/*.py'
20+
- 'dojo/notes/*.py'
21+
- 'dojo/product/*.py'
22+
- 'dojo/product_type/*.py'
23+
- 'dojo/reports/*.py'
24+
- 'dojo/risk_acceptance/*.py'
25+
- 'dojo/search/*.py'
26+
- 'dojo/templates/*.html'
27+
- 'dojo/templates/**/*.html'
28+
- 'dojo/templatetags/*.py'
29+
- 'dojo/test/*.py'
30+
- 'dojo/tool_config/*.py'
31+
- 'dojo/tool_product/*.py'
32+
- 'dojo/tool_type/*.py'
33+
- 'dojo/user/*.py'
34+
- 'dojo/apps.py'
35+
- 'dojo/celery.py'
36+
- 'dojo/context_processors.py'
37+
- 'dojo/decorators.py'
38+
- 'dojo/filters.py'
39+
- 'dojo/forms.py'
40+
- 'dojo/middleware.py'
41+
- 'dojo/models.py'
42+
- 'dojo/okta.py'
43+
- 'dojo/pipeline.py'
44+
- 'dojo/remote_user.py'
45+
- 'dojo/tasks.py'
46+
- 'dojo/urls.py'
47+
- 'dojo/utils.py'
48+
- 'dojo/views.py'
49+
- 'dojo/wsgi.py'
50+
- 'docker/environments/*.env'
51+
- 'docker/extra_settings'
52+
- 'docker/entrypoint-celery-beat.sh'
53+
- 'docker/entrypoint-celery-worker.sh'
54+
- 'docker/entrypoint-initializer.sh'
55+
- 'docker/entrypoint-nginx.sh'
56+
- 'docker/entrypoint-uwsgi.sh'
57+
- 'docker/wait-for-it.sh'
58+
allowedAuthors:
59+
usernames:
60+
- mtesauro
61+
- devGregA
62+
- cneill
63+
- Maffooch
64+
- blakeaowens
65+
- kiblik
66+
- dsever
67+
- dogboat
68+
- hblankenship
69+
- valentijnscholten
70+
notificationList:
71+
- '@mtesauro'

‎.github/CODEOWNERS‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# Any kind of package updates only need 2 approvals,
2+
# So let's add three folks here
3+
requirements.txt @cneill @mtesauro @Maffooch
4+
# Any dockerfile or compose changes will need to be viewed by
5+
# these people
6+
Dockerfile.* @mtesauro @Maffooch
7+
docker-compose.* @mtesauro @Maffooch
8+
/docker/ @mtesauro @Maffooch
9+
# Documentation changes
10+
/docs/content/ @paulOsinski @valentijnscholten @Maffooch
11+
# Kubernetes should be reviewed by reviewed first by those that know it
12+
/helm/ @cneill @kiblik @Maffooch
13+
# Anything UI related needs to be checked out by those with the eye for it
14+
/dojo/static/ @blakeaowens @Maffooch
15+
/dojo/templates/ @blakeaowens @Maffooch
16+
# Any model changes should be closely looked at
17+
/dojo/models.py @Maffooch
18+
# All other code changes should be reviewed by someone
19+
* @Maffooch @mtesauro

‎.github/ISSUE_TEMPLATE/bug_report.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ assignees: ''
77

88
---
99
**Slack us first!**
10-
The easiest and fastest way to help you is via Slack. There's a free and easy signup to join our #defectdojo channel in the OWASP Slack workspace: [Get Access.](https://owasp-slack.herokuapp.com/)
10+
The easiest and fastest way to help you is via Slack. There's a free and easy signup to join our #defectdojo channel in the OWASP Slack workspace: [Get Access.](https://owasp.org/slack/invite)
1111
If you're confident you've found a bug, or are allergic to Slack, you can submit an issue anyway.
1212

1313
**Be informative**
@@ -33,10 +33,11 @@ A clear and concise description of what you expected to happen.
3333

3434
**Environment information**
3535
- Operating System: [e.g. Ubuntu 18.04]
36+
- Docker Compose or Helm version (Output of `docker compose version` or `helm version`)
3637
- DefectDojo version (see footer) or commit message: [use `git show -s --format="[%ci] %h: %s [%d]"`]
3738

3839
**Logs**
39-
Use `docker-compose logs` (or similar, depending on your deployment method) to get the logs and add the relevant sections here showing the error occurring (if applicable).
40+
Use `docker compose logs` (or similar, depending on your deployment method) to get the logs and add the relevant sections here showing the error occurring (if applicable).
4041

4142
**Sample scan files**
4243
If applicable, add sample scan files to help reproduce your problem.

‎.github/ISSUE_TEMPLATE/feature_request.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ labels: enhancement
66
assignees: ''
77

88
---
9+
## :warning: Note on feature completeness :warning:
10+
11+
We are narrowing the scope of acceptable enhancements to DefectDojo. Learn more here:
12+
https://github.com/DefectDojo/django-DefectDojo/blob/master/readme-docs/CONTRIBUTING.md
913

1014
**Is your feature request related to a problem? Please describe**
1115
A clear and concise description of what the problem is.

‎.github/ISSUE_TEMPLATE/support_request.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ assignees: ''
77

88
---
99
**Slack us first!**
10-
The easiest and fastest way to help you is via Slack. There's a free and easy signup to join our #defectdojo channel in the OWASP Slack workspace: [Get Access.](https://owasp-slack.herokuapp.com/)
10+
The easiest and fastest way to help you is via Slack. There's a free and easy signup to join our #defectdojo channel in the OWASP Slack workspace: [Get Access.](https://owasp.org/slack/invite)
1111
If you're confident you've found a bug, or are allergic to Slack, you can submit an issue anyway.
1212

1313
**Be informative**
@@ -33,10 +33,11 @@ A clear and concise description of what you expected to happen.
3333

3434
**Environment information**
3535
- Operating System: [e.g. Ubuntu 18.04]
36+
- Docker Compose or Helm version (Output of `docker compose version` or `helm version`)
3637
- DefectDojo version (see footer) or commit message: [use `git show -s --format="[%ci] %h: %s [%d]"`]
3738

3839
**Logs**
39-
Use `docker-compose logs` (or similar, depending on your deployment method) to get the logs and add the relevant sections here showing the error occurring (if applicable).
40+
Use `docker compose logs` (or similar, depending on your deployment method) to get the logs and add the relevant sections here showing the error occurring (if applicable).
4041

4142
**Sample scan files**
4243
If applicable, add sample scan files to help reproduce your problem.

‎.github/dependabot.yml‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ updates:
1111
versions:
1212
- ">= 5.a"
1313
- "< 6"
14+
- dependency-name: boto3
15+
update-types: ["version-update:semver-minor"]
1416
- package-ecosystem: npm
1517
directory: "/components"
1618
schedule:
@@ -62,10 +64,3 @@ updates:
6264
versions:
6365
- ">= 4.a"
6466
- "< 5"
65-
- package-ecosystem: docker
66-
directory: "/"
67-
schedule:
68-
interval: weekly
69-
open-pull-requests-limit: 10
70-
target-branch: dev
71-

‎.github/labeler.yml‎

Lines changed: 53 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,72 @@
1+
---
12
docs:
2-
- docs/**/*
3-
- readme-docs/**/*
3+
- changed-files:
4+
- any-glob-to-any-file:
5+
- docs/**/*
6+
- readme-docs/**/*
47

58
docker:
6-
- docker/**/*
7-
- docker**
8-
- Docker*
9+
- changed-files:
10+
- any-glob-to-any-file:
11+
- docker/**/*
12+
- docker**
13+
- Docker*
914

1015
helm:
11-
- helm/defectdojo/*
12-
- helm/defectdojo/**/*
16+
- changed-files:
17+
- any-glob-to-any-file:
18+
- helm/defectdojo/*
19+
- helm/defectdojo/**/*
1320

1421
"New Migration":
15-
- dojo/db_migrations/*
22+
- changed-files:
23+
- any-glob-to-any-file:
24+
- dojo/db_migrations/*
1625

1726
unittests:
18-
- unittests/**/*
27+
- changed-files:
28+
- any-glob-to-any-file:
29+
- unittests/**/*
1930

2031
integration_tests:
21-
- tests/**/*
32+
- changed-files:
33+
- any-glob-to-any-file:
34+
- tests/**/*
2235

2336
settings_changes:
24-
- dojo/settings/settings.dist.py
37+
- changed-files:
38+
- any-glob-to-any-file:
39+
- dojo/settings/settings.dist.py
2540

2641
apiv2:
27-
- dojo/api_v2/**/*
42+
- changed-files:
43+
- any-glob-to-any-file:
44+
- dojo/api_v2/**/*
2845

2946
ui:
30-
- dojo/static/**/*
31-
- dojo/templates/**/*
32-
- dojo/templatetags/**/*
47+
- changed-files:
48+
- any-glob-to-any-file:
49+
- dojo/static/**/*
50+
- dojo/templates/**/*
51+
- dojo/templatetags/**/*
3352

3453
parser:
35-
- dojo/tools/**/*
54+
- changed-files:
55+
- any-glob-to-any-file:
56+
- dojo/tools/**/*
57+
58+
localization:
59+
- changed-files:
60+
- any-glob-to-any-file:
61+
- dojo/locale/*
62+
- dojo/locale/**/*
63+
64+
lint:
65+
- changed-files:
66+
- any-glob-to-any-file:
67+
- ruff.toml
68+
69+
gha:
70+
- changed-files:
71+
- any-glob-to-any-file:
72+
- .github/workflows

‎.github/pull_request_template.md‎

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
## :warning: Pre-Approval check :warning:
2+
3+
We don't want to waste your time, so if you're unsure whether your hypothetical enhancement meets the criteria for approval, please file an issue to get pre-approval before beginning work on a PR.
4+
Learn more here: https://github.com/DefectDojo/django-DefectDojo/blob/master/readme-docs/CONTRIBUTING.md#submission-pre-approval
5+
6+
**Description**
7+
8+
Describe the feature / bug fix implemented by this PR.
9+
If this is a new parser, [the parser guide](https://docs.defectdojo.com/en/open_source/contributing/how-to-write-a-parser/) may be worth (re)reading.
10+
11+
**Test results**
12+
13+
Ideally you extend the test suite in `tests/` and `dojo/unittests` to cover the changed in this PR.
14+
Alternatively, describe what you have and haven't tested.
15+
16+
**Documentation**
17+
18+
Please update any documentation when needed in the [documentation folder](https://github.com/DefectDojo/django-DefectDojo/tree/dev/docs))
19+
20+
**Checklist**
21+
22+
This checklist is for your information.
23+
24+
- [ ] Make sure to rebase your PR against the very latest `dev`.
25+
- [ ] Features/Changes should be submitted against the `dev`.
26+
- [ ] Bugfixes should be submitted against the `bugfix` branch.
27+
- [ ] Give a meaningful name to your PR, as it may end up being used in the release notes.
28+
- [ ] Your code is flake8 compliant.
29+
- [ ] Your code is python 3.13 compliant.
30+
- [ ] 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.
31+
- [ ] Model changes must include the necessary migrations in the dojo/db_migrations folder.
32+
- [ ] Add applicable tests to the unit tests.
33+
- [ ] Add the proper label to categorize your PR.
34+
35+
**Extra information**
36+
37+
Please clear everything below when submitting your pull request, it's here purely for your information.
38+
39+
Moderators: Labels currently accepted for PRs:
40+
- Import Scans (for new scanners/importers)
41+
- enhancement
42+
- performance
43+
- feature
44+
- bugfix
45+
- maintenance (a.k.a chores)
46+
- dependencies
47+
- New Migration (when the PR introduces a DB migration)
48+
- settings_changes (when the PR introduces changes or new settings in settings.dist.py)
49+
50+
# Contributors: Git Tips
51+
## Rebase on dev branch
52+
If the dev branch has changed since you started working on it, please rebase your work after the current dev.
53+
54+
On your working branch `mybranch`:
55+
```
56+
git rebase dev mybranch
57+
```
58+
In case of conflict:
59+
```
60+
git mergetool
61+
git rebase --continue
62+
```
63+
64+
When everything's fine on your local branch, force push to your `myOrigin` remote:
65+
```
66+
git push myOrigin --force-with-lease
67+
```
68+
69+
To cancel everything:
70+
```
71+
git rebase --abort
72+
```
73+
74+
75+
## Squashing commits
76+
```
77+
git rebase -i origin/dev
78+
```
79+
- Replace `pick` by `fixup` on the commits you want squashed out
80+
- Replace `pick` by `reword` on the first commit if you want to change the commit message
81+
- Save the file and quit your editor
82+
83+
Force push to your `myOrigin` remote:
84+
```
85+
git push myOrigin --force-with-lease
86+
```

‎.github/release-drafter.yml‎

Lines changed: 29 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
name-template: '$NEXT_MINOR_VERSION 🌈'
2-
tag-template: '$NEXT_MINOR_VERSION'
1+
name-template: '$RESOLVED_VERSION 🌈'
2+
tag-template: '$RESOLVED_VERSION'
3+
34
branches:
45
- master
6+
57
categories:
68
- title: '💣 Breaking changes'
79
labels:
@@ -35,17 +37,37 @@ categories:
3537
- 'bug'
3638
- title: 📝 Documentation updates
3739
label: 'documentation'
40+
- title: '🖌 Updates in UI'
41+
label: 'ui'
42+
- title: '🗣 Updates in localization'
43+
label: 'localization'
44+
- title: '🔧 Improved code quality with linters'
45+
label: 'lint'
46+
- title: '⚙️ Improvemets of GitHub Actions'
47+
label: 'gha'
3848
- title: '🧰 Maintenance'
49+
collapse-after: 3
3950
labels:
4051
- 'dependencies'
4152
- 'maintenance'
42-
- title: '🖌 Updates in UI'
43-
label: 'ui'
4453
exclude-labels:
45-
- 'skip-changelog'
54+
- 'skip-changelog'
55+
4656
change-template: '- $TITLE @$AUTHOR (#$NUMBER)'
4757
template: |
48-
Please consult the [Upgrade notes in the documentation ](https://defectdojo.github.io/django-DefectDojo/getting_started/upgrading/) for specific instructions for this release, and general upgrade instructions. Below is an automatically generated list of all PRs merged since the previous release.
49-
58+
Please consult the [Upgrade notes in the documentation ](https://docs.defectdojo.com/en/open_source/upgrading/upgrading_guide/) for specific instructions for this release, and general upgrade instructions. Below is an automatically generated list of all PRs merged since the previous release.
59+
5060
## Changes since $PREVIOUS_TAG
5161
$CHANGES
62+
63+
version-resolver:
64+
major:
65+
labels:
66+
- 'major'
67+
minor:
68+
labels:
69+
- 'minor'
70+
patch:
71+
labels:
72+
- 'patch'
73+
default: patch

0 commit comments

Comments
 (0)