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

Commit 6fe8830

Browse files
authored
Enable & fix lint (#60)
* fix: lint fix: lint fix: lint * Enable lint * fix: add curl
1 parent 2bedbed commit 6fe8830

15 files changed

+75
-62
lines changed

.drone.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ steps:
1111
pull: always
1212
image: golang:1.15-alpine
1313
commands:
14-
- apk add --no-cache make git gcc build-base
14+
- apk add --no-cache make git gcc build-base curl
1515
- make clean
1616
- make vet
17-
#- make lint
17+
- make lint
1818
- make test
1919
- make build
2020
settings:

cache/cache_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ func TestCache(t *testing.T) {
1919
})
2020

2121
g.It("Should set and get an item", func() {
22-
Set(c, "foo", "bar")
22+
err := Set(c, "foo", "bar")
23+
g.Assert(err).IsNil()
2324
v, e := Get(c, "foo")
2425
g.Assert(v).Equal("bar")
2526
g.Assert(e == nil).IsTrue()

cache/helper.go

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,10 @@ func GetRepos(c context.Context, user *model.User) ([]*model.Repo, error) {
2626
if err != nil {
2727
return nil, err
2828
}
29-
FromContext(c).Set(key, repos)
29+
err = FromContext(c).Set(key, repos)
30+
if err != nil {
31+
return nil, err
32+
}
3033
return repos, nil
3134
}
3235

@@ -47,7 +50,12 @@ func GetTeams(c context.Context, user *model.User) ([]*model.Team, error) {
4750
if err != nil {
4851
return nil, err
4952
}
50-
FromContext(c).Set(key, teams)
53+
54+
err = FromContext(c).Set(key, teams)
55+
if err != nil {
56+
return nil, err
57+
}
58+
5159
return teams, nil
5260
}
5361

@@ -70,7 +78,10 @@ func GetPerm(c context.Context, user *model.User, owner, name string) (*model.Pe
7078
if err != nil {
7179
return nil, err
7280
}
73-
FromContext(c).Set(key, perm)
81+
err = FromContext(c).Set(key, perm)
82+
if err != nil {
83+
return nil, err
84+
}
7485
return perm, nil
7586
}
7687

@@ -90,6 +101,10 @@ func GetMembers(c context.Context, user *model.User, team string) ([]*model.Memb
90101
if err != nil {
91102
return nil, err
92103
}
93-
FromContext(c).Set(key, members)
104+
err = FromContext(c).Set(key, members)
105+
if err != nil {
106+
return nil, err
107+
}
108+
94109
return members, nil
95110
}

cache/helper_test.go

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77

88
"github.com/go-gitea/lgtm/model"
99
"github.com/go-gitea/lgtm/remote"
10-
"github.com/go-gitea/lgtm/remote/mock"
10+
mocks "github.com/go-gitea/lgtm/remote/mock"
1111

1212
"github.com/franela/goblin"
1313
"github.com/gin-gonic/gin"
@@ -44,7 +44,8 @@ func TestHelper(t *testing.T) {
4444
fakeRepo.Name,
4545
)
4646

47-
Set(c, key, fakePerm)
47+
err := Set(c, key, fakePerm)
48+
g.Assert(err).IsNil()
4849
r.On("GetPerm", c, fakeUser, fakeRepo.Owner, fakeRepo.Name).Return(nil, errFake).Once()
4950
p, err := GetPerm(c, fakeUser, fakeRepo.Owner, fakeRepo.Name)
5051
g.Assert(p).Equal(fakePerm)
@@ -71,7 +72,8 @@ func TestHelper(t *testing.T) {
7172
fakeUser.Login,
7273
)
7374

74-
Set(c, key, fakeRepos)
75+
err := Set(c, key, fakeRepos)
76+
g.Assert(err).IsNil()
7577
r.On("GetRepos", c, fakeUser).Return(nil, errFake).Once()
7678
p, err := GetRepos(c, fakeUser)
7779
g.Assert(p).Equal(fakeRepos)
@@ -97,7 +99,8 @@ func TestHelper(t *testing.T) {
9799
fakeUser.Login,
98100
)
99101

100-
Set(c, key, fakeTeams)
102+
err := Set(c, key, fakeTeams)
103+
g.Assert(err).IsNil()
101104
r.On("GetTeams", c, fakeUser).Return(nil, errFake).Once()
102105
p, err := GetTeams(c, fakeUser)
103106
g.Assert(p).Equal(fakeTeams)
@@ -121,7 +124,8 @@ func TestHelper(t *testing.T) {
121124
g.It("Should get members", func() {
122125
key := "members:drone"
123126

124-
Set(c, key, fakeMembers)
127+
err := Set(c, key, fakeMembers)
128+
g.Assert(err).IsNil()
125129
r.On("GetMembers", c, fakeUser, "drone").Return(nil, errFake).Once()
126130
p, err := GetMembers(c, fakeUser, "drone")
127131
g.Assert(p).Equal(fakeMembers)

model/config.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@ func ParseConfigStr(data string) (*Config, error) {
4747
if len(c.Team) == 0 {
4848
c.Team = *team
4949
}
50-
if c.SelfApprovalOff == false {
50+
if !c.SelfApprovalOff {
5151
c.SelfApprovalOff = *selfApprovalOff
5252
}
53-
if c.IgnoreMaintainersFile == false {
53+
if !c.IgnoreMaintainersFile {
5454
c.IgnoreMaintainersFile = *ignoreMaintainersFile
5555
}
5656

model/maintainer.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,11 +146,11 @@ func parseln(s string) string {
146146

147147
// regular expression determines if a line in the maintainers
148148
// file only has the single GitHub username and no other metadata.
149-
var reLogin = regexp.MustCompile("^\\w[\\w-]+$")
149+
var reLogin = regexp.MustCompile(`^\w[\w-]+$`)
150150

151151
// regular expression determines if a line in the maintainers
152152
// file has the username and metadata.
153-
var reLoginMeta = regexp.MustCompile("(.+) <(.+)> \\(@(.+)\\)")
153+
var reLoginMeta = regexp.MustCompile(`(.+) <(.+)> \(@(.+)\)`)
154154

155155
// regular expression determines if a line in the maintainers
156156
// file has the username and email.

model/util.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,10 @@ func Rand() string {
1919
maxrb := byte(256 - (256 % len(chars)))
2020
i := 0
2121
for {
22-
io.ReadFull(rand.Reader, r)
22+
_, err := io.ReadFull(rand.Reader, r)
23+
if err != nil {
24+
return ""
25+
}
2326
for _, c := range r {
2427
if c >= maxrb {
2528
// Skip this number to avoid modulo bias.

remote/github/client.go

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,11 @@ import (
99
"net/http"
1010
"net/url"
1111

12+
"golang.org/x/net/context"
1213
"golang.org/x/oauth2"
1314
)
1415

1516
const (
16-
pathLogin = "%slogin?access_token=%s"
17-
pathUser = "%sapi/user"
18-
pathRepos = "%sapi/user/repos"
19-
pathRepo = "%sapi/repos/%s"
20-
pathConf = "%sapi/repos/%s/maintainers"
2117
pathBranch = "%srepos/%s/%s/branches/%s/protection"
2218

2319
// protected branch
@@ -39,7 +35,7 @@ func NewClient(uri string) *Client {
3935
// authenticates all outbound requests with the given token.
4036
func NewClientToken(uri, token string) *Client {
4137
config := new(oauth2.Config)
42-
auther := config.Client(oauth2.NoContext, &oauth2.Token{AccessToken: token})
38+
auther := config.Client(context.TODO(), &oauth2.Token{AccessToken: token})
4339
return &Client{auther, uri}
4440
}
4541

@@ -79,11 +75,6 @@ func (c *Client) get(rawurl string, out interface{}) error {
7975
return c.do(rawurl, "GET", nil, out)
8076
}
8177

82-
// helper function for making an http POST request.
83-
func (c *Client) post(rawurl string, in, out interface{}) error {
84-
return c.do(rawurl, "POST", in, out)
85-
}
86-
8778
// helper function for making an http PUT request.
8879
func (c *Client) put(rawurl string, in, out interface{}) error {
8980
return c.do(rawurl, "PUT", in, out)
@@ -94,11 +85,6 @@ func (c *Client) patch(rawurl string, in, out interface{}) error {
9485
return c.do(rawurl, "PATCH", in, out)
9586
}
9687

97-
// helper function for making an http DELETE request.
98-
func (c *Client) delete(rawurl string) error {
99-
return c.do(rawurl, "DELETE", nil, nil)
100-
}
101-
10288
// helper function to make an http request
10389
func (c *Client) do(rawurl, method string, in, out interface{}) error {
10490
// executes the http request and returns the body as

remote/github/github.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ func (g *Github) GetUser(c context.Context, res http.ResponseWriter, req *http.R
5050
}
5151

5252
// exchanges the oauth2 code for an access token
53-
token, err := config.Exchange(oauth2.NoContext, code)
53+
token, err := config.Exchange(context.TODO(), code)
5454
if err != nil {
5555
return nil, fmt.Errorf("Error exchanging token. %s", err)
5656
}
@@ -226,7 +226,10 @@ func (g *Github) SetHook(c context.Context, user *model.User, repo *model.Repo,
226226

227227
old, err := GetHook(c, client, repo.Owner, repo.Name, link)
228228
if err == nil && old != nil {
229-
client.Repositories.DeleteHook(c, repo.Owner, repo.Name, *old.ID)
229+
_, err = client.Repositories.DeleteHook(c, repo.Owner, repo.Name, *old.ID)
230+
if err != nil {
231+
return err
232+
}
230233
}
231234

232235
_, err = CreateHook(c, client, repo.Owner, repo.Name, link)

remote/github/utils.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
func setupClient(rawurl, accessToken string) *github.Client {
1313
token := oauth2.Token{AccessToken: accessToken}
1414
source := oauth2.StaticTokenSource(&token)
15-
client := oauth2.NewClient(oauth2.NoContext, source)
15+
client := oauth2.NewClient(context.TODO(), source)
1616
github := github.NewClient(client)
1717
github.BaseURL, _ = url.Parse(rawurl)
1818
return github

store/datastore/repos.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ func toList(items []string) (string, []interface{}) {
5454
size = 990
5555
items = items[:990]
5656
}
57-
var qs = make([]string, size, size)
58-
var in = make([]interface{}, size, size)
57+
var qs = make([]string, size)
58+
var in = make([]interface{}, size)
5959
for i, item := range items {
6060
qs[i] = "?"
6161
in[i] = item

store/datastore/repos_test.go

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,10 @@ func Test_repostore(t *testing.T) {
1818
// before each test be sure to purge the package
1919
// table data from the database.
2020
g.BeforeEach(func() {
21-
db.Exec("DELETE FROM repos")
22-
db.Exec("DELETE FROM users")
21+
_, err := db.Exec("DELETE FROM repos")
22+
g.Assert(err).IsNil()
23+
_, err = db.Exec("DELETE FROM users")
24+
g.Assert(err).IsNil()
2325
})
2426

2527
g.It("Should Set a Repo", func() {
@@ -59,7 +61,8 @@ func Test_repostore(t *testing.T) {
5961
Link: "https://github.com/octocat/hello-world",
6062
Private: true,
6163
}
62-
s.CreateRepo(&repo)
64+
err := s.CreateRepo(&repo)
65+
g.Assert(err).IsNil()
6366
getrepo, err := s.GetRepo(repo.ID)
6467
g.Assert(err == nil).IsTrue()
6568
g.Assert(repo.ID).Equal(getrepo.ID)
@@ -77,7 +80,8 @@ func Test_repostore(t *testing.T) {
7780
Owner: "bradrydzewski",
7881
Name: "drone",
7982
}
80-
s.CreateRepo(&repo)
83+
err := s.CreateRepo(&repo)
84+
g.Assert(err).IsNil()
8185
getrepo, err := s.GetRepoSlug(repo.Slug)
8286
g.Assert(err == nil).IsTrue()
8387
g.Assert(repo.ID).Equal(getrepo.ID)
@@ -105,9 +109,12 @@ func Test_repostore(t *testing.T) {
105109
Name: "hello-world",
106110
Slug: "octocat/hello-world",
107111
}
108-
s.CreateRepo(repo1)
109-
s.CreateRepo(repo2)
110-
s.CreateRepo(repo3)
112+
err := s.CreateRepo(repo1)
113+
g.Assert(err).IsNil()
114+
err = s.CreateRepo(repo2)
115+
g.Assert(err).IsNil()
116+
err = s.CreateRepo(repo3)
117+
g.Assert(err).IsNil()
111118

112119
repos, err := s.GetRepoMulti("octocat/fork-knife", "octocat/hello-world")
113120
g.Assert(err == nil).IsTrue()
@@ -123,7 +130,8 @@ func Test_repostore(t *testing.T) {
123130
Owner: "bradrydzewski",
124131
Name: "drone",
125132
}
126-
s.CreateRepo(&repo)
133+
err := s.CreateRepo(&repo)
134+
g.Assert(err).IsNil()
127135
_, err1 := s.GetRepo(repo.ID)
128136
err2 := s.DeleteRepo(&repo)
129137
_, err3 := s.GetRepo(repo.ID)

store/datastore/users.go

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -40,17 +40,6 @@ WHERE user_login = ?
4040
LIMIT 1
4141
`
4242

43-
const userListQuery = `
44-
SELECT *
45-
FROM users
46-
ORDER BY user_login ASC
47-
`
48-
49-
const userCountQuery = `
50-
SELECT count(1)
51-
FROM users
52-
`
53-
5443
const userDeleteStmt = `
5544
DELETE FROM users
5645
WHERE user_id = ?

store/datastore/users_test.go

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ func Test_userstore(t *testing.T) {
1818
// before each test be sure to purge the package
1919
// table data from the database.
2020
g.BeforeEach(func() {
21-
db.Exec("DELETE FROM users")
21+
_, err := db.Exec("DELETE FROM users")
22+
g.Assert(err).IsNil()
2223
})
2324

2425
g.It("Should Update a User", func() {
@@ -56,7 +57,8 @@ func Test_userstore(t *testing.T) {
5657
Avatar: "b9015b0857e16ac4d94a0ffd9a0b79c8",
5758
}
5859

59-
s.CreateUser(&user)
60+
err := s.CreateUser(&user)
61+
g.Assert(err).IsNil()
6062
getuser, err := s.GetUser(user.ID)
6163
g.Assert(err == nil).IsTrue()
6264
g.Assert(user.ID).Equal(getuser.ID)
@@ -73,7 +75,8 @@ func Test_userstore(t *testing.T) {
7375
7476
Token: "e42080dddf012c718e476da161d21ad5",
7577
}
76-
s.CreateUser(&user)
78+
err := s.CreateUser(&user)
79+
g.Assert(err).IsNil()
7780
getuser, err := s.GetUserLogin(user.Login)
7881
g.Assert(err == nil).IsTrue()
7982
g.Assert(user.ID).Equal(getuser.ID)
@@ -103,7 +106,8 @@ func Test_userstore(t *testing.T) {
103106
104107
Token: "e42080dddf012c718e476da161d21ad5",
105108
}
106-
s.CreateUser(&user)
109+
err := s.CreateUser(&user)
110+
g.Assert(err).IsNil()
107111
_, err1 := s.GetUser(user.ID)
108112
err2 := s.DeleteUser(&user)
109113
_, err3 := s.GetUser(user.ID)

web/login.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ func LoginToken(c *gin.Context) {
103103
token := token.New(token.UserToken, user.Login)
104104
tokenstr, err := token.SignExpires(user.Secret, exp)
105105
if err != nil {
106-
c.AbortWithError(http.StatusInternalServerError, err)
106+
c.AbortWithError(http.StatusInternalServerError, err) // nolint: errcheck
107107
return
108108
}
109109
c.IndentedJSON(http.StatusOK, &tokenPayload{

0 commit comments

Comments
 (0)