Skip to content

Commit

Permalink
Merge branch 'main' into feature/mula/relationship-filtering
Browse files Browse the repository at this point in the history
* main: (502 commits)
  Fix 'created by' in report and add 'created from recipe' (#4094)
  Remove deprecated queryparams (#4117)
  Pin Ubuntu runners to version `24.04` (#4120)
  Update client.py, reflect earlier changes in katalogus api (#4107)
  Updated `cryptography` (#4121)
  Updated packages (#4114)
  fix task list for boefjes, normalizer and ooi detail (#4115)
  Updated testcase for `Schedule` should result in `schedule_id` of `Task` to be set to `None` (#4104)
  Remove the empty keiko package and container (#4110)
  1.18 release notes improvements (#4109)
  Remove unused queue_uri from boefje settings (#4068)
  add 1.18 release notes (#4083)
  Combined schedulers (#3839)
  remove inline styling / svg graph as not compatible with out CSP (#4075)
  Hotfix for empty report in history table (#4087)
  optimize various bits around scan profiles (#4050)
  Update build-rdo-package.yml (#4081)
  Lock down codeowner edit rights to operations (#4086)
  Translations update from Hosted Weblate (#4085)
  fix logout and styling (#4080)
  ...
  • Loading branch information
jpbruinsslot committed Feb 27, 2025
2 parents 952a650 + e24ede5 commit 5ba1b89
Show file tree
Hide file tree
Showing 1,787 changed files with 223,959 additions and 282,204 deletions.
5 changes: 2 additions & 3 deletions .env-defaults
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ TWOFACTOR_ENABLED=False
# --- Endpoints --- #
OCTOPOES_API=http://octopoes_api:80
SCHEDULER_API=http://scheduler:8000
KEIKO_API=http://keiko:8000
KATALOGUS_API=http://katalogus:8000
XTDB_URI=http://crux:3000
BOEFJES_API=http://boefje:8000
Expand All @@ -22,10 +21,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
6 changes: 1 addition & 5 deletions .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 Expand Up @@ -59,13 +59,9 @@ BYTES_DB_PASSWORD={%BYTES_DB_PASSWORD}
BYTES_DB_URI=postgresql://${BYTES_DB_USER}:${BYTES_DB_PASSWORD}@postgres:5432/${BYTES_DB}


# --- Keiko --- #
# See `keiko/keiko/settings.py`

# --- Octopoes --- #
# See `octopoes/octopoes/config/settings.py`


# --- Mula --- #
# See `mula/scheduler/config/settings.py`

Expand Down
7 changes: 3 additions & 4 deletions .env-prod
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,9 @@ TWOFACTOR_ENABLED=True
# --- Endpoints --- #
OCTOPOES_API=http://octopoes_api:80
SCHEDULER_API=http://scheduler:8000
KEIKO_API=http://keiko:8000
KATALOGUS_API=http://katalogus:8000
XTDB_URI=http://crux:3000
BOEFJE_API=http://boefje:8000
BOEFJES_API=http://boefje:8000

# Bytes uses JWT for authentication
BYTES_API=http://bytes:8000
Expand All @@ -30,8 +29,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
3 changes: 1 addition & 2 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
# These owners will be the default owners for everything in
# the repo. Unless a later match takes precedence,
* @minvws/kat-managers
.github/CODEOWNERS @minvws/irealisatie-operations
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.
61 changes: 49 additions & 12 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -1,22 +1,59 @@
---
name: Feature request
about: Suggest an idea for this project
title: ''
labels: 'feature'
assignees: 'underdarknl'
title: ""
labels: "feature"
assignees: ""
---

_Please add one or more of the following labels to your issue:_
`frontend backend community dependencies`
`frontend` `backend` `design` `documentation` `community` `dependencies`

**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
## About this feature

**Describe the solution you'd like**
A clear and concise description of what you want to happen.
### Detailed description

**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.
_Add detailed description of the new feature you'd like to propose. If this feature is related to a problem, what problem does it solve?_

**Additional context**
Add any other context or screenshots about the feature request here.
### Feature benefit/User story

_Please also explain why this feature is important or necessary. What benefit does it bring to users? If possible, provide a user story format:_

As a [_type of user_], I want to [_action_] so that [_benefit_].

### Specifications

_Please add some specifications for the implementation. What needs to be implemented to match the design?_

The implementation should include…

- [ ] Specification 1
- [ ] Specification 2

### Additional information

_Any additional information, considerations, or context that might be helpful for understanding or evaluating the feature request._

## Design

_This part should only be filled in by the OpenKAT design team._

### Screenshots

_Include screenshots of the proposed design changes here._

### Figma link

_Link to the Figma design for further visualization (if applicable)_

## Implementation

_This part should only be filled in by the developers._

### Possible solution

_Outline your proposed solution for implementing the feature. You can include any specific ideas, designs, or functionalities here._

### Alternatives considered

_Describe any alternative approaches or solutions you've considered, and why you believe the proposed solution is superior._
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"
28 changes: 23 additions & 5 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -1,32 +1,50 @@
### 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._

_You have to create an issue to link to this PR. If this really is not possible, write a very detailed description here and add this PR to the project board directly._

_Please add the link to the issue after "Closes"._

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._

### QA notes

_Please add some information for QA on how to test the newly created code._

---

### Code Checklist

<!--- Mandatory: --->

- [ ] 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.
- [ ] This PR only contains functionality relevant to the issue.
- [ ] 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 checked the documentation and made changes where necessary.
- [ ] I have performed a self-review of my code and refactored it to the best of my abilities.

### Communication
<!--- If applicable: --->

- [ ] Tickets have been created for newly discovered issues.
- [ ] For any non-trivial functionality, I have added integration and/or end-to-end tests.
- [ ] 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.
35 changes: 35 additions & 0 deletions .github/scripts/coverage_file_fixer.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
#!/usr/bin/env python


# This script fixes the filename attribute in a coverage.xml file for SonarCloud coverage analysis
# These filenames should be relative to the base dir and not the coverage source directory


import argparse
import xml.etree.ElementTree as etree
from pathlib import Path


def path_prefixer(file: Path, prefix: Path) -> None:
xml = file.read_text()
root = etree.fromstring(xml) # noqa: S314

for element in root.findall(".//*[@filename]"):
filename = element.get("filename")
if filename is not None:
element.set("filename", prefix.joinpath(filename).as_posix())

file.write_text(etree.tostring(root).decode())


def main():
parser = argparse.ArgumentParser(description="Prefix paths in coverage.xml files")
parser.add_argument("file", type=Path, help="Path to the coverage.xml file.")
parser.add_argument("prefix", type=Path, help="Path to prefix the filenames with.")
args = parser.parse_args()

path_prefixer(Path(args.file), Path(args.prefix))


if __name__ == "__main__":
main()
39 changes: 39 additions & 0 deletions .github/workflows/boefjes-tests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
name: Boefjes Test (with coverage)

on:
workflow_call:

jobs:
Tests:
runs-on: ubuntu-24.04

steps:
- uses: actions/checkout@v4

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

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

- name: Install dev requirements
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 plugin requirements
run: find boefjes/plugins/ -name requirements.txt -execdir pip install -r requirements.txt \;
working-directory: boefjes/

- name: Install Octopoes
run: cd octopoes && python setup.py bdist_wheel && pip install dist/octopoes*.whl

- name: Run pytests
run: python3 -m pytest --cov boefjes/ --cov-report xml --cov-branch boefjes/tests

- name: Upload coverage as artifact
uses: actions/upload-artifact@v4
with:
name: boefjes-coverage-unit
path: coverage.xml
10 changes: 5 additions & 5 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 All @@ -19,7 +19,7 @@ on:

jobs:
create_container_image:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- name: Checkout code
uses: actions/checkout@v4
Expand Down Expand Up @@ -54,7 +54,7 @@ jobs:
cp _version.py boefjes/boefjes/katalogus/version.py
- name: Build container image
uses: docker/build-push-action@v5
uses: docker/build-push-action@v6
with:
# We don't use git context because that doesn't process .dockerignore
# https://github.com/docker/cli/issues/2827
Expand Down
Loading

0 comments on commit 5ba1b89

Please sign in to comment.