Update code to the latest golangci-lint

This commit is contained in:
9seconds
2021-07-31 11:35:05 +03:00
parent dc99dd165e
commit eaa757b6d0
9 changed files with 14 additions and 18 deletions
+1 -1
View File
@@ -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(
+2 -5
View File
@@ -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)
+2 -2
View File
@@ -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
}
+2 -2
View File
@@ -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
}
+1 -1
View File
@@ -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)
}
+1 -1
View File
@@ -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)
}