CR comments

jfrog · Sep 18, 2024 · 8106d1f · 8106d1f
1 parent 3f25abf
commit 8106d1f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/utils/pythonutils/piputils.go b/utils/pythonutils/piputils.go
@@ -81,7 +81,7 @@ func getPackageDetailsFromSetuppy(srcPath string) (packageName string, packageVe
 	}
 
 	// Extract package name from setup.py.
-	packageName, packageVersion, err = ExtractPackageNameFromSetupPy(filePath)
+	packageName, packageVersion, err = extractPackageNameFromSetupPy(filePath)
 	if err != nil {
 		// If setup.py egg_info command failed we use build name as module name and continue to pip-install execution
 		return "", "", errors.New("couldn't determine module-name after running the 'egg_info' command: " + err.Error())
@@ -96,7 +96,7 @@ func getSetupPyFilePath(srcPath string) (string, error) {
 }
 
 // Get the project name and version by running 'egg_info' command on setup.py and extracting it from 'PKG-INFO' file.
-func ExtractPackageNameFromSetupPy(setuppyFilePath string) (string, string, error) {
+func extractPackageNameFromSetupPy(setuppyFilePath string) (string, string, error) {
 	// Execute egg_info command and return PKG-INFO content.
 	content, err := getEgginfoPkginfoContent(setuppyFilePath)
 	if err != nil {
@@ -184,7 +184,7 @@ func extractPackageNameFromEggBase(eggBase string) ([]byte, error) {
 // If pattern of package name of version not found, return an error.
 func getProjectNameAndVersionFromFileContent(content []byte) (string, string, error) {
 	// Create package-name regexp.
-	packageNameRegexp := regexp.MustCompile(`(?m)^Name:\s` + _packageNameRegexp)
+	packageNameRegexp := regexp.MustCompile(`(?m)^Name:\s` + packageNameRegexp)
 
 	// Find first nameMatch of packageNameRegexp.
 	nameMatch := packageNameRegexp.FindStringSubmatch(string(content))
@@ -193,7 +193,7 @@ func getProjectNameAndVersionFromFileContent(content []byte) (string, string, er
 	}
 
 	// Create package-version regexp.
-	packageVersionRegexp := regexp.MustCompile(`(?m)^Version:\s` + _packageNameRegexp)
+	packageVersionRegexp := regexp.MustCompile(`(?m)^Version:\s` + packageNameRegexp)
 
 	// Find first match of packageNameRegexp.
 	versionMatch := packageVersionRegexp.FindStringSubmatch(string(content))
@@ -205,8 +205,8 @@ func getProjectNameAndVersionFromFileContent(content []byte) (string, string, er
 }
 
 // Try getting the name and version from pyproject.toml or from setup.py, if those exist.
-func GetPipProjectNameAndVersion(srcPath string) (projectName string, projectVersion string, err error) {
-	projectName, projectVersion, err = GetPipProjectDetailsFromPyProjectToml(srcPath)
+func getPipProjectNameAndVersion(srcPath string) (projectName string, projectVersion string, err error) {
+	projectName, projectVersion, err = getPipProjectDetailsFromPyProjectToml(srcPath)
 	if err != nil || projectName != "" {
 		return
 	}
@@ -215,15 +215,15 @@ func GetPipProjectNameAndVersion(srcPath string) (projectName string, projectVer
 
 // Returns project ID based on name and version from pyproject.toml or setup.py, if found.
 func getPipProjectId(srcPath string) (string, error) {
-	projectName, projectVersion, err := GetPipProjectNameAndVersion(srcPath)
+	projectName, projectVersion, err := getPipProjectNameAndVersion(srcPath)
 	if err != nil || projectName == "" {
 		return "", err
 	}
 	return projectName + ":" + projectVersion, nil
 }
 
 // Try getting the name and version from pyproject.toml.
-func GetPipProjectDetailsFromPyProjectToml(srcPath string) (projectName string, projectVersion string, err error) {
+func getPipProjectDetailsFromPyProjectToml(srcPath string) (projectName string, projectVersion string, err error) {
 	filePath, err := getPyProjectFilePath(srcPath)
 	if err != nil || filePath == "" {
 		return

diff --git a/utils/pythonutils/twineutils.go b/utils/pythonutils/twineutils.go
@@ -64,7 +64,7 @@ func getArtifactsParser(artifactsPaths *[]string) (parser *gofrogcmd.CmdOutputPa
 
 // Create artifacts entities from the artifacts paths that were found during the upload.
 func CreateArtifactsFromPaths(artifactsPaths []string) (artifacts []entities.Artifact, err error) {
-	projectName, projectVersion, err := GetPipProjectNameAndVersion("")
+	projectName, projectVersion, err := getPipProjectNameAndVersion("")
 	if err != nil {
 		return
 	}

diff --git a/utils/pythonutils/utils.go b/utils/pythonutils/utils.go
@@ -25,7 +25,7 @@ const (
 	startUsingCachedPattern = `^\s*Using\scached\s`
 	usingCacheCaptureGroup  = `[\S]+`
 	endPattern              = `\s\(`
-	_packageNameRegexp      = `(\w[\w-.]+)`
+	packageNameRegexp       = `(\w[\w-.]+)`
 )
 
 type PythonTool string
@@ -277,7 +277,7 @@ func InstallWithLogParsing(tool PythonTool, commandArgs []string, log utils.Log,
 
 	// Extract downloaded package name.
 	parsers = append(parsers, &gofrogcmd.CmdOutputPattern{
-		RegExp: regexp.MustCompile(`^Collecting\s` + _packageNameRegexp),
+		RegExp: regexp.MustCompile(`^Collecting\s` + packageNameRegexp),
 		ExecFunc: func(pattern *gofrogcmd.CmdOutputPattern) (string, error) {
 			// If this pattern matched a second time before downloaded-file-name was found, prompt a message.
 			if expectingPackageFilePath {
@@ -330,7 +330,7 @@ func InstallWithLogParsing(tool PythonTool, commandArgs []string, log utils.Log,
 
 	// Extract already installed packages names.
 	parsers = append(parsers, &gofrogcmd.CmdOutputPattern{
-		RegExp: regexp.MustCompile(`^Requirement\salready\ssatisfied:\s` + _packageNameRegexp),
+		RegExp: regexp.MustCompile(`^Requirement\salready\ssatisfied:\s` + packageNameRegexp),
 		ExecFunc: func(pattern *gofrogcmd.CmdOutputPattern) (string, error) {
 			// Check for out of bound results.
 			if len(pattern.MatchedResults)-1 < 0 {