test: unit-tests and refactoring

Signed-off-by: Christian Kotzbauer <[email protected]>
ckotzbauer · Jun 17, 2022 · aec1106 · aec1106
1 parent c00c14a
commit aec1106
Show file tree

Hide file tree

Showing 13 changed files with 6,366 additions and 105 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -35,8 +35,12 @@ jobs:
       - name: Build binary
         run: make build
 
-#      - name: Unit tests
-#        run: make test
+      - name: Unit tests
+        run: make test
+
+      - uses: codecov/codecov-action@v3
+        with:
+          files: cover.out
 
       - name: Build image
         uses: docker/build-push-action@v3

diff --git a/Makefile b/Makefile
@@ -14,3 +14,6 @@ fmt:
 # Run go vet against code
 vet:
 	go vet ./...
+
+test:
+	go test $(shell go list ./...) -coverprofile cover.out
diff --git a/go.mod b/go.mod
@@ -8,10 +8,10 @@ require (
 	github.com/sirupsen/logrus v1.8.1
 	github.com/spf13/cobra v1.4.0
 	github.com/spf13/viper v1.12.0
+	github.com/stretchr/testify v1.7.2
 	gopkg.in/yaml.v3 v3.0.1
 	k8s.io/api v0.24.1
 	k8s.io/apimachinery v0.24.1
-	k8s.io/client-go v0.24.1
 )
 
 require (
@@ -188,7 +188,6 @@ require (
 	github.com/sigstore/sigstore v1.2.1-0.20220424143412-3d41663116d5 // indirect
 	github.com/soheilhy/cmux v0.1.5 // indirect
 	github.com/spdx/tools-golang v0.2.0 // indirect
-	github.com/stretchr/testify v1.7.2 // indirect
 	github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // indirect
 	github.com/tent/canonical-json-go v0.0.0-20130607151641-96e4ba3a7613 // indirect
 	github.com/thales-e-security/pool v0.0.2 // indirect
@@ -251,6 +250,7 @@ require (
 	gopkg.in/square/go-jose.v2 v2.6.0 // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect
 	gorm.io/gorm v1.23.3 // indirect
+	k8s.io/client-go v0.24.1 // indirect
 	k8s.io/klog/v2 v2.60.1 // indirect
 	k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 // indirect
 	k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect

diff --git a/go.sum b/go.sum
diff --git a/internal/vuln/daemon/daemon.go b/internal/vuln/daemon/daemon.go
@@ -66,7 +66,10 @@ func (c *CronService) runBackgroundService() {
 		scanItems = append(scanItems, s.LoadScanItems()...)
 	}
 
-	gr, err := grype.New()
+	gr, err := grype.New(
+		viper.GetString(vuln.ConfigKeyGrypeConfigFile),
+		viper.GetString(vuln.ConfigKeyMinSeverity),
+		viper.GetBool(vuln.ConfigKeyOnlyFixed))
 
 	if err != nil {
 		c.printNextExecution()
@@ -102,11 +105,18 @@ func initSources(sourceKeys []string) []source.Source {
 		var err error
 
 		if sa == "git" {
-			s := git.NewGitSource()
+			workingTree := viper.GetString(vuln.ConfigKeyGitWorkingTree)
+			workPath := viper.GetString(vuln.ConfigKeyGitPath)
+			repository := viper.GetString(vuln.ConfigKeyGitRepository)
+			branch := viper.GetString(vuln.ConfigKeyGitBranch)
+			token := viper.GetString(vuln.ConfigKeyGitAccessToken)
+			s := git.NewGitSource(workingTree, workPath, repository, branch, token)
 			err = s.ValidateConfig()
 			sources = append(sources, s)
 		} else if sa == "kubernetes" {
-			s := kubernetes.NewKubernetesSource()
+			namespaceLabelSelector := viper.GetString(vuln.ConfigKeyNamespaceLabelSelector)
+			podLabelSelector := viper.GetString(vuln.ConfigKeyPodLabelSelector)
+			s := kubernetes.NewKubernetesSource(namespaceLabelSelector, podLabelSelector)
 			err = s.ValidateConfig()
 			sources = append(sources, s)
 		} else {
@@ -133,7 +143,8 @@ func initTargets(targetKeys []string) []target.Target {
 		var t target.Target
 
 		if ta == "json" {
-			t = target.NewJsonTarget()
+			reportsDir := viper.GetString(vuln.ConfigKeyReportsDir)
+			t = target.NewJsonTarget(reportsDir)
 		} else if ta == "metrics" {
 			t = target.NewMetricTarget()
 		} else {