review

Author: ldez

pkg/printers/codeclimate.go

@@ -7,11 +7,6 @@ import (
 	"github.com/golangci/golangci-lint/pkg/result"
 )
 
-const (
-	defaultCheckName           = "golangci-lint"
-	defaultCodeClimateSeverity = "critical"
-)
-
 // CodeClimateIssue is a subset of the Code Climate spec.
 // https://github.com/codeclimate/platform/blob/master/spec/analyzers/SPEC.md#data-types
 // It is just enough to support GitLab CI Code Quality.
@@ -39,30 +34,20 @@ func NewCodeClimate(w io.Writer) *CodeClimate {
 
 func (p CodeClimate) Print(issues []result.Issue) error {
 	codeClimateIssues := make([]CodeClimateIssue, 0, len(issues))
+
 	for i := range issues {
 		issue := &issues[i]
+
 		codeClimateIssue := CodeClimateIssue{}
-		codeClimateIssue.Description = issue.Text
-		codeClimateIssue.CheckName = defaultCheckName
+		codeClimateIssue.Description = issue.Description()
+		codeClimateIssue.CheckName = issue.FromLinter
 		codeClimateIssue.Location.Path = issue.Pos.Filename
 		codeClimateIssue.Location.Lines.Begin = issue.Pos.Line
 		codeClimateIssue.Fingerprint = issue.Fingerprint()
-		codeClimateIssue.Severity = defaultCodeClimateSeverity
-
-		if issue.FromLinter != "" {
-			codeClimateIssue.CheckName = issue.FromLinter
-		}
-
-		if issue.Severity != "" {
-			codeClimateIssue.Severity = issue.Severity
-		}
+		codeClimateIssue.Severity = issue.Severity
 
 		codeClimateIssues = append(codeClimateIssues, codeClimateIssue)
 	}
 
-	err := json.NewEncoder(p.w).Encode(codeClimateIssues)
-	if err != nil {
-		return err
-	}
-	return nil
+	return json.NewEncoder(p.w).Encode(codeClimateIssues)
 }

pkg/printers/codeclimate_test.go

@@ -41,7 +41,8 @@ func TestCodeClimate_Print(t *testing.T) {
 			},
 		},
 		{
-			Text: "issue c",
+			FromLinter: "linter-c",
+			Text:       "issue c",
 			SourceLines: []string{
 				"func foo() {",
 				"\tfmt.Println(\"ccc\")",
@@ -62,7 +63,7 @@ func TestCodeClimate_Print(t *testing.T) {
 	err := printer.Print(issues)
 	require.NoError(t, err)
 
-	expected := `[{"description":"some issue","check_name":"linter-a","severity":"warning","fingerprint":"BA73C5DF4A6FD8462FFF1D3140235777","location":{"path":"path/to/filea.go","lines":{"begin":10}}},{"description":"another issue","check_name":"linter-b","severity":"error","fingerprint":"0777B4FE60242BD8B2E9B7E92C4B9521","location":{"path":"path/to/fileb.go","lines":{"begin":300}}},{"description":"issue c","check_name":"golangci-lint","severity":"critical","fingerprint":"BEE6E9FBB6BFA4B7DB9FB036697FB036","location":{"path":"path/to/filec.go","lines":{"begin":200}}}]
+	expected := `[{"description":"linter-a: some issue","check_name":"linter-a","severity":"warning","fingerprint":"BA73C5DF4A6FD8462FFF1D3140235777","location":{"path":"path/to/filea.go","lines":{"begin":10}}},{"description":"linter-b: another issue","check_name":"linter-b","severity":"error","fingerprint":"0777B4FE60242BD8B2E9B7E92C4B9521","location":{"path":"path/to/fileb.go","lines":{"begin":300}}},{"description":"linter-c: issue c","check_name":"linter-c","severity":"critical","fingerprint":"BEE6E9FBB6BFA4B7DB9FB036697FB036","location":{"path":"path/to/filec.go","lines":{"begin":200}}}]
 `
 
 	assert.Equal(t, expected, buf.String())

pkg/result/issue.go

@@ -81,6 +81,10 @@ func (i *Issue) GetLineRange() Range {
 	return *i.LineRange
 }
 
+func (i *Issue) Description() string {
+	return fmt.Sprintf("%s: %s", i.FromLinter, i.Text)
+}
+
 func (i *Issue) Fingerprint() string {
 	firstLine := ""
 	if len(i.SourceLines) > 0 {