fix(license): return license separation using separators ,, or, etc. (#6916)

This commit is contained in:
DmitriyLewen
2024-06-14 13:36:47 +06:00
committed by GitHub
parent d77d9ce384
commit 52f7aa54b5
6 changed files with 80 additions and 43 deletions

View File

@@ -7,10 +7,10 @@ import (
"net/textproto"
"strings"
"github.com/samber/lo"
"golang.org/x/xerrors"
ftypes "github.com/aquasecurity/trivy/pkg/fanal/types"
"github.com/aquasecurity/trivy/pkg/licensing"
"github.com/aquasecurity/trivy/pkg/log"
xio "github.com/aquasecurity/trivy/pkg/x/io"
)
@@ -87,7 +87,7 @@ func (p *Parser) Parse(r xio.ReadSeekerAt) ([]ftypes.Package, []ftypes.Dependenc
{
Name: name,
Version: version,
Licenses: lo.Ternary(license != "", []string{license}, nil),
Licenses: licensing.SplitLicenses(license),
},
}, nil, nil
}