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

chore(lint): add containedctx, decorder and errchkjson

Browse Source
This commit is contained in:
Quentin McGaw
2022-02-26 13:49:53 +00:00
parent 26b049b361
commit 836f021a87
8 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.golangci.yml
View File

@@ -9,6 +9,7 @@ issues:
- dupl - dupl
- maligned - maligned
- goerr113 - goerr113
- containedctx
- path: internal/server/ - path: internal/server/
linters: linters:
- dupl - dupl
@@ -49,9 +50,12 @@ linters:
- asciicheck - asciicheck
- bidichk - bidichk
- bodyclose - bodyclose
- containedctx
- decorder
- dogsled - dogsled
- dupl - dupl
- durationcheck - durationcheck
- errchkjson
- errname - errname
- exhaustive - exhaustive
- exportloopref - exportloopref
@@ -71,9 +75,11 @@ linters:
- gomoddirectives - gomoddirectives
- goprintffuncname - goprintffuncname
- gosec - gosec
- grouper
- ifshort - ifshort
- importas - importas
- lll - lll
- maintidx
- makezero - makezero
- misspell - misspell
- nakedret - nakedret

2
cmd/gluetun/main.go
View File

@@ -122,7 +122,7 @@ var (
errCommandUnknown = errors.New("command is unknown") errCommandUnknown = errors.New("command is unknown")
) )
//nolint:gocognit,gocyclo //nolint:gocognit,gocyclo,maintidx
func _main(ctx context.Context, buildInfo models.BuildInformation, func _main(ctx context.Context, buildInfo models.BuildInformation,
args []string, logger logging.ParentLogger, source sources.Source, args []string, logger logging.ParentLogger, source sources.Source,
tun tun.Interface, netLinker netlink.NetLinker, cmder command.RunStarter, tun tun.Interface, netLinker netlink.NetLinker, cmder command.RunStarter,

2
internal/httpproxy/handler.go
View File

@@ -25,7 +25,7 @@ func newHandler(ctx context.Context, wg *sync.WaitGroup, logger Logger,
} }
type handler struct { type handler struct {
ctx context.Context ctx context.Context //nolint:containedctx
wg *sync.WaitGroup wg *sync.WaitGroup
client *http.Client client *http.Client
logger Logger logger Logger

2
internal/server/dns.go
View File

@@ -19,7 +19,7 @@ func newDNSHandler(ctx context.Context, looper dns.Looper,
} }
type dnsHandler struct { type dnsHandler struct {
ctx context.Context ctx context.Context //nolint:containedctx
looper dns.Looper looper dns.Looper
warner warner warner warner
} }

2
internal/server/handlerv0.go
View File

@@ -22,7 +22,7 @@ func newHandlerV0(ctx context.Context, logger infoWarner,
} }
type handlerV0 struct { type handlerV0 struct {
ctx context.Context ctx context.Context //nolint:containedctx
logger infoWarner logger infoWarner
vpn vpn.Looper vpn vpn.Looper
dns dns.Looper dns dns.Looper

2
internal/server/openvpn.go
View File

@@ -21,7 +21,7 @@ func newOpenvpnHandler(ctx context.Context, looper vpn.Looper,
} }
type openvpnHandler struct { type openvpnHandler struct {
ctx context.Context ctx context.Context //nolint:containedctx
looper vpn.Looper looper vpn.Looper
pf portforward.Getter pf portforward.Getter
warner warner warner warner

2
internal/server/updater.go
View File

@@ -21,7 +21,7 @@ func newUpdaterHandler(
} }
type updaterHandler struct { type updaterHandler struct {
ctx context.Context ctx context.Context //nolint:containedctx
looper updater.Looper looper updater.Looper
warner warner warner warner
} }

2
internal/storage/read.go
View File

@@ -38,7 +38,7 @@ var (
errDecodeProvider = errors.New("cannot decode servers for provider") errDecodeProvider = errors.New("cannot decode servers for provider")
) )
func (s *Storage) extractServersFromBytes(b []byte, hardcoded models.AllServers) ( //nolint:gocognit,gocyclo func (s *Storage) extractServersFromBytes(b []byte, hardcoded models.AllServers) ( //nolint:gocognit,gocyclo,maintidx
servers models.AllServers, err error) { servers models.AllServers, err error) {
var versions allVersions var versions allVersions
if err := json.Unmarshal(b, &versions); err != nil { if err := json.Unmarshal(b, &versions); err != nil {