Skip to content

Commit e77c3aa

Browse files
baerwangbaerwang
authored
ci: actions changed golangci lint (#650)
1 parent b39ccaa commit e77c3aa

File tree

15 files changed

+71
-61
lines changed

15 files changed

+71
-61
lines changed

‎.github/actions/review-dog

Submodule review-dog deleted from c9fac88

‎.github/workflows/reviewdog.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
# under the License.
1818
#
1919
name: reviewdog
20-
on: [pull_request]
20+
on: [ pull_request ]
2121
jobs:
2222
golangci-lint:
2323
name: review
@@ -28,7 +28,8 @@ jobs:
2828
with:
2929
persist-credentials: false
3030
submodules: true
31+
3132
- name: golangci-lint
32-
uses: ./.github/actions/review-dog
33+
uses: golangci/golangci-lint-action@v6
3334
with:
34-
golangci_lint_flags: "--timeout=10m"
35+
args: --timeout=10m

‎configcenter/load.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ type (
5151
Remote bool
5252
DataId string
5353
Group string
54-
path string
55-
parser string
54+
path string // nolint:unused
55+
parser string // nolint:unused
5656
}
5757
)
5858

‎pkg/adapter/dubboregistry/registry/zookeeper/application_service_listener.go

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,10 @@ func (asl *applicationServiceListener) WatchAndHandle() {
8787
return
8888
}
8989
if failTimes > MaxFailTimes {
90-
logger.Errorf("Error happens on (path{%s}) exceed max fail times: %v,so exit listen",
91-
asl.servicePath, MaxFailTimes)
90+
logger.Errorf(
91+
"Error happens on (path{%s}) exceed max fail times: %v,so exit listen",
92+
asl.servicePath, MaxFailTimes,
93+
)
9294
return
9395
}
9496
delayTimer.Reset(ConnDelay * time.Duration(failTimes))
@@ -113,8 +115,10 @@ func (asl *applicationServiceListener) waitEventAndHandlePeriod(children []strin
113115
case <-ticker.C:
114116
asl.handleEvent(children)
115117
case zkEvent := <-e:
116-
logger.Warnf("get a zookeeper e{type:%s, server:%s, path:%s, state:%d-%s, err:%s}",
117-
zkEvent.Type.String(), zkEvent.Server, zkEvent.Path, zkEvent.State, zookeeper.StateToString(zkEvent.State), zkEvent.Err)
118+
logger.Warnf(
119+
"get a zookeeper e{type:%s, server:%s, path:%s, state:%d-%s, err:%s}",
120+
zkEvent.Type.String(), zkEvent.Server, zkEvent.Path, zkEvent.State, zookeeper.StateToString(zkEvent.State), zkEvent.Err,
121+
)
118122
if zkEvent.Type != zk.EventNodeChildrenChanged {
119123
return true
120124
}
@@ -169,7 +173,7 @@ func (asl *applicationServiceListener) handleEvent(children []string) {
169173
MapTo: "opt.types",
170174
},
171175
}
172-
if methods != nil && len(methods) != 0 {
176+
if len(methods) != 0 {
173177
for i := range methods {
174178
api := registry.CreateAPIConfig(apiPattern, location, bkConfig, methods[i], mappingParams)
175179
if err := asl.adapterListener.OnAddAPI(api); err != nil {
@@ -211,7 +215,7 @@ func (asl *applicationServiceListener) getUrls(path string) []*dubboCommon.URL {
211215
return nil
212216
}
213217
instance.SetServiceMetadata(metadataInfo)
214-
urls := make([]*dubboCommon.URL, 0)
218+
urls := make([]*dubboCommon.URL, 0, len(metadataInfo.Services))
215219
for _, service := range metadataInfo.Services {
216220
urls = append(urls, instance.ToURLs(service)...)
217221
}
@@ -247,8 +251,6 @@ func toZookeeperInstance(cris *curator_discovery.ServiceInstance) dr.ServiceInst
247251

248252
// getMethods return the methods of a service
249253
func (asl *applicationServiceListener) getMethods(in string) ([]string, error) {
250-
methods := []string{}
251-
252254
path := strings.Join([]string{methodsRootPath, in}, constant.PathSlash)
253255
data, err := asl.client.GetContent(path)
254256
if err != nil {
@@ -261,8 +263,9 @@ func (asl *applicationServiceListener) getMethods(in string) ([]string, error) {
261263
return nil, err
262264
}
263265

264-
for _, m := range sd.Methods {
265-
methods = append(methods, m.Name)
266+
methods := make([]string, len(sd.Methods))
267+
for i := range sd.Methods {
268+
methods[i] = sd.Methods[i].Name
266269
}
267270
return methods, nil
268271
}

‎pkg/adapter/dubboregistry/remoting/zookeeper/client.go

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ var (
4444
// Options defines the client option.
4545
type Options struct {
4646
zkName string
47-
ts *zk.TestCluster
47+
ts *zk.TestCluster // nolint:unused
4848
}
4949

5050
// Option defines the function to load the options
@@ -158,8 +158,10 @@ func (z *ZooKeeperClient) HandleZkEvent(s <-chan zk.Event) {
158158
case <-z.exit:
159159
return
160160
case event = <-s:
161-
logger.Infof("client{%s} get a zookeeper event{type:%s, server:%s, path:%s, state:%d-%s, err:%v}",
162-
z.name, event.Type, event.Server, event.Path, event.State, StateToString(event.State), event.Err)
161+
logger.Infof(
162+
"client{%s} get a zookeeper event{type:%s, server:%s, path:%s, state:%d-%s, err:%v}",
163+
z.name, event.Type, event.Server, event.Path, event.State, StateToString(event.State), event.Err,
164+
)
163165
switch event.State {
164166
case zk.StateDisconnected:
165167
logger.Warnf("zk{addr:%s} state is StateDisconnected, so close the zk client{name:%s}.", z.ZkAddrs, z.name)
@@ -170,8 +172,10 @@ func (z *ZooKeeperClient) HandleZkEvent(s <-chan zk.Event) {
170172
z.eventRegistryLock.RLock()
171173
for path, a := range z.eventRegistry {
172174
if strings.HasPrefix(event.Path, path) {
173-
logger.Infof("send event{state:zk.EventNodeDataChange, Path:%s} notify event to path{%s} related listener",
174-
event.Path, path)
175+
logger.Infof(
176+
"send event{state:zk.EventNodeDataChange, Path:%s} notify event to path{%s} related listener",
177+
event.Path, path,
178+
)
175179
for _, e := range a {
176180
e <- event
177181
}

‎pkg/cmd/gateway.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,6 @@ var (
5757
logFormat string
5858

5959
limitCpus string
60-
61-
// Currently default set to false, wait for up coming support
62-
initFromRemote = false
6360
)
6461

6562
var (
@@ -191,6 +188,7 @@ func initLogWithConfig(boot *model.Bootstrap) {
191188
}
192189
}
193190

191+
// nolint
194192
// initApiConfig return value of the bool is for the judgment of whether is a api meta data error, a kind of silly (?)
195193
func initApiConfig() (*model.Bootstrap, error) {
196194
bootstrap := config.Load(configPath)

‎pkg/common/grpc/manager.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,10 @@ func (gcm *GrpcConnectionManager) response(w stdHttp.ResponseWriter, res *stdHtt
131131
if err != nil {
132132
return err
133133
}
134-
w.Write(bytes)
134+
135+
if _, err = w.Write(bytes); err != nil {
136+
return err
137+
}
135138

136139
for k, vv := range res.Trailer {
137140
k = stdHttp.TrailerPrefix + k

‎pkg/config/api_config.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -454,6 +454,7 @@ func getExtractMethodRegexp() *regexp.Regexp {
454454
return regexp.MustCompile(".+/resources/([^/]+)/method/[^/]+/?$")
455455
}
456456

457+
// nolint
457458
func getCheckRatelimitRegexp() *regexp.Regexp {
458459
return regexp.MustCompile(".+/filter/ratelimit")
459460
}

‎pkg/config/config_load.go

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,7 @@ var (
4444
config *model.Bootstrap
4545
configLoadFunc LoadFunc = LoadYAMLConfig
4646

47-
configCenterType map[string]interface{}
48-
once sync.Once
47+
once sync.Once
4948
)
5049

5150
// LoadFunc ConfigLoadFunc parse a input(usually file path) into a pixiu config
@@ -182,7 +181,7 @@ func GetDiscoveryType(cfg *model.Bootstrap) (err error) {
182181
}
183182

184183
type ConfigManager struct {
185-
path string
184+
path string // nolint:unused
186185
localConfig *model.Bootstrap
187186
remoteConfig *model.Bootstrap
188187
load configcenter.Load
@@ -227,22 +226,28 @@ func (m *ConfigManager) loadRemoteBootConfigs() *model.Bootstrap {
227226
bootstrap := m.localConfig
228227

229228
// load remote
230-
once.Do(func() {
231-
m.load = configcenter.NewConfigLoad(bootstrap)
232-
})
233-
234-
configs, err := m.load.LoadConfigs(bootstrap, func(opt *configcenter.Options) {
235-
opt.Remote = true
236-
})
229+
once.Do(
230+
func() {
231+
m.load = configcenter.NewConfigLoad(bootstrap)
232+
},
233+
)
234+
235+
configs, err := m.load.LoadConfigs(
236+
bootstrap, func(opt *configcenter.Options) {
237+
opt.Remote = true
238+
},
239+
)
237240

238241
if err != nil {
239242
panic(err)
240243
}
241244

242-
err = mergo.Merge(configs, bootstrap, func(c *mergo.Config) {
243-
c.Overwrite = false
244-
c.AppendSlice = false
245-
})
245+
err = mergo.Merge(
246+
configs, bootstrap, func(c *mergo.Config) {
247+
c.Overwrite = false
248+
c.AppendSlice = false
249+
},
250+
)
246251

247252
if err != nil {
248253
panic(err)

‎pkg/config/config_load_test.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ package config
1919

2020
import (
2121
"encoding/json"
22-
"fmt"
2322
"log"
2423
"os"
2524
"testing"
@@ -140,11 +139,9 @@ func TestLoad(t *testing.T) {
140139
conf := Load("conf_test.yaml")
141140
assert.Equal(t, 1, len(conf.StaticResources.Listeners))
142141
assert.Equal(t, 1, len(conf.StaticResources.Clusters))
143-
Adapter(&b)
142+
assert.Nil(t, Adapter(&b))
144143
str1, _ := json.Marshal(conf.StaticResources)
145144
str2, _ := json.Marshal(b.StaticResources)
146-
fmt.Println(string(str1))
147-
fmt.Println(string(str2))
148145
assert.Equal(t, string(str1), string(str2))
149146
}
150147

‎pkg/filter/accesslog/access_log.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,7 @@ func buildAccessLogMsg(c *http.HttpContext, cost time.Duration) string {
149149
return builder.String()
150150
}
151151

152+
// nolint
152153
// converter interface to byte array
153154
func getBytes(key interface{}) ([]byte, error) {
154155
var buf bytes.Buffer

‎pkg/filter/http/grpcproxy/descriptor.go

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -103,12 +103,13 @@ func (dr *Descriptor) initDescriptorSource(cfg *Config) *Descriptor {
103103
}
104104

105105
func (dr *Descriptor) getServerDescriptorSourceCtx(refCtx context.Context, cfg *Config) (DescriptorSource, error) {
106-
var cc *grpc.ClientConn
107-
var err error
108-
gconn := refCtx.Value(ct.ContextKey(GrpcClientConnKey))
109-
switch t := gconn.(type) {
106+
var (
107+
err error
108+
cc *grpc.ClientConn
109+
)
110+
switch t := refCtx.Value(ct.ContextKey(GrpcClientConnKey)).(type) {
110111
case *grpc.ClientConn:
111-
cc = gconn.(*grpc.ClientConn)
112+
cc = t
112113
case nil:
113114
err = errors.New("the descriptor source not found!")
114115
default:
@@ -117,19 +118,16 @@ func (dr *Descriptor) getServerDescriptorSourceCtx(refCtx context.Context, cfg *
117118
return &serverSource{client: grpcreflect.NewClient(refCtx, reflectpb.NewServerReflectionClient(cc))}, err
118119
}
119120

121+
// nolint
120122
func (dr *Descriptor) getServerDescriptorSource(refCtx context.Context, cc *grpc.ClientConn) DescriptorSource {
121123
return &serverSource{client: grpcreflect.NewClient(refCtx, reflectpb.NewServerReflectionClient(cc))}
122124
}
123125

124126
func (dr *Descriptor) getFileDescriptorCompose(ctx context.Context, cfg *Config) (DescriptorSource, error) {
125-
126-
var err error
127-
128127
if dr.fileSource == nil {
129128
dr.initFileDescriptorSource(cfg)
130129
}
131-
132-
return dr.fileSource, err
130+
return dr.fileSource, nil
133131
}
134132

135133
func (dr *Descriptor) initFileDescriptorSource(cfg *Config) *Descriptor {

‎pkg/listener/http/http_listener.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,7 @@ func (ls *HttpListenerService) httpsListener() {
110110
hl := createDefaultHttpWorker(ls)
111111

112112
// user customize http config
113-
var hc *model.HttpConfig
114-
hc = model.MapInStruct(ls.Config)
113+
hc := model.MapInStruct(ls.Config)
115114

116115
mux := http.NewServeMux()
117116
mux.HandleFunc("/", hl.ServeHTTP)
@@ -139,8 +138,7 @@ func (ls *HttpListenerService) httpListener() {
139138
hl := createDefaultHttpWorker(ls)
140139

141140
// user customize http config
142-
var hc *model.HttpConfig
143-
hc = model.MapInStruct(ls.Config)
141+
hc := model.MapInStruct(ls.Config)
144142

145143
mux := http.NewServeMux()
146144
mux.HandleFunc("/", hl.ServeHTTP)

‎pkg/router/route.go

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ import (
3939
// Node defines the single method of the router configured API
4040
type Node struct {
4141
fullPath string
42-
filters []string
42+
filters []string // nolint:unused
4343
method *config.Method
4444
headers map[string]string
4545
}
@@ -134,8 +134,10 @@ func (rt *Route) PutAPI(api router.API) error {
134134
_, _ = rt.tree.Put(key, rn)
135135
return nil
136136
}
137-
return errors.Errorf("Method %s with address %s already exists in path %s",
138-
api.Method.HTTPVerb, lowerCasePath, node.fullPath)
137+
return errors.Errorf(
138+
"Method %s with address %s already exists in path %s",
139+
api.Method.HTTPVerb, lowerCasePath, node.fullPath,
140+
)
139141
}
140142

141143
// PutOrUpdateAPI puts or updates an api into the resource

‎pkg/server/cluster_manager.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ func (cm *ClusterManager) PickEndpoint(clusterName string, policy model.LbPolicy
162162
}
163163

164164
func (cm *ClusterManager) pickOneEndpoint(c *model.ClusterConfig, policy model.LbPolicy) *model.Endpoint {
165-
if c.Endpoints == nil || len(c.Endpoints) == 0 {
165+
if len(c.Endpoints) == 0 {
166166
return nil
167167
}
168168

0 commit comments

Comments
 (0)