Merge pull request #5372 from DefectDojo/release/2.4.0

Release: Merge release into master from: release/2.4.0

Author: Maffooch

.dockerignore

@@ -1,4 +1,3 @@
 .git
 .gitignore
 *.md
-.env*

.github/labeler.yml

@@ -15,3 +15,6 @@ integration_tests:
 
 settings_changes:
 - any: ['dojo/settings/settings.dist.py']
+
+apiv2:
+- any: ['dojo/api_v2/**/*']

.github/workflows/integration-tests.yml

@@ -82,6 +82,33 @@ jobs:
     name: integration tests
     needs: build
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        test-case: [
+          "tests/finding_test.py",
+          "tests/report_builder_test.py",
+          "tests/notes_test.py",
+          "tests/regulations_test.py",
+          "tests/product_type_test.py",
+          "tests/product_test.py",
+          "tests/endpoint_test.py",
+          "tests/engagement_test.py",
+          "tests/environment_test.py",
+          "tests/test_test.py",
+          "tests/user_test.py",
+          "tests/group_test.py",
+          "tests/product_group_test.py",
+          "tests/product_type_group_test.py",
+          "tests/product_member_test.py",
+          "tests/product_type_member_test.py",
+          "tests/ibm_appscan_test.py",
+          "tests/search_test.py",
+          "tests/file_test.py",
+          "tests/dedupe_test.py",
+          "tests/check_various_pages.py",
+        ]
+      fail-fast: false
+
     steps:
 
       - name: Checkout
@@ -112,6 +139,8 @@ jobs:
 
       - name: Integration tests
         run: docker-compose up --exit-code-from integration-tests integration-tests
+        env:
+          DD_INTEGRATION_TEST_FILENAME: ${{ matrix.test-case }}
 
       - name: Logs
         if: always()

.github/workflows/unit-tests.yml

@@ -35,17 +35,8 @@ jobs:
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1
-
-      # build with docker so we can use layer caching
-      - name: Cache Docker layers
-        uses: actions/cache@v2
         with:
-          path: /tmp/.buildx-cache-${{ env.docker-image }}
-          key: ${{ runner.os }}-buildx-${{ env.docker-image }}-${{ github.workflow }}-${{ github.sha }}-${{ github.run_id }}
-          restore-keys: |
-            ${{ runner.os }}-buildx-${{ env.docker-image }}-${{ github.workflow }}-${{ github.sha }}
-            ${{ runner.os }}-buildx-${{ env.docker-image }}-${{ github.workflow }}
-            ${{ runner.os }}-buildx-${{ env.docker-image }}
+          buildkitd-flags: --debug
 
       - name: Build
         id: docker_build
@@ -58,8 +49,8 @@ jobs:
             ${{ env.DD_DOCKER_REPO }}/defectdojo-${{ env.docker-image }}:latest
           file: Dockerfile.${{ env.docker-image }}
 
-          cache-from: type=local,src=/tmp/.buildx-cache-${{ env.docker-image }}
-          cache-to: type=local,dest=/tmp/.buildx-cache-${{ env.docker-image }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
 
       # run tests with docker-compose
       - name: Set unit-test mode

Dockerfile.django

@@ -47,7 +47,6 @@ RUN \
     uuid-runtime \
     # only required for the dbshell (used by the initializer job)
     postgresql-client \
-    curl \
     && \
   apt-get clean && \
   rm -rf /var/lib/apt/lists && \
@@ -77,9 +76,6 @@ COPY dojo/ ./dojo/
 # Add extra fixtures to docker image which are loaded by the initializer
 COPY docker/extra_fixtures/* /app/dojo/fixtures/
 
-# Fallback for safety parser, if installation does't allow internet connectivity
-RUN curl -sS -o dojo/tools/safety/insecure_full.json https://raw.githubusercontent.com/pyupio/safety-db/master/data/insecure_full.json
-
 COPY tests/ ./tests/
 RUN \
   # Remove placeholder copied from docker/certs

Dockerfile.integration-tests

@@ -30,6 +30,13 @@ RUN \
 
 RUN pip install --no-cache-dir selenium requests chromedriver-autoinstaller
 
+# Installing Chromedriver
+WORKDIR /opt/chrome-driver
+RUN \
+  python -c "import chromedriver_autoinstaller; chromedriver_autoinstaller.install(cwd=True)" && \
+  chmod -R 0755 .
+WORKDIR /app
+
 COPY docker/wait-for-it.sh \
   docker/entrypoint-integration-tests.sh \
   /
@@ -38,11 +45,6 @@ COPY tests/ ./tests/
 
 RUN chmod -R 0777 /app
 
-# These 2 lines are needed for the chromium driver 
-RUN chmod -R ugo+w /usr/local/lib/python3.8/site-packages
-RUN mkdir /.local
-RUN chmod -R ugo+w /.local
-
 USER 1001
 ENV \
   DD_ADMIN_USER=admin \