Follow convention for naming catalogers (#2277)

* follow convention for naming catalogers

Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com>

* fix cataloger name example

Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com>

---------

Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com>
This commit is contained in:
Alex Goodman
2023-11-02 12:39:42 +00:00
committed by GitHub
parent 6c41f15975
commit b2f4d7eda2
144 changed files with 294 additions and 273 deletions
+1 -1
View File
@@ -235,7 +235,7 @@ func TestPackagesCmdFlags(t *testing.T) {
},
{
name: "catalogers-option",
// This will detect enable python-index-cataloger, python-package-cataloger and ruby-gemspec cataloger
// This will detect enable python-package-cataloger, python-installed-package-cataloger and ruby-gemspec cataloger
args: []string{"packages", "-o", "json", "--catalogers", "python,ruby-gemspec", coverageImage},
assertions: []traitAssertion{
assertPackageCount(13),
@@ -31672,7 +31672,7 @@
"name": "gpg",
"version": "1.10.0",
"type": "python",
"foundBy": "python-package-cataloger",
"foundBy": "python-installed-package-cataloger",
"locations": [
{
"path": "/usr/lib64/python3.6/site-packages/gpg-1.10.0-py3.6.egg-info",
@@ -95502,7 +95502,7 @@
"name": "rpm",
"version": "4.14.2",
"type": "python",
"foundBy": "python-package-cataloger",
"foundBy": "python-installed-package-cataloger",
"locations": [
{
"path": "/usr/lib64/python3.6/site-packages/rpm-4.14.2-py3.6.egg-info",
@@ -98658,7 +98658,7 @@
"name": "setuptools",
"version": "39.2.0",
"type": "python",
"foundBy": "python-package-cataloger",
"foundBy": "python-installed-package-cataloger",
"locations": [
{
"path": "/usr/lib/python3.6/site-packages/setuptools-39.2.0.dist-info/METADATA",
+1 -1
View File
@@ -18,7 +18,7 @@ func TestSbomCataloger(t *testing.T) {
actualSbomPkgs := 0
actualGoModPkgs := 0
for pkg := range sbom.Artifacts.Packages.Enumerate(pkg.GoModulePkg) {
if pkg.FoundBy == "go-mod-file-cataloger" {
if pkg.FoundBy == "go-module-file-cataloger" {
actualGoModPkgs += 1
} else if pkg.FoundBy == "sbom-cataloger" {
actualSbomPkgs += 1