update based on githubci lint

pkg/filters/headerlookup/headerlookup_test.go

@@ -21,7 +21,6 @@
  "net/http"
  "os"
  "sort"
- "sync"
  "testing"
  "time"
 
@@ -79,9 +78,8 @@
  assert := assert.New(t)
  clusterInstance, _ := createClusterAndSyncer()
 
- var mockMap sync.Map
  supervisor := supervisor.NewMock(
- nil, clusterInstance, mockMap, mockMap, nil, nil, false, nil, nil)
+ nil, clusterInstance, nil, nil, false, nil, nil)
 
  const validYaml = `
 name: headerLookup
@@ -191,9 +189,8 @@
 
  clusterInstance, syncerChannel := createClusterAndSyncer()
 
- var mockMap sync.Map
  supervisor := supervisor.NewMock(
- nil, clusterInstance, mockMap, mockMap, nil, nil, false, nil, nil)
+ nil, clusterInstance, nil, nil, false, nil, nil)
 
  // let's put data to 'foobar'
  foobar := `
@@ -224,7 +221,7 @@
  assert.Equal(hdr1, hdr2)
  assert.Equal("123456789", hdr1)
 
  hl, err = createHeaderLookup(config, hl, supervisor)
  ctx, header = prepareCtxAndHeader(t)
 
  // update key-value store
@@ -274,9 +271,8 @@
  headerKey: "user-ext-id"
 `
  clusterInstance, _ := createClusterAndSyncer()
- var mockMap sync.Map
  supervisor := supervisor.NewMock(
- nil, clusterInstance, mockMap, mockMap, nil, nil, false, nil, nil)
+ nil, clusterInstance, nil, nil, false, nil, nil)
  bobbanana := `
 ext-id: "333"
 extra-entry: "extra"

pkg/filters/proxies/httpproxy/pool_test.go

@@ -19,7 +19,6 @@ package httpproxy
 
 import (
  "net/http"
- "sync"
  "testing"
 
  "github.com/megaease/easegress/v2/pkg/context"
@@ -93,7 +92,7 @@ servers:
  assert.NoError(spec.Validate())
 
  p := &Proxy{}
- p.super = supervisor.NewMock(option.New(), nil, sync.Map{}, sync.Map{}, nil,
+ p.super = supervisor.NewMock(option.New(), nil, nil,
  nil, false, nil, nil)
  sp := NewServerPool(p, spec, "test")
  policies := map[string]resilience.Policy{}
@@ -135,7 +134,7 @@ servers:
  assert.NoError(spec.Validate())
 
  p := &Proxy{}
- p.super = supervisor.NewMock(option.New(), nil, sync.Map{}, sync.Map{}, nil,
+ p.super = supervisor.NewMock(option.New(), nil, nil,
  nil, false, nil, nil)
  sp := NewServerPool(p, spec, "test")
  spCtx := &serverPoolContext{
@@ -178,7 +177,7 @@ func TestCopyCORSHeaders(t *testing.T) {
  dst.Add("X-Dst", "dst")
 
  p := &Proxy{}
- p.super = supervisor.NewMock(option.New(), nil, sync.Map{}, sync.Map{}, nil,
+ p.super = supervisor.NewMock(option.New(), nil, nil,
  nil, false, nil, nil)
  sp := NewServerPool(p, &ServerPoolSpec{}, "test")
  dst = sp.mergeResponseHeader(dst, src)

pkg/filters/proxies/httpproxy/proxy_test.go

@@ -24,7 +24,6 @@ import (
  "net/http/httptest"
  "os"
  "strings"
- "sync"
  "sync/atomic"
  "testing"
  "time"
@@ -58,7 +57,7 @@ func newTestProxy(yamlConfig string, assert *assert.Assertions) *Proxy {
 
  proxy := kind.CreateInstance(spec).(*Proxy)
 
- proxy.super = supervisor.NewMock(option.New(), nil, sync.Map{}, sync.Map{}, nil,
+ proxy.super = supervisor.NewMock(option.New(), nil, nil,
  nil, false, nil, nil)
 
  proxy.Init()

pkg/filters/validator/validator_test.go

@@ -24,7 +24,6 @@ import (
  "net/http"
  "os"
  "strings"
- "sync"
  "testing"
  "time"
 
@@ -536,7 +535,7 @@ basicAuth:
  }
 
  supervisor := supervisor.NewMock(
- nil, clusterInstance, sync.Map{}, sync.Map{}, nil, nil, false, nil, nil)
+ nil, clusterInstance, nil, nil, false, nil, nil)
 
  yamlConfig := `
 kind: Validator

pkg/graceupdate/graceupdate.go

@@ -71,21 +71,16 @@ func NotifySigUsr2(closeCls func(), restartCls func()) error {
  // Reset signal usr2 notify
  NotifySigUsr2(closeCls, restartCls)
  } else {
- childdone := make(chan error, 1)
  go func() {
  process, err := os.FindProcess(pid)
  if err != nil {
  restartCls()
  NotifySigUsr2(closeCls, restartCls)
  } else {
  _, werr := process.Wait()
- childdone <- werr
- select {
- case err := <-childdone:
- logger.Errorf("child proc exited: %v", err)
- restartCls()
- NotifySigUsr2(closeCls, restartCls)
- }
+ logger.Errorf("child proc exited: %v", werr)
+ restartCls()
+ NotifySigUsr2(closeCls, restartCls)
  }
  }()
  }

pkg/object/httpserver/httpserver_test.go

@@ -19,7 +19,6 @@ package httpserver
 
 import (
  "os"
- "sync"
  "testing"
  "time"
 
@@ -46,7 +45,7 @@ port: 38081
 keepAlive: true
 https: false
 `
- super := supervisor.NewMock(option.New(), nil, sync.Map{}, sync.Map{}, nil,
+ super := supervisor.NewMock(option.New(), nil, nil,
  nil, false, nil, nil)
  superSpec, err := super.NewSpec(yamlConfig)
  assert.NoError(err)

pkg/object/httpserver/runtime_test.go

@@ -18,7 +18,6 @@
 package httpserver
 
 import (
- "sync"
  "testing"
  "time"
 
@@ -38,7 +37,7 @@ port: 38081
 keepAlive: true
 https: false
 `
- super := supervisor.NewMock(option.New(), nil, sync.Map{}, sync.Map{}, nil,
+ super := supervisor.NewMock(option.New(), nil, nil,
  nil, false, nil, nil)
  superSpec, err := super.NewSpec(yamlConfig)
  assert.NoError(err)

pkg/object/mqttproxy/mqtt_test.go

@@ -751,10 +751,9 @@ type testServer struct {
 
 func newServer(addr string) *testServer {
  mux := http.NewServeMux()
- srv := http.Server{Addr: addr, Handler: mux}
  ts := &testServer{
  mux: mux,
- srv: srv,
+ srv: http.Server{Addr: addr, Handler: mux},
  addr: addr,
  }
  return ts
@@ -1389,7 +1388,7 @@ func TestMQTTProxy(t *testing.T) {
 name: mqtt-proxy
 kind: MQTTProxy
 `
- super := supervisor.NewMock(option.New(), nil, sync.Map{}, sync.Map{}, nil, nil, false, nil, nil)
+ super := supervisor.NewMock(option.New(), nil, nil, nil, false, nil, nil)
  super.Options()
  superSpec, err := super.NewSpec(yamlStr)
  assert.Nil(err)

pkg/supervisor/mock.go

@@ -18,26 +18,21 @@
 package supervisor
 
 import (
- "sync"
-
  "github.com/megaease/easegress/v2/pkg/cluster"
  "github.com/megaease/easegress/v2/pkg/option"
 )
 
 // NewMock return a mock supervisor for testing purpose
-func NewMock(options *option.Options, cls cluster.Cluster, businessControllers sync.Map,
- systemControllers sync.Map, objectRegistry *ObjectRegistry, watcher *ObjectEntityWatcher,
+func NewMock(options *option.Options, cls cluster.Cluster, objectRegistry *ObjectRegistry, watcher *ObjectEntityWatcher,
  firstHandle bool, firstHandleDone chan struct{}, done chan struct{}) *Supervisor {
  return &Supervisor{
- options: options,
- cls: cls,
- businessControllers: businessControllers,
- systemControllers: systemControllers,
- objectRegistry: objectRegistry,
- watcher: watcher,
- firstHandle: firstHandle,
- firstHandleDone: firstHandleDone,
- done: done,
+ options: options,
+ cls: cls,
+ objectRegistry: objectRegistry,
+ watcher: watcher,
+ firstHandle: firstHandle,
+ firstHandleDone: firstHandleDone,
+ done: done,
  }
 }
 

pkg/util/prometheushelper/helper.go

@@ -150,13 +150,13 @@ func NewSummary(opt prometheus.SummaryOpts, labels []string) *prometheus.Summary
 }
 
 func getAndValidate(metricName string, labels []string) (string, error) {
- if ValidateMetricName(metricName) == false {
- return "", fmt.Errorf("Invalid metric name: %s", metricName)
+ if !ValidateMetricName(metricName) {
+ return "", fmt.Errorf("invalid metric name: %s", metricName)
  }
 
  for _, l := range labels {
- if ValidateLabelName(l) == false {
- return "", fmt.Errorf("Invalid label name: %s", l)
+ if !ValidateLabelName(l) {
+ return "", fmt.Errorf("invalid label name: %s", l)
  }
  }
  return metricName, nil