Skip to content
This repository was archived by the owner on Jun 2, 2023. It is now read-only.

Commit 949f89f

Browse files
committed
support GitHub Suggested Changes
1 parent 4ef5aeb commit 949f89f

32 files changed

+477
-183
lines changed

.golangci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@ linters:
3131
# golangci.com configuration
3232
# https://github.com/golangci/golangci/wiki/Configuration
3333
service:
34-
golangci-lint-version: 1.13.x # use fixed version to not introduce new linters unexpectedly
34+
golangci-lint-version: 1.15.x # use fixed version to not introduce new linters unexpectedly

README.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,17 @@ echo "create database api_prod;" | docker-compose exec -T pg psql -Upostgres
1717
```
1818
It runs postgres and redis needed for both api and worker.
1919

20-
### How to run worker
20+
### How to run
2121
```bash
22-
make run_dev
22+
make run_api
23+
make run_worker
2324
```
2425

2526
### Configuration
2627
Configurate via `.env` file. Dev `.env` may be like this:
2728
```
2829
WEB_ROOT="https://dev.golangci.com"
29-
API_URL="https://api.golangci.com"
30+
API_URL="https://api.dev.golangci.com"
3031
GITHUB_CALLBACK_HOST=https://api.dev.golangci.com
3132
DATABASE_URL="postgresql://postgres:test@localhost:5432/api_prod?sslmode=disable"
3233
REDIS_URL="redis://127.0.0.1:6379"

go.mod

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ require (
1111
github.com/aws/aws-sdk-go v0.0.0-20180126231901-00cca3f093a8
1212
github.com/cenkalti/backoff v2.0.0+incompatible
1313
github.com/certifi/gocertifi v0.0.0-20180905225744-ee1a9a0726d2 // indirect
14-
github.com/davecgh/go-spew v1.1.1 // indirect
1514
github.com/denisenkom/go-mssqldb v0.0.0-20181014144952-4e0d7dc8888f // indirect
1615
github.com/docker/distribution v2.6.2+incompatible // indirect
1716
github.com/docker/docker v1.13.1 // indirect
@@ -30,10 +29,9 @@ require (
3029
github.com/go-logfmt/logfmt v0.4.0 // indirect
3130
github.com/go-sql-driver/mysql v1.4.1 // indirect
3231
github.com/go-stack/stack v1.8.0 // indirect
33-
github.com/golang/mock v1.1.1
34-
github.com/golangci/golangci-lint v0.0.0-20181114200623-a84578d603c7
32+
github.com/golang/mock v1.2.0
33+
github.com/golangci/golangci-lint v1.15.0
3534
github.com/gomodule/redigo v2.0.0+incompatible // indirect
36-
github.com/google/go-cmp v0.2.0 // indirect
3735
github.com/google/go-github v0.0.0-20180123235826-b1f138353a62
3836
github.com/google/go-querystring v1.0.0 // indirect
3937
github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e // indirect
@@ -50,7 +48,6 @@ require (
5048
github.com/joho/godotenv v0.0.0-20180115024921-6bb08516677f
5149
github.com/jtolds/gls v4.2.1+incompatible // indirect
5250
github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88 // indirect
53-
github.com/kr/pretty v0.1.0 // indirect
5451
github.com/levigross/grequests v0.0.0-20180717012718-3f841d606c5a
5552
github.com/lib/pq v0.0.0-20180201184707-88edab080323
5653
github.com/markbates/goth v0.0.0-20180113214406-24f8ac10e57e
@@ -82,10 +79,9 @@ require (
8279
github.com/yudai/pp v2.0.1+incompatible // indirect
8380
golang.org/x/oauth2 v0.0.0-20180118004544-b28fcf2b08a1
8481
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f // indirect
85-
golang.org/x/tools v0.0.0-20180831211245-5d4988d199e2
82+
golang.org/x/tools v0.0.0-20190125232054-379209517ffe
8683
google.golang.org/appengine v1.3.0 // indirect
8784
gopkg.in/boj/redistore.v1 v1.0.0-20160128113310-fc113767cd6b
88-
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
8985
gopkg.in/ini.v1 v1.39.0 // indirect
9086
gopkg.in/redsync.v1 v1.0.1
9187
gopkg.in/yaml.v2 v2.2.1

go.sum

Lines changed: 79 additions & 19 deletions
Large diffs are not rendered by default.

pkg/api/models/autogenerated_auth.go

Lines changed: 14 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/api/models/autogenerated_org.go

Lines changed: 17 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/api/models/autogenerated_org_sub.go

Lines changed: 14 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/api/models/autogenerated_payment_gateway_event.go

Lines changed: 14 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/api/models/autogenerated_pull_request_analysis.go

Lines changed: 17 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/api/models/autogenerated_repo.go

Lines changed: 14 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/api/models/autogenerated_repo_analysis.go

Lines changed: 17 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/api/models/autogenerated_repo_analysis_status.go

Lines changed: 14 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/api/models/autogenerated_user.go

Lines changed: 17 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/worker/analyze/linters/golinters/golangci_lint.go

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -98,11 +98,13 @@ func (g GolangciLint) Run(ctx context.Context, sg *logresult.StepGroup, exec exe
9898
var retIssues []result.Issue
9999
for _, i := range res.Issues {
100100
retIssues = append(retIssues, result.Issue{
101-
File: i.FilePath(),
102-
LineNumber: i.Line(),
103-
Text: i.Text,
104-
FromLinter: i.FromLinter,
105-
HunkPos: i.HunkPos,
101+
File: i.FilePath(),
102+
LineNumber: i.Line(),
103+
Text: i.Text,
104+
FromLinter: i.FromLinter,
105+
HunkPos: i.HunkPos,
106+
LineRange: i.LineRange,
107+
Replacement: i.Replacement,
106108
})
107109
step.AddOutputLine("%s:%d: %s (%s)", i.FilePath(), i.Line(), i.Text, i.FromLinter)
108110
}

pkg/worker/analyze/linters/linter_mock.go

Lines changed: 15 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/worker/analyze/linters/result/issue.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,16 @@
11
package result
22

3+
import golangciLintResult "github.com/golangci/golangci-lint/pkg/result"
4+
35
type Issue struct {
46
FromLinter string
57
Text string
68
File string
79
LineNumber int
810
HunkPos int
11+
12+
LineRange *golangciLintResult.Range
13+
Replacement *golangciLintResult.Replacement
914
}
1015

1116
func NewIssue(fromLinter, text, file string, lineNumber, hunkPos int) Issue {

0 commit comments

Comments
 (0)