From 7c61bb6ed1333059810cb3325c5620f5e646957c Mon Sep 17 00:00:00 2001 From: naveensrinivasan <172697+naveensrinivasan@users.noreply.github.com> Date: Fri, 9 Sep 2022 16:12:50 -0500 Subject: [PATCH 1/2] :seedling: Format the JSON output - This helps with this issue https://github.com/ossf/scorecard/issues/2243 Signed-off-by: naveensrinivasan <172697+naveensrinivasan@users.noreply.github.com> --- pkg/json.go | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg/json.go b/pkg/json.go index 0159ea4d024..6765a0f8f77 100644 --- a/pkg/json.go +++ b/pkg/json.go @@ -125,6 +125,7 @@ func (r *ScorecardResult) AsJSON2(showDetails bool, } encoder := json.NewEncoder(writer) + encoder.SetIndent("", " ") out := JSONScorecardResultV2{ Repo: jsonRepoV2{ Name: r.Repo.Name, From e1dd80e88754f4ddcfea808a88d8a0ff9fce14d3 Mon Sep 17 00:00:00 2001 From: naveensrinivasan <172697+naveensrinivasan@users.noreply.github.com> Date: Sat, 15 Oct 2022 15:03:49 -0500 Subject: [PATCH 2/2] Included the JSON formatting for cron Signed-off-by: naveensrinivasan <172697+naveensrinivasan@users.noreply.github.com> --- cron/internal/format/json.go | 1 + cron/internal/format/json_raw_results.go | 1 + pkg/json.go | 1 + 3 files changed, 3 insertions(+) diff --git a/cron/internal/format/json.go b/cron/internal/format/json.go index 8b5a8801a17..71ff04c26b6 100644 --- a/cron/internal/format/json.go +++ b/cron/internal/format/json.go @@ -86,6 +86,7 @@ type jsonScorecardResultV2 struct { // AsJSON exports results as JSON for new detail format. func AsJSON(r *pkg.ScorecardResult, showDetails bool, logLevel log.Level, writer io.Writer) error { encoder := json.NewEncoder(writer) + encoder.SetIndent("", " ") out := jsonScorecardResult{ Repo: r.Repo.Name, diff --git a/cron/internal/format/json_raw_results.go b/cron/internal/format/json_raw_results.go index 41f69659917..d07215f8d4e 100644 --- a/cron/internal/format/json_raw_results.go +++ b/cron/internal/format/json_raw_results.go @@ -265,6 +265,7 @@ func fillJSONRawResults(r *jsonScorecardRawResult, raw *checker.RawResults) erro // AsRawJSON exports results as JSON for raw results. func AsRawJSON(r *pkg.ScorecardResult, writer io.Writer) error { encoder := json.NewEncoder(writer) + encoder.SetIndent("", " ") out := jsonScorecardRawResult{ Repo: jsonRepoV2{ Name: r.Repo.Name, diff --git a/pkg/json.go b/pkg/json.go index 6765a0f8f77..aeb951e389f 100644 --- a/pkg/json.go +++ b/pkg/json.go @@ -86,6 +86,7 @@ type JSONScorecardResultV2 struct { // AsJSON exports results as JSON for new detail format. func (r *ScorecardResult) AsJSON(showDetails bool, logLevel log.Level, writer io.Writer) error { encoder := json.NewEncoder(writer) + encoder.SetIndent("", " ") out := jsonScorecardResult{ Repo: r.Repo.Name,