From eaa757b6d0eee218f3c4d4c5013c27583eab8006 Mon Sep 17 00:00:00 2001 From: 9seconds Date: Sat, 31 Jul 2021 11:35:05 +0300 Subject: [PATCH] Update code to the latest golangci-lint --- internal/cli/run_proxy.go | 2 +- internal/cli/simple_run.go | 7 ++----- internal/config/type_concurrency.go | 4 ++-- internal/config/type_error_rate.go | 4 ++-- internal/config/type_hostport.go | 2 +- internal/config/type_port.go | 2 +- ipblocklist/firehol.go | 4 ++-- network/proxy_dialer.go | 2 +- stats/prometheus.go | 5 ++--- 9 files changed, 14 insertions(+), 18 deletions(-) diff --git a/internal/cli/run_proxy.go b/internal/cli/run_proxy.go index 745319f..95507e4 100644 --- a/internal/cli/run_proxy.go +++ b/internal/cli/run_proxy.go @@ -115,7 +115,7 @@ func makeIPBlocklist(conf *config.Config, logger mtglib.Logger, ntw mtglib.Netwo } func makeEventStream(conf *config.Config, logger mtglib.Logger) (mtglib.EventStream, error) { - factories := make([]events.ObserverFactory, 0, 2) + factories := make([]events.ObserverFactory, 0, 2) // nolint: gomnd if conf.Stats.StatsD.Enabled.Get(false) { statsdFactory, err := stats.NewStatsd( diff --git a/internal/cli/simple_run.go b/internal/cli/simple_run.go index 4d1726a..5a4bb0e 100644 --- a/internal/cli/simple_run.go +++ b/internal/cli/simple_run.go @@ -34,7 +34,7 @@ func (s *SimpleRun) Run(cli *CLI, version string) error { // nolint: cyclop return fmt.Errorf("incorrect secret: %w", err) } - if err := conf.Concurrency.Set(strconv.FormatUint(s.Concurrency, 10)); err != nil { + if err := conf.Concurrency.Set(strconv.FormatUint(s.Concurrency, 10)); err != nil { // nolint: gomnd return fmt.Errorf("incorrect concurrency: %w", err) } @@ -46,7 +46,7 @@ func (s *SimpleRun) Run(cli *CLI, version string) error { // nolint: cyclop return fmt.Errorf("incorrect prefer-ip: %w", err) } - if err := conf.DomainFrontingPort.Set(strconv.FormatUint(s.DomainFrontingPort, 10)); err != nil { + if err := conf.DomainFrontingPort.Set(strconv.FormatUint(s.DomainFrontingPort, 10)); err != nil { // nolint: gomnd return fmt.Errorf("incorrect domain-fronting-port: %w", err) } @@ -72,9 +72,6 @@ func (s *SimpleRun) Run(cli *CLI, version string) error { // nolint: cyclop conf.Debug.Value = s.Debug conf.Defense.AntiReplay.Enabled.Value = true - conf.Defense.Blocklist.Enabled.Value = false - conf.Stats.StatsD.Enabled.Value = false - conf.Stats.Prometheus.Enabled.Value = false if err := conf.Validate(); err != nil { return fmt.Errorf("invalid result configuration: %w", err) diff --git a/internal/config/type_concurrency.go b/internal/config/type_concurrency.go index 4f39b3b..e2ccd67 100644 --- a/internal/config/type_concurrency.go +++ b/internal/config/type_concurrency.go @@ -10,7 +10,7 @@ type TypeConcurrency struct { } func (t *TypeConcurrency) Set(value string) error { - concurrencyValue, err := strconv.ParseUint(value, 10, 64) + concurrencyValue, err := strconv.ParseUint(value, 10, 16) // nolint: gomnd if err != nil { return fmt.Errorf("value is not uint (%s): %w", value, err) } @@ -41,5 +41,5 @@ func (t TypeConcurrency) MarshalJSON() ([]byte, error) { } func (t TypeConcurrency) String() string { - return strconv.FormatUint(uint64(t.Value), 10) + return strconv.FormatUint(uint64(t.Value), 10) // nolint: gomnd } diff --git a/internal/config/type_error_rate.go b/internal/config/type_error_rate.go index 4e30e09..92465de 100644 --- a/internal/config/type_error_rate.go +++ b/internal/config/type_error_rate.go @@ -12,7 +12,7 @@ type TypeErrorRate struct { } func (t *TypeErrorRate) Set(value string) error { - parsedValue, err := strconv.ParseFloat(value, 64) + parsedValue, err := strconv.ParseFloat(value, 64) // nolint: gomnd if err != nil { return fmt.Errorf("value is not a float (%s): %w", value, err) } @@ -43,5 +43,5 @@ func (t TypeErrorRate) MarshalJSON() ([]byte, error) { } func (t TypeErrorRate) String() string { - return strconv.FormatFloat(t.Value, 'f', -1, 64) + return strconv.FormatFloat(t.Value, 'f', -1, 64) // nolint: gomnd } diff --git a/internal/config/type_hostport.go b/internal/config/type_hostport.go index 665ba10..8dcb254 100644 --- a/internal/config/type_hostport.go +++ b/internal/config/type_hostport.go @@ -18,7 +18,7 @@ func (t *TypeHostPort) Set(value string) error { return fmt.Errorf("incorrect host:port value (%v): %w", value, err) } - portValue, err := strconv.ParseUint(port, 10, 16) + portValue, err := strconv.ParseUint(port, 10, 16) // nolint: gomnd if err != nil { return fmt.Errorf("incorrect port number (%v): %w", value, err) } diff --git a/internal/config/type_port.go b/internal/config/type_port.go index cdab9ee..3965fb7 100644 --- a/internal/config/type_port.go +++ b/internal/config/type_port.go @@ -10,7 +10,7 @@ type TypePort struct { } func (t *TypePort) Set(value string) error { - portValue, err := strconv.ParseUint(value, 10, 16) + portValue, err := strconv.ParseUint(value, 10, 16) // nolint: gomnd if err != nil { return fmt.Errorf("incorrect port number (%v): %w", value, err) } diff --git a/ipblocklist/firehol.go b/ipblocklist/firehol.go index 953aeba..52f7a91 100644 --- a/ipblocklist/firehol.go +++ b/ipblocklist/firehol.go @@ -119,7 +119,7 @@ func (f *Firehol) Run(updateEach time.Duration) { } func (f *Firehol) containsIPv4(addr net.IP) bool { - ip := patricia.NewIPv4AddressFromBytes(addr, 32) + ip := patricia.NewIPv4AddressFromBytes(addr, 32) // nolint: gomnd if ok, _, err := f.treeV4.FindDeepestTag(ip); ok && err == nil { return true @@ -129,7 +129,7 @@ func (f *Firehol) containsIPv4(addr net.IP) bool { } func (f *Firehol) containsIPv6(addr net.IP) bool { - ip := patricia.NewIPv6Address(addr, 128) + ip := patricia.NewIPv6Address(addr, 128) // nolint: gomnd if ok, _, err := f.treeV6.FindDeepestTag(ip); ok && err == nil { return true diff --git a/network/proxy_dialer.go b/network/proxy_dialer.go index 9c3f0f7..9419499 100644 --- a/network/proxy_dialer.go +++ b/network/proxy_dialer.go @@ -16,7 +16,7 @@ func newProxyDialer(baseDialer Dialer, proxyURL *url.URL) Dialer { ) if param := params.Get("open_threshold"); param != "" { - if intNum, err := strconv.ParseUint(param, 10, 32); err == nil { + if intNum, err := strconv.ParseUint(param, 10, 32); err == nil { // nolint: gomnd openThreshold = uint32(intNum) } } diff --git a/stats/prometheus.go b/stats/prometheus.go index 7a22777..97c6e97 100644 --- a/stats/prometheus.go +++ b/stats/prometheus.go @@ -119,11 +119,10 @@ func (p prometheusProcessor) EventReplayAttack(_ mtglib.EventReplayAttack) { } func (p prometheusProcessor) Shutdown() { - for _, v := range p.streams { + for k, v := range p.streams { releaseStreamInfo(v) + delete(p.streams, k) } - - p.streams = make(map[string]*streamInfo) } // PrometheusFactory is a factory of events.Observers which collect