Skip to content

Commit 9d52018

Browse files
authored
fix(server): pass license categories to options (#7203)
Signed-off-by: nikpivkin <[email protected]>
1 parent 5cbc452 commit 9d52018

File tree

1 file changed

+11
-3
lines changed

1 file changed

+11
-3
lines changed

pkg/rpc/server/server.go

+11-3
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import (
99
"google.golang.org/protobuf/types/known/emptypb"
1010

1111
"github.com/aquasecurity/trivy/pkg/cache"
12+
ftypes "github.com/aquasecurity/trivy/pkg/fanal/types"
1213
"github.com/aquasecurity/trivy/pkg/log"
1314
"github.com/aquasecurity/trivy/pkg/rpc"
1415
"github.com/aquasecurity/trivy/pkg/scanner"
@@ -46,10 +47,17 @@ func (s *ScanServer) Scan(ctx context.Context, in *rpcScanner.ScanRequest) (*rpc
4647
scanners := lo.Map(in.Options.Scanners, func(s string, index int) types.Scanner {
4748
return types.Scanner(s)
4849
})
50+
51+
licenseCategories := lo.MapEntries(in.Options.LicenseCategories,
52+
func(k string, v *rpcScanner.Licenses) (ftypes.LicenseCategory, []string) {
53+
return ftypes.LicenseCategory(k), v.Names
54+
})
55+
4956
options := types.ScanOptions{
50-
PkgTypes: in.Options.PkgTypes,
51-
Scanners: scanners,
52-
IncludeDevDeps: in.Options.IncludeDevDeps,
57+
PkgTypes: in.Options.PkgTypes,
58+
Scanners: scanners,
59+
IncludeDevDeps: in.Options.IncludeDevDeps,
60+
LicenseCategories: licenseCategories,
5361
}
5462
results, os, err := s.localScanner.Scan(ctx, in.Target, in.ArtifactId, in.BlobIds, options)
5563
if err != nil {

0 commit comments

Comments
 (0)