Skip to content

Commit

Permalink
refactor: Move Polaris package under plugin (#419)
Browse files Browse the repository at this point in the history
Signed-off-by: Daniel Pacak <pacak.daniel@gmail.com>
  • Loading branch information
danielpacak committed Mar 5, 2021
1 parent 3892722 commit a36725a
Show file tree
Hide file tree
Showing 14 changed files with 18 additions and 15 deletions.
6 changes: 3 additions & 3 deletions pkg/cmd/scan_configaudit.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package cmd
import (
"context"

"github.com/aquasecurity/starboard/pkg/config"
"github.com/aquasecurity/starboard/pkg/configauditreport"
"github.com/aquasecurity/starboard/pkg/plugin"
"github.com/aquasecurity/starboard/pkg/starboard"
"github.com/spf13/cobra"
"k8s.io/cli-runtime/pkg/genericclioptions"
Expand Down Expand Up @@ -62,11 +62,11 @@ func ScanConfigAuditReports(buildInfo starboard.BuildInfo, cf *genericclioptions
if err != nil {
return err
}
plugin, err := config.GetConfigAuditReportPlugin(buildInfo, starboardConfig)
instance, err := plugin.GetConfigAuditReportPlugin(buildInfo, starboardConfig)
if err != nil {
return err
}
scanner := configauditreport.NewScanner(scheme, kubeClientset, opts, plugin)
scanner := configauditreport.NewScanner(scheme, kubeClientset, opts, instance)
report, err := scanner.Scan(ctx, workload, gvk)
if err != nil {
return err
Expand Down
6 changes: 3 additions & 3 deletions pkg/cmd/scan_vulnerabilities.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"fmt"

"github.com/aquasecurity/starboard/pkg/config"
"github.com/aquasecurity/starboard/pkg/plugin"
"github.com/aquasecurity/starboard/pkg/starboard"
"github.com/aquasecurity/starboard/pkg/vulnerabilityreport"
"github.com/spf13/cobra"
Expand Down Expand Up @@ -98,15 +98,15 @@ func ScanVulnerabilityReports(buildInfo starboard.BuildInfo, cf *genericclioptio
if err != nil {
return err
}
plugin, err := config.GetVulnerabilityReportPlugin(buildInfo, starboardConfig)
instance, err := plugin.GetVulnerabilityReportPlugin(buildInfo, starboardConfig)
if err != nil {
return err
}
reports, err := vulnerabilityreport.NewScanner(
scheme,
kubeClientset,
opts,
plugin).Scan(ctx, workload)
instance).Scan(ctx, workload)
if err != nil {
return err
}
Expand Down
1 change: 0 additions & 1 deletion pkg/config/config_test.go

This file was deleted.

6 changes: 3 additions & 3 deletions pkg/operator/operator.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ import (
"context"
"fmt"

"github.com/aquasecurity/starboard/pkg/config"
"github.com/aquasecurity/starboard/pkg/configauditreport"
"github.com/aquasecurity/starboard/pkg/ext"
"github.com/aquasecurity/starboard/pkg/kube"
"github.com/aquasecurity/starboard/pkg/kubebench"
"github.com/aquasecurity/starboard/pkg/operator/controller"
"github.com/aquasecurity/starboard/pkg/operator/etc"
"github.com/aquasecurity/starboard/pkg/plugin"
"github.com/aquasecurity/starboard/pkg/starboard"
"github.com/aquasecurity/starboard/pkg/vulnerabilityreport"
"k8s.io/client-go/kubernetes"
Expand Down Expand Up @@ -122,7 +122,7 @@ func Run(buildInfo starboard.BuildInfo, operatorConfig etc.Config) error {
logsReader := kube.NewLogsReader(kubeClientset)
secretsReader := kube.NewControllerRuntimeSecretsReader(mgr.GetClient())

vulnerabilityReportPlugin, err := config.GetVulnerabilityReportPlugin(buildInfo, starboardConfig)
vulnerabilityReportPlugin, err := plugin.GetVulnerabilityReportPlugin(buildInfo, starboardConfig)
if err != nil {
return err
}
Expand All @@ -141,7 +141,7 @@ func Run(buildInfo starboard.BuildInfo, operatorConfig etc.Config) error {
return fmt.Errorf("unable to setup vulnerabilityreport reconciler: %w", err)
}

configAuditReportPlugin, err := config.GetConfigAuditReportPlugin(buildInfo, starboardConfig)
configAuditReportPlugin, err := plugin.GetConfigAuditReportPlugin(buildInfo, starboardConfig)
if err != nil {
return err
}
Expand Down
1 change: 1 addition & 0 deletions pkg/plugin/doc.go
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
package plugin
4 changes: 2 additions & 2 deletions pkg/config/config.go → pkg/plugin/factory.go
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package config
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/polaris"
"github.com/aquasecurity/starboard/pkg/plugin/polaris"
"github.com/aquasecurity/starboard/pkg/starboard"
"github.com/aquasecurity/starboard/pkg/trivy"
"github.com/aquasecurity/starboard/pkg/vulnerabilityreport"
Expand Down
1 change: 1 addition & 0 deletions pkg/plugin/factory_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
package plugin_test
2 changes: 2 additions & 0 deletions pkg/plugin/polaris/doc.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
// The polaris package provides primitives for working with Polaris.
package polaris
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"github.com/aquasecurity/starboard/pkg/apis/aquasecurity/v1alpha1"
"github.com/aquasecurity/starboard/pkg/ext"
"github.com/aquasecurity/starboard/pkg/kube"
"github.com/aquasecurity/starboard/pkg/polaris"
"github.com/aquasecurity/starboard/pkg/plugin/polaris"
"github.com/aquasecurity/starboard/pkg/starboard"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
Expand Down
File renamed without changes.
2 changes: 0 additions & 2 deletions pkg/polaris/doc.go

This file was deleted.

2 changes: 2 additions & 0 deletions pkg/trivy/doc.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
// The trivy package provides primitives for working with Trivy.
package trivy

0 comments on commit a36725a

Please sign in to comment.