remove x/slices pkg

aquasecurity · Sep 22, 2023 · 9592d3f · 9592d3f
1 parent 821177e
commit 9592d3f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 74 deletions.
diff --git a/pkg/fanal/artifact/artifact.go b/pkg/fanal/artifact/artifact.go
@@ -11,7 +11,7 @@ import (
 	"github.com/aquasecurity/trivy/pkg/fanal/types"
 	"github.com/aquasecurity/trivy/pkg/fanal/walker"
 	"github.com/aquasecurity/trivy/pkg/misconf"
-	"github.com/aquasecurity/trivy/pkg/x/slices"
+	"github.com/samber/lo"
 )
 
 type Option struct {
@@ -65,10 +65,12 @@ func (o *Option) Sort() {
 
 func (o *Option) ConfigFiles() []string {
 	// data paths and policy paths are ignored because their own file systems are created for them
-	return slices.Merge(
-		o.MisconfScannerOption.TerraformTFVars,
-		o.MisconfScannerOption.HelmFileValues,
-		o.MisconfScannerOption.HelmValueFiles,
+	return lo.Flatten(
+		[][]string{
+			o.MisconfScannerOption.TerraformTFVars,
+			o.MisconfScannerOption.HelmFileValues,
+			o.MisconfScannerOption.HelmValueFiles,
+		},
 	)
 }
 

diff --git a/pkg/x/slices/slices.go b/pkg/x/slices/slices.go
diff --git a/pkg/x/slices/slices_test.go b/pkg/x/slices/slices_test.go