Merge branch 'dev' into master-into-dev/2.35.2-2.36.0-dev

DefectDojo · Jun 10, 2024 · bb7da36 · bb7da36
2 parents 9593530 + 6b9fd8c
commit bb7da36
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 20 deletions.
diff --git a/.github/workflows/rest-framework-tests.yml b/.github/workflows/rest-framework-tests.yml
@@ -34,20 +34,20 @@ jobs:
         run: docker/setEnv.sh unit_tests_cicd
 
       # phased startup so we can use the exit code from unit test container
-      - name: Start MySQL
-        run: docker compose --env-file ./docker/environments/mysql-redis.env up -d mysql
+      - name: Start Postgres
+        run: docker compose --env-file ./docker/environments/postgres-redis.env up -d postgres
 
       # no celery or initializer needed for unit tests
       - name: Unit tests
         timeout-minutes: 10
-        run: docker compose --profile mysql-redis --env-file ./docker/environments/mysql-redis.env up --no-deps --exit-code-from uwsgi uwsgi
+        run: docker compose --profile postgres-redis --env-file ./docker/environments/postgres-redis.env up --no-deps --exit-code-from uwsgi uwsgi
         env:
           DJANGO_VERSION: ${{ matrix.os }}
 
       - name: Logs
         if: failure()
-        run: docker compose --profile mysql-redis --env-file ./docker/environments/mysql-redis.env logs --tail="2500" uwsgi
+        run: docker compose --profile postgres-redis --env-file ./docker/environments/postgres-redis.env logs --tail="2500" uwsgi
 
       - name: Shutdown
         if: always()
-        run: docker compose --profile mysql-redis --env-file ./docker/environments/mysql-redis.env down
+        run: docker compose --profile postgres-redis --env-file ./docker/environments/postgres-redis.env down
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -141,7 +141,7 @@ services:
     volumes:
       - defectdojo_data:/var/lib/mysql
   postgres:
-    image: postgres:16.3-alpine@sha256:e89da2c083a5405943408b6807cd1fd25dc9010c1294e30611b841778bedc653
+    image: postgres:16.3-alpine@sha256:d037653693c4168efbb95cdc1db705d31278a4a8d608d133eca1f07af9793960
     profiles: 
       - postgres-rabbitmq
       - postgres-redis

diff --git a/docs/content/en/getting_started/upgrading/2.36.md b/docs/content/en/getting_started/upgrading/2.36.md
@@ -0,0 +1,7 @@
+---
+title: 'Upgrading to DefectDojo Version 2.36.x'
+toc_hide: true
+weight: -20240603
+description: No special instructions.
+---
+There are no special instructions for upgrading to 2.36.x. Check the [Release Notes](https://github.com/DefectDojo/django-DefectDojo/releases/tag/2.36.0) for the contents of the release.
diff --git a/helm/defectdojo/Chart.lock b/helm/defectdojo/Chart.lock
@@ -4,15 +4,15 @@ dependencies:
   version: 9.19.1
 - name: postgresql
   repository: https://charts.bitnami.com/bitnami
-  version: 15.5.1
+  version: 15.5.4
 - name: postgresql-ha
   repository: https://charts.bitnami.com/bitnami
   version: 9.4.11
 - name: rabbitmq
   repository: https://charts.bitnami.com/bitnami
-  version: 14.3.1
+  version: 14.4.1
 - name: redis
   repository: https://charts.bitnami.com/bitnami
-  version: 19.5.0
-digest: sha256:f7d84de0e09aa04522aca1b64fb2a297ad028c507144046f16da47d6750007dd
-generated: "2024-05-30T16:46:40.020662037Z"
+  version: 19.5.2
+digest: sha256:bbb03050d96cdc317d8088bb62b53a0b892746fd1e5763f7c374da31d3d30895
+generated: "2024-06-06T21:33:03.331847962Z"
diff --git a/helm/defectdojo/Chart.yaml b/helm/defectdojo/Chart.yaml
@@ -23,7 +23,7 @@ dependencies:
     alias: postgresqlha
     condition: postgresqlha.enabled
   - name: rabbitmq
-    version: ~14.3.0
+    version: ~14.4.0
     repository: "https://charts.bitnami.com/bitnami"
     condition: rabbitmq.enabled
   - name: redis

diff --git a/requirements-lint.txt b/requirements-lint.txt
@@ -1 +1 @@
-ruff==0.4.7
+ruff==0.4.8
diff --git a/requirements.txt b/requirements.txt
@@ -36,14 +36,14 @@ mysqlclient==2.1.1
 openpyxl==3.1.3
 Pillow==10.3.0  # required by django-imagekit
 psycopg2-binary==2.9.9
-cryptography==42.0.7
+cryptography==42.0.8
 python-dateutil==2.9.0.post0
 pytz==2024.1
-redis==5.0.4
+redis==5.0.5
 requests==2.32.3
 sqlalchemy==2.0.30  # Required by Celery broker transport
 urllib3==1.26.18
-uWSGI==2.0.25.1
+uWSGI==2.0.26
 vobject==0.9.7
 whitenoise==5.2.0
 titlecase==2.4.1
@@ -70,12 +70,12 @@ hyperlink==21.0.0
 django-test-migrations==1.3.0
 djangosaml2==1.9.3
 drf-spectacular==0.27.2
-drf-spectacular-sidecar==2024.5.1
+drf-spectacular-sidecar==2024.6.1
 django-ratelimit==4.1.0
 argon2-cffi==23.1.0
 blackduck==1.1.3
 pycurl==7.45.3  # Required for Celery Broker AWS (SQS) support
-boto3==1.34.117  # Required for Celery Broker AWS (SQS) support
+boto3==1.34.120  # Required for Celery Broker AWS (SQS) support
 netaddr==1.3.0
 vulners==2.1.7
 fontawesomefree==6.5.1
diff --git a/unittests/test_rest_framework.py b/unittests/test_rest_framework.py
@@ -1576,7 +1576,7 @@ def __init__(self, *args, **kwargs):
         self.permission_create = Permissions.Test_Add
         self.permission_update = Permissions.Test_Edit
         self.permission_delete = Permissions.Test_Delete
-        self.deleted_objects = 18
+        self.deleted_objects = 5
         BaseClass.RESTEndpointTest.__init__(self, *args, **kwargs)
 
 
@@ -2676,7 +2676,7 @@ def __init__(self, *args, **kwargs):
         }
         self.update_fields = {'color': 'blue'}
         self.test_type = TestType.CONFIGURATION_PERMISSIONS
-        self.deleted_objects = 2
+        self.deleted_objects = 1
         BaseClass.RESTEndpointTest.__init__(self, *args, **kwargs)