diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index e94c5e22a8..fef2f458a7 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -35,7 +35,7 @@ jobs: java-package: jdk # (jre, jdk, or jdk+fx) - defaults to jdk architecture: x64 # (x64 or x86) - defaults to x64 - run: | - cd hooks/${{ matrix.unit }}/ + cd hooks/${{ matrix.unit }}/hook/ ./gradlew test # ---- Unit-Test | Python ---- @@ -89,7 +89,7 @@ jobs: done - name: "Install npm dependencies in all hook sub projects" run: | - for dir in hooks/*/ + for dir in hooks/*/hook do cd $dir if [ -f package.json ] && [ -f package-lock.json ]; then @@ -109,7 +109,8 @@ jobs: npm ci - name: "Compile Typescript" run: | - cd hooks/cascading-scans + cd hooks/cascading-scans/hook + npm ci npm run build - name: "Run tests & publish code coverage" uses: paambaati/codeclimate-action@v2.6.0 @@ -325,8 +326,8 @@ jobs: - name: Build and Push uses: docker/build-push-action@v2 with: - context: ./hooks/${{ matrix.hook }} - file: ./hooks/${{ matrix.hook }}/Dockerfile + context: ./hooks/${{ matrix.hook }}/hook + file: ./hooks/${{ matrix.hook }}/hook/Dockerfile build-args: | namespace=${{ env.DOCKER_NAMESPACE }} baseImageTag=${{ env.baseImageTag }} diff --git a/hooks/cascading-scans/.dockerignore b/hooks/cascading-scans/hook/.dockerignore similarity index 100% rename from hooks/cascading-scans/.dockerignore rename to hooks/cascading-scans/hook/.dockerignore diff --git a/hooks/cascading-scans/Dockerfile b/hooks/cascading-scans/hook/Dockerfile similarity index 100% rename from hooks/cascading-scans/Dockerfile rename to hooks/cascading-scans/hook/Dockerfile diff --git a/hooks/cascading-scans/hook.test.js b/hooks/cascading-scans/hook/hook.test.js similarity index 100% rename from hooks/cascading-scans/hook.test.js rename to hooks/cascading-scans/hook/hook.test.js diff --git a/hooks/cascading-scans/hook.ts b/hooks/cascading-scans/hook/hook.ts similarity index 100% rename from hooks/cascading-scans/hook.ts rename to hooks/cascading-scans/hook/hook.ts diff --git a/hooks/cascading-scans/kubernetes-label-selector.test.js b/hooks/cascading-scans/hook/kubernetes-label-selector.test.js similarity index 100% rename from hooks/cascading-scans/kubernetes-label-selector.test.js rename to hooks/cascading-scans/hook/kubernetes-label-selector.test.js diff --git a/hooks/cascading-scans/kubernetes-label-selector.ts b/hooks/cascading-scans/hook/kubernetes-label-selector.ts similarity index 100% rename from hooks/cascading-scans/kubernetes-label-selector.ts rename to hooks/cascading-scans/hook/kubernetes-label-selector.ts diff --git a/hooks/cascading-scans/package-lock.json b/hooks/cascading-scans/hook/package-lock.json similarity index 100% rename from hooks/cascading-scans/package-lock.json rename to hooks/cascading-scans/hook/package-lock.json diff --git a/hooks/cascading-scans/package-lock.json.license b/hooks/cascading-scans/hook/package-lock.json.license similarity index 100% rename from hooks/cascading-scans/package-lock.json.license rename to hooks/cascading-scans/hook/package-lock.json.license diff --git a/hooks/cascading-scans/package.json b/hooks/cascading-scans/hook/package.json similarity index 100% rename from hooks/cascading-scans/package.json rename to hooks/cascading-scans/hook/package.json diff --git a/hooks/cascading-scans/package.json.license b/hooks/cascading-scans/hook/package.json.license similarity index 100% rename from hooks/cascading-scans/package.json.license rename to hooks/cascading-scans/hook/package.json.license diff --git a/hooks/cascading-scans/scan-helpers.ts b/hooks/cascading-scans/hook/scan-helpers.ts similarity index 100% rename from hooks/cascading-scans/scan-helpers.ts rename to hooks/cascading-scans/hook/scan-helpers.ts diff --git a/hooks/finding-post-processing/.dockerignore b/hooks/finding-post-processing/hook/.dockerignore similarity index 100% rename from hooks/finding-post-processing/.dockerignore rename to hooks/finding-post-processing/hook/.dockerignore diff --git a/hooks/finding-post-processing/Dockerfile b/hooks/finding-post-processing/hook/Dockerfile similarity index 100% rename from hooks/finding-post-processing/Dockerfile rename to hooks/finding-post-processing/hook/Dockerfile diff --git a/hooks/finding-post-processing/hook.js b/hooks/finding-post-processing/hook/hook.js similarity index 100% rename from hooks/finding-post-processing/hook.js rename to hooks/finding-post-processing/hook/hook.js diff --git a/hooks/finding-post-processing/hook.test.js b/hooks/finding-post-processing/hook/hook.test.js similarity index 100% rename from hooks/finding-post-processing/hook.test.js rename to hooks/finding-post-processing/hook/hook.test.js diff --git a/hooks/finding-post-processing/package-lock.json b/hooks/finding-post-processing/hook/package-lock.json similarity index 100% rename from hooks/finding-post-processing/package-lock.json rename to hooks/finding-post-processing/hook/package-lock.json diff --git a/hooks/finding-post-processing/package-lock.json.license b/hooks/finding-post-processing/hook/package-lock.json.license similarity index 100% rename from hooks/finding-post-processing/package-lock.json.license rename to hooks/finding-post-processing/hook/package-lock.json.license diff --git a/hooks/finding-post-processing/package.json b/hooks/finding-post-processing/hook/package.json similarity index 100% rename from hooks/finding-post-processing/package.json rename to hooks/finding-post-processing/hook/package.json diff --git a/hooks/finding-post-processing/package.json.license b/hooks/finding-post-processing/hook/package.json.license similarity index 100% rename from hooks/finding-post-processing/package.json.license rename to hooks/finding-post-processing/hook/package.json.license diff --git a/hooks/generic-webhook/.dockerignore b/hooks/generic-webhook/hook/.dockerignore similarity index 100% rename from hooks/generic-webhook/.dockerignore rename to hooks/generic-webhook/hook/.dockerignore diff --git a/hooks/generic-webhook/Dockerfile b/hooks/generic-webhook/hook/Dockerfile similarity index 100% rename from hooks/generic-webhook/Dockerfile rename to hooks/generic-webhook/hook/Dockerfile diff --git a/hooks/generic-webhook/hook.js b/hooks/generic-webhook/hook/hook.js similarity index 100% rename from hooks/generic-webhook/hook.js rename to hooks/generic-webhook/hook/hook.js diff --git a/hooks/generic-webhook/hook.test.js b/hooks/generic-webhook/hook/hook.test.js similarity index 100% rename from hooks/generic-webhook/hook.test.js rename to hooks/generic-webhook/hook/hook.test.js diff --git a/hooks/generic-webhook/package-lock.json b/hooks/generic-webhook/hook/package-lock.json similarity index 100% rename from hooks/generic-webhook/package-lock.json rename to hooks/generic-webhook/hook/package-lock.json diff --git a/hooks/generic-webhook/package-lock.json.license b/hooks/generic-webhook/hook/package-lock.json.license similarity index 100% rename from hooks/generic-webhook/package-lock.json.license rename to hooks/generic-webhook/hook/package-lock.json.license diff --git a/hooks/generic-webhook/package.json b/hooks/generic-webhook/hook/package.json similarity index 100% rename from hooks/generic-webhook/package.json rename to hooks/generic-webhook/hook/package.json diff --git a/hooks/generic-webhook/package.json.license b/hooks/generic-webhook/hook/package.json.license similarity index 100% rename from hooks/generic-webhook/package.json.license rename to hooks/generic-webhook/hook/package.json.license diff --git a/hooks/notification/.dockerignore b/hooks/notification/hook/.dockerignore similarity index 100% rename from hooks/notification/.dockerignore rename to hooks/notification/hook/.dockerignore diff --git a/hooks/notification/Dockerfile b/hooks/notification/hook/Dockerfile similarity index 100% rename from hooks/notification/Dockerfile rename to hooks/notification/hook/Dockerfile diff --git a/hooks/notification/Notifier.ts b/hooks/notification/hook/Notifier.ts similarity index 100% rename from hooks/notification/Notifier.ts rename to hooks/notification/hook/Notifier.ts diff --git a/hooks/notification/NotifierFactory.test.ts b/hooks/notification/hook/NotifierFactory.test.ts similarity index 100% rename from hooks/notification/NotifierFactory.test.ts rename to hooks/notification/hook/NotifierFactory.test.ts diff --git a/hooks/notification/NotifierFactory.ts b/hooks/notification/hook/NotifierFactory.ts similarity index 100% rename from hooks/notification/NotifierFactory.ts rename to hooks/notification/hook/NotifierFactory.ts diff --git a/hooks/notification/NotifierType.ts b/hooks/notification/hook/NotifierType.ts similarity index 100% rename from hooks/notification/NotifierType.ts rename to hooks/notification/hook/NotifierType.ts diff --git a/hooks/notification/Notifiers/AbstractNotifier.ts b/hooks/notification/hook/Notifiers/AbstractNotifier.ts similarity index 100% rename from hooks/notification/Notifiers/AbstractNotifier.ts rename to hooks/notification/hook/Notifiers/AbstractNotifier.ts diff --git a/hooks/notification/Notifiers/AbstractWebHookNotifier.ts b/hooks/notification/hook/Notifiers/AbstractWebHookNotifier.ts similarity index 100% rename from hooks/notification/Notifiers/AbstractWebHookNotifier.ts rename to hooks/notification/hook/Notifiers/AbstractWebHookNotifier.ts diff --git a/hooks/notification/Notifiers/EMailNotifier.test.ts b/hooks/notification/hook/Notifiers/EMailNotifier.test.ts similarity index 100% rename from hooks/notification/Notifiers/EMailNotifier.test.ts rename to hooks/notification/hook/Notifiers/EMailNotifier.test.ts diff --git a/hooks/notification/Notifiers/EMailNotifier.ts b/hooks/notification/hook/Notifiers/EMailNotifier.ts similarity index 100% rename from hooks/notification/Notifiers/EMailNotifier.ts rename to hooks/notification/hook/Notifiers/EMailNotifier.ts diff --git a/hooks/notification/Notifiers/MSTeamsNotifier.test.ts b/hooks/notification/hook/Notifiers/MSTeamsNotifier.test.ts similarity index 100% rename from hooks/notification/Notifiers/MSTeamsNotifier.test.ts rename to hooks/notification/hook/Notifiers/MSTeamsNotifier.test.ts diff --git a/hooks/notification/Notifiers/MSTeamsNotifier.ts b/hooks/notification/hook/Notifiers/MSTeamsNotifier.ts similarity index 100% rename from hooks/notification/Notifiers/MSTeamsNotifier.ts rename to hooks/notification/hook/Notifiers/MSTeamsNotifier.ts diff --git a/hooks/notification/Notifiers/SlackAppNotifier.test.ts b/hooks/notification/hook/Notifiers/SlackAppNotifier.test.ts similarity index 100% rename from hooks/notification/Notifiers/SlackAppNotifier.test.ts rename to hooks/notification/hook/Notifiers/SlackAppNotifier.test.ts diff --git a/hooks/notification/Notifiers/SlackAppNotifier.ts b/hooks/notification/hook/Notifiers/SlackAppNotifier.ts similarity index 100% rename from hooks/notification/Notifiers/SlackAppNotifier.ts rename to hooks/notification/hook/Notifiers/SlackAppNotifier.ts diff --git a/hooks/notification/Notifiers/SlackNotifier.test.ts b/hooks/notification/hook/Notifiers/SlackNotifier.test.ts similarity index 100% rename from hooks/notification/Notifiers/SlackNotifier.test.ts rename to hooks/notification/hook/Notifiers/SlackNotifier.test.ts diff --git a/hooks/notification/Notifiers/SlackNotifier.ts b/hooks/notification/hook/Notifiers/SlackNotifier.ts similarity index 100% rename from hooks/notification/Notifiers/SlackNotifier.ts rename to hooks/notification/hook/Notifiers/SlackNotifier.ts diff --git a/hooks/notification/__testfiles__/channels.yaml b/hooks/notification/hook/__testfiles__/channels.yaml similarity index 100% rename from hooks/notification/__testfiles__/channels.yaml rename to hooks/notification/hook/__testfiles__/channels.yaml diff --git a/hooks/notification/__testfiles__/slack.json b/hooks/notification/hook/__testfiles__/slack.json similarity index 100% rename from hooks/notification/__testfiles__/slack.json rename to hooks/notification/hook/__testfiles__/slack.json diff --git a/hooks/notification/__testfiles__/slack.json.license b/hooks/notification/hook/__testfiles__/slack.json.license similarity index 100% rename from hooks/notification/__testfiles__/slack.json.license rename to hooks/notification/hook/__testfiles__/slack.json.license diff --git a/hooks/notification/hook.test.ts b/hooks/notification/hook/hook.test.ts similarity index 100% rename from hooks/notification/hook.test.ts rename to hooks/notification/hook/hook.test.ts diff --git a/hooks/notification/hook.ts b/hooks/notification/hook/hook.ts similarity index 100% rename from hooks/notification/hook.ts rename to hooks/notification/hook/hook.ts diff --git a/hooks/notification/model/Finding.ts b/hooks/notification/hook/model/Finding.ts similarity index 100% rename from hooks/notification/model/Finding.ts rename to hooks/notification/hook/model/Finding.ts diff --git a/hooks/notification/model/NotificationChannel.ts b/hooks/notification/hook/model/NotificationChannel.ts similarity index 100% rename from hooks/notification/model/NotificationChannel.ts rename to hooks/notification/hook/model/NotificationChannel.ts diff --git a/hooks/notification/model/Scan.ts b/hooks/notification/hook/model/Scan.ts similarity index 100% rename from hooks/notification/model/Scan.ts rename to hooks/notification/hook/model/Scan.ts diff --git a/hooks/notification/notification-templates/email.njk b/hooks/notification/hook/notification-templates/email.njk similarity index 100% rename from hooks/notification/notification-templates/email.njk rename to hooks/notification/hook/notification-templates/email.njk diff --git a/hooks/notification/notification-templates/msteams-messageCard.njk b/hooks/notification/hook/notification-templates/msteams-messageCard.njk similarity index 100% rename from hooks/notification/notification-templates/msteams-messageCard.njk rename to hooks/notification/hook/notification-templates/msteams-messageCard.njk diff --git a/hooks/notification/notification-templates/slack-individual-findings-with-defectdojo.njk b/hooks/notification/hook/notification-templates/slack-individual-findings-with-defectdojo.njk similarity index 100% rename from hooks/notification/notification-templates/slack-individual-findings-with-defectdojo.njk rename to hooks/notification/hook/notification-templates/slack-individual-findings-with-defectdojo.njk diff --git a/hooks/notification/notification-templates/slack-messageCard.njk b/hooks/notification/hook/notification-templates/slack-messageCard.njk similarity index 100% rename from hooks/notification/notification-templates/slack-messageCard.njk rename to hooks/notification/hook/notification-templates/slack-messageCard.njk diff --git a/hooks/notification/package-lock.json b/hooks/notification/hook/package-lock.json similarity index 100% rename from hooks/notification/package-lock.json rename to hooks/notification/hook/package-lock.json diff --git a/hooks/notification/package-lock.json.license b/hooks/notification/hook/package-lock.json.license similarity index 100% rename from hooks/notification/package-lock.json.license rename to hooks/notification/hook/package-lock.json.license diff --git a/hooks/notification/package.json b/hooks/notification/hook/package.json similarity index 100% rename from hooks/notification/package.json rename to hooks/notification/hook/package.json diff --git a/hooks/notification/package.json.license b/hooks/notification/hook/package.json.license similarity index 100% rename from hooks/notification/package.json.license rename to hooks/notification/hook/package.json.license diff --git a/hooks/persistence-defectdojo/.dockerignore b/hooks/persistence-defectdojo/hook/.dockerignore similarity index 100% rename from hooks/persistence-defectdojo/.dockerignore rename to hooks/persistence-defectdojo/hook/.dockerignore diff --git a/hooks/persistence-defectdojo/Dockerfile b/hooks/persistence-defectdojo/hook/Dockerfile similarity index 100% rename from hooks/persistence-defectdojo/Dockerfile rename to hooks/persistence-defectdojo/hook/Dockerfile diff --git a/hooks/persistence-defectdojo/build.gradle b/hooks/persistence-defectdojo/hook/build.gradle similarity index 100% rename from hooks/persistence-defectdojo/build.gradle rename to hooks/persistence-defectdojo/hook/build.gradle diff --git a/hooks/persistence-defectdojo/gradle/wrapper/gradle-wrapper.jar b/hooks/persistence-defectdojo/hook/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from hooks/persistence-defectdojo/gradle/wrapper/gradle-wrapper.jar rename to hooks/persistence-defectdojo/hook/gradle/wrapper/gradle-wrapper.jar diff --git a/hooks/persistence-defectdojo/gradle/wrapper/gradle-wrapper.properties b/hooks/persistence-defectdojo/hook/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from hooks/persistence-defectdojo/gradle/wrapper/gradle-wrapper.properties rename to hooks/persistence-defectdojo/hook/gradle/wrapper/gradle-wrapper.properties diff --git a/hooks/persistence-defectdojo/gradlew b/hooks/persistence-defectdojo/hook/gradlew similarity index 100% rename from hooks/persistence-defectdojo/gradlew rename to hooks/persistence-defectdojo/hook/gradlew diff --git a/hooks/persistence-defectdojo/gradlew.bat b/hooks/persistence-defectdojo/hook/gradlew.bat similarity index 100% rename from hooks/persistence-defectdojo/gradlew.bat rename to hooks/persistence-defectdojo/hook/gradlew.bat diff --git a/hooks/persistence-defectdojo/lombok.config b/hooks/persistence-defectdojo/hook/lombok.config similarity index 100% rename from hooks/persistence-defectdojo/lombok.config rename to hooks/persistence-defectdojo/hook/lombok.config diff --git a/hooks/persistence-defectdojo/settings.gradle b/hooks/persistence-defectdojo/hook/settings.gradle similarity index 100% rename from hooks/persistence-defectdojo/settings.gradle rename to hooks/persistence-defectdojo/hook/settings.gradle diff --git a/hooks/persistence-defectdojo/src/main/java/io/securecodebox/models/V1Scan.java b/hooks/persistence-defectdojo/hook/src/main/java/io/securecodebox/models/V1Scan.java similarity index 100% rename from hooks/persistence-defectdojo/src/main/java/io/securecodebox/models/V1Scan.java rename to hooks/persistence-defectdojo/hook/src/main/java/io/securecodebox/models/V1Scan.java diff --git a/hooks/persistence-defectdojo/src/main/java/io/securecodebox/models/V1ScanList.java b/hooks/persistence-defectdojo/hook/src/main/java/io/securecodebox/models/V1ScanList.java similarity index 100% rename from hooks/persistence-defectdojo/src/main/java/io/securecodebox/models/V1ScanList.java rename to hooks/persistence-defectdojo/hook/src/main/java/io/securecodebox/models/V1ScanList.java diff --git a/hooks/persistence-defectdojo/src/main/java/io/securecodebox/models/V1ScanSpec.java b/hooks/persistence-defectdojo/hook/src/main/java/io/securecodebox/models/V1ScanSpec.java similarity index 100% rename from hooks/persistence-defectdojo/src/main/java/io/securecodebox/models/V1ScanSpec.java rename to hooks/persistence-defectdojo/hook/src/main/java/io/securecodebox/models/V1ScanSpec.java diff --git a/hooks/persistence-defectdojo/src/main/java/io/securecodebox/models/V1ScanSpecCascades.java b/hooks/persistence-defectdojo/hook/src/main/java/io/securecodebox/models/V1ScanSpecCascades.java similarity index 100% rename from hooks/persistence-defectdojo/src/main/java/io/securecodebox/models/V1ScanSpecCascades.java rename to hooks/persistence-defectdojo/hook/src/main/java/io/securecodebox/models/V1ScanSpecCascades.java diff --git a/hooks/persistence-defectdojo/src/main/java/io/securecodebox/models/V1ScanSpecCascadesMatchExpressions.java b/hooks/persistence-defectdojo/hook/src/main/java/io/securecodebox/models/V1ScanSpecCascadesMatchExpressions.java similarity index 100% rename from hooks/persistence-defectdojo/src/main/java/io/securecodebox/models/V1ScanSpecCascadesMatchExpressions.java rename to hooks/persistence-defectdojo/hook/src/main/java/io/securecodebox/models/V1ScanSpecCascadesMatchExpressions.java diff --git a/hooks/persistence-defectdojo/src/main/java/io/securecodebox/models/V1ScanStatus.java b/hooks/persistence-defectdojo/hook/src/main/java/io/securecodebox/models/V1ScanStatus.java similarity index 100% rename from hooks/persistence-defectdojo/src/main/java/io/securecodebox/models/V1ScanStatus.java rename to hooks/persistence-defectdojo/hook/src/main/java/io/securecodebox/models/V1ScanStatus.java diff --git a/hooks/persistence-defectdojo/src/main/java/io/securecodebox/models/V1ScanStatusFindings.java b/hooks/persistence-defectdojo/hook/src/main/java/io/securecodebox/models/V1ScanStatusFindings.java similarity index 100% rename from hooks/persistence-defectdojo/src/main/java/io/securecodebox/models/V1ScanStatusFindings.java rename to hooks/persistence-defectdojo/hook/src/main/java/io/securecodebox/models/V1ScanStatusFindings.java diff --git a/hooks/persistence-defectdojo/src/main/java/io/securecodebox/models/V1ScanStatusFindingsSeverities.java b/hooks/persistence-defectdojo/hook/src/main/java/io/securecodebox/models/V1ScanStatusFindingsSeverities.java similarity index 100% rename from hooks/persistence-defectdojo/src/main/java/io/securecodebox/models/V1ScanStatusFindingsSeverities.java rename to hooks/persistence-defectdojo/hook/src/main/java/io/securecodebox/models/V1ScanStatusFindingsSeverities.java diff --git a/hooks/persistence-defectdojo/src/main/java/io/securecodebox/models/V1ScanStatusReadAndWriteHookStatus.java b/hooks/persistence-defectdojo/hook/src/main/java/io/securecodebox/models/V1ScanStatusReadAndWriteHookStatus.java similarity index 100% rename from hooks/persistence-defectdojo/src/main/java/io/securecodebox/models/V1ScanStatusReadAndWriteHookStatus.java rename to hooks/persistence-defectdojo/hook/src/main/java/io/securecodebox/models/V1ScanStatusReadAndWriteHookStatus.java diff --git a/hooks/persistence-defectdojo/src/main/java/io/securecodebox/persistence/DefectDojoPersistenceProvider.java b/hooks/persistence-defectdojo/hook/src/main/java/io/securecodebox/persistence/DefectDojoPersistenceProvider.java similarity index 100% rename from hooks/persistence-defectdojo/src/main/java/io/securecodebox/persistence/DefectDojoPersistenceProvider.java rename to hooks/persistence-defectdojo/hook/src/main/java/io/securecodebox/persistence/DefectDojoPersistenceProvider.java diff --git a/hooks/persistence-defectdojo/src/main/java/io/securecodebox/persistence/config/PersistenceProviderConfig.java b/hooks/persistence-defectdojo/hook/src/main/java/io/securecodebox/persistence/config/PersistenceProviderConfig.java similarity index 100% rename from hooks/persistence-defectdojo/src/main/java/io/securecodebox/persistence/config/PersistenceProviderConfig.java rename to hooks/persistence-defectdojo/hook/src/main/java/io/securecodebox/persistence/config/PersistenceProviderConfig.java diff --git a/hooks/persistence-defectdojo/src/main/java/io/securecodebox/persistence/exceptions/DefectDojoLoopException.java b/hooks/persistence-defectdojo/hook/src/main/java/io/securecodebox/persistence/exceptions/DefectDojoLoopException.java similarity index 100% rename from hooks/persistence-defectdojo/src/main/java/io/securecodebox/persistence/exceptions/DefectDojoLoopException.java rename to hooks/persistence-defectdojo/hook/src/main/java/io/securecodebox/persistence/exceptions/DefectDojoLoopException.java diff --git a/hooks/persistence-defectdojo/src/main/java/io/securecodebox/persistence/exceptions/DefectDojoPersistenceException.java b/hooks/persistence-defectdojo/hook/src/main/java/io/securecodebox/persistence/exceptions/DefectDojoPersistenceException.java similarity index 100% rename from hooks/persistence-defectdojo/src/main/java/io/securecodebox/persistence/exceptions/DefectDojoPersistenceException.java rename to hooks/persistence-defectdojo/hook/src/main/java/io/securecodebox/persistence/exceptions/DefectDojoPersistenceException.java diff --git a/hooks/persistence-defectdojo/src/main/java/io/securecodebox/persistence/exceptions/DefectDojoUnreachableException.java b/hooks/persistence-defectdojo/hook/src/main/java/io/securecodebox/persistence/exceptions/DefectDojoUnreachableException.java similarity index 100% rename from hooks/persistence-defectdojo/src/main/java/io/securecodebox/persistence/exceptions/DefectDojoUnreachableException.java rename to hooks/persistence-defectdojo/hook/src/main/java/io/securecodebox/persistence/exceptions/DefectDojoUnreachableException.java diff --git a/hooks/persistence-defectdojo/src/main/java/io/securecodebox/persistence/mapping/DefectDojoFindingToSecureCodeBoxMapper.java b/hooks/persistence-defectdojo/hook/src/main/java/io/securecodebox/persistence/mapping/DefectDojoFindingToSecureCodeBoxMapper.java similarity index 100% rename from hooks/persistence-defectdojo/src/main/java/io/securecodebox/persistence/mapping/DefectDojoFindingToSecureCodeBoxMapper.java rename to hooks/persistence-defectdojo/hook/src/main/java/io/securecodebox/persistence/mapping/DefectDojoFindingToSecureCodeBoxMapper.java diff --git a/hooks/persistence-defectdojo/src/main/java/io/securecodebox/persistence/mapping/SecureCodeBoxFindingsToDefectDojoMapper.java b/hooks/persistence-defectdojo/hook/src/main/java/io/securecodebox/persistence/mapping/SecureCodeBoxFindingsToDefectDojoMapper.java similarity index 100% rename from hooks/persistence-defectdojo/src/main/java/io/securecodebox/persistence/mapping/SecureCodeBoxFindingsToDefectDojoMapper.java rename to hooks/persistence-defectdojo/hook/src/main/java/io/securecodebox/persistence/mapping/SecureCodeBoxFindingsToDefectDojoMapper.java diff --git a/hooks/persistence-defectdojo/src/main/java/io/securecodebox/persistence/models/DefectDojoImportFinding.java b/hooks/persistence-defectdojo/hook/src/main/java/io/securecodebox/persistence/models/DefectDojoImportFinding.java similarity index 100% rename from hooks/persistence-defectdojo/src/main/java/io/securecodebox/persistence/models/DefectDojoImportFinding.java rename to hooks/persistence-defectdojo/hook/src/main/java/io/securecodebox/persistence/models/DefectDojoImportFinding.java diff --git a/hooks/persistence-defectdojo/src/main/java/io/securecodebox/persistence/models/Scan.java b/hooks/persistence-defectdojo/hook/src/main/java/io/securecodebox/persistence/models/Scan.java similarity index 100% rename from hooks/persistence-defectdojo/src/main/java/io/securecodebox/persistence/models/Scan.java rename to hooks/persistence-defectdojo/hook/src/main/java/io/securecodebox/persistence/models/Scan.java diff --git a/hooks/persistence-defectdojo/src/main/java/io/securecodebox/persistence/models/SecureCodeBoxFinding.java b/hooks/persistence-defectdojo/hook/src/main/java/io/securecodebox/persistence/models/SecureCodeBoxFinding.java similarity index 100% rename from hooks/persistence-defectdojo/src/main/java/io/securecodebox/persistence/models/SecureCodeBoxFinding.java rename to hooks/persistence-defectdojo/hook/src/main/java/io/securecodebox/persistence/models/SecureCodeBoxFinding.java diff --git a/hooks/persistence-defectdojo/src/main/java/io/securecodebox/persistence/service/KubernetesService.java b/hooks/persistence-defectdojo/hook/src/main/java/io/securecodebox/persistence/service/KubernetesService.java similarity index 100% rename from hooks/persistence-defectdojo/src/main/java/io/securecodebox/persistence/service/KubernetesService.java rename to hooks/persistence-defectdojo/hook/src/main/java/io/securecodebox/persistence/service/KubernetesService.java diff --git a/hooks/persistence-defectdojo/src/main/java/io/securecodebox/persistence/service/S3Service.java b/hooks/persistence-defectdojo/hook/src/main/java/io/securecodebox/persistence/service/S3Service.java similarity index 100% rename from hooks/persistence-defectdojo/src/main/java/io/securecodebox/persistence/service/S3Service.java rename to hooks/persistence-defectdojo/hook/src/main/java/io/securecodebox/persistence/service/S3Service.java diff --git a/hooks/persistence-defectdojo/src/main/java/io/securecodebox/persistence/service/ScanService.java b/hooks/persistence-defectdojo/hook/src/main/java/io/securecodebox/persistence/service/ScanService.java similarity index 100% rename from hooks/persistence-defectdojo/src/main/java/io/securecodebox/persistence/service/ScanService.java rename to hooks/persistence-defectdojo/hook/src/main/java/io/securecodebox/persistence/service/ScanService.java diff --git a/hooks/persistence-defectdojo/src/main/java/io/securecodebox/persistence/strategies/Strategy.java b/hooks/persistence-defectdojo/hook/src/main/java/io/securecodebox/persistence/strategies/Strategy.java similarity index 100% rename from hooks/persistence-defectdojo/src/main/java/io/securecodebox/persistence/strategies/Strategy.java rename to hooks/persistence-defectdojo/hook/src/main/java/io/securecodebox/persistence/strategies/Strategy.java diff --git a/hooks/persistence-defectdojo/src/main/java/io/securecodebox/persistence/strategies/VersionedEngagementsStrategy.java b/hooks/persistence-defectdojo/hook/src/main/java/io/securecodebox/persistence/strategies/VersionedEngagementsStrategy.java similarity index 100% rename from hooks/persistence-defectdojo/src/main/java/io/securecodebox/persistence/strategies/VersionedEngagementsStrategy.java rename to hooks/persistence-defectdojo/hook/src/main/java/io/securecodebox/persistence/strategies/VersionedEngagementsStrategy.java diff --git a/hooks/persistence-defectdojo/src/main/java/io/securecodebox/persistence/util/DescriptionGenerator.java b/hooks/persistence-defectdojo/hook/src/main/java/io/securecodebox/persistence/util/DescriptionGenerator.java similarity index 100% rename from hooks/persistence-defectdojo/src/main/java/io/securecodebox/persistence/util/DescriptionGenerator.java rename to hooks/persistence-defectdojo/hook/src/main/java/io/securecodebox/persistence/util/DescriptionGenerator.java diff --git a/hooks/persistence-defectdojo/src/main/java/io/securecodebox/persistence/util/ScanNameMapping.java b/hooks/persistence-defectdojo/hook/src/main/java/io/securecodebox/persistence/util/ScanNameMapping.java similarity index 100% rename from hooks/persistence-defectdojo/src/main/java/io/securecodebox/persistence/util/ScanNameMapping.java rename to hooks/persistence-defectdojo/hook/src/main/java/io/securecodebox/persistence/util/ScanNameMapping.java diff --git a/hooks/persistence-defectdojo/src/main/resources/application.yaml b/hooks/persistence-defectdojo/hook/src/main/resources/application.yaml similarity index 100% rename from hooks/persistence-defectdojo/src/main/resources/application.yaml rename to hooks/persistence-defectdojo/hook/src/main/resources/application.yaml diff --git a/hooks/persistence-defectdojo/src/main/resources/log4j.xml b/hooks/persistence-defectdojo/hook/src/main/resources/log4j.xml similarity index 100% rename from hooks/persistence-defectdojo/src/main/resources/log4j.xml rename to hooks/persistence-defectdojo/hook/src/main/resources/log4j.xml diff --git a/hooks/persistence-defectdojo/src/test/java/io/securecodebox/persistence/DescriptionGeneratorTest.java b/hooks/persistence-defectdojo/hook/src/test/java/io/securecodebox/persistence/DescriptionGeneratorTest.java similarity index 100% rename from hooks/persistence-defectdojo/src/test/java/io/securecodebox/persistence/DescriptionGeneratorTest.java rename to hooks/persistence-defectdojo/hook/src/test/java/io/securecodebox/persistence/DescriptionGeneratorTest.java diff --git a/hooks/persistence-defectdojo/src/test/java/io/securecodebox/persistence/mapping/DefectDojoFindingToSecureCodeBoxMapperTest.java b/hooks/persistence-defectdojo/hook/src/test/java/io/securecodebox/persistence/mapping/DefectDojoFindingToSecureCodeBoxMapperTest.java similarity index 100% rename from hooks/persistence-defectdojo/src/test/java/io/securecodebox/persistence/mapping/DefectDojoFindingToSecureCodeBoxMapperTest.java rename to hooks/persistence-defectdojo/hook/src/test/java/io/securecodebox/persistence/mapping/DefectDojoFindingToSecureCodeBoxMapperTest.java diff --git a/hooks/persistence-defectdojo/src/test/java/io/securecodebox/persistence/mapping/SecureCodeBoxFindingsToDefectDojoMapperTest.java b/hooks/persistence-defectdojo/hook/src/test/java/io/securecodebox/persistence/mapping/SecureCodeBoxFindingsToDefectDojoMapperTest.java similarity index 100% rename from hooks/persistence-defectdojo/src/test/java/io/securecodebox/persistence/mapping/SecureCodeBoxFindingsToDefectDojoMapperTest.java rename to hooks/persistence-defectdojo/hook/src/test/java/io/securecodebox/persistence/mapping/SecureCodeBoxFindingsToDefectDojoMapperTest.java diff --git a/hooks/persistence-defectdojo/src/test/java/io/securecodebox/persistence/service/KubernetesServiceTest.java b/hooks/persistence-defectdojo/hook/src/test/java/io/securecodebox/persistence/service/KubernetesServiceTest.java similarity index 100% rename from hooks/persistence-defectdojo/src/test/java/io/securecodebox/persistence/service/KubernetesServiceTest.java rename to hooks/persistence-defectdojo/hook/src/test/java/io/securecodebox/persistence/service/KubernetesServiceTest.java diff --git a/hooks/persistence-defectdojo/src/test/java/io/securecodebox/persistence/strategies/VersionedEngagementsStrategyTest.java b/hooks/persistence-defectdojo/hook/src/test/java/io/securecodebox/persistence/strategies/VersionedEngagementsStrategyTest.java similarity index 100% rename from hooks/persistence-defectdojo/src/test/java/io/securecodebox/persistence/strategies/VersionedEngagementsStrategyTest.java rename to hooks/persistence-defectdojo/hook/src/test/java/io/securecodebox/persistence/strategies/VersionedEngagementsStrategyTest.java diff --git a/hooks/persistence-defectdojo/src/test/resources/kubehunter-dd-findings.json b/hooks/persistence-defectdojo/hook/src/test/resources/kubehunter-dd-findings.json similarity index 100% rename from hooks/persistence-defectdojo/src/test/resources/kubehunter-dd-findings.json rename to hooks/persistence-defectdojo/hook/src/test/resources/kubehunter-dd-findings.json diff --git a/hooks/persistence-defectdojo/src/test/resources/kubehunter-scb-findings.json b/hooks/persistence-defectdojo/hook/src/test/resources/kubehunter-scb-findings.json similarity index 100% rename from hooks/persistence-defectdojo/src/test/resources/kubehunter-scb-findings.json rename to hooks/persistence-defectdojo/hook/src/test/resources/kubehunter-scb-findings.json diff --git a/hooks/persistence-defectdojo/update.sh b/hooks/persistence-defectdojo/hook/update.sh similarity index 100% rename from hooks/persistence-defectdojo/update.sh rename to hooks/persistence-defectdojo/hook/update.sh diff --git a/hooks/persistence-elastic/.dockerignore b/hooks/persistence-elastic/hook/.dockerignore similarity index 100% rename from hooks/persistence-elastic/.dockerignore rename to hooks/persistence-elastic/hook/.dockerignore diff --git a/hooks/persistence-elastic/Dockerfile b/hooks/persistence-elastic/hook/Dockerfile similarity index 100% rename from hooks/persistence-elastic/Dockerfile rename to hooks/persistence-elastic/hook/Dockerfile diff --git a/hooks/persistence-elastic/__mocks__/@elastic/elasticsearch.js b/hooks/persistence-elastic/hook/__mocks__/@elastic/elasticsearch.js similarity index 100% rename from hooks/persistence-elastic/__mocks__/@elastic/elasticsearch.js rename to hooks/persistence-elastic/hook/__mocks__/@elastic/elasticsearch.js diff --git a/hooks/persistence-elastic/hook.js b/hooks/persistence-elastic/hook/hook.js similarity index 100% rename from hooks/persistence-elastic/hook.js rename to hooks/persistence-elastic/hook/hook.js diff --git a/hooks/persistence-elastic/hook.test.js b/hooks/persistence-elastic/hook/hook.test.js similarity index 100% rename from hooks/persistence-elastic/hook.test.js rename to hooks/persistence-elastic/hook/hook.test.js diff --git a/hooks/persistence-elastic/package-lock.json b/hooks/persistence-elastic/hook/package-lock.json similarity index 100% rename from hooks/persistence-elastic/package-lock.json rename to hooks/persistence-elastic/hook/package-lock.json diff --git a/hooks/persistence-elastic/package-lock.json.license b/hooks/persistence-elastic/hook/package-lock.json.license similarity index 100% rename from hooks/persistence-elastic/package-lock.json.license rename to hooks/persistence-elastic/hook/package-lock.json.license diff --git a/hooks/persistence-elastic/package.json b/hooks/persistence-elastic/hook/package.json similarity index 100% rename from hooks/persistence-elastic/package.json rename to hooks/persistence-elastic/hook/package.json diff --git a/hooks/persistence-elastic/package.json.license b/hooks/persistence-elastic/hook/package.json.license similarity index 100% rename from hooks/persistence-elastic/package.json.license rename to hooks/persistence-elastic/hook/package.json.license diff --git a/hooks/teams-webhook/.dockerignore b/hooks/teams-webhook/hook/.dockerignore similarity index 100% rename from hooks/teams-webhook/.dockerignore rename to hooks/teams-webhook/hook/.dockerignore diff --git a/hooks/teams-webhook/Dockerfile b/hooks/teams-webhook/hook/Dockerfile similarity index 100% rename from hooks/teams-webhook/Dockerfile rename to hooks/teams-webhook/hook/Dockerfile diff --git a/hooks/teams-webhook/__snapshots__/hook.test.js.snap b/hooks/teams-webhook/hook/__snapshots__/hook.test.js.snap similarity index 100% rename from hooks/teams-webhook/__snapshots__/hook.test.js.snap rename to hooks/teams-webhook/hook/__snapshots__/hook.test.js.snap diff --git a/hooks/teams-webhook/__snapshots__/hook.test.js.snap.license b/hooks/teams-webhook/hook/__snapshots__/hook.test.js.snap.license similarity index 100% rename from hooks/teams-webhook/__snapshots__/hook.test.js.snap.license rename to hooks/teams-webhook/hook/__snapshots__/hook.test.js.snap.license diff --git a/hooks/teams-webhook/__snapshots__/msteams-template.test.js.snap b/hooks/teams-webhook/hook/__snapshots__/msteams-template.test.js.snap similarity index 100% rename from hooks/teams-webhook/__snapshots__/msteams-template.test.js.snap rename to hooks/teams-webhook/hook/__snapshots__/msteams-template.test.js.snap diff --git a/hooks/teams-webhook/__snapshots__/msteams-template.test.js.snap.license b/hooks/teams-webhook/hook/__snapshots__/msteams-template.test.js.snap.license similarity index 100% rename from hooks/teams-webhook/__snapshots__/msteams-template.test.js.snap.license rename to hooks/teams-webhook/hook/__snapshots__/msteams-template.test.js.snap.license diff --git a/hooks/teams-webhook/__testfiles__/ms-teams_messageCard.json b/hooks/teams-webhook/hook/__testfiles__/ms-teams_messageCard.json similarity index 100% rename from hooks/teams-webhook/__testfiles__/ms-teams_messageCard.json rename to hooks/teams-webhook/hook/__testfiles__/ms-teams_messageCard.json diff --git a/hooks/teams-webhook/__testfiles__/ms-teams_messageCard.json.license b/hooks/teams-webhook/hook/__testfiles__/ms-teams_messageCard.json.license similarity index 100% rename from hooks/teams-webhook/__testfiles__/ms-teams_messageCard.json.license rename to hooks/teams-webhook/hook/__testfiles__/ms-teams_messageCard.json.license diff --git a/hooks/teams-webhook/__testfiles__/rocketchat.json b/hooks/teams-webhook/hook/__testfiles__/rocketchat.json similarity index 100% rename from hooks/teams-webhook/__testfiles__/rocketchat.json rename to hooks/teams-webhook/hook/__testfiles__/rocketchat.json diff --git a/hooks/teams-webhook/__testfiles__/rocketchat.json.license b/hooks/teams-webhook/hook/__testfiles__/rocketchat.json.license similarity index 100% rename from hooks/teams-webhook/__testfiles__/rocketchat.json.license rename to hooks/teams-webhook/hook/__testfiles__/rocketchat.json.license diff --git a/hooks/teams-webhook/__testfiles__/slack.json b/hooks/teams-webhook/hook/__testfiles__/slack.json similarity index 100% rename from hooks/teams-webhook/__testfiles__/slack.json rename to hooks/teams-webhook/hook/__testfiles__/slack.json diff --git a/hooks/teams-webhook/__testfiles__/slack.json.license b/hooks/teams-webhook/hook/__testfiles__/slack.json.license similarity index 100% rename from hooks/teams-webhook/__testfiles__/slack.json.license rename to hooks/teams-webhook/hook/__testfiles__/slack.json.license diff --git a/hooks/teams-webhook/hook.js b/hooks/teams-webhook/hook/hook.js similarity index 100% rename from hooks/teams-webhook/hook.js rename to hooks/teams-webhook/hook/hook.js diff --git a/hooks/teams-webhook/hook.test.js b/hooks/teams-webhook/hook/hook.test.js similarity index 100% rename from hooks/teams-webhook/hook.test.js rename to hooks/teams-webhook/hook/hook.test.js diff --git a/hooks/teams-webhook/msteams-template.js b/hooks/teams-webhook/hook/msteams-template.js similarity index 100% rename from hooks/teams-webhook/msteams-template.js rename to hooks/teams-webhook/hook/msteams-template.js diff --git a/hooks/teams-webhook/msteams-template.test.js b/hooks/teams-webhook/hook/msteams-template.test.js similarity index 100% rename from hooks/teams-webhook/msteams-template.test.js rename to hooks/teams-webhook/hook/msteams-template.test.js diff --git a/hooks/teams-webhook/package-lock.json b/hooks/teams-webhook/hook/package-lock.json similarity index 100% rename from hooks/teams-webhook/package-lock.json rename to hooks/teams-webhook/hook/package-lock.json diff --git a/hooks/teams-webhook/package-lock.json.license b/hooks/teams-webhook/hook/package-lock.json.license similarity index 100% rename from hooks/teams-webhook/package-lock.json.license rename to hooks/teams-webhook/hook/package-lock.json.license diff --git a/hooks/teams-webhook/package.json b/hooks/teams-webhook/hook/package.json similarity index 100% rename from hooks/teams-webhook/package.json rename to hooks/teams-webhook/hook/package.json diff --git a/hooks/teams-webhook/package.json.license b/hooks/teams-webhook/hook/package.json.license similarity index 100% rename from hooks/teams-webhook/package.json.license rename to hooks/teams-webhook/hook/package.json.license diff --git a/hooks/update-field/.dockerignore b/hooks/update-field/hook/.dockerignore similarity index 100% rename from hooks/update-field/.dockerignore rename to hooks/update-field/hook/.dockerignore diff --git a/hooks/update-field/Dockerfile b/hooks/update-field/hook/Dockerfile similarity index 100% rename from hooks/update-field/Dockerfile rename to hooks/update-field/hook/Dockerfile diff --git a/hooks/update-field/hook.js b/hooks/update-field/hook/hook.js similarity index 100% rename from hooks/update-field/hook.js rename to hooks/update-field/hook/hook.js diff --git a/hooks/update-field/hook.test.js b/hooks/update-field/hook/hook.test.js similarity index 100% rename from hooks/update-field/hook.test.js rename to hooks/update-field/hook/hook.test.js diff --git a/hooks/update-field/package-lock.json b/hooks/update-field/hook/package-lock.json similarity index 100% rename from hooks/update-field/package-lock.json rename to hooks/update-field/hook/package-lock.json diff --git a/hooks/update-field/package-lock.json.license b/hooks/update-field/hook/package-lock.json.license similarity index 100% rename from hooks/update-field/package-lock.json.license rename to hooks/update-field/hook/package-lock.json.license diff --git a/hooks/update-field/package.json b/hooks/update-field/hook/package.json similarity index 100% rename from hooks/update-field/package.json rename to hooks/update-field/hook/package.json diff --git a/hooks/update-field/package.json.license b/hooks/update-field/hook/package.json.license similarity index 100% rename from hooks/update-field/package.json.license rename to hooks/update-field/hook/package.json.license