linter cleanup

eeisegn · agustingroh · commit 7ca5035a9938 · 2025-08-28T07:50:23.000-03:00
diff --git a/cmd/cli/main.go b/cmd/cli/main.go
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-// Package main load the Vulnerability CLI
+// Package main load the Vulnerability CLI.
 package main
 
 func main() {
diff --git a/cmd/server/main.go b/cmd/server/main.go
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-// Package main loads the gRPC Vulnerability Server Service
+// Package main loads the gRPC Vulnerability Server Service.
 package main
 
 import (
diff --git a/pkg/adapters/vulnerability_support.go b/pkg/adapters/vulnerability_support.go
@@ -173,7 +173,7 @@ func FromCpeComponentOutputToComponentCpesResponse(input []dtos.CpeComponentOutp
 	return response, nil
 }
 
-// FromCpeComponentOutputToComponentCpesResponse converts an internal CPE Output structure into Component CPE Info.
+// FromCpeComponentOutputToComponentsCpesResponse FromCpeComponentOutputToComponentCpesResponse converts an internal CPE Output structure into Component CPE Info.
 func FromCpeComponentOutputToComponentsCpesResponse(input []dtos.CpeComponentOutput) (*pb.ComponentsCpesResponse, error) {
 	componentsInfo, err := getComponentCPEInfo(input)
 	if err != nil {
diff --git a/pkg/cmd/cli.go b/pkg/cmd/cli.go
@@ -16,4 +16,4 @@
 
 package cmd
 
-// TODO Add CLI code processing here
+// TODO Add CLI code processing here.
diff --git a/pkg/cmd/doc.go b/pkg/cmd/doc.go
@@ -14,8 +14,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-// Package cmd handles any command line driven interfaces to the Vulnerability service
-// It is currently made up of:
-// - Server Service
-// - Command line interface (CLI)
+/*
+Package cmd handles any command line driven interfaces to the Vulnerability service.
+It is currently made up of:
+  - Server Service
+  - Command line interface (CLI)
+*/
 package cmd
diff --git a/pkg/dtos/vulnerability_output_test.go b/pkg/dtos/vulnerability_output_test.go
@@ -44,8 +44,7 @@ func TestEmptyVulnerabilitiesOutput(t *testing.T) {
 	t.Log("Parsed output object: ", output)
 }
 func TestVulnerabilitiesOutput(t *testing.T) {
-	/*CVE-2019-15619
-	  CVE-2019-15619*/
+	// CVE-2019-15619 CVE-2019-15619
 	var outputJSON = `{
     "purls": [
       {
diff --git a/pkg/models/all_urls_test.go b/pkg/models/all_urls_test.go
@@ -211,8 +211,7 @@ func TestAllUrlsSearchVersion(t *testing.T) {
 	allUrls, err = allUrlsModel.GetURLsByPurlString("pkg:gem/tablestyle", "22.22.22") // Shouldn't exist
 	if err != nil {
 		t.Errorf("all_urls.GetURLsByPurlString() error = failed to find purl by version string")
-	}
-	if len(allUrls.PurlName) > 0 {
+	} else if len(allUrls.PurlName) > 0 {
 		t.Errorf("all_urls.GetURLsByPurlString() error = Found match, when we shouldn't: %v", allUrls)
 	}
 }
diff --git a/pkg/models/common.go b/pkg/models/common.go
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-// This file common tasks for the models package
+// This file common tasks for the models package.
 
 package models
 
diff --git a/pkg/models/cpe_purl.go b/pkg/models/cpe_purl.go
@@ -132,18 +132,15 @@ func FilterCpesByRequirement(cpes []CpePurl, purlReq string) []CpePurl {
 		zlog.S.Infof("No cpes in filterCpes()")
 		return []CpePurl{}
 	}
-
 	var c *semver.Constraints
-
 	if len(purlReq) > 0 {
 		zlog.S.Debugf("Building version constraint for %v", purlReq)
 		var err error
 		c, err = semver.NewConstraint(purlReq)
 		if err != nil {
-			zlog.S.Warnf("Encountered an issue parsing version constraint string '%v' (%v,%v): %v", purlReq, err)
+			zlog.S.Warnf("Encountered an issue parsing version constraint string '%v': %v", purlReq, err)
 		}
 	}
-
 	zlog.S.Debugf("Filtering cpes by requirement...")
 	output := []CpePurl{}
 	for _, cpe := range cpes {
diff --git a/pkg/models/docs.go b/pkg/models/docs.go
@@ -14,13 +14,15 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-// Package models contains all the logic required to interact with the SCANOSS database.
-// It provides data structures to represent the data retrieved from the system.
-// Current models/tables supported are:
-// - Mines
-// - Licenses
-// - Versions
-// - Projects
-// - All URLs
-// - Golang Projects
+/*
+Package models contains all the logic required to interact with the SCANOSS database.
+It provides data structures to represent the data retrieved from the system.
+Current models/tables supported are:
+  - Mines
+  - Licenses
+  - Versions
+  - Projects
+  - All URLs
+  - Golang Projects
+*/
 package models
diff --git a/pkg/models/licenses.go b/pkg/models/licenses.go
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-// Handle all interaction with the licenses table
+// Handle all interaction with the licenses table.
 
 package models
 
diff --git a/pkg/models/mines.go b/pkg/models/mines.go
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-// Handle all interaction with the mines table
+// Handle all interaction with the mines table.
 
 package models
 
diff --git a/pkg/models/projects.go b/pkg/models/projects.go
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-// Handle all interaction with the projects table
+// Handle all interaction with the projects table.
 
 package models
 
diff --git a/pkg/models/versions.go b/pkg/models/versions.go
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-// Handle all interaction with the versions table
+// Handle all interaction with the versions table.
 
 package models
 
@@ -63,7 +63,7 @@ func (m *VersionModel) GetVersionByName(name string, create bool) (Version, erro
 		"SELECT id, version_name, semver FROM versions"+
 			" WHERE version_name = $1",
 		name).StructScan(&version)
-	if err != nil && err != sql.ErrNoRows {
+	if err != nil && !errors.Is(err, sql.ErrNoRows) {
 		zlog.S.Errorf("Error: Failed to query versions table for %v: %v", name, err)
 		return Version{}, fmt.Errorf("failed to query the versions table: %v", err)
 	}
diff --git a/pkg/service/vulnerability_service.go b/pkg/service/vulnerability_service.go
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-// Package service implements the gRPC service endpoints
+// Package service implements the gRPC service endpoints.
 package service
 
 import (
diff --git a/pkg/service/vulnerability_service_test.go b/pkg/service/vulnerability_service_test.go
@@ -486,15 +486,15 @@ func TestVulnerabilityServer_GetComponentsVulnerabilities(t *testing.T) {
 	}{
 		// FIXME: Make this query pkg/models/vulns_purl.go::GetVulnsByPurl() generic for Postgres and SQLite.
 		// Current implementation uses Postgres-specific syntax that breaks on SQLite
-		/*{
+		/* {
 			name: "Get Components Vulnerabilities success",
 			s:    s,
 			args: args{
 				ctx: ctx,
 				req: &cpeReq,
 			},
 			want: &pb.ComponentsVulnerabilityResponse{Status: &common.StatusResponse{Status: common.StatusCode_SUCCESS, Message: "Success"}},
-		},*/
+		}, */
 		{
 			name: "Get Components Vulnerabilities fail",
 			s:    s,
@@ -598,15 +598,15 @@ func TestVulnerabilityServer_GetComponentVulnerabilities(t *testing.T) {
 	}{
 		// FIXME: Make this query pkg/models/vulns_purl.go::GetVulnsByPurl() generic for Postgres and SQLite.
 		// Current implementation uses Postgres-specific syntax that breaks on SQLite
-		/*{
+		/* {
 			name: "Get Components Vulnerabilities success",
 			s:    s,
 			args: args{
 				ctx: ctx,
 				req: &successReq,
 			},
 			want: &pb.ComponentVulnerabilityResponse{Status: &common.StatusResponse{Status: common.StatusCode_SUCCESS, Message: "Success"}},
-		},*/
+		}, */
 		{
 			name: "Get Components Vulnerabilities fail",
 			s:    s,
diff --git a/pkg/usecase/cpe_test.go b/pkg/usecase/cpe_test.go
@@ -67,9 +67,6 @@ func TestGetCpeUseCase(t *testing.T) {
 		t.Fatalf("failed to load Config: %v", err)
 	}
 	cpeUc := NewCpe(ctx, conn, myConfig, db)
-	if err != nil {
-		t.Fatalf("an error '%s' was not expected when parsing input json", err)
-	}
 	cpes, err := cpeUc.GetCpes(components)
 	if err != nil {
 		// The GetCpes method now properly returns errors for problematic data

Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,7 @@ func FromCpeComponentOutputToComponentCpesResponse(input []dtos.CpeComponentOutp`
`173`	`173`	`return response, nil`
`174`	`174`	`}`
`175`	`175`
`176`		`-// FromCpeComponentOutputToComponentCpesResponse converts an internal CPE Output structure into Component CPE Info.`
	`176`	`+// FromCpeComponentOutputToComponentsCpesResponse FromCpeComponentOutputToComponentCpesResponse converts an internal CPE Output structure into Component CPE Info.`
`177`	`177`	`func FromCpeComponentOutputToComponentsCpesResponse(input []dtos.CpeComponentOutput) (*pb.ComponentsCpesResponse, error) {`
`178`	`178`	`componentsInfo, err := getComponentCPEInfo(input)`
`179`	`179`	`if err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -16,4 +16,4 @@`
`16`	`16`
`17`	`17`	`package cmd`
`18`	`18`
`19`		`-// TODO Add CLI code processing here`
	`19`	`+// TODO Add CLI code processing here.`
Original file line number	Diff line number	Diff line change
`@@ -44,8 +44,7 @@ func TestEmptyVulnerabilitiesOutput(t *testing.T) {`
`44`	`44`	`t.Log("Parsed output object: ", output)`
`45`	`45`	`}`
`46`	`46`	`func TestVulnerabilitiesOutput(t *testing.T) {`
`47`		`- /*CVE-2019-15619`
`48`		`- CVE-2019-15619*/`
	`47`	`+ // CVE-2019-15619 CVE-2019-15619`
`49`	`48`	var outputJSON = `{
`50`	`49`	`"purls": [`
`51`	`50`	`{`
Original file line number	Diff line number	Diff line change
`@@ -211,8 +211,7 @@ func TestAllUrlsSearchVersion(t *testing.T) {`
`211`	`211`	`allUrls, err = allUrlsModel.GetURLsByPurlString("pkg:gem/tablestyle", "22.22.22") // Shouldn't exist`
`212`	`212`	`if err != nil {`
`213`	`213`	`t.Errorf("all_urls.GetURLsByPurlString() error = failed to find purl by version string")`
`214`		`- }`
`215`		`- if len(allUrls.PurlName) > 0 {`
	`214`	`+ } else if len(allUrls.PurlName) > 0 {`
`216`	`215`	`t.Errorf("all_urls.GetURLsByPurlString() error = Found match, when we shouldn't: %v", allUrls)`
`217`	`216`	`}`
`218`	`217`	`}`