feat: DGP-498 - add missing legacy JSON output fields to vulnerabilities and license issues:

  - credit
  - fixedin
  - is_malicious
  - semver
  - socialTrendAlert
  - packageManager -- from vuln or license ecosystem based on Build vs. OS discriminator

Top level:
  - set uniqueCount from the test's effective summary

Chore:
  - remove Go's string encoding and HTML escaping before output, for situations like "<=" in Semver.
  - passes a logger into transform.go for early warnings about unexpected fields

Author: bsalomon-snyk

internal/commands/ostest/ostest.go

@@ -51,6 +51,9 @@ const ForceLegacyCLIEnvVar = "SNYK_FORCE_LEGACY_CLI"
 // ApplicationJSONContentType matches the content type for legacy JSON findings records.
 const ApplicationJSONContentType = "application/json"
 
+// LogFieldCount is the logger key for number of findings.
+const LogFieldCount = "count"
+
 // ErrNoSummaryData is returned when a test summary cannot be generated due to lack of data.
 var ErrNoSummaryData = std_errors.New("no summary data to create")
 
@@ -282,14 +285,14 @@ func runTest(
 	if err != nil {
 		logger.Error().Err(err).Msg("Error fetching findings")
 		if !complete && len(findingsData) > 0 {
-			logger.Warn().Int("count", len(findingsData)).Msg("Partial findings retrieved as an error occurred")
+			logger.Warn().Int(LogFieldCount, len(findingsData)).Msg("Partial findings retrieved as an error occurred")
 		}
 	} else {
 		logger.Info().Msgf("Findings count: %d\n", len(findingsData))
 
 		logger.Info().
 			Bool("complete", complete).
-			Int("count", len(findingsData)).
+			Int(LogFieldCount, len(findingsData)).
 			Msg("Findings fetched successfully")
 	}
 
@@ -300,15 +303,28 @@ func runTest(
 		return nil, fmt.Errorf("failed to get current working directory: %w", err)
 	}
 
+	var uniqueCount int32
+	summary := finalResult.GetEffectiveSummary()
+	if summary != nil {
+		if summary.Count > math.MaxInt32 {
+			uniqueCount = math.MaxInt32
+			logger.Warn().Uint32(LogFieldCount, summary.Count).Msg("Unique finding count exceeds int32 max, capping value.")
+		} else {
+			uniqueCount = int32(summary.Count)
+		}
+	}
+
 	legacyJSON, err := transform.ConvertSnykSchemaFindingsToLegacyJSON(
 		&transform.SnykSchemaToLegacyParams{
 			Findings:       findingsData,
 			TestResult:     finalResult,
 			ProjectName:    projectName,
 			PackageManager: packageManager,
 			CurrentDir:     currentDir,
+			UniqueCount:    uniqueCount,
 			DepCount:       depCount,
 			ErrFactory:     errFactory,
+			Logger:         logger,
 		})
 	if err != nil {
 		return nil, fmt.Errorf("error converting snyk schema findings to legacy json: %w", err)