Skip to content

Commit ce20e42

Browse files
committed
fix: fix golangci-lint errors
1 parent e8aaba1 commit ce20e42

3 files changed

Lines changed: 12 additions & 10 deletions

File tree

casdoorsdk/policy.go

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,30 +28,25 @@ type CasbinRule struct {
2828
V3 string `xorm:"varchar(100) index not null default ''"`
2929
V4 string `xorm:"varchar(100) index not null default ''"`
3030
V5 string `xorm:"varchar(100) index not null default ''"`
31-
32-
tableName string `xorm:"-"`
3331
}
3432

3533
func (c *Client) AddPolicy(enforcer *Enforcer, policy *CasbinRule) (bool, error) {
36-
var policies []*CasbinRule
37-
policies = make([]*CasbinRule, 1)
34+
policies := make([]*CasbinRule, 1)
3835
policies[0] = policy
3936
_, affected, err := c.modifyPolicy("add-policy", enforcer, policies, nil)
4037
return affected, err
4138
}
4239

4340
func (c *Client) UpdatePolicy(enforcer *Enforcer, oldpolicy *CasbinRule, newpolicy *CasbinRule) (bool, error) {
44-
var policies []*CasbinRule
45-
policies = make([]*CasbinRule, 2)
41+
policies := make([]*CasbinRule, 2)
4642
policies[0] = oldpolicy
4743
policies[1] = newpolicy
4844
_, affected, err := c.modifyPolicy("update-policy", enforcer, policies, nil)
4945
return affected, err
5046
}
5147

5248
func (c *Client) RemovePolicy(enforcer *Enforcer, policy *CasbinRule) (bool, error) {
53-
var policies []*CasbinRule
54-
policies = make([]*CasbinRule, 1)
49+
policies := make([]*CasbinRule, 1)
5550
policies[0] = policy
5651
_, affected, err := c.modifyPolicy("remove-policy", enforcer, policies, nil)
5752
return affected, err

casdoorsdk/resource_test.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,11 @@ func TestResource(t *testing.T) {
3434
if err != nil {
3535
t.Fatalf("Failed to open the file: %v\n", err)
3636
}
37-
defer file.Close()
37+
defer func() {
38+
if err := file.Close(); err != nil {
39+
t.Errorf("Failed to close the file: %v\n", err)
40+
}
41+
}()
3842
data, err := io.ReadAll(file)
3943
if err != nil {
4044
t.Fatalf("Failed to read data from the file: %v\n", err)

casdoorsdk/util.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ func createFormFile(formData map[string][]byte) (string, io.Reader, error) {
4646

4747
body := new(bytes.Buffer)
4848
w := multipart.NewWriter(body)
49-
defer w.Close()
5049

5150
for k, v := range formData {
5251
pw, err := w.CreateFormFile(k, "file")
@@ -60,6 +59,10 @@ func createFormFile(formData map[string][]byte) (string, io.Reader, error) {
6059
}
6160
}
6261

62+
if err := w.Close(); err != nil {
63+
return "", nil, err
64+
}
65+
6366
return w.FormDataContentType(), body, nil
6467
}
6568

0 commit comments

Comments
 (0)