Skip to content

Commit 155599d

Browse files
committed
Tighten up the golangci-lint config
1 parent ac26963 commit 155599d

File tree

3 files changed

+9
-21
lines changed

3 files changed

+9
-21
lines changed

.golangci.yml

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,9 @@ linters:
6060
gosec:
6161
excludes:
6262
- G115
63+
# Potential file inclusion via variable - we only open files asked by
64+
# the user of the API.
65+
- G304
6366
govet:
6467
disable:
6568
- shadow
@@ -135,22 +138,13 @@ linters:
135138
unparam:
136139
check-exported: true
137140
exclusions:
138-
generated: lax
139-
presets:
140-
- comments
141-
- common-false-positives
142-
- legacy
143-
- std-error-handling
141+
warn-unused: true
144142
rules:
145143
- linters:
146144
- govet
147145
- revive
148146
path: _test.go
149147
text: 'fieldalignment:'
150-
paths:
151-
- third_party$
152-
- builtin$
153-
- examples$
154148
formatters:
155149
enable:
156150
- gci
@@ -166,9 +160,3 @@ formatters:
166160
- prefix(github.com/oschwald/maxminddb-golang)
167161
gofumpt:
168162
extra-rules: true
169-
exclusions:
170-
generated: lax
171-
paths:
172-
- third_party$
173-
- builtin$
174-
- examples$

example_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ func ExampleReader_Lookup_struct() {
1414
if err != nil {
1515
log.Fatal(err)
1616
}
17-
defer db.Close()
17+
defer db.Close() //nolint:errcheck // error doesn't matter
1818

1919
addr := netip.MustParseAddr("81.2.69.142")
2020

@@ -39,7 +39,7 @@ func ExampleReader_Lookup_interface() {
3939
if err != nil {
4040
log.Fatal(err)
4141
}
42-
defer db.Close()
42+
defer db.Close() //nolint:errcheck // error doesn't matter
4343

4444
addr := netip.MustParseAddr("81.2.69.142")
4545

@@ -61,7 +61,7 @@ func ExampleReader_Networks() {
6161
if err != nil {
6262
log.Fatal(err)
6363
}
64-
defer db.Close()
64+
defer db.Close() //nolint:errcheck // error doesn't matter
6565

6666
for result := range db.Networks() {
6767
record := struct {
@@ -108,7 +108,7 @@ func ExampleReader_NetworksWithin() {
108108
if err != nil {
109109
log.Fatal(err)
110110
}
111-
defer db.Close()
111+
defer db.Close() //nolint:errcheck // error doesn't matter
112112

113113
prefix, err := netip.ParsePrefix("1.0.0.0/8")
114114
if err != nil {

reader.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ func Open(file string, options ...ReaderOption) (*Reader, error) {
6969
if err != nil {
7070
return nil, err
7171
}
72-
defer mapFile.Close()
72+
defer mapFile.Close() //nolint:errcheck // error is generally not relevant
7373

7474
stats, err := mapFile.Stat()
7575
if err != nil {

0 commit comments

Comments
 (0)