Merge branch 'main' into fix/mula-db-disconnect

* main: Update `pre-commit` dependencies and enable Ruff autofix (#739) Cleanup Rocky requirements (#729) Add (I) to ruff and fix imports (#723) Add port-common bit and KAT-OPEN-COMMON-PORT FindingType (#734) Use setuptools-scm to write correct version to version.py (#737) Enable and disable bits (#732) Scan level inheritance chain (#722) Octopoes origin param endpoint (#731)
minvws · Apr 17, 2023 · f83949a · f83949a
2 parents 24de09e + e311eed
commit f83949a
Show file tree

Hide file tree

Showing 479 changed files with 1,585 additions and 1,379 deletions.
diff --git a/.github/workflows/boefjes_container_image.yml b/.github/workflows/boefjes_container_image.yml
@@ -5,10 +5,12 @@ on:
     paths:
       - boefjes/**
       - octopoes/**
+      - .github/workflows/boefjes_container_image.yml
   pull_request:
     paths:
       - boefjes/**
       - octopoes/**
+      - .github/workflows/boefjes_container_image.yml
 
 jobs:
   create_container_image:
@@ -39,6 +41,14 @@ jobs:
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Generate version.py
+        run: |
+          pip install setuptools-scm==7.1.0
+          python -m setuptools_scm
+          cp _version.py boefjes/boefjes/version.py
+          cp _version.py boefjes/boefjes/katalogus/version.py
+          cp _version.py boefjes/boefjes/plugin_repository/version.py
+
       - name: Build container image
         uses: docker/build-push-action@v3
         with:

diff --git a/.github/workflows/boefjes_debian_package.yml b/.github/workflows/boefjes_debian_package.yml
@@ -5,10 +5,12 @@ on:
     paths:
       - boefjes/**
       - octopoes/**
+      - .github/workflows/boefjes_debian_package.yml
   pull_request:
     paths:
       - boefjes/**
       - octopoes/**
+      - .github/workflows/boefjes_debian_package.yml
 
 jobs:
   build-package:
@@ -22,14 +24,13 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - name: Get version from release tag or generate one
+      - name: Generate version.py and set RELEASE_VERSION
         run: |
-          if [ ${GITHUB_REF_TYPE} = "tag" ]; then
-            echo "RELEASE_VERSION=${GITHUB_REF#refs/*/v}" >> $GITHUB_ENV
-          else
-            pip install setuptools-scm==7.1.0
-            echo "RELEASE_VERSION=$(python -m setuptools_scm)" >> $GITHUB_ENV
-          fi
+          pip install setuptools-scm==7.1.0
+          echo "RELEASE_VERSION=$(python -m setuptools_scm)" >> $GITHUB_ENV
+          cp _version.py boefjes/boefjes/version.py
+          cp _version.py boefjes/boefjes/katalogus/version.py
+          cp _version.py boefjes/boefjes/plugin_repository/version.py
 
       - name: Run debian package build
         uses: addnab/docker-run-action@v3

diff --git a/.github/workflows/bytes_container_image.yml b/.github/workflows/bytes_container_image.yml
@@ -4,9 +4,11 @@ on:
   push:
     paths:
       - bytes/**
+      - .github/workflows/bytes_container_image.yml
   pull_request:
     paths:
       - bytes/**
+      - .github/workflows/bytes_container_image.yml
 
 jobs:
   create_container_image:
@@ -37,6 +39,12 @@ jobs:
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Generate version.py
+        run: |
+          pip install setuptools-scm==7.1.0
+          python -m setuptools_scm
+          cp _version.py bytes/bytes/version.py
+
       - name: Build container image
         uses: docker/build-push-action@v3
         with:

diff --git a/.github/workflows/bytes_debian_package.yml b/.github/workflows/bytes_debian_package.yml
@@ -4,9 +4,11 @@ on:
   push:
     paths:
       - bytes/**
+      - .github/workflows/bytes_debian_package.yml
   pull_request:
     paths:
       - bytes/**
+      - .github/workflows/bytes_debian_package.yml
 
 jobs:
   build-package:
@@ -20,14 +22,11 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - name: Get version from release tag or generate one
+      - name: Generate version.py and set RELEASE_VERSION
         run: |
-          if [ ${GITHUB_REF_TYPE} = "tag" ]; then
-            echo "RELEASE_VERSION=${GITHUB_REF#refs/*/v}" >> $GITHUB_ENV
-          else
-            pip install setuptools-scm==7.1.0
-            echo "RELEASE_VERSION=$(python -m setuptools_scm)" >> $GITHUB_ENV
-          fi
+          pip install setuptools-scm==7.1.0
+          echo "RELEASE_VERSION=$(python -m setuptools_scm)" >> $GITHUB_ENV
+          cp _version.py bytes/bytes/version.py
 
       - name: Run debian package build
         uses: addnab/docker-run-action@v3

diff --git a/.github/workflows/keiko_container_image.yml b/.github/workflows/keiko_container_image.yml
@@ -4,9 +4,11 @@ on:
   push:
     paths:
       - keiko/**
+      - .github/workflows/keiko_container_image.yml
   pull_request:
     paths:
       - keiko/**
+      - .github/workflows/keiko_container_image.yml
 
 jobs:
   create_container_image:
@@ -37,6 +39,12 @@ jobs:
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Generate version.py
+        run: |
+          pip install setuptools-scm==7.1.0
+          python -m setuptools_scm
+          cp _version.py keiko/keiko/version.py
+
       - name: Build container image
         uses: docker/build-push-action@v3
         with:

diff --git a/.github/workflows/keiko_debian_package.yml b/.github/workflows/keiko_debian_package.yml
@@ -4,9 +4,11 @@ on:
   push:
     paths:
       - keiko/**
+      - .github/workflows/keiko_debian_package.yml
   pull_request:
     paths:
       - keiko/**
+      - .github/workflows/keiko_debian_package.yml
 
 jobs:
   build-package:
@@ -20,14 +22,11 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - name: Get version from release tag or generate one
+      - name: Generate version.py and set RELEASE_VERSION
         run: |
-          if [ ${GITHUB_REF_TYPE} = "tag" ]; then
-            echo "RELEASE_VERSION=${GITHUB_REF#refs/*/v}" >> $GITHUB_ENV
-          else
-            pip install setuptools-scm==7.1.0
-            echo "RELEASE_VERSION=$(python -m setuptools_scm)" >> $GITHUB_ENV
-          fi
+          pip install setuptools-scm==7.1.0
+          echo "RELEASE_VERSION=$(python -m setuptools_scm)" >> $GITHUB_ENV
+          cp _version.py keiko/keiko/version.py
 
       - name: Run debian package build
         uses: addnab/docker-run-action@v3

diff --git a/.github/workflows/mula_container_image.yml b/.github/workflows/mula_container_image.yml
@@ -4,9 +4,11 @@ on:
   push:
     paths:
       - mula/**
+      - .github/workflows/mula_container_image.yml
   pull_request:
     paths:
       - mula/**
+      - .github/workflows/mula_container_image.yml
 
 jobs:
   create_container_image:
@@ -37,6 +39,12 @@ jobs:
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Generate version.py
+        run: |
+          pip install setuptools-scm==7.1.0
+          python -m setuptools_scm
+          cp _version.py mula/scheduler/version.py
+
       - name: Build container image
         uses: docker/build-push-action@v3
         with:

diff --git a/.github/workflows/mula_debian_package.yml b/.github/workflows/mula_debian_package.yml
@@ -4,9 +4,11 @@ on:
   push:
     paths:
       - mula/**
+      - .github/workflows/mula_debian_package.yml
   pull_request:
     paths:
       - mula/**
+      - .github/workflows/mula_debian_package.yml
 
 jobs:
   build-package:
@@ -20,14 +22,11 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - name: Get version from release tag or generate one
+      - name: Generate version.py and set RELEASE_VERSION
         run: |
-          if [ ${GITHUB_REF_TYPE} = "tag" ]; then
-            echo "RELEASE_VERSION=${GITHUB_REF#refs/*/v}" >> $GITHUB_ENV
-          else
-            pip install setuptools-scm==7.1.0
-            echo "RELEASE_VERSION=$(python -m setuptools_scm)" >> $GITHUB_ENV
-          fi
+          pip install setuptools-scm==7.1.0
+          echo "RELEASE_VERSION=$(python -m setuptools_scm)" >> $GITHUB_ENV
+          cp _version.py mula/scheduler/version.py
 
       - name: Run debian package build
         uses: addnab/docker-run-action@v3

diff --git a/.github/workflows/octopoes_container_image.yml b/.github/workflows/octopoes_container_image.yml
@@ -4,9 +4,11 @@ on:
   push:
     paths:
       - octopoes/**
+      - .github/workflows/octopoes_container_image.yml
   pull_request:
     paths:
       - octopoes/**
+      - .github/workflows/octopoes_container_image.yml
 
 jobs:
   create_container_image:
@@ -37,6 +39,12 @@ jobs:
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Generate version.py
+        run: |
+          pip install setuptools-scm==7.1.0
+          python -m setuptools_scm
+          cp _version.py octopoes/octopoes/version.py
+
       - name: Build container image
         uses: docker/build-push-action@v3
         with:

diff --git a/.github/workflows/octopoes_debian_package.yml b/.github/workflows/octopoes_debian_package.yml
@@ -4,9 +4,11 @@ on:
   push:
     paths:
       - octopoes/**
+      - .github/workflows/octopoes_debian_package.yml
   pull_request:
     paths:
       - octopoes/**
+      - .github/workflows/octopoes_debian_package.yml
 
 jobs:
   build-package:
@@ -20,14 +22,11 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - name: Get version from release tag or generate one
+      - name: Generate version.py and set RELEASE_VERSION
         run: |
-          if [ ${GITHUB_REF_TYPE} = "tag" ]; then
-            echo "RELEASE_VERSION=${GITHUB_REF#refs/*/v}" >> $GITHUB_ENV
-          else
-            pip install setuptools-scm==7.1.0
-            echo "RELEASE_VERSION=$(python -m setuptools_scm)" >> $GITHUB_ENV
-          fi
+          pip install setuptools-scm==7.1.0
+          echo "RELEASE_VERSION=$(python -m setuptools_scm)" >> $GITHUB_ENV
+          cp _version.py octopoes/octopoes/version.py
 
       - name: Run debian package build
         uses: addnab/docker-run-action@v3

diff --git a/.github/workflows/rocky_container_image.yml b/.github/workflows/rocky_container_image.yml
@@ -5,10 +5,12 @@ on:
     paths:
       - octopoes/**
       - rocky/**
+      - .github/workflows/rocky_container_image.yml
   pull_request:
     paths:
       - octopoes/**
       - rocky/**
+      - .github/workflows/rocky_container_image.yml
 
 jobs:
   create_container_image:
@@ -39,6 +41,12 @@ jobs:
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Generate version.py
+        run: |
+          pip install setuptools-scm==7.1.0
+          python -m setuptools_scm
+          cp _version.py rocky/rocky/version.py
+
       - name: Build container image
         uses: docker/build-push-action@v3
         with:

diff --git a/.github/workflows/rocky_debian_package.yml b/.github/workflows/rocky_debian_package.yml
@@ -5,10 +5,12 @@ on:
     paths:
       - octopoes/**
       - rocky/**
+      - .github/workflows/rocky_debian_package.yml
   pull_request:
     paths:
       - octopoes/**
       - rocky/**
+      - .github/workflows/rocky_debian_package.yml
 
 jobs:
   build-package:
@@ -22,14 +24,11 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - name: Get version from release tag or generate one
+      - name: Generate version.py and set RELEASE_VERSION
         run: |
-          if [ ${GITHUB_REF_TYPE} = "tag" ]; then
-            echo "RELEASE_VERSION=${GITHUB_REF#refs/*/v}" >> $GITHUB_ENV
-          else
-            pip install setuptools-scm==7.1.0
-            echo "RELEASE_VERSION=$(python -m setuptools_scm)" >> $GITHUB_ENV
-          fi
+          pip install setuptools-scm==7.1.0
+          echo "RELEASE_VERSION=$(python -m setuptools_scm)" >> $GITHUB_ENV
+          cp _version.py rocky/rocky/version.py
 
       - name: Run debian package build
         uses: addnab/docker-run-action@v3

diff --git a/.gitignore b/.gitignore
@@ -432,3 +432,4 @@ $RECYCLE.BIN/
 deployment/github_config.sh
 
 nl-kat-*
+/_version.py