From 5ea1d784640f2aba95ddd16250f1eced656dd7f8 Mon Sep 17 00:00:00 2001 From: Alex Goodman Date: Fri, 4 Jun 2021 09:38:15 -0400 Subject: [PATCH] rename helper fn to toELVersion Signed-off-by: Alex Goodman --- syft/pkg/cataloger/rpmdb/parse_rpmdb.go | 6 +++--- syft/pkg/cataloger/rpmdb/parse_rpmdb_test.go | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/syft/pkg/cataloger/rpmdb/parse_rpmdb.go b/syft/pkg/cataloger/rpmdb/parse_rpmdb.go index a9630cdd6..794201d90 100644 --- a/syft/pkg/cataloger/rpmdb/parse_rpmdb.go +++ b/syft/pkg/cataloger/rpmdb/parse_rpmdb.go @@ -62,7 +62,7 @@ func parseRpmDB(resolver source.FilePathResolver, dbLocation source.Location, re p := pkg.Package{ Name: entry.Name, - Version: toElVersion(metadata), + Version: toELVersion(metadata), Locations: []source.Location{dbLocation}, FoundBy: catalogerName, Type: pkg.RpmPkg, @@ -78,11 +78,11 @@ func parseRpmDB(resolver source.FilePathResolver, dbLocation source.Location, re // The RPM naming scheme is [name]-[version]-[release]-[arch], where version is implicitly expands to [epoch]:[version]. // RPM version comparison depends on comparing at least the version and release fields together as a subset of the -// naming scheme. This toElVersion function takes a RPM DB package information and converts it into a minimally comparable +// naming scheme. This toELVersion function takes a RPM DB package information and converts it into a minimally comparable // version string, containing epoch (optional), version, and release information. Epoch is an optional field and can be // assumed to be 0 when not provided for comparison purposes, however, if the underlying RPM DB entry does not have // an epoch specified it would be slightly disingenuous to display a value of 0. -func toElVersion(metadata pkg.RpmdbMetadata) string { +func toELVersion(metadata pkg.RpmdbMetadata) string { if metadata.Epoch != nil { return fmt.Sprintf("%d:%s-%s", *metadata.Epoch, metadata.Version, metadata.Release) } diff --git a/syft/pkg/cataloger/rpmdb/parse_rpmdb_test.go b/syft/pkg/cataloger/rpmdb/parse_rpmdb_test.go index 64c405cd4..2502118d8 100644 --- a/syft/pkg/cataloger/rpmdb/parse_rpmdb_test.go +++ b/syft/pkg/cataloger/rpmdb/parse_rpmdb_test.go @@ -199,7 +199,7 @@ func TestToElVersion(t *testing.T) { for _, test := range tests { t.Run(test.name, func(t *testing.T) { - assert.Equal(t, test.expected, toElVersion(test.entry)) + assert.Equal(t, test.expected, toELVersion(test.entry)) }) } }