Skip to content

Commit

Permalink
Merge branch 'main' into feature/mula/refactor-queue
Browse files Browse the repository at this point in the history
* main: (78 commits)
  Translations update from Hosted Weblate (#3048)
  Translations update from Hosted Weblate (#3018)
  Fix empty consumes of boefjes will trigger tasks in scheduler (#3017)
  Fixes text in secondary menu on scan profile detail page (#3035)
  chore: Resolves css-issues found by sonarcloud (#3034)
  Add raw AuthToken SQL migration (#3009)
  Translations update from Hosted Weblate (#3012)
  Rewrite xtdb-cli.py with "click" (#2957)
  Phase out the Repository model from the KATalogus (#2984)
  Fix merge conflicts in weblate (#3007)
  Translations update from Hosted Weblate (#2996)
  Reports: Fix select all OOIs (#2909)
  Adding IPv6 support to documentation for Docker setups (#2813)
  Translations update from Hosted Weblate (#2930)
  User documentation for reports (#2898)
  Fix task api status code response for malformed id in the scheduler (#2953)
  Add drill trace option in dnssec boefje (#2979)
  Updated packages (#2972)
  Update granian and remove workaround for fixed bug (#2980)
  Fix typing in boefjes/normalizers (#2933)
  ...
  • Loading branch information
jpbruinsslot committed Jun 11, 2024
2 parents a0f4be6 + 9734747 commit 8c5d7bf
Show file tree
Hide file tree
Showing 612 changed files with 18,543 additions and 14,184 deletions.
4 changes: 2 additions & 2 deletions .env-defaults
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ BYTES_API=http://bytes:8000
DJANGO_SUPERUSER_EMAIL=superuser@localhost
DJANGO_SUPERUSER_FULL_NAME="KAT Superuser"

# https://docs.openkat.nl/technical_design/hardening.html#django-allowed-hosts
# https://docs.openkat.nl/installation_and_deployment/hardening.html#django-allowed-hosts
DJANGO_ALLOWED_HOSTS=127.0.0.1,localhost

# https://docs.openkat.nl/technical_design/hardening.html#django-csrf-trusted-origins
# https://docs.openkat.nl/installation_and_deployment/hardening.html#django-csrf-trusted-origins
DJANGO_CSRF_TRUSTED_ORIGINS=http://localhost,http://127.0.0.1

# This allows running pytest inside the container
Expand Down
2 changes: 1 addition & 1 deletion .env-dist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ RABBITMQ_DEFAULT_USER={%QUEUE_USERNAME}
RABBITMQ_DEFAULT_PASS={%QUEUE_PASSWORD}

# --- OpenTelemetry --- #
# Uncomment to enable OpenTelemetry https://docs.openkat.nl/technical_design/localinstall.html#opentelemetry
# Uncomment to enable OpenTelemetry https://docs.openkat.nl/installation_and_deployment/localinstall.html#opentelemetry
# SPAN_EXPORT_GRPC_ENDPOINT=http://jaeger:4317

# --- Octopoes, Boefjes & Bytes shared --- #
Expand Down
4 changes: 2 additions & 2 deletions .env-prod
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ BYTES_API=http://bytes:8000
DJANGO_SUPERUSER_EMAIL=superuser@localhost
DJANGO_SUPERUSER_FULL_NAME="KAT Superuser"

# https://docs.openkat.nl/technical_design/hardening.html#django-allowed-hosts
# https://docs.openkat.nl/installation_and_deployment/hardening.html#django-allowed-hosts
DJANGO_ALLOWED_HOSTS=127.0.0.1,localhost

# https://docs.openkat.nl/technical_design/hardening.html#django-csrf-trusted-origins
# https://docs.openkat.nl/installation_and_deployment/hardening.html#django-csrf-trusted-origins
DJANGO_CSRF_TRUSTED_ORIGINS=http://localhost,http://127.0.0.1
14 changes: 8 additions & 6 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
---
name: Bug report
about: Create a bug report to help us improve
title: ''
labels: 'bug'
assignees: ''
title: ""
labels: "bug"
assignees: ""
---

_Please add `bug`, the name of any relevant modules (e.g. `rocky`), and any other relevant labels to your issue._
Expand All @@ -13,6 +13,7 @@ A clear and concise description of what the bug is.

**To Reproduce**
Steps to reproduce the behavior:

1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
Expand All @@ -29,9 +30,10 @@ Note the release tag (and if possible: the installation method) here.
If it concerns an in-development version, note the branch(es) and commit hash(es) here as well.

**Desktop (please complete the following information if relevant):**
- OS: [e.g. iOS]
- Browser: [e.g. chrome, safari]
- Version: [e.g. 22]

- OS: [e.g. iOS]
- Browser: [e.g. chrome, safari]
- Version: [e.g. 22]

**Additional context**
Add any other context about the problem here.
6 changes: 3 additions & 3 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
---
name: Feature request
about: Suggest an idea for this project
title: ''
labels: 'feature'
assignees: 'underdarknl'
title: ""
labels: "feature"
assignees: "underdarknl"
---

_Please add one or more of the following labels to your issue:_
Expand Down
8 changes: 5 additions & 3 deletions .github/ISSUE_TEMPLATE/user_story.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
---
name: User story
about: Create a task that is phrased as a user story
title: ''
labels: ''
assignees: ''
title: ""
labels: ""
assignees: ""
---

## User Story

As a [type of user],
I want [some goal or desired outcome],
so that [some reason or benefit].

## Acceptance Criteria:

- [List specific conditions or criteria that must be met for the story to be considered complete.]
22 changes: 11 additions & 11 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@

version: 2
updates:
- package-ecosystem: "pip" # See documentation for possible values
directory: "/" # Location of package manifests
schedule:
interval: "weekly"
ignore:
- dependency-name: "*"
update-types: ["version-update:semver-minor"]
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "monthly"
- package-ecosystem: "pip" # See documentation for possible values
directory: "/" # Location of package manifests
schedule:
interval: "weekly"
ignore:
- dependency-name: "*"
update-types: ["version-update:semver-minor"]
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "monthly"
9 changes: 9 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -1,32 +1,41 @@
### Changes

_Please describe the essence of this PR in a few sentences. Mention any breaking changes or required configuration steps._

### Issue link

_Please add a link to the issue after "Closes". If there is no issue for this PR, please add it to the project board directly._

Closes ...

### Demo

_Please add some proof in the form of screenshots or screen recordings to show (off) new functionality, if there are interesting new features for end-users._

---

### Code Checklist

- [ ] All the commits in this PR are properly PGP-signed and verified.
- [ ] This PR only contains functionality relevant to the issue; tickets have been created for newly discovered issues.
- [ ] I have written unit tests for the changes or fixes I made.
- [ ] For any non-trivial functionality, I have added integration and/or end-to-end tests.
- [ ] I have performed a self-review of my code and refactored it to the best of my abilities.

### Communication

- [ ] I have informed others of any required `.env` changes files if required and changed the `.env-dist` accordingly.
- [ ] I have made corresponding changes to the documentation, if necessary.
- [ ] I have included comments in the code to elaborate on what is not self-evident from the code itself, including references to issues and discussions online, or implicit behavior of an interface.

---

## Checklist for code reviewers:

Copy-paste the checklist from [the docs/source/templates folder](https://github.com/minvws/nl-kat-coordination/blob/main/docs/source/templates/pull_request_template_review_code.md) into your comment.

---

## Checklist for QA:

Copy-paste the checklist from [the docs/source/templates folder](https://github.com/minvws/nl-kat-coordination/blob/main/docs/source/templates/pull_request_template_review_qa.md) into your comment.
6 changes: 3 additions & 3 deletions .github/workflows/boefjes_container_image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ name: Boefjes Create container image
on:
push:
branches:
- 'main'
- 'release-*'
- "main"
- "release-*"
tags:
- '*'
- "*"
paths:
- boefjes/**
- octopoes/**
Expand Down
13 changes: 6 additions & 7 deletions .github/workflows/boefjes_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ name: Boefjes Run the test suite
on:
push:
branches:
- 'main'
- 'release-*'
- "main"
- "release-*"
tags:
- '*'
- "*"
paths:
- boefjes/**
- octopoes/**
Expand All @@ -17,11 +17,10 @@ on:

jobs:
Tests:

strategy:
fail-fast: false
matrix:
version: [ '3.10', '3.11' ]
version: ["3.10", "3.11"]

runs-on: ubuntu-20.04
env:
Expand All @@ -33,13 +32,13 @@ jobs:
- uses: actions/setup-python@v5
with:
python-version: ${{ matrix.version }}
cache: 'pip' # caching pip dependencies
cache: "pip" # caching pip dependencies

- name: Install pip
run: python3 -m pip install --upgrade pip

- name: Install dev requirements
run: pip install -r requirements-dev.txt
run: grep -v git+https:// requirements-dev.txt | pip install -r /dev/stdin && grep git+https:// requirements-dev.txt | pip install -r /dev/stdin
working-directory: ./boefjes

- name: Install requirements
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-debian-docker-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
workflow_dispatch: {}
push:
branches:
- 'main'
- "main"
paths:
- "packaging"
- ".github/workflows/build-debian-docker-image.yml"
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/build-rdo-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ jobs:

- uses: actions/setup-python@v5
with:
python-version: '3.10'
cache: 'pip'
python-version: "3.10"
cache: "pip"

- name: Prep Install requirements
run: sudo apt install gettext -y
Expand All @@ -38,7 +38,7 @@ jobs:
- name: Prep Configure git
run: git config --global url."https://github.com/".insteadOf "ssh://[email protected]/"

# Octopoes
# Octopoes
- name: Octopoes Create /var/lib/html
run: sudo rm -rfv /var/lib/html; sudo mkdir -p /var/www/html ; sudo chown `id -u`:`id -g` /var/www/html

Expand Down Expand Up @@ -75,7 +75,7 @@ jobs:
- name: Octopoes Cleanup
run: sudo rm -rfv /var/www/html/

# Rocky
# Rocky
- name: Rocky Create /var/lib/html
run: sudo rm -rfv /var/lib/html; sudo mkdir -p /var/www/html ; sudo chown `id -u`:`id -g` /var/www/html

Expand Down Expand Up @@ -129,7 +129,7 @@ jobs:
run: tar -cvzf ${{ env.PKGDIR }}/rocky_${{ env.RELEASE_VERSION }}.tar.gz --exclude node_modules --exclude rocky_venv* --exclude=.git* --exclude .parcel-cache --exclude Dockerfile .
working-directory: ./rocky

# Bytes
# Bytes
- name: Bytes Create /var/lib/html
run: sudo rm -rfv /var/lib/html; sudo mkdir -p /var/www/html ; sudo chown `id -u`:`id -g` /var/www/html

Expand All @@ -150,7 +150,7 @@ jobs:
- name: Bytes Create bytes venv package
run: tar -zcvf ${{ env.PKGDIR }}/bytes_venv_${{ env.RELEASE_VERSION }}.tar.gz -C /var/www/html/ .venv

# Mula / Scheduler
# Mula / Scheduler
- name: Mula Create /var/lib/html
run: sudo rm -rfv /var/lib/html; sudo mkdir -p /var/www/html ; sudo chown `id -u`:`id -g` /var/www/html

Expand All @@ -175,7 +175,7 @@ jobs:
- name: Create venv archive
run: tar -zcvf ${{ env.PKGDIR }}/scheduler_venv_${{ env.RELEASE_VERSION }}.tar.gz -C /var/www/html/ .venv

# Boefjes
# Boefjes
- name: Boefjes Create /var/lib/html
run: sudo rm -rfv /var/lib/html; sudo mkdir -p /var/www/html ; sudo chown `id -u`:`id -g` /var/www/html

Expand All @@ -187,7 +187,7 @@ jobs:
run: python3.10 -m venv /var/www/html/.venv

- name: Install requirements
run: source .venv/bin/activate; pip install --upgrade pip; find . -name requirements.txt | xargs -L 1 pip install -r; pip install ${{ github.workspace }}/octopoes/dist/octopoes*.whl
run: source .venv/bin/activate; pip install --upgrade pip; grep -v git+https:// requirements.txt | pip install -r /dev/stdin ; grep git+https:// requirements.txt | pip install -r /dev/stdin; pip install ${{ github.workspace }}/octopoes/dist/octopoes*.whl
working-directory: /var/www/html

- name: Create archive
Expand All @@ -197,7 +197,7 @@ jobs:
run: tar -cvzf ${{ env.PKGDIR }}/boefjes_${{ env.RELEASE_VERSION }}.tar.gz .
working-directory: ./boefjes

# Keiko
# Keiko
- name: Keiko Create /var/lib/html
run: sudo rm -rfv /var/lib/html; sudo mkdir -p /var/www/html ; sudo chown `id -u`:`id -g` /var/www/html

Expand All @@ -219,7 +219,7 @@ jobs:
run: tar -cvzf ${{ env.PKGDIR }}/katkeiko_${{ env.RELEASE_VERSION }}.tar.gz .
working-directory: ./keiko

# Common / Uploads
# Common / Uploads
- name: Octopoes Upload whl package
uses: actions/upload-artifact@v4
with:
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/build_docs_on_pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,13 @@ jobs:
build-artifact:
runs-on: ubuntu-latest
steps:

- name: Checkout code
uses: actions/checkout@v4

- uses: actions/setup-python@v5
with:
python-version: 3.11
cache: 'pip' # caching pip dependencies
cache: "pip" # caching pip dependencies

- name: Install pip dependencies
run: pip install -r requirements.txt
Expand All @@ -32,4 +31,4 @@ jobs:
uses: actions/upload-artifact@v4
with:
name: "github-pages-no-deploy"
path: 'docs/_build'
path: "docs/_build"
6 changes: 3 additions & 3 deletions .github/workflows/bytes_container_image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ name: Bytes Create container image
on:
push:
branches:
- 'main'
- 'release-*'
- "main"
- "release-*"
tags:
- '*'
- "*"
paths:
- bytes/**
- .github/workflows/bytes_container_image.yml
Expand Down
9 changes: 4 additions & 5 deletions .github/workflows/bytes_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ name: Bytes Run the test suite
on:
push:
branches:
- 'main'
- 'release-*'
- "main"
- "release-*"
tags:
- '*'
- "*"
paths:
- bytes/**
pull_request:
Expand All @@ -15,11 +15,10 @@ on:

jobs:
test:

strategy:
fail-fast: false
matrix:
version: [ '3.10', '3.11' ]
version: ["3.10", "3.11"]

runs-on: ubuntu-20.04

Expand Down
Loading

0 comments on commit 8c5d7bf

Please sign in to comment.