oss/syft
2
0
Fork 0
mirror of https://github.com/anchore/syft.git synced 2025-11-17 16:33:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

golang cataloger - main module version as is (#986)

Browse Source 
Signed-off-by: Jonas Xavier <jonasx@anchore.com>
This commit is contained in:
Jonas Xavier 2022-05-05 00:01:00 -07:00 committed by GitHub
parent 8b6c576d78
commit 2fc344aba4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
syft/pkg/cataloger/golang/parse_go_bin.go
View File

@ -29,13 +29,11 @@ var (
func makeGoMainPackage(mod *debug.BuildInfo, arch string, location source.Location) pkg.Package { func makeGoMainPackage(mod *debug.BuildInfo, arch string, location source.Location) pkg.Package {
gbs := getBuildSettings(mod.Settings) gbs := getBuildSettings(mod.Settings)
main := newGoBinaryPackage(&mod.Main, mod.GoVersion, arch, location, gbs) main := newGoBinaryPackage(&mod.Main, mod.GoVersion, arch, location, gbs)
main.Version = "(devel)"
if v, ok := gbs["vcs.revision"]; ok { if v, ok := gbs["vcs.revision"]; ok {
main.Version = v main.Version = v
} }
main.SetID()
return main return main
} }

6
syft/pkg/cataloger/golang/parse_go_bin_test.go
View File

@ -213,7 +213,7 @@ func TestBuildGoPkgInfo(t *testing.T) {
arch: archDetails, arch: archDetails,
mod: &debug.BuildInfo{ mod: &debug.BuildInfo{
GoVersion: goCompiledVersion, GoVersion: goCompiledVersion,
Main: debug.Module{Path: "github.com/anchore/syft"}, Main: debug.Module{Path: "github.com/anchore/syft", Version: "(devel)"},
Settings: []debug.BuildSetting{ Settings: []debug.BuildSetting{
{Key: "GOARCH", Value: archDetails}, {Key: "GOARCH", Value: archDetails},
{Key: "GOOS", Value: "darwin"}, {Key: "GOOS", Value: "darwin"},
@ -227,7 +227,7 @@ func TestBuildGoPkgInfo(t *testing.T) {
arch: archDetails, arch: archDetails,
mod: &debug.BuildInfo{ mod: &debug.BuildInfo{
GoVersion: goCompiledVersion, GoVersion: goCompiledVersion,
Main: debug.Module{Path: "github.com/anchore/syft"}, Main: debug.Module{Path: "github.com/anchore/syft", Version: "(devel)"},
Settings: []debug.BuildSetting{ Settings: []debug.BuildSetting{
{Key: "GOARCH", Value: archDetails}, {Key: "GOARCH", Value: archDetails},
{Key: "GOOS", Value: "darwin"}, {Key: "GOOS", Value: "darwin"},
@ -297,7 +297,7 @@ func TestBuildGoPkgInfo(t *testing.T) {
arch: archDetails, arch: archDetails,
mod: &debug.BuildInfo{ mod: &debug.BuildInfo{
GoVersion: goCompiledVersion, GoVersion: goCompiledVersion,
Main: debug.Module{Path: "github.com/anchore/syft"}, Main: debug.Module{Path: "github.com/anchore/syft", Version: "(devel)"},
Settings: []debug.BuildSetting{ Settings: []debug.BuildSetting{
{Key: "GOARCH", Value: archDetails}, {Key: "GOARCH", Value: archDetails},
{Key: "GOOS", Value: "darwin"}, {Key: "GOOS", Value: "darwin"},