Minor formatting issues

.golangci.toml

@@ -10,4 +10,4 @@ format = "colored-line-number"
 
 [linters]
 enable-all = true
-disable = ["gochecknoglobals", "gas", "gomnd", "goerr113", "exhaustivestruct"]
+disable = ["gochecknoglobals", "gas", "goerr113", "exhaustivestruct"]

cli/access.go

@@ -44,18 +44,17 @@ func (c *Access) Run(cli *CLI, version string) error {
 		return fmt.Errorf("cannot init config: %w", err)
 	}
 
-	wg := &sync.WaitGroup{}
 	resp := &accessResponse{}
 	resp.Secret.Base64 = c.conf.Secret.Base64()
 	resp.Secret.Hex = c.conf.Secret.Hex()
 
-	wg.Add(2)
+	wg := &sync.WaitGroup{}
+	wg.Add(2) // nolint: gomnd
 
 	go func() {
 		defer wg.Done()
 
 		ip := c.conf.Network.PublicIP.IPv4.Value(nil)
-
 		if ip == nil {
 			ip = c.getIP("tcp4")
 		}
@@ -71,7 +70,6 @@ func (c *Access) Run(cli *CLI, version string) error {
 		defer wg.Done()
 
 		ip := c.conf.Network.PublicIP.IPv4.Value(nil)
-
 		if ip == nil {
 			ip = c.getIP("tcp6")
 		}
@@ -86,7 +84,6 @@ func (c *Access) Run(cli *CLI, version string) error {
 	wg.Wait()
 
 	encoder := json.NewEncoder(os.Stdout)
-
 	encoder.SetEscapeHTML(false)
 	encoder.SetIndent("", "  ")
 
@@ -137,7 +134,6 @@ func (c *Access) makeURLs(ip net.IP, cli *CLI) *accessResponseURLs {
 	}
 
 	values := url.Values{}
-
 	values.Set("server", ip.String())
 	values.Set("port", strconv.Itoa(int(c.conf.BindTo.PortValue(0))))
 
@@ -163,7 +159,6 @@ func (c *Access) makeURLs(ip net.IP, cli *CLI) *accessResponseURLs {
 			RawQuery: urlQuery,
 		}).String(),
 	}
-
 	rv.TgQrCode = c.makeQRCode(rv.TgURL)
 	rv.TmeQrCode = c.makeQRCode(rv.TmeURL)
 
@@ -172,7 +167,6 @@ func (c *Access) makeURLs(ip net.IP, cli *CLI) *accessResponseURLs {
 
 func (c *Access) makeQRCode(data string) string {
 	values := url.Values{}
-
 	values.Set("qzone", "4")
 	values.Set("format", "svg")
 	values.Set("data", data)

config/config.go

@@ -122,23 +122,21 @@ type configRaw struct {
 
 func Parse(rawData []byte) (*Config, error) {
 	rawConf := &configRaw{}
-
-	if err := toml.Unmarshal(rawData, rawConf); err != nil {
-		return nil, fmt.Errorf("cannot parse toml config: %w", err)
-	}
-
 	jsonBuf := &bytes.Buffer{}
-	jsonEncoder := json.NewEncoder(jsonBuf)
+	conf := &Config{}
 
+	jsonEncoder := json.NewEncoder(jsonBuf)
 	jsonEncoder.SetEscapeHTML(false)
 	jsonEncoder.SetIndent("", "")
 
+	if err := toml.Unmarshal(rawData, rawConf); err != nil {
+		return nil, fmt.Errorf("cannot parse toml config: %w", err)
+	}
+
 	if err := jsonEncoder.Encode(rawConf); err != nil {
 		return nil, fmt.Errorf("cannot dump into interim format: %w", err)
 	}
 
-	conf := &Config{}
-
 	if err := json.NewDecoder(jsonBuf).Decode(conf); err != nil {
 		return nil, fmt.Errorf("cannot parse final config: %w", err)
 	}

config/type_error_rate.go

@@ -5,6 +5,8 @@ import (
 	"strconv"
 )
 
+const typeErrorRateIgnoreLess = 1e-8
+
 type TypeErrorRate struct {
 	value float64
 }
@@ -33,7 +35,7 @@ func (c TypeErrorRate) String() string {
 }
 
 func (c TypeErrorRate) Value(defaultValue float64) float64 {
-	if c.value < 1e-8 {
+	if c.value < typeErrorRateIgnoreLess {
 		return defaultValue
 	}
 

config/type_metric_prefix.go

@@ -15,7 +15,6 @@ func (c *TypeMetricPrefix) UnmarshalText(data []byte) error {
 	}
 
 	prefix := string(data)
-
 	if ok, err := regexp.MatchString("^[a-z0-9]+$", prefix); !ok || err != nil {
 		return fmt.Errorf("incorrect metric prefix: %s", prefix)
 	}

mtglib/network/circuit_breaker.go

@@ -125,7 +125,6 @@ func (c *circuitBreakerDialer) switchState(state uint32) {
 	}
 
 	c.failuresCount = 0
-
 	atomic.StoreUint32(&c.halfOpenAttempts, 0)
 	atomic.StoreUint32(&c.state, state)
 }
@@ -158,7 +157,6 @@ func (c *circuitBreakerDialer) tryHalfOpen() {
 
 func (c *circuitBreakerDialer) stopTimer(timerRef **time.Timer) {
 	timer := *timerRef
-
 	if timer == nil {
 		return
 	}

mtglib/network/circuit_breaker_internal_test.go

@@ -51,7 +51,6 @@ func (suite *CircuitBreakerTestSuite) TestMultipleRunsOk() {
 		Return(suite.connMock, nil)
 
 	wg := &sync.WaitGroup{}
-
 	wg.Add(5)
 
 	go func() {
@@ -126,7 +125,6 @@ func (suite *CircuitBreakerTestSuite) TestHalfOpen() {
 	time.Sleep(500 * time.Millisecond)
 
 	conn, err := suite.d.DialContext(suite.ctx, "tcp", "127.0.0.2")
-
 	suite.NoError(err)
 	suite.Equal("10.0.0.10:80", conn.RemoteAddr().String())
 

mtglib/network/default_test.go

@@ -20,7 +20,6 @@ func (suite *DefaultDialerTestSuite) SetupSuite() {
 	suite.HTTPServerTestSuite.SetupSuite()
 
 	d, err := network.NewDefaultDialer(0, 0)
-
 	suite.NoError(err)
 
 	suite.d = d
@@ -28,13 +27,11 @@ func (suite *DefaultDialerTestSuite) SetupSuite() {
 
 func (suite *DefaultDialerTestSuite) TestNegativeTimeout() {
 	_, err := network.NewDefaultDialer(-1, 0)
-
 	suite.Error(err)
 }
 
 func (suite *DefaultDialerTestSuite) TestNegativeBufferSize() {
 	_, err := network.NewDefaultDialer(0, -1)
-
 	suite.Error(err)
 }
 
@@ -42,7 +39,6 @@ func (suite *DefaultDialerTestSuite) TestUnsupportedProtocol() {
 	_, err := suite.d.DialContext(context.Background(),
 		"udp",
 		suite.HTTPServerAddress())
-
 	suite.Error(err)
 }
 
@@ -50,7 +46,6 @@ func (suite *DefaultDialerTestSuite) TestCannotDial() {
 	_, err := suite.d.DialContext(context.Background(),
 		"tcp",
 		suite.HTTPServerAddress()+suite.HTTPServerAddress())
-
 	suite.Error(err)
 }
 
@@ -58,7 +53,6 @@ func (suite *DefaultDialerTestSuite) TestConnectOk() {
 	conn, err := suite.d.DialContext(context.Background(),
 		"tcp",
 		suite.HTTPServerAddress())
-
 	suite.NoError(err)
 	suite.NotNil(conn)
 

mtglib/network/load_balanced_socks5_test.go

@@ -28,12 +28,10 @@ func (suite *LoadBalancedSocks5TestSuite) SetupSuite() {
 
 func (suite *LoadBalancedSocks5TestSuite) SetupTest() {
 	baseDialer, _ := network.NewDefaultDialer(0, 0)
-
 	lbDialer, err := network.NewLoadBalancedSocks5Dialer(baseDialer, []*url.URL{
 		suite.MakeSocks5URL("user", "password"),
 		suite.MakeSocks5URL("user2", "password"),
 	})
-
 	suite.NoError(err)
 
 	suite.httpClient = suite.MakeHTTPClient(lbDialer)
@@ -48,13 +46,11 @@ func (suite *LoadBalancedSocks5TestSuite) TestIncorrectURL() {
 	_, err := network.NewLoadBalancedSocks5Dialer(&DialerMock{}, []*url.URL{
 		{Scheme: "http"},
 	})
-
 	suite.Error(err)
 }
 
 func (suite *LoadBalancedSocks5TestSuite) TestCannotDial() {
 	baseDialer := &DialerMock{}
-
 	baseDialer.On("DialContext", mock.Anything, "tcp", "127.0.0.1:1080").
 		Times(network.ProxyDialerOpenThreshold).
 		Return(&net.TCPConn{}, io.EOF)

mtglib/network/network.go

@@ -49,7 +49,6 @@ func (n *network) DialContext(ctx context.Context, protocol, address string) (ne
 	}
 
 	var conn net.Conn
-
 	for _, v := range ips {
 		conn, err = n.dialer.DialContext(ctx, protocol, net.JoinHostPort(v, port))
 

mtglib/network/proxy_dialer_internal_test.go

@@ -22,7 +22,6 @@ func (suite *ProxyDialerTestSuite) SetupSuite() {
 
 func (suite *ProxyDialerTestSuite) TestSetupDefaults() {
 	d := newProxyDialer(&DialerMock{}, suite.u).(*circuitBreakerDialer)
-
 	suite.EqualValues(ProxyDialerOpenThreshold, d.openThreshold)
 	suite.EqualValues(ProxyDialerHalfOpenTimeout, d.halfOpenTimeout)
 	suite.EqualValues(ProxyDialerResetFailuresTimeout, d.resetFailuresTimeout)
@@ -30,14 +29,12 @@ func (suite *ProxyDialerTestSuite) TestSetupDefaults() {
 
 func (suite *ProxyDialerTestSuite) TestSetupValuesAllOk() {
 	query := url.Values{}
-
 	query.Set("open_threshold", "30")
 	query.Set("reset_failures_timeout", "1s")
 	query.Set("half_open_timeout", "2s")
-
 	suite.u.RawQuery = query.Encode()
-	d := newProxyDialer(&DialerMock{}, suite.u).(*circuitBreakerDialer)
 
+	d := newProxyDialer(&DialerMock{}, suite.u).(*circuitBreakerDialer)
 	suite.EqualValues(30, d.openThreshold)
 	suite.EqualValues(2*time.Second, d.halfOpenTimeout)
 	suite.EqualValues(time.Second, d.resetFailuresTimeout)
@@ -51,10 +48,9 @@ func (suite *ProxyDialerTestSuite) TestOpenThreshold() {
 		param := v
 		suite.T().Run(v, func(t *testing.T) {
 			query.Set("open_threshold", param)
-
 			suite.u.RawQuery = query.Encode()
-			d := newProxyDialer(&DialerMock{}, suite.u).(*circuitBreakerDialer)
 
+			d := newProxyDialer(&DialerMock{}, suite.u).(*circuitBreakerDialer)
 			assert.EqualValues(t, ProxyDialerOpenThreshold, d.openThreshold)
 		})
 	}
@@ -68,10 +64,9 @@ func (suite *ProxyDialerTestSuite) TestHalfOpenTimeout() {
 		param := v
 		suite.T().Run(v, func(t *testing.T) {
 			query.Set("half_open_timeout", param)
-
 			suite.u.RawQuery = query.Encode()
-			d := newProxyDialer(&DialerMock{}, suite.u).(*circuitBreakerDialer)
 
+			d := newProxyDialer(&DialerMock{}, suite.u).(*circuitBreakerDialer)
 			assert.EqualValues(t, ProxyDialerHalfOpenTimeout, d.halfOpenTimeout)
 		})
 	}
@@ -85,10 +80,9 @@ func (suite *ProxyDialerTestSuite) TestResetFailuresTimeout() {
 		param := v
 		suite.T().Run(v, func(t *testing.T) {
 			query.Set("reset_failures_timeout", param)
-
 			suite.u.RawQuery = query.Encode()
-			d := newProxyDialer(&DialerMock{}, suite.u).(*circuitBreakerDialer)
 
+			d := newProxyDialer(&DialerMock{}, suite.u).(*circuitBreakerDialer)
 			assert.EqualValues(t, ProxyDialerHalfOpenTimeout, d.halfOpenTimeout)
 		})
 	}

mtglib/secret.go

@@ -31,7 +31,6 @@ func (s Secret) MarshalText() ([]byte, error) {
 
 func (s *Secret) UnmarshalText(data []byte) error {
 	text := string(data)
-
 	if text == "" {
 		return ErrSecretEmpty
 	}

mtglib/secret_test.go

@@ -32,13 +32,11 @@ func (suite *SecretTestSuite) TestParseSecret() {
 
 		suite.T().Run(name, func(t *testing.T) {
 			parsed, err := mtglib.ParseSecret(param)
-
 			assert.NoError(t, err)
 			assert.Equal(t, s.Key, parsed.Key)
 			assert.Equal(t, s.Host, parsed.Host)
 
 			newSecret := mtglib.Secret{}
-
 			assert.NoError(t, newSecret.UnmarshalText([]byte(param)))
 			assert.Equal(t, s.Key, newSecret.Key)
 			assert.Equal(t, s.Host, newSecret.Host)
@@ -67,7 +65,6 @@ func (suite *SecretTestSuite) TestMarshalData() {
 	copy(s.Key[:], secretData)
 
 	data, err := json.Marshal(&s)
-
 	suite.NoError(err)
 	suite.Equal(string(data), `"7tEcbLvZ7-f-1bwNsiCwlmVnb29nbGUuY29t"`)
 }
@@ -87,7 +84,6 @@ func (suite *SecretTestSuite) TestIncorrectSecret() {
 
 		suite.T().Run(param, func(t *testing.T) {
 			_, err := mtglib.ParseSecret(param)
-
 			assert.Error(t, err)
 		})
 	}
@@ -97,7 +93,6 @@ func (suite *SecretTestSuite) TestInvariant() {
 	generated := mtglib.GenerateSecret("google.com")
 
 	parsed, err := mtglib.ParseSecret(generated.Hex())
-
 	suite.NoError(err)
 	suite.Equal(generated.Key, parsed.Key)
 	suite.Equal(generated.Host, parsed.Host)