ci(ci): add ssh-scan to matrix build

nigthknight · nigthknight · commit dc45669e58c8 · 2021-10-05T12:40:30.000+02:00
I added ssh-scan to matrix build and moved the integration tests

Signed-off-by: Yannik Fuhrmeister &lt;yannik.fuhrmeister@iteratec.com&gt;
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -279,6 +279,7 @@ jobs:
         unit:
           - amass
           - nuclei
+          - ssh-scan
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -463,7 +464,6 @@ jobs:
           - nikto
           - nmap
           - screenshooter
-          - ssh-scan
           - sslyze
           - test-scan
           - trivy
@@ -1022,19 +1022,6 @@ jobs:
           npx jest --ci --color ./hooks/notification.test.js
           helm -n integration-tests uninstall test-scan http-webhook notification-hook
 
-      # ---- SSH_SCAN Integration Tests ----
-
-      - name: "ssh-scan Integration Tests"
-        run: |
-          kubectl -n integration-tests delete scans --all
-          helm -n integration-tests install ssh-scan ./scanners/ssh-scan/  \
-            --set="parser.image.tag=sha-$(git rev-parse --short HEAD)" \
-            --set="parser.image.repository=docker.io/${{ env.DOCKER_NAMESPACE }}/parser-ssh-scan" \
-            --set="parser.env[0].name=CRASH_ON_FAILED_VALIDATION" \
-            --set-string="parser.env[0].value=true"
-          cd tests/integration/
-          npx jest --ci --color scanner/ssh-scan.test.js
-
       # ---- SSLyze Integration Tests ----
 
       - name: "sslyze Integration Tests"
diff --git a/scanners/ssh-scan/Makefile b/scanners/ssh-scan/Makefile
@@ -11,3 +11,10 @@ scanner = ssh-scan
 include ../../scanners.mk
 
 deploy-test-deps: deploy-test-dep-dummy-ssh
+
+integration-tests:
+	@echo ".: 🩺 Starting integration test in kind namespace 'integration-tests'."
+	kubectl -n integration-tests delete scans --all
+	cd ../../tests/integration/ && npm ci
+	cd ../../scanners/${scanner}
+	npx --yes --package jest@$(JEST_VERSION) jest --verbose --ci --colors --coverage --passWithNoTests ${scanner}/integration-tests
diff --git a/scanners/ssh-scan/integration-tests/jest.config.json b/scanners/ssh-scan/integration-tests/jest.config.json
@@ -0,0 +1 @@
+{}
diff --git a/scanners/ssh-scan/integration-tests/ssh-scan.test.js b/scanners/ssh-scan/integration-tests/ssh-scan.test.js
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 // todo: Integrate into github ci pipeline
-const { scan } = require("../helpers");
+const { scan } = require("../../../tests/integration/helpers.js");
 
 jest.retryTimes(3);
 
