secureCodeBox · nigthknight · Jun 7, 2021 · Jun 8, 2021 · Jun 8, 2021 · Jun 14, 2021
diff --git 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
@@ -99,6 +99,9 @@ jobs:
               # cd back
               cd -
           done
+      - name: Debug Hook Installation
+        if: failure()
+        run: "find /home/runner/.npm/_logs -type f -exec cat {} +"
       - name: "Install npm test dependencies"
         run: |
           npm ci
@@ -109,14 +112,15 @@ 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
-        env:
-          CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
-        with:
-          coverageCommand: npm test -- --ci --colors --coverage
+      # - name: "Run tests & publish code coverage"
+      #   uses: paambaati/codeclimate-action@v2.6.0
+      #   env:
+      #     CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
+      #   with:
+      #     coverageCommand: npm test -- --ci --colors --coverage --testPathIgnorePatterns=["/integration-tests/"]
 
   # ---- Build Stage ----
 
@@ -279,6 +283,72 @@ jobs:
           tags: ${{ steps.docker_meta.outputs.tags }}
           labels: ${{ steps.docker_meta.outputs.labels }}
 
+# ---- New Makefile based CI Pipeline steps ----
+  makefile-scanner:
+    name: "Make Scanners"
+    needs: 
+      - sdk
+      - operator
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        unit: ["amass"]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
+        with:
+          node-version: '14'
+      - name: "Start kind cluster"
+        run: |
+          kind version
+          kind create cluster --image kindest/node:v1.21.1@sha256:69860bda5563ac81e3c0057d654b5253219618a22ec3a346306239bba8cfa1a6 --wait 3m
+      - name: "Inspect kind cluster"
+        run: |
+          kubectl config current-context
+          kubectl get node
+      - name: Install Operator
+        working-directory: ./operator
+        run: |
+          make helm-deploy
+      - name: "Run makefile for scanner '${{ matrix.unit }}'"
+        working-directory: ./scanners/${{ matrix.unit }}/
+        run: |
+          make all
+
+  makefile-hooks:
+    name: "Make Hooks"
+    needs: 
+      - sdk
+      - operator
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        unit: ["finding-post-processing"]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
+        with:
+          node-version: '14'
+      - name: "Start kind cluster"
+        run: |
+          kind version
+          kind create cluster --image kindest/node:v1.21.1@sha256:69860bda5563ac81e3c0057d654b5253219618a22ec3a346306239bba8cfa1a6 --wait 3m
+      - name: "Inspect kind cluster"
+        run: |
+          kubectl config current-context
+          kubectl get node
+      - name: Install Operator
+        working-directory: ./operator
+        run: |
+          make helm-deploy
+      - name: "Run makefile for hook '${{ matrix.unit }}'"
+        working-directory: ./hooks/${{ matrix.unit }}/
+        run: |
+          make all
+
+
   # ---- Build Stage | Matrix Hooks ----
 
   hooks:
@@ -325,8 +395,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 }}
@@ -769,16 +839,13 @@ jobs:
           kubectl create deployment --image nginx:alpine nginx --namespace demo-targets
           kubectl expose deployment nginx --port 80 --namespace demo-targets
 
-      # ---- OWASP Amass Integration Tests ----
+      # # ---- OWASP Amass Integration Tests ----
 
-      - name: "amass Integration Tests"
-        run: |
-          kubectl -n integration-tests delete scans --all
-          helm -n integration-tests install amass ./scanners/amass/ \
-            --set="parser.image.repository=docker.io/${{ env.DOCKER_NAMESPACE }}/parser-amass" \
-            --set="parser.image.tag=sha-$(git rev-parse --short HEAD)"
-          cd tests/integration/
-          npx jest --ci --color scanner/amass.test.js
+      # - name: "amass Integration Tests"
+      #   working-directory: ./scanners/amass
+      #   run: |
+      #     make deploy IMG_TAG=$(git rev-parse --short HEAD)
+      #     make integration-tests
 
       # ---- gitleaks Integration Tests ----
 

diff --git a/.gitignore b/.gitignore
@@ -22,7 +22,7 @@
 *.ipr
 out/
 
-Created by https://www.toptal.com/developers/gitignore/api/vim
+# Created by https://www.toptal.com/developers/gitignore/api/vim
 # Edit at https://www.toptal.com/developers/gitignore?templates=vim
 
 ### Vim ###
@@ -47,3 +47,5 @@ tags
 [._]*.un~
 
 # End of https://www.toptal.com/developers/gitignore/api/vim
+
+*.tar
diff --git a/hooks/cascading-scans/.gitignore b/hooks/cascading-scans/.gitignore
@@ -1,8 +1,3 @@
-# SPDX-FileCopyrightText: 2020 iteratec GmbH
-#
-# SPDX-License-Identifier: Apache-2.0
-
-node_modules
-*.map
-**.js
-!**.test.js
+declarative-subsequent-scans.tar
+*.js
+*.js.map
diff --git a/hooks/cascading-scans/.helmignore b/hooks/cascading-scans/.helmignore
@@ -33,3 +33,5 @@ config/*
 Dockerfile
 .dockerignore
 docs/
+declarative-subsequent-scans.tar
+hook
diff --git a/hooks/cascading-scans/.dockerignore → hooks/cascading-scans/hook/.dockerignore b/hooks/cascading-scans/.dockerignore → hooks/cascading-scans/hook/.dockerignore
diff --git a/hooks/cascading-scans/Dockerfile → hooks/cascading-scans/hook/Dockerfile b/hooks/cascading-scans/Dockerfile → hooks/cascading-scans/hook/Dockerfile