Skip to content

Commit 2ec69ff

Browse files
committed
ci(ci): add cmseek to matrix make build
Signed-off-by: Yannik Fuhrmeister <yannik.fuhrmeister@protonmail.com>
1 parent f75ae54 commit 2ec69ff

5 files changed

Lines changed: 11 additions & 75 deletions

File tree

.github/workflows/ci.yaml

Lines changed: 1 addition & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -280,6 +280,7 @@ jobs:
280280
unit:
281281
- amass
282282
- angularjs-csti-scanner
283+
- cmseek
283284
- gitleaks
284285
- kubeaudit
285286
- kube-hunter
@@ -492,7 +493,6 @@ jobs:
492493
strategy:
493494
matrix:
494495
parser:
495-
- cmseek
496496
- git-repo-scanner
497497
- test-scan
498498

@@ -565,66 +565,6 @@ jobs:
565565
# This Matrix should contain Third Party Scanners
566566
# The Tag for the Image should be the current version of the Scanner
567567

568-
scanners-third-party:
569-
name: "Build | Third Party Scanner"
570-
needs:
571-
- unit-python
572-
- unit-javascript
573-
runs-on: ubuntu-latest
574-
strategy:
575-
matrix:
576-
scanner:
577-
- cmseek
578-
579-
steps:
580-
- name: Checkout
581-
uses: actions/checkout@v2
582-
583-
- name: Set ENV Var with Scanner Version
584-
uses: mikefarah/yq@v4.4.1
585-
# Notice: The current version of the scanner is provided via the Chart.yaml to ensure
586-
# there is only one place to edit the version of a scanner
587-
with:
588-
cmd: echo scannerVersion=$(yq e .appVersion scanners/${{ matrix.scanner }}/Chart.yaml) >> $GITHUB_ENV
589-
590-
- name: Docker Meta
591-
id: docker_meta
592-
uses: docker/metadata-action@v3
593-
with:
594-
images: ${{ env.DOCKER_NAMESPACE }}/scanner-${{ matrix.scanner }}
595-
tags: |
596-
type=sha
597-
${{ env.scannerVersion }}
598-
599-
- name: Set up Docker Buildx
600-
uses: docker/setup-buildx-action@v1
601-
602-
- name: Login to DockerHub
603-
uses: docker/login-action@v1
604-
with:
605-
username: ${{ secrets.DOCKER_USERNAME }}
606-
password: ${{ secrets.DOCKER_TOKEN }}
607-
608-
- name: Build and Push
609-
uses: docker/build-push-action@v2
610-
with:
611-
context: ./scanners/${{ matrix.scanner }}/scanner
612-
file: ./scanners/${{ matrix.scanner }}/scanner/Dockerfile
613-
build-args: |
614-
scannerVersion=${{ env.scannerVersion }}
615-
platforms: linux/amd64
616-
push: true
617-
tags: ${{ steps.docker_meta.outputs.tags }}
618-
labels: ${{ steps.docker_meta.outputs.labels }}
619-
620-
- name: Update Docker Hub Description
621-
uses: peter-evans/dockerhub-description@v2
622-
with:
623-
username: ${{ secrets.DOCKERHUB_USERNAME }}
624-
password: ${{ secrets.DOCKERHUB_PASSWORD }}
625-
repository: ${{ env.DOCKER_NAMESPACE }}/scanner-${{ matrix.scanner }}
626-
readme-filepath: ./scanners/${{ matrix.scanner }}/docs/README.DockerHub-Scanner.md
627-
628568
# ---- Build | Scanners | Custom Scanner ----
629569

630570
# This Section contains Scanners that are developed by the secureCodeBox project
@@ -925,19 +865,6 @@ jobs:
925865
kubectl create deployment --image nginx:alpine nginx --namespace demo-targets
926866
kubectl expose deployment nginx --port 80 --namespace demo-targets
927867
928-
# ---- CMSeeK Integration Tests ----
929-
930-
- name: "cmseek Integration Tests"
931-
run: |
932-
kubectl -n integration-tests delete scans --all
933-
helm -n integration-tests install cmseek ./scanners/cmseek/ \
934-
--set="parser.image.tag=sha-$(git rev-parse --short HEAD)" \
935-
--set="parser.image.repository=docker.io/${{ env.DOCKER_NAMESPACE }}/parser-cmseek" \
936-
--set="parser.env[0].name=CRASH_ON_FAILED_VALIDATION" \
937-
--set-string="parser.env[0].value=true"
938-
cd tests/integration/
939-
npx jest --ci --color scanner/cmseek.test.js
940-
941868
# ---- Notification Hook Tests ----
942869

943870
- name: "Notification Hook Tests"

scanners/cmseek/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
*.tar

scanners/cmseek/Makefile

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,10 @@ scanner = cmseek
1010
custom_scanner = set
1111

1212
include ../../scanners.mk
13+
14+
integration-tests:
15+
@echo ".: 🩺 Starting integration test in kind namespace 'integration-tests'."
16+
kubectl -n integration-tests delete scans --all
17+
cd ../../tests/integration/ && npm ci
18+
cd ../../scanners/${scanner}
19+
npx --yes --package jest@$(JEST_VERSION) jest --verbose --ci --colors --coverage --passWithNoTests ${scanner}/integration-tests

tests/integration/scanner/cmseek.test.js renamed to scanners/cmseek/integration-tests/cmseek.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//
33
// SPDX-License-Identifier: Apache-2.0
44

5-
const { scan } = require("../helpers");
5+
const { scan } = require("../../../tests/integration/helpers");
66

77
jest.retryTimes(3);
88

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{}

0 commit comments

Comments
 (0)