Solve GoReport card issues Closes #2298

Checkmarx · Apr 12, 2021 · 00536a8 · 00536a8
1 parent 3d8a6cc
commit 00536a8
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 10 deletions.
diff --git a/internal/constants/constants.go b/internal/constants/constants.go
@@ -11,7 +11,7 @@ const Fullname = "Keeping Infrastructure as Code Secure"
 // SCMCommit - Source control management commit identifier
 const SCMCommit = "N/A"
 
-// LogFile - logfile name
+// DefaultLogFile - logfile name
 const DefaultLogFile = "info.log"
 
 // DefaultConfigFilename - default configuration filename

diff --git a/pkg/detector/default_detect.go b/pkg/detector/default_detect.go
@@ -22,7 +22,6 @@ func (d defaultDetectLine) DetectLine(file *model.FileMetadata, searchKey string
 	lines := strings.Split(text, "\n")
 	foundAtLeastOne := false
 	currentLine := 0
-	isBreak := false
 	var extractedString [][]string
 	extractedString = GetBracketValues(searchKey, extractedString, "")
 	sanitizedSubstring := searchKey
@@ -32,7 +31,7 @@ func (d defaultDetectLine) DetectLine(file *model.FileMetadata, searchKey string
 
 	for _, key := range strings.Split(sanitizedSubstring, ".") {
 		substr1, substr2 := GenerateSubstrings(key, extractedString)
-
+		var isBreak bool
 		foundAtLeastOne, currentLine, isBreak = DetectCurrentLine(lines, substr1, substr2, currentLine, foundAtLeastOne)
 
 		if isBreak {

diff --git a/pkg/detector/docker/docker_detect.go b/pkg/detector/docker/docker_detect.go
@@ -27,7 +27,6 @@ func (d DetectKindLine) DetectLine(file *model.FileMetadata, searchKey string,
 	logWithFields *zerolog.Logger, outputLines int) model.VulnerabilityLines {
 	text := strings.ReplaceAll(file.OriginalData, "\r", "")
 	lines := prepareDockerFileLines(text)
-	isBreak := false
 	foundAtLeastOne := false
 	currentLine := 0
 	var extractedString [][]string
@@ -39,7 +38,7 @@ func (d DetectKindLine) DetectLine(file *model.FileMetadata, searchKey string,
 
 	for _, key := range strings.Split(sKey, ".") {
 		substr1, substr2 := detector.GenerateSubstrings(key, extractedString)
-
+		var isBreak bool
 		foundAtLeastOne, currentLine, isBreak = detector.DetectCurrentLine(lines, substr1, substr2,
 			currentLine, foundAtLeastOne)
 

diff --git a/pkg/engine/source/source.go b/pkg/engine/source/source.go
@@ -1,4 +1,4 @@
-//go:generate go run -mod=mod github.com/golang/mock/mockgen -package mock -source=./$GOFILE -destination=../mock/$GOFILE
+// Package source (go:generate go run -mod=mod github.com/golang/mock/mockgen -package mock -source=./$GOFILE -destination=../mock/$GOFILE)
 package source
 
 import "github.com/Checkmarx/kics/pkg/model"

diff --git a/pkg/model/model.go b/pkg/model/model.go
@@ -1,4 +1,4 @@
-//go:generate go run -mod=mod github.com/mailru/easyjson/easyjson ./$GOFILE
+// Package model (go:generate go run -mod=mod github.com/mailru/easyjson/easyjson ./$GOFILE)
 package model
 
 import (
@@ -180,12 +180,12 @@ func (m FileMetadatas) ToMap() map[string]FileMetadata {
 	return c
 }
 
-//easyjson:json
+// Documents (easyjson:json)
 type Documents struct {
 	Documents []Document `json:"document"`
 }
 
-//easyjson:json
+// Document (easyjson:json)
 type Document map[string]interface{}
 
 // Combine merge documents from FileMetadatas using the ID as reference for Document ID and FileName as reference for file

diff --git a/pkg/resolver/helm/helm.go b/pkg/resolver/helm/helm.go
@@ -93,9 +93,15 @@ func newClient() *action.Install {
 func setID(chartReq *chart.Chart) *chart.Chart {
 	for _, temp := range chartReq.Templates {
 		temp = addID(temp) //nolint
+		if temp != nil {
+			continue
+		}
 	}
 	for _, dep := range chartReq.Dependencies() {
 		dep = setID(dep) //nolint
+		if dep != nil {
+			continue
+		}
 	}
 	return chartReq
 }

diff --git a/tools/tools.go b/tools/tools.go
@@ -1,4 +1,4 @@
-// +build tools
+// Package tools (+build tools)
 package tools
 
 // Manage tool dependencies via go.mod.