Skip to content

Commit 97acfcf

Browse files
smorimotolukasmalkmus
authored andcommitted
Fix lint errors
Signed-off-by: Sora Morimoto <[email protected]>
1 parent d4338b6 commit 97acfcf

File tree

4 files changed

+25
-23
lines changed

4 files changed

+25
-23
lines changed

.golangci.yaml

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,18 @@
11
run:
22
modules-download-mode: readonly
3-
skip-dirs:
4-
- .git
5-
- .github
6-
- .vscode
7-
- dist
3+
4+
linters-settings:
5+
gofmt:
6+
simplify: true
7+
goimports:
8+
local-prefixes: github.com/axiomhq/axiom-syslog-proxy
9+
govet:
10+
enable:
11+
- shadow
12+
nolintlint:
13+
allow-unused: false
14+
require-explanation: true
15+
require-specific: true
816

917
linters:
1018
disable-all: true
@@ -34,15 +42,9 @@ linters:
3442
- unused
3543
- whitespace
3644

37-
linters-settings:
38-
gofmt:
39-
simplify: true
40-
goimports:
41-
local-prefixes: github.com/axiomhq/axiom-syslog-proxy
42-
govet:
43-
check-shadowing: true
44-
nolintlint:
45-
allow-unused: false
46-
allow-leading-space: false
47-
require-explanation: true
48-
require-specific: true
45+
issues:
46+
exclude-dirs:
47+
- .git
48+
- .github
49+
- .vscode
50+
- dist

parser/parse.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ func parseJSON(data []byte) (*Log, error) {
146146
Metadata: map[string]interface{}{},
147147
}
148148

149-
if err := jsonparser.ObjectEach(data, func(key []byte, value []byte, dataType jsonparser.ValueType, offset int) error {
149+
if err := jsonparser.ObjectEach(data, func(key []byte, value []byte, dataType jsonparser.ValueType, _ int) error {
150150
return extractJSONProperty(key, value, dataType, msg)
151151
}); err != nil {
152152
return nil, err
@@ -197,15 +197,15 @@ func extractMetadataValue(concatKey string, value []byte, dataType jsonparser.Va
197197
switch dataType {
198198
case jsonparser.Object:
199199
level++
200-
if err := jsonparser.ObjectEach(value, func(kk []byte, vv []byte, dtdt jsonparser.ValueType, offset int) error {
200+
if err := jsonparser.ObjectEach(value, func(kk []byte, vv []byte, dtdt jsonparser.ValueType, _ int) error {
201201
return extractMetadataValue(joinKey(concatKey, string(kk)), vv, dtdt, level, msg)
202202
}); err != nil {
203203
return err
204204
}
205205
case jsonparser.Array:
206206
arrayIndex := 0
207207
level++
208-
if _, err := jsonparser.ArrayEach(value, func(vv []byte, dtdt jsonparser.ValueType, offset int, err error) {
208+
if _, err := jsonparser.ArrayEach(value, func(vv []byte, dtdt jsonparser.ValueType, _ int, err error) {
209209
if err != nil {
210210
return
211211
}

parser/parse_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -694,7 +694,7 @@ func BenchmarkParserDifferentMetadataTypes(b *testing.B) {
694694
}
695695

696696
func BenchmarkParser(b *testing.B) {
697-
p := New(func(msg *Log) {})
697+
p := New(func(_ *Log) {})
698698

699699
const msg = "<1> 2009-10-16T11:51:56+02:00 ip-34-23-211-23 symbolicator ERROR 2008 SOMEMSG - hello"
700700
rawMsg := []byte(msg)

parser/syslog.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -570,10 +570,10 @@ func parseStructuredData(data []byte, index *int, length *int) (map[string]map[s
570570
sc := scanner.Scanner{}
571571
sc.Init(bytes.NewBuffer(data[offset+1:]))
572572
sc.Mode = scanner.ScanStrings | scanner.ScanIdents
573-
sc.IsIdentRune = func(ch rune, i int) bool {
573+
sc.IsIdentRune = func(ch rune, _ int) bool {
574574
return unicode.IsLetter(ch) || unicode.IsDigit(ch) || ch == '@' || ch == '.'
575575
}
576-
sc.Error = func(s *scanner.Scanner, msg string) {}
576+
sc.Error = func(_ *scanner.Scanner, _ string) {}
577577

578578
var (
579579
sdID, sdParam string

0 commit comments

Comments
 (0)