add all warnings and error to json if out-format=json

Author: jirfag

pkg/commands/executor.go

@@ -3,6 +3,7 @@ package commands
 import (
 	"github.com/golangci/golangci-lint/pkg/config"
 	"github.com/golangci/golangci-lint/pkg/logutils"
+	"github.com/golangci/golangci-lint/pkg/report"
 	"github.com/spf13/cobra"
 )
 
@@ -16,6 +17,8 @@ type Executor struct {
 	version, commit, date string
 
 	log logutils.Log
+
+	reportData report.Data
 }
 
 func NewExecutor(version, commit, date string) *Executor {
@@ -24,9 +27,10 @@ func NewExecutor(version, commit, date string) *Executor {
 		version: version,
 		commit:  commit,
 		date:    date,
-		log:     logutils.NewStderrLog(""),
 	}
 
+	e.log = report.NewLogWrapper(logutils.NewStderrLog(""), &e.reportData)
+
 	e.initRoot()
 	e.initRun()
 	e.initLinters()

pkg/commands/run.go

@@ -211,6 +211,17 @@ func (e *Executor) runAnalysis(ctx context.Context, args []string) (<-chan resul
 		return nil, err
 	}
 
+	for _, lc := range lintersdb.GetAllSupportedLinterConfigs() {
+		isEnabled := false
+		for _, linter := range linters {
+			if linter.Linter.Name() == lc.Linter.Name() {
+				isEnabled = true
+				break
+			}
+		}
+		e.reportData.AddLinter(lc.Linter.Name(), isEnabled, lc.EnabledByDefault)
+	}
+
 	lintCtx, err := lint.LoadContext(ctx, linters, e.cfg, e.log.Child("load"))
 	if err != nil {
 		return nil, err
@@ -251,11 +262,30 @@ func (e *Executor) runAndPrint(ctx context.Context, args []string) error {
 		return err
 	}
 
+	p, err := e.createPrinter()
+	if err != nil {
+		return err
+	}
+
+	gotAnyIssues, err := p.Print(ctx, issues)
+	if err != nil {
+		return fmt.Errorf("can't print %d issues: %s", len(issues), err)
+	}
+
+	if gotAnyIssues {
+		e.exitCode = e.cfg.Run.ExitCodeIfIssuesFound
+		return nil
+	}
+
+	return nil
+}
+
+func (e *Executor) createPrinter() (printers.Printer, error) {
 	var p printers.Printer
 	format := e.cfg.Output.Format
 	switch format {
 	case config.OutFormatJSON:
-		p = printers.NewJSON()
+		p = printers.NewJSON(&e.reportData)
 	case config.OutFormatColoredLineNumber, config.OutFormatLineNumber:
 		p = printers.NewText(e.cfg.Output.PrintIssuedLine,
 			format == config.OutFormatColoredLineNumber, e.cfg.Output.PrintLinterName, e.cfg.Run.Silent,
@@ -266,20 +296,10 @@ func (e *Executor) runAndPrint(ctx context.Context, args []string) error {
 	case config.OutFormatCheckstyle:
 		p = printers.NewCheckstyle()
 	default:
-		return fmt.Errorf("unknown output format %s", format)
+		return nil, fmt.Errorf("unknown output format %s", format)
 	}
 
-	gotAnyIssues, err := p.Print(ctx, issues)
-	if err != nil {
-		return fmt.Errorf("can't print %d issues: %s", len(issues), err)
-	}
-
-	if gotAnyIssues {
-		e.exitCode = e.cfg.Run.ExitCodeIfIssuesFound
-		return nil
-	}
-
-	return nil
+	return p, nil
 }
 
 func (e *Executor) executeRun(cmd *cobra.Command, args []string) {

pkg/logutils/stderr_log.go

@@ -93,7 +93,7 @@ func (sl StderrLog) Debugf(format string, args ...interface{}) {
 func (sl StderrLog) Child(name string) Log {
 	prefix := ""
 	if sl.name != "" {
-		prefix = sl.name + ":"
+		prefix = sl.name + "/"
 	}
 
 	child := sl

pkg/printers/json.go

@@ -6,27 +6,34 @@ import (
 	"fmt"
 
 	"github.com/golangci/golangci-lint/pkg/logutils"
+	"github.com/golangci/golangci-lint/pkg/report"
 	"github.com/golangci/golangci-lint/pkg/result"
 )
 
-type JSON struct{}
+type JSON struct {
+	rd *report.Data
+}
 
-func NewJSON() *JSON {
-	return &JSON{}
+func NewJSON(rd *report.Data) *JSON {
+	return &JSON{
+		rd: rd,
+	}
 }
 
 type JSONResult struct {
 	Issues []result.Issue
+	Report *report.Data
 }
 
-func (JSON) Print(ctx context.Context, issues <-chan result.Issue) (bool, error) {
+func (p JSON) Print(ctx context.Context, issues <-chan result.Issue) (bool, error) {
 	allIssues := []result.Issue{}
 	for i := range issues {
 		allIssues = append(allIssues, i)
 	}
 
 	res := JSONResult{
 		Issues: allIssues,
+		Report: p.rd,
 	}
 
 	outputJSON, err := json.Marshal(res)

pkg/report/data.go

@@ -0,0 +1,26 @@
+package report
+
+type Warning struct {
+	Tag  string `json:",omitempty"`
+	Text string
+}
+
+type LinterData struct {
+	Name             string
+	Enabled          bool `json:",omitempty"`
+	EnabledByDefault bool `json:",omitempty"`
+}
+
+type Data struct {
+	Warnings []Warning    `json:",omitempty"`
+	Linters  []LinterData `json:",omitempty"`
+	Error    string       `json:",omitempty"`
+}
+
+func (d *Data) AddLinter(name string, enabled, enabledByDefault bool) {
+	d.Linters = append(d.Linters, LinterData{
+		Name:             name,
+		Enabled:          enabled,
+		EnabledByDefault: enabledByDefault,
+	})
+}

pkg/report/log.go

@@ -0,0 +1,60 @@
+package report
+
+import (
+	"fmt"
+	"strings"
+
+	"github.com/golangci/golangci-lint/pkg/logutils"
+)
+
+type LogWrapper struct {
+	rd      *Data
+	tags    []string
+	origLog logutils.Log
+}
+
+func NewLogWrapper(log logutils.Log, reportData *Data) *LogWrapper {
+	return &LogWrapper{
+		rd:      reportData,
+		origLog: log,
+	}
+}
+
+func (lw LogWrapper) Fatalf(format string, args ...interface{}) {
+	lw.origLog.Fatalf(format, args...)
+}
+
+func (lw LogWrapper) Errorf(format string, args ...interface{}) {
+	lw.origLog.Errorf(format, args...)
+	lw.rd.Error = fmt.Sprintf(format, args...)
+}
+
+func (lw LogWrapper) Warnf(format string, args ...interface{}) {
+	lw.origLog.Warnf(format, args...)
+	w := Warning{
+		Tag:  strings.Join(lw.tags, "/"),
+		Text: fmt.Sprintf(format, args...),
+	}
+
+	lw.rd.Warnings = append(lw.rd.Warnings, w)
+}
+
+func (lw LogWrapper) Infof(format string, args ...interface{}) {
+	lw.origLog.Infof(format, args...)
+}
+
+func (lw LogWrapper) Child(name string) logutils.Log {
+	c := lw
+	c.origLog = lw.origLog.Child(name)
+	c.tags = append([]string{}, lw.tags...)
+	c.tags = append(c.tags, name)
+	return c
+}
+
+func (lw LogWrapper) SetLevel(level logutils.LogLevel) {
+	lw.origLog.SetLevel(level)
+}
+
+func (lw LogWrapper) GoString() string {
+	return fmt.Sprintf("lw: %+v, orig log: %#v", lw, lw.origLog)
+}