refactor: Common methods (aquasecurity#143)

Signed-off-by: Daniel Pacak <pacak.daniel@gmail.com>
xmonish · Sep 7, 2020 · 4aa0d52 · 4aa0d52
1 parent e5963e5
commit 4aa0d52
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 14 deletions.
diff --git a/pkg/find/vulnerabilities/trivy/scanner.go b/pkg/find/vulnerabilities/trivy/scanner.go
@@ -49,7 +49,6 @@ type Scanner struct {
 	clientset kubernetes.Interface
 	pods      *pod.Manager
 	converter Converter
-	scanners.Base
 }
 
 func (s *Scanner) Scan(ctx context.Context, workload kube.Object) (reports vulnerabilities.WorkloadVulnerabilities, owner meta.Object, err error) {
@@ -270,7 +269,7 @@ func (s *Scanner) PrepareScanJob(ctx context.Context, workload kube.Object, spec
 		Spec: batch.JobSpec{
 			BackoffLimit:          pointer.Int32Ptr(0),
 			Completions:           pointer.Int32Ptr(1),
-			ActiveDeadlineSeconds: s.GetActiveDeadlineSeconds(s.opts.ScanJobTimeout),
+			ActiveDeadlineSeconds: scanners.GetActiveDeadlineSeconds(s.opts.ScanJobTimeout),
 			Template: core.PodTemplateSpec{
 				ObjectMeta: meta.ObjectMeta{
 					Labels: map[string]string{

diff --git a/pkg/kube/pod/manager.go b/pkg/kube/pod/manager.go
@@ -159,11 +159,11 @@ func (pw *Manager) GetTerminatedContainersStatusesByJob(ctx context.Context, job
 	if err != nil {
 		return
 	}
-	statuses = pw.GetTerminatedContainersStatusesByPod(pod)
+	statuses = GetTerminatedContainersStatusesByPod(pod)
 	return
 }
 
-func (pw *Manager) GetTerminatedContainersStatusesByPod(pod *core.Pod) map[string]*core.ContainerStateTerminated {
+func GetTerminatedContainersStatusesByPod(pod *core.Pod) map[string]*core.ContainerStateTerminated {
 	states := make(map[string]*core.ContainerStateTerminated)
 	for _, status := range pod.Status.InitContainerStatuses {
 		if status.State.Terminated == nil {

diff --git a/pkg/kubebench/scanner.go b/pkg/kubebench/scanner.go
@@ -40,7 +40,6 @@ type Scanner struct {
 	clientset kubernetes.Interface
 	pods      *pod.Manager
 	converter Converter
-	scanners.Base
 }
 
 func NewScanner(opts kube.ScannerOpts, clientset kubernetes.Interface) *Scanner {
@@ -123,7 +122,7 @@ func (s *Scanner) prepareKubeBenchJob(node core.Node) *batch.Job {
 		Spec: batch.JobSpec{
 			BackoffLimit:          pointer.Int32Ptr(0),
 			Completions:           pointer.Int32Ptr(1),
-			ActiveDeadlineSeconds: s.GetActiveDeadlineSeconds(s.opts.ScanJobTimeout),
+			ActiveDeadlineSeconds: scanners.GetActiveDeadlineSeconds(s.opts.ScanJobTimeout),
 			Template: core.PodTemplateSpec{
 				ObjectMeta: meta.ObjectMeta{
 					Labels: labels.Set{

diff --git a/pkg/kubehunter/scanner.go b/pkg/kubehunter/scanner.go
@@ -35,7 +35,6 @@ type Scanner struct {
 	opts      kube.ScannerOpts
 	clientset kubernetes.Interface
 	pods      *pod.Manager
-	scanners.Base
 }
 
 func NewScanner(opts kube.ScannerOpts, clientset kubernetes.Interface) *Scanner {
@@ -104,7 +103,7 @@ func (s *Scanner) prepareKubeHunterJob() *batch.Job {
 		Spec: batch.JobSpec{
 			BackoffLimit:          pointer.Int32Ptr(0),
 			Completions:           pointer.Int32Ptr(1),
-			ActiveDeadlineSeconds: s.GetActiveDeadlineSeconds(s.opts.ScanJobTimeout),
+			ActiveDeadlineSeconds: scanners.GetActiveDeadlineSeconds(s.opts.ScanJobTimeout),
 			Template: core.PodTemplateSpec{
 				ObjectMeta: meta.ObjectMeta{
 					Labels: map[string]string{

diff --git a/pkg/polaris/scanner.go b/pkg/polaris/scanner.go
@@ -34,7 +34,6 @@ type Scanner struct {
 	clientset kubernetes.Interface
 	pods      *pod.Manager
 	converter Converter
-	scanners.Base
 }
 
 func NewScanner(opts kube.ScannerOpts, clientset kubernetes.Interface) *Scanner {
@@ -95,7 +94,7 @@ func (s *Scanner) preparePolarisJob() *batch.Job {
 		Spec: batch.JobSpec{
 			BackoffLimit:          pointer.Int32Ptr(0),
 			Completions:           pointer.Int32Ptr(1),
-			ActiveDeadlineSeconds: s.GetActiveDeadlineSeconds(s.opts.ScanJobTimeout),
+			ActiveDeadlineSeconds: scanners.GetActiveDeadlineSeconds(s.opts.ScanJobTimeout),
 			Template: core.PodTemplateSpec{
 				ObjectMeta: meta.ObjectMeta{
 					Labels: map[string]string{

diff --git a/pkg/scanners/base.go b/pkg/scanners/base.go
@@ -6,10 +6,7 @@ import (
 	"k8s.io/utils/pointer"
 )
 
-type Base struct {
-}
-
-func (s *Base) GetActiveDeadlineSeconds(d time.Duration) (timeout *int64) {
+func GetActiveDeadlineSeconds(d time.Duration) (timeout *int64) {
 	if d > 0 {
 		timeout = pointer.Int64Ptr(int64(d.Seconds()))
 		return