Skip to content

Commit 90ad169

Browse files
daheigedaheige
authored
feat: update plugin for code style (polarismesh#733)
* feat: update namespace for code style * feat: update plugin for code style.
1 parent ed3d7a0 commit 90ad169

25 files changed

+54
-90
lines changed

‎namespace/namespace.go

+2
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ import (
3131
"github.com/polarismesh/polaris/common/utils"
3232
)
3333

34+
var _ NamespaceOperateServer = (*Server)(nil)
35+
3436
func (s *Server) allowAutoCreate() bool {
3537
return s.cfg.AutoCreate
3638
}

‎plugin/auth.go

+2-4
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,8 @@ import (
2626
"github.com/polarismesh/polaris/common/log"
2727
)
2828

29-
var (
30-
// 插件初始化原子变量
31-
authOnce = &sync.Once{}
32-
)
29+
// 插件初始化原子变量
30+
var authOnce sync.Once
3331

3432
// Auth AUTH插件接口
3533
type Auth interface {

‎plugin/auth/defaultauth/auth.go

+9-17
Original file line numberDiff line numberDiff line change
@@ -65,29 +65,25 @@ func (da *defaultAuth) Allow(platformID, platformToken string) bool {
6565

6666
// CheckPermission 权限检查
6767
func (da *defaultAuth) CheckPermission(reqCtx interface{}, authRule interface{}) (bool, error) {
68-
6968
ctx, ok := reqCtx.(*model.AcquireContext)
7069
if !ok {
7170
return false, ErrorInvalidParameter
7271
}
7372

7473
userId := utils.ParseUserID(ctx.GetRequestContext())
75-
strategies, ok := authRule.([]*model.StrategyDetail)
76-
74+
strategies, _ := authRule.([]*model.StrategyDetail)
7775
if len(strategies) == 0 {
7876
return true, nil
7977
}
8078

8179
reqRes := ctx.GetAccessResources()
8280
var (
83-
checkNamespace bool = false
84-
checkService bool = true
85-
checkConfigGroup bool = true
81+
checkNamespace = false
82+
checkService = true
83+
checkConfigGroup = true
8684
)
8785

88-
for index := range strategies {
89-
rule := strategies[index]
90-
86+
for _, rule := range strategies {
9187
if !da.checkAction(rule.Action, ctx.GetOperation()) {
9288
continue
9389
}
@@ -133,18 +129,15 @@ func (da *defaultAuth) checkAction(expect string, actual model.ResourceOperation
133129
// @param searchMaps 鉴权策略中某一类型的资源列表信息
134130
// @return bool 是否可以操作本次被访问的所有资源
135131
func checkAnyElementExist(userId string, waitSearch []model.ResourceEntry, searchMaps *SearchMap) bool {
136-
if len(waitSearch) == 0 {
137-
return true
138-
}
139-
if searchMaps.passAll {
132+
if len(waitSearch) == 0 || searchMaps.passAll {
140133
return true
141134
}
142135

143-
for i := range waitSearch {
144-
entry := waitSearch[i]
136+
for _, entry := range waitSearch {
145137
if entry.Owner == userId {
146138
continue
147139
}
140+
148141
if _, ok := searchMaps.items[entry.ID]; !ok {
149142
return false
150143
}
@@ -168,8 +161,7 @@ func buildSearchMap(ss []model.StrategyResource) []*SearchMap {
168161
passAll: false,
169162
}
170163

171-
for i := range ss {
172-
val := ss[i]
164+
for _, val := range ss {
173165
if val.ResType == int32(api.ResourceType_Namespaces) {
174166
nsSearchMaps.items[val.ResID] = emptyVal
175167
nsSearchMaps.passAll = (val.ResID == "*") || nsSearchMaps.passAll

‎plugin/auth/defaultauth/default.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ const (
2727

2828
var (
2929
// emptyVal 空对象，占位而已
30-
emptyVal struct{} = struct{}{}
30+
emptyVal = struct{}{}
3131
)
3232

3333
// 自注册到插件列表

‎plugin/auth/platform/platform.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ const (
3535
// PluginName plugin name
3636
PluginName = "platform"
3737
// DefaultTimeDiff default time diff
38-
DefaultTimeDiff = -1 * time.Second * 5
38+
DefaultTimeDiff = -5 * time.Second
3939
)
4040

4141
// init 初始化注册函数

‎plugin/cmdb/memory/memory.go

+1-4
Original file line numberDiff line numberDiff line change
@@ -62,14 +62,11 @@ func (m *Memory) GetLocation(host string) (*model.Location, error) {
6262

6363
// Range 实现CMDB插件接口
6464
func (m *Memory) Range(handler func(host string, location *model.Location) (bool, error)) error {
65-
cont, err := handler("", nil)
65+
_, err := handler("", nil)
6666
if err != nil {
6767
return err
6868
}
6969

70-
if !cont {
71-
return nil
72-
}
7370
return nil
7471
}
7572

‎plugin/discoverevent.go

+1-3
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,7 @@ import (
2525
"github.com/polarismesh/polaris/common/model"
2626
)
2727

28-
var (
29-
discoverEventOnce = &sync.Once{}
30-
)
28+
var discoverEventOnce sync.Once
3129

3230
// DiscoverChannel is used to receive discover events from the agent
3331
type DiscoverChannel interface {

‎plugin/discoverevent/local/event_local.go

+6-15
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,8 @@ import (
3232
)
3333

3434
const (
35-
PluginName string = "discoverEventLocal"
36-
defaultBufferSize int = 1024
37-
)
38-
39-
var (
40-
emptyModelDiscoverEvent = model.DiscoverEvent{}
35+
PluginName = "discoverEventLocal"
36+
defaultBufferSize = 1024
4137
)
4238

4339
func init() {
@@ -100,10 +96,10 @@ func (holder *eventBufferHolder) Size() int {
10096
type discoverEventLocal struct {
10197
eventCh chan model.DiscoverEvent
10298
eventLog *zap.Logger
103-
bufferPool *sync.Pool
99+
bufferPool sync.Pool
104100
curEventBuffer *eventBufferHolder
105101
cursor int
106-
syncLock *sync.Mutex
102+
syncLock sync.Mutex
107103
}
108104

109105
// Name 插件名称
@@ -137,8 +133,7 @@ func (el *discoverEventLocal) Initialize(conf *plugin.ConfigEntry) error {
137133
config.RotationMaxAge,
138134
)
139135

140-
el.syncLock = &sync.Mutex{}
141-
el.bufferPool = &sync.Pool{
136+
el.bufferPool = sync.Pool{
142137
New: func() interface{} {
143138
return newEventBufferHolder(defaultBufferSize)
144139
},
@@ -168,9 +163,9 @@ func (el *discoverEventLocal) PublishEvent(event model.DiscoverEvent) {
168163

169164
// Run 执行主逻辑
170165
func (el *discoverEventLocal) Run() {
171-
172166
// 定时刷新事件到日志的定时器
173167
syncInterval := time.NewTicker(time.Duration(10) * time.Second)
168+
defer syncInterval.Stop()
174169

175170
for {
176171
select {
@@ -199,19 +194,15 @@ func (el *discoverEventLocal) switchEventBuffer() {
199194

200195
// writeToFile 事件落盘
201196
func (el *discoverEventLocal) writeToFile(eventHolder *eventBufferHolder) {
202-
203197
el.syncLock.Lock()
204-
205198
defer func() {
206199
el.syncLock.Unlock()
207200
eventHolder.Reset()
208201
el.bufferPool.Put(eventHolder)
209-
210202
}()
211203

212204
for eventHolder.HasNext() {
213205
event := eventHolder.Next()
214-
215206
el.eventLog.Info(fmt.Sprintf(
216207
"%s|%s|%s|%d|%s|%d|%s",
217208
event.Namespace,

‎plugin/discoverevent/loki/event_loki.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ import (
2525
)
2626

2727
const (
28-
PluginName string = "discoverEventLoki"
29-
defaultBatchSize int = 512
30-
defaultQueueSize int = 1024
28+
PluginName = "discoverEventLoki"
29+
defaultBatchSize = 512
30+
defaultQueueSize = 1024
3131
)
3232

3333
func init() {
@@ -61,7 +61,7 @@ func (d *discoverEventLoki) Initialize(conf *plugin.ConfigEntry) error {
6161
}
6262
d.eventLog = lokiLogger
6363
d.eventCh = make(chan model.DiscoverEvent, queueSize)
64-
d.stopCh = make(chan struct{})
64+
d.stopCh = make(chan struct{}, 1)
6565
go d.Run()
6666
return nil
6767
}

‎plugin/discoverevent/loki/event_loki_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ func Test_discoverEventLoki_Destroy(t *testing.T) {
8888
for _, tt := range tests {
8989
t.Run(tt.name, func(t *testing.T) {
9090
d := &discoverEventLoki{
91-
stopCh: make(chan struct{}),
91+
stopCh: make(chan struct{}, 1),
9292
}
9393
err := d.Destroy()
9494
assert.Nil(t, err)

‎plugin/discoverevent/loki/logger.go

+4-1
Original file line numberDiff line numberDiff line change
@@ -152,14 +152,16 @@ func (l *LokiLogger) Log(events []model.DiscoverEvent) {
152152
log.Errorf("[Discoverevent][LokiLogger] marshal push request error: %v", err)
153153
return
154154
}
155+
155156
buf = snappy.Encode(nil, buf)
156157
resp, err := l.send(context.Background(), buf)
157158
if err != nil {
158159
log.Errorf("[Discoverevent][LokiLogger] send request error: %v", err)
159160
return
160161
}
162+
defer resp.Body.Close()
163+
161164
if resp.StatusCode != http.StatusNoContent {
162-
defer resp.Body.Close()
163165
body, err := ioutil.ReadAll(resp.Body)
164166
if err != nil {
165167
log.Errorf("[Discoverevent][LokiLogger] read resp body error: %v", err)
@@ -178,6 +180,7 @@ func (l *LokiLogger) send(ctx context.Context, reqBody []byte) (*http.Response,
178180
if err != nil {
179181
return nil, err
180182
}
183+
181184
req = req.WithContext(ctx)
182185
req.Header.Set("Content-Type", contentType)
183186
if l.tenantID != "" {

‎plugin/discoverstatis.go

+1-3
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,7 @@ import (
2525
"github.com/polarismesh/polaris/common/log"
2626
)
2727

28-
var (
29-
discoverStatisOnce = &sync.Once{}
30-
)
28+
var discoverStatisOnce sync.Once
3129

3230
// DiscoverStatis 服务发现统计插件接口
3331
type DiscoverStatis interface {

‎plugin/history.go

+2-4
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,8 @@ import (
2525
"github.com/polarismesh/polaris/common/model"
2626
)
2727

28-
var (
29-
// 插件初始化原子变量
30-
historyOnce = &sync.Once{}
31-
)
28+
// 插件初始化原子变量
29+
var historyOnce sync.Once
3230

3331
// History 历史记录插件
3432
type History interface {

‎plugin/history/loki/history_loki.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ import (
2929
// 把操作记录记录到Loki
3030
const (
3131
// PluginName plugin name
32-
PluginName string = "HistoryLoki"
33-
defaultBatchSize int = 512
34-
defaultQueueSize int = 1024
32+
PluginName = "HistoryLoki"
33+
defaultBatchSize = 512
34+
defaultQueueSize = 1024
3535
)
3636

3737
func init() {
@@ -65,7 +65,7 @@ func (h *HistoryLoki) Initialize(conf *plugin.ConfigEntry) error {
6565
}
6666
h.logger = lokiLogger
6767
h.entryCh = make(chan *model.RecordEntry, queueSize)
68-
h.stopCh = make(chan struct{})
68+
h.stopCh = make(chan struct{}, 1)
6969
go h.Run()
7070
return nil
7171
}

‎plugin/history/loki/history_loki_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ func TestHistoryLoki_Destroy(t *testing.T) {
9494
for _, tt := range tests {
9595
t.Run(tt.name, func(t *testing.T) {
9696
d := &HistoryLoki{
97-
stopCh: make(chan struct{}),
97+
stopCh: make(chan struct{}, 1),
9898
}
9999
err := d.Destroy()
100100
assert.Nil(t, err)

‎plugin/history/loki/logger.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -157,8 +157,9 @@ func (l *LokiLogger) Log(entries []*model.RecordEntry) {
157157
log.Errorf("[History][LokiLogger] send request error: %v", err)
158158
return
159159
}
160+
defer resp.Body.Close()
161+
160162
if resp.StatusCode != http.StatusNoContent {
161-
defer resp.Body.Close()
162163
body, err := ioutil.ReadAll(resp.Body)
163164
if err != nil {
164165
log.Errorf("[History][LokiLogger] read resp body error: %v", err)

‎plugin/password.go

+1-3
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,7 @@ import (
2424
"github.com/polarismesh/polaris/common/log"
2525
)
2626

27-
var (
28-
passwordOnce = &sync.Once{}
29-
)
27+
var passwordOnce sync.Once
3028

3129
// ParsePassword 密码插件
3230
type ParsePassword interface {

‎plugin/plugin.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525
var (
2626
pluginSet = make(map[string]Plugin)
2727
config = &Config{}
28-
once = &sync.Once{}
28+
once sync.Once
2929
)
3030

3131
// RegisterPlugin 注册插件

‎plugin/ratelimit.go

+1-3
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,7 @@ var RatelimitStr = map[RatelimitType]string{
4949
InstanceRatelimit: "instance-limit",
5050
}
5151

52-
var (
53-
rateLimitOnce = sync.Once{}
54-
)
52+
var rateLimitOnce sync.Once
5553

5654
// Ratelimit Ratelimit插件接口
5755
type Ratelimit interface {

‎plugin/ratelimit/lrurate/base.go

+2-8
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,8 @@ func hash(str string) uint32 {
5454
// allowIP ip限流
5555
func allowIP(id string) bool {
5656
key := hash(id)
57-
5857
ipLruCache.ContainsOrAdd(key, rate.NewLimiter(rate.Limit(rateLimitIPRate), rateLimitIPBurst))
59-
60-
value, ok := ipLruCache.Get(key)
61-
if ok {
58+
if value, ok := ipLruCache.Get(key); ok {
6259
return value.(*rate.Limiter).Allow()
6360
}
6461

@@ -68,11 +65,8 @@ func allowIP(id string) bool {
6865
// allowService service限流
6966
func allowService(id string) bool {
7067
key := hash(id)
71-
7268
serviceLruCache.ContainsOrAdd(key, rate.NewLimiter(rate.Limit(rateLimitServiceRate), rateLimitServiceBurst))
73-
74-
value, ok := serviceLruCache.Get(key)
75-
if ok {
69+
if value, ok := serviceLruCache.Get(key); ok {
7670
return value.(*rate.Limiter).Allow()
7771
}
7872

‎plugin/ratelimit/lrurate/lrurate.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ func (m *LRURate) Destroy() error {
137137

138138
// Allow 实现CMDB插件接口
139139
func (m *LRURate) Allow(rateType plugin.RatelimitType, id string) bool {
140-
switch plugin.RatelimitType(rateType) {
140+
switch rateType {
141141
case plugin.IPRatelimit:
142142
return allowIP(id)
143143
case plugin.ServiceRatelimit:

0 commit comments

Comments
 (0)