Merge pull request #2 from scanoss/linting-cleanup

Golang License Fix

CHANGELOG.md

@@ -9,6 +9,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - Upcoming changes...
 
+## [0.7.2] - 2023-11-27
+### Added
+- Added SQL tracing support for advanced debug
+### Fixed
+- Fixed issue with golang license reporting for certain components
+
 ## [0.7.1] - 2023-11-20
 ### Added
 - Added Open Telemetry spans/traces/metrics
@@ -50,3 +56,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 [0.6.0]: https://github.com/scanoss/papi/compare/v0.5.0...v0.6.0
 [0.7.0]: https://github.com/scanoss/papi/compare/v0.6.0...v0.7.0
 [0.7.1]: https://github.com/scanoss/papi/compare/v0.7.0...v0.7.1
+[0.7.2]: https://github.com/scanoss/papi/compare/v0.7.1...v0.7.2

config/app-config-dev.json

@@ -15,7 +15,8 @@
     "Host":   "localhost",
     "User":   "scanoss",
     "Passwd": "secret123!",
-    "Schema": "scanoss"
+    "Schema": "scanoss",
+    "Trace": false
   },
   "Components": {
     "CommitMissing": false

config/app-config-docker-local-dev.json

@@ -11,7 +11,8 @@
     "Host":   "host.docker.internal",
     "User":   "scanoss",
     "Passwd": "secret123!",
-    "Schema": "scanoss"
+    "Schema": "scanoss",
+    "Trace": false
   },
   "Components": {
     "CommitMissing": false

go.mod

@@ -11,7 +11,7 @@ require (
 	github.com/lib/pq v1.10.9
 	github.com/mattn/go-sqlite3 v1.14.18
 	github.com/package-url/packageurl-go v0.1.2
-	github.com/scanoss/go-grpc-helper v0.2.0
+	github.com/scanoss/go-grpc-helper v0.3.0
 	github.com/scanoss/go-purl-helper v0.2.0
 	github.com/scanoss/papi v0.2.0
 	github.com/scanoss/zap-logging-helper v0.3.0

go.sum

@@ -641,8 +641,8 @@ github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/f
 github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
 github.com/saintfish/chardet v0.0.0-20120816061221-3af4cd4741ca h1:NugYot0LIVPxTvN8n+Kvkn6TrbMyxQiuvKdEwFdR9vI=
 github.com/saintfish/chardet v0.0.0-20120816061221-3af4cd4741ca/go.mod h1:uugorj2VCxiV1x+LzaIdVa9b4S4qGAcH6cbhh4qVxOU=
-github.com/scanoss/go-grpc-helper v0.2.0 h1:Dy5tTU2T/7cti65m8UJNN5xIB+VXl8KXFQhg4ILe31I=
-github.com/scanoss/go-grpc-helper v0.2.0/go.mod h1:bUkHdBfMhZnkYXTbELr0FUe7GntzcDIWM5Q7b9kuFaQ=
+github.com/scanoss/go-grpc-helper v0.3.0 h1:4FeNOUX1X1uxZCd8pWz0iYwoPsH7cm4jK0yM3Mbuuvk=
+github.com/scanoss/go-grpc-helper v0.3.0/go.mod h1:bUkHdBfMhZnkYXTbELr0FUe7GntzcDIWM5Q7b9kuFaQ=
 github.com/scanoss/go-purl-helper v0.2.0 h1:kJBVv3euNhKQunoVFxiHxZLNHgSPAwTbz823oa3wcgw=
 github.com/scanoss/go-purl-helper v0.2.0/go.mod h1:lAtt1KcKIUylaj8YW7Qn/jq5Vvwh8fV2huqfvT9SKLM=
 github.com/scanoss/ipfilter/v2 v2.0.2 h1:GaB9i8kVJg9JQZm5XGStYkEpiaCVdsrj7ezI2wV/oh8=

pkg/config/server_config.go

@@ -53,6 +53,7 @@ type ServerConfig struct {
 		Schema  string `env:"DB_SCHEMA"`
 		SslMode string `env:"DB_SSL_MODE"` // enable/disable
 		Dsn     string `env:"DB_DSN"`
+		Trace   bool   `env:"DB_TRACE"` // true/false
 	}
 	Components struct {
 		CommitMissing bool `env:"COMP_COMMIT_MISSING"` // Write component details to the DB if they are looked up live
@@ -98,6 +99,7 @@ func setServerConfigDefaults(cfg *ServerConfig) {
 	cfg.Database.User = "scanoss"
 	cfg.Database.Schema = "scanoss"
 	cfg.Database.SslMode = "disable"
+	cfg.Database.Trace = false
 	cfg.Components.CommitMissing = false
 	cfg.Logging.DynamicLogging = true
 	cfg.Logging.DynamicPort = "localhost:60051"

pkg/dtos/dependency_input.go

@@ -41,14 +41,14 @@ type DepPurlInput struct {
 
 // ParseDependencyInput converts the input byte array to a DependencyInput structure.
 func ParseDependencyInput(s *zap.SugaredLogger, input []byte) (DependencyInput, error) {
-	if input == nil || len(input) == 0 {
+	if len(input) == 0 {
 		return DependencyInput{}, errors.New("no input dependency data supplied to parse")
 	}
 	var data DependencyInput
 	err := json.Unmarshal(input, &data)
 	if err != nil {
 		s.Errorf("Parse failure: %v", err)
-		return DependencyInput{}, errors.New(fmt.Sprintf("failed to parse dependency input data: %v", err))
+		return DependencyInput{}, fmt.Errorf("failed to parse dependency input data: %v", err)
 	}
 	return data, nil
 }

pkg/dtos/dependency_output.go

@@ -30,7 +30,7 @@ type DependencyOutput struct {
 
 type DependencyFileOutput struct {
 	File         string               `json:"file"`
-	Id           string               `json:"id"`
+	ID           string               `json:"id"`
 	Status       string               `json:"status"`
 	Dependencies []DependenciesOutput `json:"dependencies"`
 }
@@ -39,14 +39,14 @@ type DependenciesOutput struct {
 	Component string              `json:"component"`
 	Purl      string              `json:"purl"`
 	Version   string              `json:"version"`
-	Url       string              `json:"url"`
+	URL       string              `json:"url"`
 	Comment   string              `json:"comment"`
 	Licenses  []DependencyLicense `json:"licenses"`
 }
 
 type DependencyLicense struct {
 	Name   string `json:"name"`
-	SpdxId string `json:"spdx_id"`
+	SpdxID string `json:"spdx_id"`
 	IsSpdx bool   `json:"is_spdx_approved"`
 }
 
@@ -62,14 +62,14 @@ func ExportDependencyOutput(s *zap.SugaredLogger, output DependencyOutput) ([]by
 
 // ParseDependencyOutput converts the input byte array to a DependencyOutput structure.
 func ParseDependencyOutput(s *zap.SugaredLogger, input []byte) (DependencyOutput, error) {
-	if input == nil || len(input) == 0 {
+	if len(input) == 0 {
 		return DependencyOutput{}, errors.New("no output dependency data supplied to parse")
 	}
 	var data DependencyOutput
 	err := json.Unmarshal(input, &data)
 	if err != nil {
 		s.Errorf("Parse failure: %v", err)
-		return DependencyOutput{}, errors.New(fmt.Sprintf("failed to parse dependency output data: %v", err))
+		return DependencyOutput{}, fmt.Errorf("failed to parse dependency output data: %v", err)
 	}
 	return data, nil
 }