admin/gluetun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix errors introduced with golangci-lint 1.41.1

Browse Source
This commit is contained in:
Quentin McGaw (desktop)
2021-06-20 16:39:38 +00:00
parent 2c77b73ebc
commit 266596af68
9 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.golangci.yml
View File

@@ -20,6 +20,12 @@ issues:
- text: "exported: exported var Err*" - text: "exported: exported var Err*"
linters: linters:
- revive - revive
- text: "mnd: Magic number: 0644*"
linters:
- gomnd
- text: "mnd: Magic number: 0400*"
linters:
- gomnd
linters: linters:
disable-all: true disable-all: true
enable: enable:

3
internal/configuration/nordvpn.go
View File

@@ -69,7 +69,8 @@ func (settings *Provider) readNordvpn(r reader) (err error) {
} }
func readNordVPNServerNumbers(env params.Env) (numbers []uint16, err error) { func readNordVPNServerNumbers(env params.Env) (numbers []uint16, err error) {
possibilities := make([]string, 65537) const possiblePortsCount = 65537
possibilities := make([]string, possiblePortsCount)
for i := range possibilities { for i := range possibilities {
possibilities[i] = fmt.Sprintf("%d", i) possibilities[i] = fmt.Sprintf("%d", i)
} }

5
internal/configuration/openvpn.go
View File

@@ -115,7 +115,7 @@ func (settings *OpenVPN) read(r reader) (err error) {
return err return err
} }
settings.Verbosity, err = r.env.IntRange("OPENVPN_VERBOSITY", 0, 6, params.Default("1")) settings.Verbosity, err = r.env.IntRange("OPENVPN_VERBOSITY", 0, 6, params.Default("1")) //nolint:gomnd
if err != nil { if err != nil {
return err return err
} }
@@ -135,7 +135,8 @@ func (settings *OpenVPN) read(r reader) (err error) {
return err return err
} }
mssFix, err := r.env.IntRange("OPENVPN_MSSFIX", 0, 10000, params.Default("0")) const maxMSSFix = 10000
mssFix, err := r.env.IntRange("OPENVPN_MSSFIX", 0, maxMSSFix, params.Default("0"))
if err != nil { if err != nil {
return err return err
} }

5
internal/configuration/system.go
View File

@@ -32,13 +32,14 @@ func (settings *System) lines() (lines []string) {
} }
func (settings *System) read(r reader) (err error) { func (settings *System) read(r reader) (err error) {
settings.PUID, err = r.env.IntRange("PUID", 0, 65535, params.Default("1000"), const maxID = 65535
settings.PUID, err = r.env.IntRange("PUID", 0, maxID, params.Default("1000"),
params.RetroKeys([]string{"UID"}, r.onRetroActive)) params.RetroKeys([]string{"UID"}, r.onRetroActive))
if err != nil { if err != nil {
return err return err
} }
settings.PGID, err = r.env.IntRange("PGID", 0, 65535, params.Default("1000"), settings.PGID, err = r.env.IntRange("PGID", 0, maxID, params.Default("1000"),
params.RetroKeys([]string{"GID"}, r.onRetroActive)) params.RetroKeys([]string{"GID"}, r.onRetroActive))
if err != nil { if err != nil {
return err return err

6
internal/configuration/unbound.go
View File

@@ -29,19 +29,19 @@ func (settings *DNS) readUnbound(r reader) (err error) {
return err return err
} }
verbosityLevel, err := r.env.IntRange("DOT_VERBOSITY", 0, 5, params.Default("1")) verbosityLevel, err := r.env.IntRange("DOT_VERBOSITY", 0, 5, params.Default("1")) //nolint:gomnd
if err != nil { if err != nil {
return err return err
} }
settings.Unbound.VerbosityLevel = uint8(verbosityLevel) settings.Unbound.VerbosityLevel = uint8(verbosityLevel)
verbosityDetailsLevel, err := r.env.IntRange("DOT_VERBOSITY_DETAILS", 0, 4, params.Default("0")) verbosityDetailsLevel, err := r.env.IntRange("DOT_VERBOSITY_DETAILS", 0, 4, params.Default("0")) //nolint:gomnd
if err != nil { if err != nil {
return err return err
} }
settings.Unbound.VerbosityDetailsLevel = uint8(verbosityDetailsLevel) settings.Unbound.VerbosityDetailsLevel = uint8(verbosityDetailsLevel)
validationLogLevel, err := r.env.IntRange("DOT_VALIDATION_LOGLEVEL", 0, 2, params.Default("0")) validationLogLevel, err := r.env.IntRange("DOT_VALIDATION_LOGLEVEL", 0, 2, params.Default("0")) //nolint:gomnd
if err != nil { if err != nil {
return err return err
} }

1
internal/constants/openvpn.go
View File

@@ -1,4 +1,3 @@
//nolint:revive
package constants package constants
const ( const (

1
internal/constants/status.go
View File

@@ -1,4 +1,3 @@
//nolint:revive
package constants package constants
import ( import (

4
internal/openvpn/tun.go
View File

@@ -23,7 +23,7 @@ func (c *configurator) CheckTUN() error {
func (c *configurator) CreateTUN() error { func (c *configurator) CreateTUN() error {
c.logger.Info("creating %s", constants.TunnelDevice) c.logger.Info("creating %s", constants.TunnelDevice)
if err := c.os.MkdirAll("/dev/net", 0751); err != nil { if err := c.os.MkdirAll("/dev/net", 0751); err != nil { //nolint:gomnd
return err return err
} }
@@ -36,7 +36,7 @@ func (c *configurator) CreateTUN() error {
return err return err
} }
file, err := c.os.OpenFile(constants.TunnelDevice, os.O_WRONLY, 0666) file, err := c.os.OpenFile(constants.TunnelDevice, os.O_WRONLY, 0666) //nolint:gomnd
if err != nil { if err != nil {
return err return err
} }

2
internal/updater/providers/nordvpn/name.go
View File

@@ -19,7 +19,7 @@ func parseServerName(serverName string) (number uint16, err error) {
} }
idString := serverName[i+1:] idString := serverName[i+1:]
idUint64, err := strconv.ParseUint(idString, 10, 16) idUint64, err := strconv.ParseUint(idString, 10, 16) //nolint:gomnd
if err != nil { if err != nil {
return 0, fmt.Errorf("%w: %s", ErrInvalidIDInServerName, serverName) return 0, fmt.Errorf("%w: %s", ErrInvalidIDInServerName, serverName)
} }