Parsing correctly pURLs and prefixing targets.

.gitignore

@@ -8,3 +8,4 @@ tests/output
 .vscode/
 deploy/smithy/chart/charts
 .idea/
+components/consumers/pdf/report.html

components/producers/checkov/main.go

@@ -51,7 +51,7 @@ func run(inFile []byte, target string) error {
 func handleSarif(inFile []byte) ([]*smithyv1.Issue, error) {
 	var sarifResults []*sarif.SmithyIssueCollection
 	var smithyResults []*smithyv1.Issue
-	sarifResults, err := sarif.ToSmithy(string(inFile))
+	sarifResults, err := sarif.ToSmithy(string(inFile), sarif.ExtraContextLanguageUnspecified)
 	if err != nil {
 		return smithyResults, err
 	}

components/producers/checkov/main_test.go

@@ -43,19 +43,19 @@ func TestRunSarif(t *testing.T) {
 	require.NoError(t, err)
 	expectedIssues := []*smithyv1.Issue{
 		{
-			Target:      "code/cfngoat/cfngoat.yaml:891-892",
+			Target:      "file://code/cfngoat/cfngoat.yaml:891-892",
 			Type:        "CKV_SECRET_6",
 			Title:       "Base64 High Entropy String",
 			Severity:    smithyv1.Severity_SEVERITY_HIGH,
 			Description: "MatchedRule: {\"id\":\"CKV_SECRET_6\",\"name\":\"Base64 High Entropy String\",\"shortDescription\":{\"text\":\"Base64 High Entropy String\"},\"fullDescription\":{\"text\":\"Base64 High Entropy String\"},\"defaultConfiguration\":{\"level\":\"error\"},\"help\":{\"text\":\"Base64 High Entropy String\\nResource: c00f1a6e4b20aa64691d50781b810756d6254b8e\"}} \n Message: Base64 High Entropy String",
 		}, {
-			Target:      "code/cfngoat/.github/workflows/checkov.yaml:1-1",
+			Target:      "file://code/cfngoat/.github/workflows/checkov.yaml:1-1",
 			Type:        "CKV2_GHA_1",
 			Title:       "Ensure top-level permissions are not set to write-all",
 			Severity:    smithyv1.Severity_SEVERITY_HIGH,
 			Description: "MatchedRule: {\"id\":\"CKV2_GHA_1\",\"name\":\"Ensure top-level permissions are not set to write-all\",\"shortDescription\":{\"text\":\"Ensure top-level permissions are not set to write-all\"},\"fullDescription\":{\"text\":\"Ensure top-level permissions are not set to write-all\"},\"defaultConfiguration\":{\"level\":\"error\"},\"help\":{\"text\":\"Ensure top-level permissions are not set to write-all\\nResource: on(build)\"}} \n Message: Ensure top-level permissions are not set to write-all",
 		}, {
-			Target:      "code/cfngoat/.github/workflows/main.yaml:1-1",
+			Target:      "file://code/cfngoat/.github/workflows/main.yaml:1-1",
 			Type:        "CKV2_GHA_1",
 			Title:       "Ensure top-level permissions are not set to write-all",
 			Severity:    smithyv1.Severity_SEVERITY_HIGH,

components/producers/docker-trivy/main.go

@@ -78,7 +78,7 @@ func handleJSON(inFile []byte) ([]*v1.Issue, error) {
 func handleSarif(inFile []byte) ([]*v1.Issue, error) {
 	var sarifResults []*sarif.SmithyIssueCollection
 	var smithyResults []*v1.Issue
-	sarifResults, err := sarif.ToSmithy(string(inFile))
+	sarifResults, err := sarif.ToSmithy(string(inFile), sarif.ExtraContextLanguageUnspecified)
 	if err != nil {
 		return smithyResults, err
 	}

components/producers/java-findsecbugs/main.go

@@ -182,7 +182,7 @@ func main() {
 		if err != nil {
 			log.Fatal(err)
 		}
-		sarifResults, err = sarif.ToSmithy(string(inFile))
+		sarifResults, err = sarif.ToSmithy(string(inFile), sarif.ExtraContextLanguageUnspecified)
 		if err != nil {
 			log.Fatal(err)
 		}

components/producers/kics/main.go

@@ -32,7 +32,7 @@ func main() {
 	if Sarif {
 		var sarifResults []*sarif.SmithyIssueCollection
 		var smithyResults []*v1.Issue
-		sarifResults, err := sarif.ToSmithy(string(inFile))
+		sarifResults, err := sarif.ToSmithy(string(inFile), sarif.ExtraContextLanguageUnspecified)
 		if err != nil {
 			log.Fatal(err)
 		}

components/producers/snyk-docker/main.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"flag"
 	"log"
 	"log/slog"
 
@@ -10,6 +11,8 @@ import (
 )
 
 func main() {
+	var producerLang string
+	flag.StringVar(&producerLang, "language", "", "")
 
 	if err := producers.ParseFlags(); err != nil {
 		log.Fatal(err)
@@ -20,7 +23,7 @@ func main() {
 	if err != nil {
 		log.Fatal(err)
 	}
-	results, err := processInput(string(inFile))
+	results, err := processInput(string(inFile), producerLang)
 	if err != nil {
 		log.Fatal(err)
 	}
@@ -46,11 +49,22 @@ func writeOutput(results map[string][]*v1.Issue) error {
 	return nil
 }
 
-func processInput(input string) (map[string][]*v1.Issue, error) {
-	issues, err := sarif.ToSmithy(string(input))
+func processInput(input string, language string) (map[string][]*v1.Issue, error) {
+	var (
+		issues       []*sarif.SmithyIssueCollection
+		extraCtxLang = sarif.ExtraContextLanguageUnspecified
+		err          error
+	)
+
+	if language != "" {
+		extraCtxLang = sarif.ExtraContextLanguage(language)
+	}
+
+	issues, err = sarif.ToSmithy(input, extraCtxLang)
 	if err != nil {
 		return nil, err
 	}
+
 	results := map[string][]*v1.Issue{}
 	for _, output := range issues {
 		results[output.ToolName] = append(results[output.ToolName], output.Issues...)

components/producers/snyk-node/task.yaml

@@ -67,6 +67,7 @@ spec:
     args:
     - "-in=/scratch/snyk.out"
     - "-out=$(workspaces.output.path)/.smithy/producers/snyk.pb"
+    - "-language=javascript"
     volumeMounts:
     - mountPath: /scratch
       name: scratch

components/producers/snyk-python/task.yaml

@@ -61,6 +61,7 @@ spec:
     args:
     - "-in=/scratch/snyk.out"
     - "-out=$(workspaces.output.path)/.smithy/producers/snyk.pb"
+    - "-language=python"
     volumeMounts:
     - mountPath: /scratch
       name: scratch

components/producers/terraform-tfsec/main.go

@@ -32,7 +32,7 @@ func main() {
 	if Sarif {
 		var sarifResults []*sarif.SmithyIssueCollection
 		var smithyResults []*v1.Issue
-		sarifResults, err := sarif.ToSmithy(string(inFile))
+		sarifResults, err := sarif.ToSmithy(string(inFile), sarif.ExtraContextLanguageUnspecified)
 		if err != nil {
 			log.Fatal(err)
 		}