refactor: Move aqua package under pkg/plugin (#426)

Signed-off-by: Daniel Pacak <pacak.daniel@gmail.com>
aquasecurity · Mar 11, 2021 · a54ed60 · a54ed60
1 parent 75502ed
commit a54ed60
Show file tree

Hide file tree

Showing 17 changed files with 15 additions and 11 deletions.
diff --git a/Makefile b/Makefile
@@ -66,14 +66,14 @@ itests-starboard: check-env get-ginkgo
 	--v \
 	-coverprofile=coverage.txt \
 	-coverpkg=github.com/aquasecurity/starboard/pkg/cmd,\
-	github.com/aquasecurity/starboard/pkg/config,\
+	github.com/aquasecurity/starboard/pkg/plugin,\
 	github.com/aquasecurity/starboard/pkg/resources,\
 	github.com/aquasecurity/starboard/pkg/kube,\
 	github.com/aquasecurity/starboard/pkg/kube/pod,\
 	github.com/aquasecurity/starboard/pkg/kubebench,\
 	github.com/aquasecurity/starboard/pkg/kubehunter,\
 	github.com/aquasecurity/starboard/pkg/trivy,\
-	github.com/aquasecurity/starboard/pkg/polaris,\
+	github.com/aquasecurity/starboard/pkg/plugin/polaris,\
 	github.com/aquasecurity/starboard/pkg/configauditreport,\
 	github.com/aquasecurity/starboard/pkg/vulnerabilityreport \
 	./itest/starboard
@@ -88,10 +88,10 @@ itests-starboard-operator: check-env get-ginkgo
 	-coverpkg=github.com/aquasecurity/starboard/pkg/operator,\
 	github.com/aquasecurity/starboard/pkg/operator/predicate,\
 	github.com/aquasecurity/starboard/pkg/operator/controller,\
-	github.com/aquasecurity/starboard/pkg/config,\
+	github.com/aquasecurity/starboard/pkg/plugin,\
 	github.com/aquasecurity/starboard/pkg/resources,\
 	github.com/aquasecurity/starboard/pkg/trivy,\
-	github.com/aquasecurity/starboard/pkg/polaris,\
+	github.com/aquasecurity/starboard/pkg/plugin/polaris,\
 	github.com/aquasecurity/starboard/pkg/configauditreport,\
 	github.com/aquasecurity/starboard/pkg/vulnerabilityreport,\
 	github.com/aquasecurity/starboard/pkg/kubebench \

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/aqua/client"
-	"github.com/aquasecurity/starboard/pkg/aqua/scanner/api"
-	"github.com/aquasecurity/starboard/pkg/aqua/scanner/cli"
+	"github.com/aquasecurity/starboard/pkg/plugin/aqua/client"
+	"github.com/aquasecurity/starboard/pkg/plugin/aqua/scanner/api"
+	"github.com/aquasecurity/starboard/pkg/plugin/aqua/scanner/cli"
 	"github.com/spf13/cobra"
 )
 

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

diff --git a/pkg/plugin/aqua/client/doc.go b/pkg/plugin/aqua/client/doc.go
@@ -0,0 +1,2 @@
+// The client package provides an HTTP client for selected Aqua Enterprise REST API endpoints.
+package client
diff --git a/pkg/aqua/client/types.go → pkg/plugin/aqua/client/types.go b/pkg/aqua/client/types.go → pkg/plugin/aqua/client/types.go
diff --git a/pkg/plugin/aqua/doc.go b/pkg/plugin/aqua/doc.go
@@ -0,0 +1,2 @@
+// The aqua package provides primitives for working with Aqua Enterprise scanner.
+package aqua
diff --git a/pkg/aqua/plugin.go → pkg/plugin/aqua/plugin.go b/pkg/aqua/plugin.go → pkg/plugin/aqua/plugin.go
diff --git a/pkg/aqua/scanner/api/scanner.go → pkg/plugin/aqua/scanner/api/scanner.go b/pkg/aqua/scanner/api/scanner.go → pkg/plugin/aqua/scanner/api/scanner.go
@@ -5,7 +5,7 @@ import (
 	"time"
 
 	"github.com/aquasecurity/starboard/pkg/apis/aquasecurity/v1alpha1"
-	"github.com/aquasecurity/starboard/pkg/aqua/client"
+	"github.com/aquasecurity/starboard/pkg/plugin/aqua/client"
 	"github.com/google/go-containerregistry/pkg/name"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )

diff --git a/pkg/aqua/scanner/cli/scanner.go → pkg/plugin/aqua/scanner/cli/scanner.go b/pkg/aqua/scanner/cli/scanner.go → pkg/plugin/aqua/scanner/cli/scanner.go
@@ -9,7 +9,7 @@ import (
 	"time"
 
 	"github.com/aquasecurity/starboard/pkg/apis/aquasecurity/v1alpha1"
-	"github.com/aquasecurity/starboard/pkg/aqua/client"
+	"github.com/aquasecurity/starboard/pkg/plugin/aqua/client"
 	"github.com/google/go-containerregistry/pkg/name"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )

diff --git a/pkg/aqua/scanner/cli/types.go → pkg/plugin/aqua/scanner/cli/types.go b/pkg/aqua/scanner/cli/types.go → pkg/plugin/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/plugin/factory.go b/pkg/plugin/factory.go
@@ -3,9 +3,9 @@ package plugin
 import (
 	"fmt"
 
-	"github.com/aquasecurity/starboard/pkg/aqua"
 	"github.com/aquasecurity/starboard/pkg/configauditreport"
 	"github.com/aquasecurity/starboard/pkg/ext"
+	"github.com/aquasecurity/starboard/pkg/plugin/aqua"
 	"github.com/aquasecurity/starboard/pkg/plugin/polaris"
 	"github.com/aquasecurity/starboard/pkg/starboard"
 	"github.com/aquasecurity/starboard/pkg/trivy"