Merge pull request #748 from secureCodeBox/feature/auto-discovery-scheduledscan-retriggering

rfelber · web-flow · commit ddfdf2e9cdc6 · 2021-10-22T09:06:16.000+02:00
Let AutoDiscovery create ScheduledScans with `RetriggerOnScanTypeChange` enabled
diff --git a/auto-discovery/kubernetes/controllers/service_scan_controller.go b/auto-discovery/kubernetes/controllers/service_scan_controller.go
@@ -421,6 +421,7 @@ func generateScanSpec(autoDiscoveryConfig configv1.AutoDiscoveryConfig, scanConf
 			ScanType:   scanConfig.ScanType,
 			Parameters: params,
 		},
+		RetriggerOnScanTypeChange: true,
 	}
 
 	return scheduledScanSpec
diff --git a/auto-discovery/kubernetes/demo/juice-shop.yaml b/auto-discovery/kubernetes/demo/juice-shop.yaml
@@ -61,10 +61,10 @@ spec:
 apiVersion: helm.fluxcd.io/v1
 kind: HelmRelease
 metadata:
-  name: zap-advanced-scan
+  name: zap-advanced
   namespace: juice-shop
 spec:
   chart:
     repository: https://charts.securecodebox.io
-    version: 2.7.2
-    name: zap-advanced-scan
+    version: 3.2.0
+    name: zap-advanced
diff --git a/auto-discovery/kubernetes/go.mod b/auto-discovery/kubernetes/go.mod
@@ -10,16 +10,15 @@ require (
 	github.com/Masterminds/goutils v1.1.1 // indirect
 	github.com/Masterminds/semver v1.5.0 // indirect
 	github.com/Masterminds/sprig v2.22.0+incompatible
-	github.com/go-logr/logr v0.3.0
+	github.com/go-logr/logr v0.4.0
 	github.com/huandu/xstrings v1.3.2 // indirect
 	github.com/mitchellh/copystructure v1.2.0 // indirect
-	github.com/mitchellh/hashstructure/v2 v2.0.2 // indirect
 	github.com/onsi/ginkgo v1.14.1
 	github.com/onsi/gomega v1.10.2
-	github.com/secureCodeBox/secureCodeBox/operator v0.0.0-20210512114551-f7af2ead2c3d
-	github.com/stretchr/testify v1.5.1
-	k8s.io/api v0.19.2
-	k8s.io/apimachinery v0.19.2
-	k8s.io/client-go v0.19.2
-	sigs.k8s.io/controller-runtime v0.7.2
+	github.com/secureCodeBox/secureCodeBox/operator v0.0.0-20211020071729-60497d02f10d
+	github.com/stretchr/testify v1.6.1
+	k8s.io/api v0.20.2
+	k8s.io/apimachinery v0.20.2
+	k8s.io/client-go v0.20.2
+	sigs.k8s.io/controller-runtime v0.8.3
 )
diff --git a/auto-discovery/kubernetes/go.sum b/auto-discovery/kubernetes/go.sum

Original file line number	Diff line number	Diff line change
`@@ -421,6 +421,7 @@ func generateScanSpec(autoDiscoveryConfig configv1.AutoDiscoveryConfig, scanConf`
`421`	`421`	`ScanType: scanConfig.ScanType,`
`422`	`422`	`Parameters: params,`
`423`	`423`	`},`
	`424`	`+ RetriggerOnScanTypeChange: true,`
`424`	`425`	`}`
`425`	`426`
`426`	`427`	`return scheduledScanSpec`