fix: delta improve matching on dir name and similar path names [IDE-1051] (#810)

ShawkyZ · web-flow · commit ee1e33097efc · 2025-03-25T14:54:16.000+01:00
diff --git a/application/config/config.go b/application/config/config.go
@@ -365,10 +365,11 @@ func (c *Config) CliSettings() *CliSettings {
 }
 
 func (c *Config) Format() string {
-	c.m.Lock()
-	defer c.m.Unlock()
+	c.m.RLock()
+	defer c.m.RUnlock()
 	return c.format
 }
+
 func (c *Config) CLIDownloadLockFileName() (string, error) {
 	c.cliSettings.cliPathAccessMutex.Lock()
 	defer c.cliSettings.cliPathAccessMutex.Unlock()
diff --git a/application/server/server_smoke_test.go b/application/server/server_smoke_test.go
@@ -977,6 +977,33 @@ func Test_SmokeSnykCodeDelta_NoNewIssuesFound(t *testing.T) {
 	assert.Equal(t, 0, len(issueList), "no issues expected, as delta and no new change")
 }
 
+func Test_SmokeSnykCodeDelta_NoNewIssuesFound_JavaGoof(t *testing.T) {
+	c := testutil.SmokeTest(t, false)
+	loc, jsonRPCRecorder := setupServer(t, c)
+	c.SetSnykCodeEnabled(true)
+	c.SetDeltaFindingsEnabled(true)
+	cleanupChannels()
+	di.Init()
+	scanAggregator := di.ScanStateAggregator()
+
+	var cloneTargetDir, err = storedconfig.SetupCustomTestRepo(t, types.FilePath(t.TempDir()), "https://github.com/snyk-labs/java-goof", "f5719ae", c.Logger())
+	assert.NoError(t, err)
+
+	cloneTargetDirString := string(cloneTargetDir)
+
+	initParams := prepareInitParams(t, cloneTargetDir, c)
+
+	ensureInitialized(t, c, loc, initParams)
+
+	waitForScan(t, cloneTargetDirString, c)
+
+	waitForDeltaScan(t, scanAggregator)
+	checkForScanParams(t, jsonRPCRecorder, cloneTargetDirString, product.ProductCode)
+	issueList := getIssueListFromPublishDiagnosticsNotification(t, jsonRPCRecorder, product.ProductCode, cloneTargetDir)
+
+	assert.Equal(t, 0, len(issueList), "no issues expected, as delta and no new change")
+}
+
 func ensureInitialized(t *testing.T, c *config.Config, loc server.Local, initParams types.InitializeParams) {
 	t.Helper()
 	t.Setenv("SNYK_LOG_LEVEL", "info")
diff --git a/domain/snyk/issues.go b/domain/snyk/issues.go
@@ -26,7 +26,6 @@ import (
 	"github.com/snyk/snyk-ls/internal/delta"
 	"github.com/snyk/snyk-ls/internal/product"
 	"github.com/snyk/snyk-ls/internal/types"
-	"github.com/snyk/snyk-ls/internal/util"
 )
 
 var (
@@ -53,6 +52,8 @@ type Issue struct {
 	Message string
 	// todo [jc] this contains a formatted longest message for hovers, this needs to be pushed up and rendered in presentation. [bd] shouldn't the content and formatting be decided by the product?
 	FormattedMessage string
+	// ContentRoot is the root directory where is the issue was found
+	ContentRoot types.FilePath
 	// AffectedFilePath is the file path to the file where the issue was found
 	AffectedFilePath types.FilePath
 	// Product is the Snyk product, e.g. Snyk Open Source
@@ -94,6 +95,7 @@ func (i *Issue) Clone() *Issue {
 		Message:             i.Message,
 		FormattedMessage:    i.FormattedMessage,
 		AffectedFilePath:    i.AffectedFilePath,
+		ContentRoot:         i.ContentRoot,
 		Product:             i.Product,
 		References:          i.References,
 		IssueDescriptionURL: i.IssueDescriptionURL,
@@ -190,6 +192,12 @@ func (i *Issue) GetID() string {
 	return i.ID
 }
 
+func (i *Issue) GetContentRoot() types.FilePath {
+	i.m.RLock()
+	defer i.m.RUnlock()
+	return i.ContentRoot
+}
+
 func (i *Issue) GetDescription() string {
 	i.m.RLock()
 	defer i.m.RUnlock()
@@ -328,7 +336,6 @@ func (i *Issue) SetFingerPrint(fingerprint string) {
 	defer i.m.Unlock()
 
 	i.Fingerprint = fingerprint
-	i.GlobalIdentity = util.HashWithoutConversion([]byte(fingerprint))
 }
 
 func (i *Issue) GetRuleID() string {
diff --git a/domain/snyk/persistence/git_persistence_provider.go b/domain/snyk/persistence/git_persistence_provider.go
@@ -36,7 +36,7 @@ import (
 
 const (
 	CacheFolder   = "snyk"
-	SchemaVersion = "v1"
+	SchemaVersion = "v1_1"
 )
 
 var (
diff --git a/infrastructure/code/convert.go b/infrastructure/code/convert.go
@@ -409,6 +409,7 @@ func (s *SarifConverter) toIssues(baseDir types.FilePath) (issues []types.Issue,
 				Message:             message,
 				FormattedMessage:    formattedMessage,
 				IssueType:           issueType,
+				ContentRoot:         baseDir,
 				AffectedFilePath:    types.FilePath(absPath),
 				Product:             product.ProductCode,
 				IssueDescriptionURL: ruleLink,
diff --git a/infrastructure/iac/iac.go b/infrastructure/iac/iac.go
@@ -302,7 +302,7 @@ func (iac *Scanner) retrieveAnalysis(scanResult iacScanResult, workspacePath typ
 			issue.LineNumber = 0
 		}
 
-		i, err := iac.toIssue(types.FilePath(targetFile), issue, fileContentString)
+		i, err := iac.toIssue(workspacePath, types.FilePath(targetFile), issue, fileContentString)
 		if err != nil {
 			return nil, pkgerrors.Wrap(err, "unable to convert IaC issue to Snyk issue")
 		}
@@ -332,7 +332,7 @@ func (iac *Scanner) getExtendedMessage(issue iacIssue) string {
 	)
 }
 
-func (iac *Scanner) toIssue(affectedFilePath types.FilePath, issue iacIssue, fileContent string) (*snyk.Issue, error) {
+func (iac *Scanner) toIssue(workspacePath types.FilePath, affectedFilePath types.FilePath, issue iacIssue, fileContent string) (*snyk.Issue, error) {
 	const defaultRangeStart = 0
 	const defaultRangeEnd = 80
 	title := issue.IacDescription.Issue
@@ -377,6 +377,7 @@ func (iac *Scanner) toIssue(affectedFilePath types.FilePath, issue iacIssue, fil
 		Message:             title,
 		FormattedMessage:    iac.getExtendedMessage(issue),
 		Severity:            iac.toIssueSeverity(issue.Severity),
+		ContentRoot:         workspacePath,
 		AffectedFilePath:    affectedFilePath,
 		Product:             product.ProductInfrastructureAsCode,
 		IssueDescriptionURL: issueURL,
diff --git a/infrastructure/iac/iac_test.go b/infrastructure/iac/iac_test.go
@@ -126,7 +126,7 @@ func Test_createIssueDataForCustomUI_SuccessfullyParses(t *testing.T) {
 	c := testutil.UnitTest(t)
 	sampleIssue := sampleIssue()
 	scanner := New(c, performance.NewInstrumentor(), error_reporting.NewTestErrorReporter(), cli.NewTestExecutor())
-	issue, err := scanner.toIssue("test.yml", sampleIssue, "")
+	issue, err := scanner.toIssue("/path/to/issue", "test.yml", sampleIssue, "")
 
 	expectedAdditionalData := snyk.IaCIssueData{
 		Key:      "6a4df51fc4d53f1cfbdb4b46c165859b",
@@ -170,7 +170,7 @@ func Test_toIssue_issueHasHtmlTemplate(t *testing.T) {
 	c := testutil.UnitTest(t)
 	sampleIssue := sampleIssue()
 	scanner := New(c, performance.NewInstrumentor(), error_reporting.NewTestErrorReporter(), cli.NewTestExecutor())
-	issue, err := scanner.toIssue("test.yml", sampleIssue, "")
+	issue, err := scanner.toIssue("/path/to/issue", "test.yml", sampleIssue, "")
 
 	assert.NoError(t, err)
 
diff --git a/infrastructure/oss/cli_scanner.go b/infrastructure/oss/cli_scanner.go
@@ -344,7 +344,7 @@ func (cliScanner *CLIScanner) unmarshallAndRetrieveAnalysis(ctx context.Context,
 			logger.Error().Err(reportedErr).Send()
 			continue
 		}
-		issues = append(issues, cliScanner.retrieveIssues(&scanResult, targetFilePath, fileContent)...)
+		issues = append(issues, cliScanner.retrieveIssues(&scanResult, workDir, targetFilePath, fileContent)...)
 	}
 
 	return issues
@@ -493,15 +493,11 @@ func determineTargetFile(displayTargetFile string) string {
 	return strings.Replace(displayTargetFile, fileName, manifestFileName, 1)
 }
 
-func (cliScanner *CLIScanner) retrieveIssues(
-	res *scanResult,
-	targetFilePath types.FilePath,
-	fileContent []byte,
-) []types.Issue {
+func (cliScanner *CLIScanner) retrieveIssues(res *scanResult, workDir types.FilePath, targetFilePath types.FilePath, fileContent []byte) []types.Issue {
 	// we are updating the cli scanner maps/attributes in parallel, so we need to lock
 	cliScanner.mutex.Lock()
 	defer cliScanner.mutex.Unlock()
-	issues := convertScanResultToIssues(cliScanner.config, res, targetFilePath, fileContent, cliScanner.learnService, cliScanner.errorReporter, cliScanner.packageIssueCache)
+	issues := convertScanResultToIssues(cliScanner.config, res, workDir, targetFilePath, fileContent, cliScanner.learnService, cliScanner.errorReporter, cliScanner.packageIssueCache)
 
 	// repopulate
 	cliScanner.addVulnerabilityCountsToCache(issues)
diff --git a/infrastructure/oss/issue.go b/infrastructure/oss/issue.go
@@ -41,7 +41,7 @@ var issuesSeverity = map[string]types.Severity{
 	"medium":   types.Medium,
 }
 
-func toIssue(affectedFilePath types.FilePath, issue ossIssue, scanResult *scanResult, issueDepNode *ast.Node, learnService learn.Service, ep error_reporting.ErrorReporter) *snyk.Issue {
+func toIssue(c *config.Config, workDir types.FilePath, affectedFilePath types.FilePath, issue ossIssue, scanResult *scanResult, issueDepNode *ast.Node, learnService learn.Service, ep error_reporting.ErrorReporter) *snyk.Issue {
 	// this needs to be first so that the lesson from Snyk Learn is added
 	codeActions := issue.AddCodeActions(learnService, ep, affectedFilePath, issueDepNode)
 
@@ -74,7 +74,7 @@ func toIssue(affectedFilePath types.FilePath, issue ossIssue, scanResult *scanRe
 	additionalData := issue.toAdditionalData(scanResult, matchingIssues, affectedFilePath)
 
 	title := issue.Title
-	if config.CurrentConfig().Format() == config.FormatHtml {
+	if c.Format() == config.FormatHtml {
 		title = string(markdown.ToHTML([]byte(title), nil, nil))
 	}
 
@@ -96,6 +96,7 @@ func toIssue(affectedFilePath types.FilePath, issue ossIssue, scanResult *scanRe
 		FormattedMessage:    issue.GetExtendedMessage(issue),
 		Range:               getRangeFromNode(issueDepNode),
 		Severity:            issue.ToIssueSeverity(),
+		ContentRoot:         workDir,
 		AffectedFilePath:    affectedFilePath,
 		Product:             product.ProductOpenSource,
 		IssueDescriptionURL: issue.CreateIssueURL(),
@@ -125,7 +126,7 @@ func getRangeFromNode(issueDepNode *ast.Node) types.Range {
 	return r
 }
 
-func convertScanResultToIssues(c *config.Config, res *scanResult, targetFilePath types.FilePath, fileContent []byte, ls learn.Service, ep error_reporting.ErrorReporter, packageIssueCache map[string][]types.Issue) []types.Issue {
+func convertScanResultToIssues(c *config.Config, res *scanResult, workDir types.FilePath, targetFilePath types.FilePath, fileContent []byte, ls learn.Service, ep error_reporting.ErrorReporter, packageIssueCache map[string][]types.Issue) []types.Issue {
 	var issues []types.Issue
 
 	duplicateCheckMap := map[string]bool{}
@@ -137,7 +138,7 @@ func convertScanResultToIssues(c *config.Config, res *scanResult, targetFilePath
 			continue
 		}
 		node := getDependencyNode(c, targetFilePath, issue, fileContent)
-		snykIssue := toIssue(targetFilePath, issue, res, node, ls, ep)
+		snykIssue := toIssue(c, workDir, targetFilePath, issue, res, node, ls, ep)
 		packageIssueCache[packageKey] = append(packageIssueCache[packageKey], snykIssue)
 		issues = append(issues, snykIssue)
 		duplicateCheckMap[duplicateKey] = true
diff --git a/infrastructure/oss/oss_test.go b/infrastructure/oss/oss_test.go
@@ -102,17 +102,19 @@ func Test_introducingPackageAndVersion(t *testing.T) {
 }
 
 func Test_toIssue_LearnParameterConversion(t *testing.T) {
+	c := testutil.UnitTest(t)
 	sampleOssIssue := sampleIssue()
 	scanner := CLIScanner{
 		learnService: getLearnMock(t),
 	}
-
-	issue := toIssue("testPath", sampleOssIssue, &scanResult{}, nonEmptyNode(), scanner.learnService, scanner.errorReporter)
+	contentRoot := types.FilePath("/path/to/issue")
+	issue := toIssue(c, contentRoot, "testPath", sampleOssIssue, &scanResult{}, nonEmptyNode(), scanner.learnService, scanner.errorReporter)
 
 	assert.Equal(t, sampleOssIssue.Id, issue.ID)
 	assert.Equal(t, sampleOssIssue.Identifiers.CWE, issue.CWEs)
 	assert.Equal(t, sampleOssIssue.Identifiers.CVE, issue.CVEs)
 	assert.Equal(t, sampleOssIssue.PackageManager, issue.Ecosystem)
+	assert.Equal(t, contentRoot, issue.ContentRoot)
 	assert.Equal(t, "url", (issue.AdditionalData).(snyk.OssIssueData).Lesson)
 }
 
@@ -121,6 +123,7 @@ func nonEmptyNode() *ast.Node {
 }
 
 func Test_toIssue_CodeActions(t *testing.T) {
+	c := testutil.UnitTest(t)
 	const flashy = "⚡️ "
 	tests := []struct {
 		name               string
@@ -138,21 +141,23 @@ func Test_toIssue_CodeActions(t *testing.T) {
 	}
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
-			config.CurrentConfig().SetSnykOSSQuickFixCodeActionsEnabled(true)
-			config.CurrentConfig().SetSnykOpenBrowserActionsEnabled(test.openBrowserEnabled)
+			c.SetSnykOSSQuickFixCodeActionsEnabled(true)
+			c.SetSnykOpenBrowserActionsEnabled(test.openBrowserEnabled)
 
 			sampleOssIssue := sampleIssue()
 			scanner := CLIScanner{
 				learnService: getLearnMock(t),
 			}
 			sampleOssIssue.PackageManager = test.packageManager
 			sampleOssIssue.UpgradePath = []any{"false", test.packageName}
+			contentRoot := types.FilePath("/path/to/issue")
 
-			issue := toIssue("testPath", sampleOssIssue, &scanResult{}, nonEmptyNode(), scanner.learnService, scanner.errorReporter)
+			issue := toIssue(c, contentRoot, "testPath", sampleOssIssue, &scanResult{}, nonEmptyNode(), scanner.learnService, scanner.errorReporter)
 
 			assert.Equal(t, sampleOssIssue.Id, issue.ID)
 			assert.Equal(t, flashy+test.expectedUpgrade, issue.CodeActions[0].GetTitle())
 			assert.Equal(t, 1, len(issue.CodelensCommands))
+			assert.Equal(t, contentRoot, issue.ContentRoot)
 			assert.Equal(t, flashy+test.expectedUpgrade, issue.CodelensCommands[0].Title)
 
 			if test.openBrowserEnabled {
@@ -168,16 +173,21 @@ func Test_toIssue_CodeActions(t *testing.T) {
 }
 
 func Test_toIssue_CodeActions_WithoutFix(t *testing.T) {
+	c := testutil.UnitTest(t)
+	c.SetSnykOpenBrowserActionsEnabled(true)
+
 	sampleOssIssue := sampleIssue()
 	scanner := CLIScanner{
 		learnService: getLearnMock(t),
 	}
 	sampleOssIssue.UpgradePath = []any{"*"}
+	contentRoot := types.FilePath("/path/to/issue")
 
-	issue := toIssue("testPath", sampleOssIssue, &scanResult{}, nonEmptyNode(), scanner.learnService, scanner.errorReporter)
+	issue := toIssue(c, contentRoot, "testPath", sampleOssIssue, &scanResult{}, nonEmptyNode(), scanner.learnService, scanner.errorReporter)
 
 	assert.Equal(t, sampleOssIssue.Id, issue.ID)
 	assert.Equal(t, 2, len(issue.CodeActions))
+	assert.Equal(t, contentRoot, issue.ContentRoot)
 	assert.Equal(t, "Open description of 'THOU SHALL NOT PASS affecting package pkg' in browser (Snyk)",
 		issue.CodeActions[0].GetTitle())
 	assert.Equal(t, "Learn more about THOU SHALL NOT PASS (Snyk)", issue.CodeActions[1].GetTitle())
@@ -434,7 +444,7 @@ func Test_scheduleNewScanWithProductDisabled_NoScanRun(t *testing.T) {
 	c := testutil.UnitTest(t)
 
 	// Arrange
-	config.CurrentConfig().SetSnykOssEnabled(false)
+	c.SetSnykOssEnabled(false)
 	fakeCli := cli.NewTestExecutor()
 	fakeCli.ExecuteDuration = time.Millisecond
 	scanner := NewCLIScanner(c, performance.NewInstrumentor(), error_reporting.NewTestErrorReporter(), fakeCli, getLearnMock(t), notification.NewMockNotifier()).(*CLIScanner)
diff --git a/infrastructure/utils/fingerprint.go b/infrastructure/utils/fingerprint.go
@@ -27,26 +27,27 @@ import (
 )
 
 func CalculateFingerprintFromAdditionalData(issue types.Issue) string {
-	var preHash string
-	var dependencyChainHash string
+	var fingerprint string
+	var dependencyChain string
 	switch additionalData := issue.GetAdditionalData().(type) {
 	case snyk.OssIssueData:
 		// first element is directory name. It should not be considered for the fingerprint
 		if len(additionalData.From) > 1 {
-			dependencyChainHash = normalizeArray(additionalData.From[1:])
+			dependencyChain = normalizeArray(additionalData.From[1:])
 		} else {
-			dependencyChainHash = normalizeArray(additionalData.From)
+			dependencyChain = normalizeArray(additionalData.From)
 		}
 		// Fingerprint for OSS Issues is: name@version@fromArrayHash
-		preHash = fmt.Sprintf("%s|%s|%s|%s", additionalData.PackageName, additionalData.Version, dependencyChainHash, issue.GetRuleID())
+		fingerprint = fmt.Sprintf("%s|%s|%s|%s", additionalData.PackageName, additionalData.Version, dependencyChain, issue.GetRuleID())
 	case snyk.IaCIssueData:
 		// No need to normalize and change order of the array for IaC since order matters
-		preHash = strings.Join(additionalData.Path, "|")
+		dependencyChain = strings.Join(additionalData.Path, "|")
+		fingerprint = fmt.Sprintf("%s|%s", issue.GetRuleID(), dependencyChain)
 	default:
 		return ""
 	}
 
-	hash := sha256.Sum256([]byte(preHash))
+	hash := sha256.Sum256([]byte(fingerprint))
 	return fmt.Sprintf("%x", hash)
 }
 
diff --git a/infrastructure/utils/fingerprint_test.go b/infrastructure/utils/fingerprint_test.go
@@ -74,17 +74,19 @@ func TestCalculateFingerprintFromAdditionalData_OssIssueData(t *testing.T) {
 
 func TestCalculateFingerprintFromAdditionalData_IaCIssueData(t *testing.T) {
 	issue := &snyk.Issue{
+		ID:             "SNYK-CC-K8S-6",
 		AdditionalData: snyk.IaCIssueData{Path: []string{"path1", "path2", "path3"}},
 	}
 
-	expectedHash := sha256.Sum256([]byte("path1|path2|path3"))
+	expectedHash := sha256.Sum256([]byte("SNYK-CC-K8S-6|path1|path2|path3"))
 	assert.Equal(t, fmt.Sprintf("%x", expectedHash), CalculateFingerprintFromAdditionalData(issue))
 
 	// Test with spaces in path
 	issue = &snyk.Issue{
+		ID:             "SNYK-CC-K8S-6",
 		AdditionalData: snyk.IaCIssueData{Path: []string{"path1 with spaces", " path2 with spaces"}},
 	}
-	expectedHash = sha256.Sum256([]byte("path1 with spaces| path2 with spaces"))
+	expectedHash = sha256.Sum256([]byte("SNYK-CC-K8S-6|path1 with spaces| path2 with spaces"))
 	assert.Equal(t, fmt.Sprintf("%x", expectedHash), CalculateFingerprintFromAdditionalData(issue))
 }
 
diff --git a/internal/delta/findings_identifiable.go b/internal/delta/findings_identifiable.go
@@ -34,6 +34,7 @@ type Locatable interface {
 type Pathable interface {
 	Identifiable
 	GetPath() types.FilePath
+	GetContentRoot() types.FilePath
 }
 
 type Identifiable interface {
diff --git a/internal/delta/fuzzy_matcher.go b/internal/delta/fuzzy_matcher.go
diff --git a/internal/delta/fuzzy_matcher_test.go b/internal/delta/fuzzy_matcher_test.go
diff --git a/internal/delta/mock_identifiable.go b/internal/delta/mock_identifiable.go

Original file line number	Diff line number	Diff line change
`@@ -365,10 +365,11 @@ func (c Config) CliSettings() CliSettings {`
`365`	`365`	`}`
`366`	`366`
`367`	`367`	`func (c *Config) Format() string {`
`368`		`- c.m.Lock()`
`369`		`- defer c.m.Unlock()`
	`368`	`+ c.m.RLock()`
	`369`	`+ defer c.m.RUnlock()`
`370`	`370`	`return c.format`
`371`	`371`	`}`
	`372`	`+`
`372`	`373`	`func (c *Config) CLIDownloadLockFileName() (string, error) {`
`373`	`374`	`c.cliSettings.cliPathAccessMutex.Lock()`
`374`	`375`	`defer c.cliSettings.cliPathAccessMutex.Unlock()`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ import (`
`36`	`36`
`37`	`37`	`const (`
`38`	`38`	`CacheFolder = "snyk"`
`39`		`- SchemaVersion = "v1"`
	`39`	`+ SchemaVersion = "v1_1"`
`40`	`40`	`)`
`41`	`41`
`42`	`42`	`var (`
Original file line number	Diff line number	Diff line change
`@@ -302,7 +302,7 @@ func (iac *Scanner) retrieveAnalysis(scanResult iacScanResult, workspacePath typ`
`302`	`302`	`issue.LineNumber = 0`
`303`	`303`	`}`
`304`	`304`
`305`		`- i, err := iac.toIssue(types.FilePath(targetFile), issue, fileContentString)`
	`305`	`+ i, err := iac.toIssue(workspacePath, types.FilePath(targetFile), issue, fileContentString)`
`306`	`306`	`if err != nil {`
`307`	`307`	`return nil, pkgerrors.Wrap(err, "unable to convert IaC issue to Snyk issue")`
`308`	`308`	`}`
`@@ -332,7 +332,7 @@ func (iac *Scanner) getExtendedMessage(issue iacIssue) string {`
`332`	`332`	`)`
`333`	`333`	`}`
`334`	`334`
`335`		`-func (iac Scanner) toIssue(affectedFilePath types.FilePath, issue iacIssue, fileContent string) (snyk.Issue, error) {`
	`335`	`+func (iac Scanner) toIssue(workspacePath types.FilePath, affectedFilePath types.FilePath, issue iacIssue, fileContent string) (snyk.Issue, error) {`
`336`	`336`	`const defaultRangeStart = 0`
`337`	`337`	`const defaultRangeEnd = 80`
`338`	`338`	`title := issue.IacDescription.Issue`
`@@ -377,6 +377,7 @@ func (iac *Scanner) toIssue(affectedFilePath types.FilePath, issue iacIssue, fil`
`377`	`377`	`Message: title,`
`378`	`378`	`FormattedMessage: iac.getExtendedMessage(issue),`
`379`	`379`	`Severity: iac.toIssueSeverity(issue.Severity),`
	`380`	`+ ContentRoot: workspacePath,`
`380`	`381`	`AffectedFilePath: affectedFilePath,`
`381`	`382`	`Product: product.ProductInfrastructureAsCode,`
`382`	`383`	`IssueDescriptionURL: issueURL,`