refactor: Move aqua package (#346)

Signed-off-by: Daniel Pacak <pacak.daniel@gmail.com>
aquasecurity · Jan 16, 2021 · 725dd4f · 725dd4f
1 parent 8f29f72
commit 725dd4f
Show file tree

Hide file tree

Showing 16 changed files with 17 additions and 19 deletions.
diff --git a/cmd/scanner-aqua/main.go b/cmd/scanner-aqua/main.go
@@ -6,9 +6,9 @@ import (
 	"os"
 
 	"github.com/aquasecurity/starboard/pkg/apis/aquasecurity/v1alpha1"
-	"github.com/aquasecurity/starboard/pkg/operator/aqua/client"
-	"github.com/aquasecurity/starboard/pkg/operator/aqua/scanner/api"
-	"github.com/aquasecurity/starboard/pkg/operator/aqua/scanner/cli"
+	"github.com/aquasecurity/starboard/pkg/aqua/client"
+	"github.com/aquasecurity/starboard/pkg/aqua/scanner/api"
+	"github.com/aquasecurity/starboard/pkg/aqua/scanner/cli"
 	"github.com/spf13/cobra"
 )
 

diff --git a/pkg/operator/aqua/client/auth.go → pkg/aqua/client/auth.go b/pkg/operator/aqua/client/auth.go → pkg/aqua/client/auth.go
diff --git a/pkg/operator/aqua/client/client.go → pkg/aqua/client/client.go b/pkg/operator/aqua/client/client.go → pkg/aqua/client/client.go
diff --git a/...or/aqua/client/client_integration_test.go → pkg/aqua/client/client_integration_test.go b/...or/aqua/client/client_integration_test.go → pkg/aqua/client/client_integration_test.go
diff --git a/...operator/aqua/client/client_suite_test.go → pkg/aqua/client/client_suite_test.go b/...operator/aqua/client/client_suite_test.go → pkg/aqua/client/client_suite_test.go
diff --git a/pkg/operator/aqua/client/client_test.go → pkg/aqua/client/client_test.go b/pkg/operator/aqua/client/client_test.go → pkg/aqua/client/client_test.go
@@ -3,7 +3,7 @@ package client_test
 import (
 	"net/http"
 
-	"github.com/aquasecurity/starboard/pkg/operator/aqua/client"
+	"github.com/aquasecurity/starboard/pkg/aqua/client"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 	. "github.com/onsi/gomega/ghttp"

diff --git a/pkg/operator/aqua/client/types.go → pkg/aqua/client/types.go b/pkg/operator/aqua/client/types.go → pkg/aqua/client/types.go
diff --git a/pkg/operator/aqua/scanner.go → pkg/aqua/plugin.go b/pkg/operator/aqua/scanner.go → pkg/aqua/plugin.go
@@ -26,9 +26,9 @@ type scanner struct {
 	config      Config
 }
 
-// NewScanner constructs a new vulnerability scanner Plugin, which is using
-// the Aqua to scan container images of Kubernetes workloads.
-func NewScannerPlugin(
+// NewPlugin constructs a new vulnerabilityreport.Plugin, which is using
+// the Aqua Enterprise to scan container images of Kubernetes workloads.
+func NewPlugin(
 	idGenerator ext.IDGenerator,
 	buildInfo starboard.BuildInfo,
 	config Config,

diff --git a/pkg/operator/aqua/scanner/api/scanner.go → pkg/aqua/scanner/api/scanner.go b/pkg/operator/aqua/scanner/api/scanner.go → pkg/aqua/scanner/api/scanner.go
@@ -4,11 +4,10 @@ import (
 	"strings"
 	"time"
 
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-
 	"github.com/aquasecurity/starboard/pkg/apis/aquasecurity/v1alpha1"
-	"github.com/aquasecurity/starboard/pkg/operator/aqua/client"
+	"github.com/aquasecurity/starboard/pkg/aqua/client"
 	"github.com/google/go-containerregistry/pkg/name"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 const (

diff --git a/pkg/operator/aqua/scanner/cli/scanner.go → pkg/aqua/scanner/cli/scanner.go b/pkg/operator/aqua/scanner/cli/scanner.go → pkg/aqua/scanner/cli/scanner.go
@@ -8,11 +8,10 @@ import (
 	"os/exec"
 	"time"
 
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-
 	"github.com/aquasecurity/starboard/pkg/apis/aquasecurity/v1alpha1"
-	"github.com/aquasecurity/starboard/pkg/operator/aqua/client"
+	"github.com/aquasecurity/starboard/pkg/aqua/client"
 	"github.com/google/go-containerregistry/pkg/name"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 type Scanner struct {

diff --git a/pkg/operator/aqua/scanner/cli/types.go → pkg/aqua/scanner/cli/types.go b/pkg/operator/aqua/scanner/cli/types.go → pkg/aqua/scanner/cli/types.go
diff --git a/...aqua_csp_report/with_vulnerabilities.json → ...aqua_csp_report/with_vulnerabilities.json b/...aqua_csp_report/with_vulnerabilities.json → ...aqua_csp_report/with_vulnerabilities.json
diff --git a/...a_csp_report/without_vulnerabilities.json → ...a_csp_report/without_vulnerabilities.json b/...a_csp_report/without_vulnerabilities.json → ...a_csp_report/without_vulnerabilities.json
diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -3,8 +3,8 @@ package config
 import (
 	"fmt"
 
+	"github.com/aquasecurity/starboard/pkg/aqua"
 	"github.com/aquasecurity/starboard/pkg/ext"
-	"github.com/aquasecurity/starboard/pkg/operator/aqua"
 	"github.com/aquasecurity/starboard/pkg/starboard"
 	"github.com/aquasecurity/starboard/pkg/trivy"
 	"github.com/aquasecurity/starboard/pkg/vulnerabilityreport"
@@ -25,9 +25,9 @@ func GetVulnerabilityReportPlugin(buildInfo starboard.BuildInfo, config starboar
 	}
 	switch scanner {
 	case starboard.Trivy:
-		return trivy.NewScannerPlugin(ext.NewGoogleUUIDGenerator(), config), nil
+		return trivy.NewPlugin(ext.NewGoogleUUIDGenerator(), config), nil
 	case starboard.Aqua:
-		return aqua.NewScannerPlugin(ext.NewGoogleUUIDGenerator(), buildInfo, config), nil
+		return aqua.NewPlugin(ext.NewGoogleUUIDGenerator(), buildInfo, config), nil
 	}
 	return nil, fmt.Errorf("unsupported vulnerability scanner plugin: %s", scanner)
 }
diff --git a/pkg/trivy/scanner.go → pkg/trivy/plugin.go b/pkg/trivy/scanner.go → pkg/trivy/plugin.go
@@ -43,15 +43,15 @@ type Config interface {
 	GetTrivyServerURL() (string, error)
 }
 
-// NewScanner constructs a new vulnerabilityreport.Plugin, which is using an
+// NewPlugin constructs a new vulnerabilityreport.Plugin, which is using an
 // official Trivy container image to scan Kubernetes workloads.
 //
 // This Plugin supports both starboard.Standalone and starboard.ClientServer
 // client modes depending on the active mode returned by Config.GetTrivyMode.
 //
 // The starboard.ClientServer mode is usually more performant, however it
 // requires a Trivy server accessible at the configurable URL.
-func NewScannerPlugin(idGenerator ext.IDGenerator, config Config) vulnerabilityreport.Plugin {
+func NewPlugin(idGenerator ext.IDGenerator, config Config) vulnerabilityreport.Plugin {
 	return &scanner{
 		idGenerator: idGenerator,
 		config:      config,

diff --git a/pkg/trivy/scanner_test.go → pkg/trivy/plugin_test.go b/pkg/trivy/scanner_test.go → pkg/trivy/plugin_test.go
@@ -276,7 +276,7 @@ func TestScanner_GetScanJobSpec(t *testing.T) {
 
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {
-			jobSpec, secrets, err := trivy.NewScannerPlugin(ext.NewSimpleIDGenerator(), tc.config).
+			jobSpec, secrets, err := trivy.NewPlugin(ext.NewSimpleIDGenerator(), tc.config).
 				GetScanJobSpec(tc.workloadSpec, nil)
 			require.NoError(t, err)
 			assert.Empty(t, secrets)