added version property in sarif output

tenable · May 30, 2021 · c0b286b · c0b286b
1 parent 5bec8fb
commit c0b286b
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/pkg/version/version.go b/pkg/version/version.go
@@ -16,10 +16,17 @@
 
 package version
 
+import "fmt"
+
 // Terrascan The Terrascan version
-const Terrascan = "v1.6.0"
+const Terrascan = "1.6.0"
 
 // Get returns the terrascan version
 func Get() string {
+	return fmt.Sprintf("v%s",Terrascan)
+}
+
+// Get returns the terrascan version
+func GetNumeric() string {
 	return Terrascan
 }
diff --git a/pkg/writer/sarif.go b/pkg/writer/sarif.go
@@ -19,6 +19,7 @@ package writer
 import (
 	"fmt"
 	"github.com/accurics/terrascan/pkg/policy"
+	"github.com/accurics/terrascan/pkg/version"
 	"github.com/owenrumney/go-sarif/sarif"
 	"io"
 	"path/filepath"
@@ -42,6 +43,8 @@ func SarifWriter(data interface{}, writer io.Writer) error {
 	}
 
 	run := sarif.NewRun("terrascan", "https://github.com/accurics/terrascan")
+	run.Tool.Driver.WithVersion(version.GetNumeric())
+
 	// add a run to the report
 	report.AddRun(run)
 
@@ -71,7 +74,7 @@ func SarifWriter(data interface{}, writer io.Writer) error {
 		location := sarif.NewLocation().
 			WithPhysicalLocation(sarif.NewPhysicalLocation().
 				WithArtifactLocation(sarif.NewSimpleArtifactLocation(fmt.Sprintf("file://%s", absFilePath))).
-				WithRegion(sarif.NewRegion().WithStartLine(violation.LineNumber - 1)))
+				WithRegion(sarif.NewRegion().WithStartLine(violation.LineNumber)))
 
 		if len(violation.ResourceType) > 0 && len(violation.ResourceName) > 0 {
 			location.LogicalLocations = append(location.LogicalLocations, sarif.NewLogicalLocation().

diff --git a/pkg/writer/sarif_test.go b/pkg/writer/sarif_test.go
@@ -17,6 +17,7 @@ const expectedSarifOutput1 = `{
               "tool": {
                 "driver": {
                   "name": "terrascan",
+                  "version": "1.6.0",
                   "informationUri": "https://github.com/accurics/terrascan",
                   "rules": [
                     {
@@ -47,7 +48,7 @@ const expectedSarifOutput1 = `{
                           "uri": "file://test/modules/m1/main.tf"
                         },
                         "region": {
-                          "startLine": 19
+                          "startLine": 20
                         }
                       },
                       "logicalLocations": [
@@ -72,6 +73,7 @@ const expectedSarifOutput2 = `{
               "tool": {
                 "driver": {
                   "name": "terrascan",
+                  "version": "1.6.0",
                   "informationUri": "https://github.com/accurics/terrascan"
                 }
               },
@@ -88,6 +90,7 @@ const expectedSarifOutput3 = `{
               "tool": {
                 "driver": {
                   "name": "terrascan",
+                  "version": "1.6.0",
                   "informationUri": "https://github.com/accurics/terrascan",
                   "rules": [
                     {