refactor: Separate kube-bench -specific code (#405)

Signed-off-by: Daniel Pacak <pacak.daniel@gmail.com>
aquasecurity · Feb 19, 2021 · 0c9cf08 · 0c9cf08
1 parent 1bb07be
commit 0c9cf08
Show file tree

Hide file tree

Showing 6 changed files with 451 additions and 293 deletions.
diff --git a/pkg/cmd/scan_ciskubebench.go b/pkg/cmd/scan_ciskubebench.go
@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"sync"
 
+	"github.com/aquasecurity/starboard/pkg/ext"
 	"github.com/aquasecurity/starboard/pkg/kubebench"
 	"github.com/aquasecurity/starboard/pkg/starboard"
 	"github.com/spf13/cobra"
@@ -57,7 +58,8 @@ func ScanKubeBenchReports(cf *genericclioptions.ConfigFlags) func(cmd *cobra.Com
 		}
 
 		scheme := starboard.NewScheme()
-		scanner := kubebench.NewScanner(scheme, kubeClientset, config, opts)
+		plugin := kubebench.NewKubeBenchPlugin(ext.NewSystemClock(), config)
+		scanner := kubebench.NewScanner(scheme, kubeClientset, opts, plugin)
 
 		kubeClient, err := client.New(kubeConfig, client.Options{
 			Scheme: scheme,

diff --git a/pkg/kubebench/converter.go b/pkg/kubebench/converter.go
diff --git a/pkg/kubebench/converter_test.go b/pkg/kubebench/converter_test.go
diff --git a/pkg/kubebench/io.go b/pkg/kubebench/io.go
@@ -61,6 +61,9 @@ func (w *rw) FindByOwner(ctx context.Context, node kube.Object) (*v1alpha1.CISKu
 		Name: node.Name,
 	}, report)
 	if err != nil {
+		if errors.IsNotFound(err) {
+			return nil, nil
+		}
 		return nil, err
 	}
 	return report, nil