-
Notifications
You must be signed in to change notification settings - Fork 587
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
port golang cataloger to new generic cataloger pattern (#1289)
Signed-off-by: Alex Goodman <[email protected]> Signed-off-by: Alex Goodman <[email protected]>
- Loading branch information
Showing
12 changed files
with
294 additions
and
239 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
/* | ||
Package golang provides a concrete Cataloger implementation for go.mod files. | ||
*/ | ||
package golang | ||
|
||
import ( | ||
"github.com/anchore/syft/internal" | ||
"github.com/anchore/syft/syft/pkg/cataloger/generic" | ||
) | ||
|
||
// NewGoModFileCataloger returns a new Go module cataloger object. | ||
func NewGoModFileCataloger() *generic.Cataloger { | ||
return generic.NewCataloger("go-mod-file-cataloger"). | ||
WithParserByGlobs(parseGoModFile, "**/go.mod") | ||
} | ||
|
||
// NewGoModuleBinaryCataloger returns a new Golang cataloger object. | ||
func NewGoModuleBinaryCataloger() *generic.Cataloger { | ||
return generic.NewCataloger("go-module-binary-cataloger"). | ||
WithParserByMimeTypes(parseGoBinary, internal.ExecutableMIMETypeSet.List()...) | ||
} |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,69 @@ | ||
package golang | ||
|
||
import ( | ||
"regexp" | ||
"runtime/debug" | ||
"strings" | ||
|
||
"github.com/anchore/packageurl-go" | ||
"github.com/anchore/syft/syft/pkg" | ||
"github.com/anchore/syft/syft/source" | ||
) | ||
|
||
func newGoBinaryPackage(dep *debug.Module, mainModule, goVersion, architecture string, buildSettings map[string]string, locations ...source.Location) pkg.Package { | ||
if dep.Replace != nil { | ||
dep = dep.Replace | ||
} | ||
|
||
p := pkg.Package{ | ||
Name: dep.Path, | ||
Version: dep.Version, | ||
PURL: packageURL(dep.Path, dep.Version), | ||
Language: pkg.Go, | ||
Type: pkg.GoModulePkg, | ||
Locations: source.NewLocationSet(locations...), | ||
MetadataType: pkg.GolangBinMetadataType, | ||
Metadata: pkg.GolangBinMetadata{ | ||
GoCompiledVersion: goVersion, | ||
H1Digest: dep.Sum, | ||
Architecture: architecture, | ||
BuildSettings: buildSettings, | ||
MainModule: mainModule, | ||
}, | ||
} | ||
|
||
p.SetID() | ||
|
||
return p | ||
} | ||
|
||
func packageURL(moduleName, moduleVersion string) string { | ||
// source: https://github.com/package-url/purl-spec/blob/master/PURL-TYPES.rst#golang | ||
// note: "The version is often empty when a commit is not specified and should be the commit in most cases when available." | ||
|
||
re := regexp.MustCompile(`(/)[^/]*$`) | ||
fields := re.Split(moduleName, -1) | ||
if len(fields) == 0 { | ||
return "" | ||
} | ||
namespace := fields[0] | ||
name := strings.TrimPrefix(strings.TrimPrefix(moduleName, namespace), "/") | ||
|
||
if name == "" { | ||
// this is a "short" url (with no namespace) | ||
name = namespace | ||
namespace = "" | ||
} | ||
|
||
// The subpath is used to point to a subpath inside a package (e.g. pkg:golang/google.golang.org/genproto#googleapis/api/annotations) | ||
subpath := "" // TODO: not implemented | ||
|
||
return packageurl.NewPackageURL( | ||
packageurl.TypeGolang, | ||
namespace, | ||
name, | ||
moduleVersion, | ||
nil, | ||
subpath, | ||
).ToString() | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,41 @@ | ||
package golang | ||
|
||
import ( | ||
"testing" | ||
|
||
"github.com/stretchr/testify/assert" | ||
|
||
"github.com/anchore/syft/syft/pkg" | ||
) | ||
|
||
func Test_packageURL(t *testing.T) { | ||
|
||
tests := []struct { | ||
name string | ||
pkg pkg.Package | ||
expected string | ||
}{ | ||
{ | ||
name: "gocase", | ||
pkg: pkg.Package{ | ||
Name: "github.com/anchore/syft", | ||
Version: "v0.1.0", | ||
}, | ||
expected: "pkg:golang/github.com/anchore/[email protected]", | ||
}, | ||
{ | ||
name: "golang short name", | ||
pkg: pkg.Package{ | ||
Name: "go.opencensus.io", | ||
Version: "v0.23.0", | ||
}, | ||
expected: "pkg:golang/[email protected]", | ||
}, | ||
} | ||
|
||
for _, test := range tests { | ||
t.Run(test.name, func(t *testing.T) { | ||
assert.Equal(t, test.expected, packageURL(test.pkg.Name, test.pkg.Version)) | ||
}) | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.