Merge pull request #22 from devtron-labs/invalid-json-fix

Fix: scanning failed due to invalid json output.

common/bean.go

@@ -3,6 +3,7 @@ package common
 import (
 	"github.com/optiopay/klar/clair"
 	"github.com/quay/claircore"
+	"strings"
 	"time"
 )
 
@@ -124,3 +125,10 @@ type SeverityCount struct {
 	Moderate int `json:"moderate"`
 	Low      int `json:"low"`
 }
+
+func RemoveTrailingComma(jsonString string) string {
+	if strings.HasSuffix(jsonString, ",]") {
+		return jsonString[:len(jsonString)-2] + jsonString[len(jsonString)-1:]
+	}
+	return jsonString
+}

pkg/security/ImageScanService.go

@@ -379,6 +379,7 @@ func (impl *ImageScanServiceImpl) ConvertEndStepOutputAndSaveVulnerabilities(ste
 		impl.logger.Errorw("error in parsing template to get vulnerabilities", "err", err)
 		return err
 	}
+	renderedTemplate = common.RemoveTrailingComma(renderedTemplate)
 	var vulnerabilities []*bean.ImageScanOutputObject
 	err = json.Unmarshal([]byte(renderedTemplate), &vulnerabilities)
 	if err != nil {