refactor for updating

projecteru2 · Jul 5, 2022 · 6cca5ae · 6cca5ae
1 parent 7751945
commit 6cca5ae
Show file tree

Hide file tree

Showing 18 changed files with 244 additions and 37 deletions.
diff --git a/3rdmocks/ServerStream.go b/3rdmocks/ServerStream.go
diff --git a/Makefile b/Makefile
@@ -18,8 +18,7 @@ grpc:
 	./rpc/gen/core.proto
 
 deps:
-	env GO111MODULE=on go mod download
-	env GO111MODULE=on go mod vendor
+	go mod vendor
 
 binary:
 	CGO_ENABLED=0 go build -ldflags "$(GO_LDFLAGS)" -gcflags=all=-G=3 -o eru-core

diff --git a/cluster/mocks/Cluster.go b/cluster/mocks/Cluster.go
diff --git a/engine/docker/mocks/APIClient.go b/engine/docker/mocks/APIClient.go
diff --git a/engine/mocks/API.go b/engine/mocks/API.go
diff --git a/lock/mocks/DistributedLock.go b/lock/mocks/DistributedLock.go
diff --git a/metrics/metrics.go b/metrics/metrics.go
@@ -93,22 +93,22 @@ func (m *Metrics) SendMetrics(metrics ...*resources.Metrics) {
 			log.Errorf(nil, "[SendMetrics] Collector not found: %s", metric.Name) //nolint
 			continue
 		}
-		switch collector.(type) { // nolint: gocritic
+		switch collector.(type) { // nolint
 		case *prometheus.GaugeVec:
 			value, err := strconv.ParseFloat(metric.Value, 64)
 			if err != nil {
 				log.Errorf(nil, "[SendMetrics] Error occurred while parsing %v value %v: %v", metric.Name, metric.Value, err) //nolint
 			}
-			collector.(*prometheus.GaugeVec).WithLabelValues(metric.Labels...).Set(value)
+			collector.(*prometheus.GaugeVec).WithLabelValues(metric.Labels...).Set(value) // nolint
 			if err := m.gauge(metric.Key, value); err != nil {
 				log.Errorf(nil, "[SendMetrics] Error occurred while sending %v data to statsd: %v", metric.Name, err) //nolint
 			}
 		case *prometheus.CounterVec:
-			value, err := strconv.ParseInt(metric.Value, 10, 32)
+			value, err := strconv.ParseInt(metric.Value, 10, 32) // nolint
 			if err != nil {
 				log.Errorf(nil, "[SendMetrics] Error occurred while parsing %v value %v: %v", metric.Name, metric.Value, err) //nolint
 			}
-			collector.(*prometheus.CounterVec).WithLabelValues(metric.Labels...).Add(float64(value))
+			collector.(*prometheus.CounterVec).WithLabelValues(metric.Labels...).Add(float64(value)) // nolint
 			if err := m.count(metric.Key, int(value), 1.0); err != nil {
 				log.Errorf(nil, "[SendMetrics] Error occurred while sending %v data to statsd: %v", metric.Name, err) //nolint
 			}

diff --git a/resources/manager.go b/resources/manager.go
@@ -25,7 +25,6 @@ func NewPluginManager(config types.Config) (*PluginManager, error) {
 		config:  config,
 		plugins: []Plugin{},
 	}
-
 	return pm, nil
 }
 
@@ -56,19 +55,6 @@ func (pm *PluginManager) GetPlugins() []Plugin {
 	return pm.plugins
 }
 
-func (pm *PluginManager) callPlugins(plugins []Plugin, f func(Plugin)) {
-	wg := &sync.WaitGroup{}
-	wg.Add(len(plugins))
-
-	for _, plugin := range plugins {
-		go func(p Plugin) {
-			defer wg.Done()
-			f(p)
-		}(plugin)
-	}
-	wg.Wait()
-}
-
 func callPlugins[T any](ctx context.Context, plugins []Plugin, f func(Plugin) (T, error)) (map[Plugin]T, error) {
 	resMap := sync.Map{}
 	combinedErr := types.NewCombinedErr()

diff --git a/resources/mocks/Plugin.go b/resources/mocks/Plugin.go
diff --git a/rpc/mocks/CoreRPC_RunAndWaitServer.go b/rpc/mocks/CoreRPC_RunAndWaitServer.go
diff --git a/source/mocks/Source.go b/source/mocks/Source.go
diff --git a/store/etcdv3/meta/mocks/ETCDClientV3.go b/store/etcdv3/meta/mocks/ETCDClientV3.go
diff --git a/store/etcdv3/meta/mocks/KV.go b/store/etcdv3/meta/mocks/KV.go
diff --git a/store/etcdv3/meta/mocks/Txn.go b/store/etcdv3/meta/mocks/Txn.go
diff --git a/store/mocks/Store.go b/store/mocks/Store.go
diff --git a/utils/file.go b/utils/file.go
@@ -23,10 +23,7 @@ func ListAllExecutableFiles(basedir string) ([]string, error) {
 		return nil
 	})
 
-	if err != nil {
-		return nil, err
-	}
-	return files, nil
+	return files, err
 }
 
 func isExecutable(perm fs.FileMode) bool {