5
5
"fmt"
6
6
"log/slog"
7
7
"path/filepath"
8
+ "slices"
8
9
9
10
"github.com/google/osv-scalibr/extractor"
10
11
"github.com/google/osv-scalibr/extractor/filesystem"
@@ -44,13 +45,11 @@ func configureExtractors(extractors []filesystem.Extractor, accessors ExternalAc
44
45
}
45
46
}
46
47
47
- func getExtractors (defaultExtractorNames [][] string , accessors ExternalAccessors , actions ScannerActions ) []filesystem.Extractor {
48
+ func getExtractors (defaultExtractorNames []string , accessors ExternalAccessors , actions ScannerActions ) []filesystem.Extractor {
48
49
names := actions .ExtractorNames
49
50
50
51
if len (names ) == 0 {
51
- for _ , preset := range defaultExtractorNames {
52
- names = append (names , preset ... )
53
- }
52
+ names = defaultExtractorNames
54
53
}
55
54
56
55
extractors := scanners .BuildAll (names )
@@ -66,7 +65,7 @@ func scan(accessors ExternalAccessors, actions ScannerActions) ([]imodels.Packag
66
65
var scannedInventories []* extractor.Package
67
66
68
67
// --- Lockfiles ---
69
- lockfileExtractors := getExtractors ([][] string { scalibrextract .ExtractorsLockfiles } , accessors , actions )
68
+ lockfileExtractors := getExtractors (scalibrextract .ExtractorsLockfiles , accessors , actions )
70
69
for _ , lockfileElem := range actions .LockfilePaths {
71
70
invs , err := scanners .ScanSingleFileWithMapping (lockfileElem , lockfileExtractors )
72
71
if err != nil {
@@ -102,11 +101,11 @@ func scan(accessors ExternalAccessors, actions ScannerActions) ([]imodels.Packag
102
101
103
102
// --- Directories ---
104
103
dirExtractors := getExtractors (
105
- [][] string {
104
+ slices . Concat (
106
105
scalibrextract .ExtractorsLockfiles ,
107
106
scalibrextract .ExtractorsSBOMs ,
108
107
scalibrextract .ExtractorsDirectories ,
109
- } ,
108
+ ) ,
110
109
accessors ,
111
110
actions ,
112
111
)
0 commit comments