refactor: Move trivy package under pkg/plugin (aquasecurity#427)

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

Hide file tree

Showing 9 changed files with 5 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -72,7 +72,7 @@ itests-starboard: check-env get-ginkgo
 	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/plugin/trivy,\
 	github.com/aquasecurity/starboard/pkg/plugin/polaris,\
 	github.com/aquasecurity/starboard/pkg/configauditreport,\
 	github.com/aquasecurity/starboard/pkg/vulnerabilityreport \
@@ -90,7 +90,7 @@ itests-starboard-operator: check-env get-ginkgo
 	github.com/aquasecurity/starboard/pkg/operator/controller,\
 	github.com/aquasecurity/starboard/pkg/plugin,\
 	github.com/aquasecurity/starboard/pkg/resources,\
-	github.com/aquasecurity/starboard/pkg/trivy,\
+	github.com/aquasecurity/starboard/pkg/plugin/trivy,\
 	github.com/aquasecurity/starboard/pkg/plugin/polaris,\
 	github.com/aquasecurity/starboard/pkg/configauditreport,\
 	github.com/aquasecurity/starboard/pkg/vulnerabilityreport,\

diff --git a/pkg/plugin/factory.go b/pkg/plugin/factory.go
@@ -7,8 +7,8 @@ import (
 	"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/plugin/trivy"
 	"github.com/aquasecurity/starboard/pkg/starboard"
-	"github.com/aquasecurity/starboard/pkg/trivy"
 	"github.com/aquasecurity/starboard/pkg/vulnerabilityreport"
 )
 

diff --git a/pkg/trivy/converter.go → pkg/plugin/trivy/converter.go b/pkg/trivy/converter.go → pkg/plugin/trivy/converter.go
diff --git a/pkg/trivy/converter_test.go → pkg/plugin/trivy/converter_test.go b/pkg/trivy/converter_test.go → pkg/plugin/trivy/converter_test.go
@@ -7,8 +7,8 @@ import (
 	"time"
 
 	"github.com/aquasecurity/starboard/pkg/apis/aquasecurity/v1alpha1"
+	"github.com/aquasecurity/starboard/pkg/plugin/trivy"
 	"github.com/aquasecurity/starboard/pkg/starboard"
-	"github.com/aquasecurity/starboard/pkg/trivy"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

diff --git a/pkg/trivy/doc.go → pkg/plugin/trivy/doc.go b/pkg/trivy/doc.go → pkg/plugin/trivy/doc.go
diff --git a/pkg/trivy/model.go → pkg/plugin/trivy/model.go b/pkg/trivy/model.go → pkg/plugin/trivy/model.go
diff --git a/pkg/trivy/model_test.go → pkg/plugin/trivy/model_test.go b/pkg/trivy/model_test.go → pkg/plugin/trivy/model_test.go
diff --git a/pkg/trivy/plugin.go → pkg/plugin/trivy/plugin.go b/pkg/trivy/plugin.go → pkg/plugin/trivy/plugin.go
diff --git a/pkg/trivy/plugin_test.go → pkg/plugin/trivy/plugin_test.go b/pkg/trivy/plugin_test.go → pkg/plugin/trivy/plugin_test.go
@@ -4,8 +4,8 @@ import (
 	"testing"
 
 	"github.com/aquasecurity/starboard/pkg/ext"
+	"github.com/aquasecurity/starboard/pkg/plugin/trivy"
 	"github.com/aquasecurity/starboard/pkg/starboard"
-	"github.com/aquasecurity/starboard/pkg/trivy"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	corev1 "k8s.io/api/core/v1"