move NormalizePkgName to common package

Signed-off-by: nikpivkin <nikita.pivkin@smartforce.io>

pkg/dependency/parser/python/poetry/parse.go

@@ -2,13 +2,13 @@ package poetry
 
 import (
 	"sort"
-	"strings"
 
 	"github.com/BurntSushi/toml"
 	"golang.org/x/xerrors"
 
 	version "github.com/aquasecurity/go-pep440-version"
 	"github.com/aquasecurity/trivy/pkg/dependency"
+	"github.com/aquasecurity/trivy/pkg/dependency/parser/python"
 	ftypes "github.com/aquasecurity/trivy/pkg/fanal/types"
 	"github.com/aquasecurity/trivy/pkg/log"
 	xio "github.com/aquasecurity/trivy/pkg/x/io"
@@ -105,7 +105,7 @@ func (p *Parser) parseDependencies(deps map[string]any, pkgVersions map[string][
 }
 
 func (p *Parser) parseDependency(name string, versRange any, pkgVersions map[string][]string) (string, error) {
-	name = NormalizePkgName(name)
+	name = python.NormalizePkgName(name)
 	vers, ok := pkgVersions[name]
 	if !ok {
 		return "", xerrors.Errorf("no version found for %q", name)
@@ -149,17 +149,6 @@ func matchVersion(currentVersion, constraint string) (bool, error) {
 	return c.Check(v), nil
 }
 
-// NormalizePkgName normalizes the package name based on pep-0426
-func NormalizePkgName(name string) string {
-	// The package names don't use `_`, `.` or upper case, but dependency names can contain them.
-	// We need to normalize those names.
-	// cf. https://peps.python.org/pep-0426/#name
-	name = strings.ToLower(name)              // e.g. https://github.com/python-poetry/poetry/blob/c8945eb110aeda611cc6721565d7ad0c657d453a/poetry.lock#L819
-	name = strings.ReplaceAll(name, "_", "-") // e.g. https://github.com/python-poetry/poetry/blob/c8945eb110aeda611cc6721565d7ad0c657d453a/poetry.lock#L50
-	name = strings.ReplaceAll(name, ".", "-") // e.g. https://github.com/python-poetry/poetry/blob/c8945eb110aeda611cc6721565d7ad0c657d453a/poetry.lock#L816
-	return name
-}
-
 func packageID(name, ver string) string {
 	return dependency.ID(ftypes.Poetry, name, ver)
 }

pkg/dependency/parser/python/pyproject/pyproject.go

@@ -8,7 +8,7 @@ import (
 	"github.com/samber/lo"
 	"golang.org/x/xerrors"
 
-	"github.com/aquasecurity/trivy/pkg/dependency/parser/python/poetry"
+	"github.com/aquasecurity/trivy/pkg/dependency/parser/python"
 )
 
 type PyProject struct {
@@ -37,7 +37,7 @@ func (d *dependencies) UnmarshalTOML(data any) error {
 	}
 
 	*d = lo.MapEntries(m, func(pkgName string, _ any) (string, struct{}) {
-		return poetry.NormalizePkgName(pkgName), struct{}{}
+		return python.NormalizePkgName(pkgName), struct{}{}
 	})
 	return nil
 }

pkg/dependency/parser/python/python.go

@@ -0,0 +1,14 @@
+package python
+
+import "strings"
+
+// NormalizePkgName normalizes the package name based on pep-0426
+func NormalizePkgName(name string) string {
+	// The package names don't use `_`, `.` or upper case, but dependency names can contain them.
+	// We need to normalize those names.
+	// cf. https://peps.python.org/pep-0426/#name
+	name = strings.ToLower(name)              // e.g. https://github.com/python-poetry/poetry/blob/c8945eb110aeda611cc6721565d7ad0c657d453a/poetry.lock#L819
+	name = strings.ReplaceAll(name, "_", "-") // e.g. https://github.com/python-poetry/poetry/blob/c8945eb110aeda611cc6721565d7ad0c657d453a/poetry.lock#L50
+	name = strings.ReplaceAll(name, ".", "-") // e.g. https://github.com/python-poetry/poetry/blob/c8945eb110aeda611cc6721565d7ad0c657d453a/poetry.lock#L816
+	return name
+}

pkg/dependency/parser/python/python_test.go

@@ -0,0 +1,38 @@
+package python_test
+
+import (
+	"testing"
+
+	"github.com/aquasecurity/trivy/pkg/dependency/parser/python"
+	"github.com/stretchr/testify/assert"
+)
+
+func Test_NormalizePkgName(t *testing.T) {
+	tests := []struct {
+		pkgName  string
+		expected string
+	}{
+		{
+			pkgName:  "SecretStorage",
+			expected: "secretstorage",
+		},
+		{
+			pkgName:  "pywin32-ctypes",
+			expected: "pywin32-ctypes",
+		},
+		{
+			pkgName:  "jaraco.classes",
+			expected: "jaraco-classes",
+		},
+		{
+			pkgName:  "green_gdk",
+			expected: "green-gdk",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.pkgName, func(t *testing.T) {
+			assert.Equal(t, tt.expected, python.NormalizePkgName(tt.pkgName))
+		})
+	}
+}