RepoMirrors/mediamtx
1
0
Fork 0
mirror of https://github.com/bluenviron/mediamtx synced 2025-02-17 12:06:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

update golangci-lint (#3149)

Browse Source
This commit is contained in:
Alessandro Ros 2024-03-19 12:53:26 +01:00 committed by GitHub
parent 29f0ded9f1
commit c7dbb951f3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
17 changed files with 31 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.golangci.yml
View File

@ -15,6 +15,7 @@ linters:
- nilerr - nilerr
- prealloc - prealloc
- revive - revive
- usestdlibvars
- unconvert - unconvert
- tparallel - tparallel
- wastedassign - wastedassign

2
Makefile
View File

@ -1,5 +1,5 @@
BASE_IMAGE = golang:1.21-alpine3.19 BASE_IMAGE = golang:1.21-alpine3.19
LINT_IMAGE = golangci/golangci-lint:v1.55.2 LINT_IMAGE = golangci/golangci-lint:v1.56.2
NODE_IMAGE = node:20-alpine3.19 NODE_IMAGE = node:20-alpine3.19
ALPINE_IMAGE = alpine:3.19 ALPINE_IMAGE = alpine:3.19
RPI32_IMAGE = balenalib/raspberry-pi:bullseye-run-20230712 RPI32_IMAGE = balenalib/raspberry-pi:bullseye-run-20230712

2
internal/conf/env/env_test.go vendored
View File

@ -194,7 +194,7 @@ func FuzzLoad(f *testing.F) {
f.Add("MYPREFIX_MYDURATION", "a") f.Add("MYPREFIX_MYDURATION", "a")
f.Add("MYPREFIX_MYDURATION_A", "a") f.Add("MYPREFIX_MYDURATION_A", "a")
f.Fuzz(func(t *testing.T, key string, val string) { f.Fuzz(func(_ *testing.T, key string, val string) {
env := map[string]string{ env := map[string]string{
key: val, key: val,
} }

4
internal/core/path_test.go
View File

@ -650,12 +650,12 @@ func TestPathSourceRegexp(t *testing.T) {
StatusCode: base.StatusOK, StatusCode: base.StatusOK,
}, stream, nil }, stream, nil
}, },
onSetup: func(ctx *gortsplib.ServerHandlerOnSetupCtx) (*base.Response, *gortsplib.ServerStream, error) { onSetup: func(_ *gortsplib.ServerHandlerOnSetupCtx) (*base.Response, *gortsplib.ServerStream, error) {
return &base.Response{ return &base.Response{
StatusCode: base.StatusOK, StatusCode: base.StatusOK,
}, stream, nil }, stream, nil
}, },
onPlay: func(ctx *gortsplib.ServerHandlerOnPlayCtx) (*base.Response, error) { onPlay: func(_ *gortsplib.ServerHandlerOnPlayCtx) (*base.Response, error) {
return &base.Response{ return &base.Response{
StatusCode: base.StatusOK, StatusCode: base.StatusOK,
}, nil }, nil

2
internal/formatprocessor/h264_test.go
View File

@ -202,7 +202,7 @@ func TestH264EmptyPacket(t *testing.T) {
} }
func FuzzRTPH264ExtractParams(f *testing.F) { func FuzzRTPH264ExtractParams(f *testing.F) {
f.Fuzz(func(t *testing.T, b []byte) { f.Fuzz(func(_ *testing.T, b []byte) {
rtpH264ExtractParams(b) rtpH264ExtractParams(b)
}) })
} }

2
internal/formatprocessor/h265_test.go
View File

@ -198,7 +198,7 @@ func TestH265EmptyPacket(t *testing.T) {
} }
func FuzzRTPH265ExtractParams(f *testing.F) { func FuzzRTPH265ExtractParams(f *testing.F) {
f.Fuzz(func(t *testing.T, b []byte) { f.Fuzz(func(_ *testing.T, b []byte) {
rtpH265ExtractParams(b) rtpH265ExtractParams(b)
}) })
} }

2
internal/protocols/rtmp/amf0/unmarshal_test.go
View File

@ -307,7 +307,7 @@ func FuzzUnmarshal(f *testing.F) {
f.Add(ca.enc) f.Add(ca.enc)
} }
f.Fuzz(func(t *testing.T, b []byte) { f.Fuzz(func(_ *testing.T, b []byte) {
Unmarshal(b) //nolint:errcheck Unmarshal(b) //nolint:errcheck
}) })
} }

8
internal/protocols/rtmp/chunk/chunk_test.go
View File

@ -158,28 +158,28 @@ func TestChunkMarshal(t *testing.T) {
} }
func FuzzChunk0Read(f *testing.F) { func FuzzChunk0Read(f *testing.F) {
f.Fuzz(func(t *testing.T, b []byte) { f.Fuzz(func(_ *testing.T, b []byte) {
var chunk Chunk0 var chunk Chunk0
chunk.Read(bytes.NewReader(b), 65536, false) //nolint:errcheck chunk.Read(bytes.NewReader(b), 65536, false) //nolint:errcheck
}) })
} }
func FuzzChunk1Read(f *testing.F) { func FuzzChunk1Read(f *testing.F) {
f.Fuzz(func(t *testing.T, b []byte) { f.Fuzz(func(_ *testing.T, b []byte) {
var chunk Chunk1 var chunk Chunk1
chunk.Read(bytes.NewReader(b), 65536, false) //nolint:errcheck chunk.Read(bytes.NewReader(b), 65536, false) //nolint:errcheck
}) })
} }
func FuzzChunk2Read(f *testing.F) { func FuzzChunk2Read(f *testing.F) {
f.Fuzz(func(t *testing.T, b []byte) { f.Fuzz(func(_ *testing.T, b []byte) {
var chunk Chunk2 var chunk Chunk2
chunk.Read(bytes.NewReader(b), 65536, false) //nolint:errcheck chunk.Read(bytes.NewReader(b), 65536, false) //nolint:errcheck
}) })
} }
func FuzzChunk3Read(f *testing.F) { func FuzzChunk3Read(f *testing.F) {
f.Fuzz(func(t *testing.T, b []byte) { f.Fuzz(func(_ *testing.T, b []byte) {
var chunk Chunk3 var chunk Chunk3
chunk.Read(bytes.NewReader(b), 65536, true) //nolint:errcheck chunk.Read(bytes.NewReader(b), 65536, true) //nolint:errcheck
}) })

2
internal/protocols/rtmp/message/reader_test.go
View File

@ -297,7 +297,7 @@ func FuzzReader(f *testing.F) {
0x01, 0x00, 0x00, 0x00, 0x88, 0x68, 0x76, 0x63, 0x01, 0x00, 0x00, 0x00, 0x88, 0x68, 0x76, 0x63,
0x31, 0x01, 0x02, 0x03, 0x31, 0x01, 0x02, 0x03,
}) })
f.Fuzz(func(t *testing.T, b []byte) { f.Fuzz(func(_ *testing.T, b []byte) {
bc := bytecounter.NewReader(bytes.NewReader(b)) bc := bytecounter.NewReader(bytes.NewReader(b))
r := NewReader(bc, bc, nil) r := NewReader(bc, bc, nil)
r.Read() //nolint:errcheck r.Read() //nolint:errcheck

8
internal/protocols/rtmp/rawmessage/reader_test.go
View File

@ -205,7 +205,7 @@ func TestReader(t *testing.T) {
t.Run(ca.name, func(t *testing.T) { t.Run(ca.name, func(t *testing.T) {
var buf bytes.Buffer var buf bytes.Buffer
br := bytecounter.NewReader(&buf) br := bytecounter.NewReader(&buf)
r := NewReader(br, br, func(count uint32) error { r := NewReader(br, br, func(_ uint32) error {
return nil return nil
}) })
@ -234,7 +234,7 @@ func TestReaderAcknowledge(t *testing.T) {
var buf bytes.Buffer var buf bytes.Buffer
bc := bytecounter.NewReader(&buf) bc := bytecounter.NewReader(&buf)
r := NewReader(bc, bc, func(count uint32) error { r := NewReader(bc, bc, func(_ uint32) error {
close(onAckCalled) close(onAckCalled)
return nil return nil
}) })
@ -269,9 +269,9 @@ func TestReaderAcknowledge(t *testing.T) {
} }
func FuzzReader(f *testing.F) { func FuzzReader(f *testing.F) {
f.Fuzz(func(t *testing.T, b []byte) { f.Fuzz(func(_ *testing.T, b []byte) {
br := bytecounter.NewReader(bytes.NewReader(b)) br := bytecounter.NewReader(bytes.NewReader(b))
r := NewReader(br, br, func(count uint32) error { r := NewReader(br, br, func(_ uint32) error {
return nil return nil
}) })

2
internal/protocols/websocket/serverconn.go
View File

@ -18,7 +18,7 @@ var (
) )
var upgrader = websocket.Upgrader{ var upgrader = websocket.Upgrader{
CheckOrigin: func(r *http.Request) bool { CheckOrigin: func(_ *http.Request) bool {
return true return true
}, },
} }

2
internal/protocols/websocket/serverconn_test.go
View File

@ -39,7 +39,7 @@ func TestServerConn(t *testing.T) {
defer res.Body.Close() defer res.Body.Close()
defer c.Close() //nolint:errcheck defer c.Close() //nolint:errcheck
c.SetPingHandler(func(msg string) error { c.SetPingHandler(func(_ string) error {
close(pingReceived) close(pingReceived)
return nil return nil
}) })

4
internal/record/agent_test.go
View File

@ -167,10 +167,10 @@ func TestAgent(t *testing.T) {
SegmentDuration: 1 * time.Second, SegmentDuration: 1 * time.Second,
PathName: "mypath", PathName: "mypath",
Stream: stream, Stream: stream,
OnSegmentCreate: func(fpath string) { OnSegmentCreate: func(_ string) {
segCreated <- struct{}{} segCreated <- struct{}{}
}, },
OnSegmentComplete: func(fpath string) { OnSegmentComplete: func(_ string) {
segDone <- struct{}{} segDone <- struct{}{}
}, },
Parent: &test.NilLogger{}, Parent: &test.NilLogger{},

2
internal/servers/rtmp/server_test.go
View File

@ -258,7 +258,7 @@ func TestServerRead(t *testing.T) {
}, },
}) })
r.OnDataH264(func(pts time.Duration, au [][]byte) { r.OnDataH264(func(_ time.Duration, au [][]byte) {
require.Equal(t, [][]byte{ require.Equal(t, [][]byte{
test.FormatH264.SPS, test.FormatH264.SPS,
test.FormatH264.PPS, test.FormatH264.PPS,

2
internal/servers/rtsp/server_test.go
View File

@ -228,7 +228,7 @@ func TestServerRead(t *testing.T) {
recv := make(chan struct{}) recv := make(chan struct{})
reader.OnPacketRTPAny(func(m *description.Media, f format.Format, p *rtp.Packet) { reader.OnPacketRTPAny(func(_ *description.Media, _ format.Format, p *rtp.Packet) {
require.Equal(t, &rtp.Packet{ require.Equal(t, &rtp.Packet{
Header: rtp.Header{ Header: rtp.Header{
Version: 2, Version: 2,

4
internal/staticsources/hls/source.go
View File

@ -123,7 +123,7 @@ func (s *Source) Run(params defs.StaticSourceRunParams) error {
}}, }},
} }
c.OnDataH26x(track, func(pts time.Duration, dts time.Duration, au [][]byte) { c.OnDataH26x(track, func(pts time.Duration, _ time.Duration, au [][]byte) {
stream.WriteUnit(medi, medi.Formats[0], &unit.H264{ stream.WriteUnit(medi, medi.Formats[0], &unit.H264{
Base: unit.Base{ Base: unit.Base{
NTP: time.Now(), NTP: time.Now(),
@ -144,7 +144,7 @@ func (s *Source) Run(params defs.StaticSourceRunParams) error {
}}, }},
} }
c.OnDataH26x(track, func(pts time.Duration, dts time.Duration, au [][]byte) { c.OnDataH26x(track, func(pts time.Duration, _ time.Duration, au [][]byte) {
stream.WriteUnit(medi, medi.Formats[0], &unit.H265{ stream.WriteUnit(medi, medi.Formats[0], &unit.H265{
Base: unit.Base{ Base: unit.Base{
NTP: time.Now(), NTP: time.Now(),

12
internal/staticsources/rtsp/source_test.go
View File

@ -69,12 +69,12 @@ func TestSource(t *testing.T) {
StatusCode: base.StatusOK, StatusCode: base.StatusOK,
}, stream, nil }, stream, nil
}, },
onSetup: func(ctx *gortsplib.ServerHandlerOnSetupCtx) (*base.Response, *gortsplib.ServerStream, error) { onSetup: func(_ *gortsplib.ServerHandlerOnSetupCtx) (*base.Response, *gortsplib.ServerStream, error) {
return &base.Response{ return &base.Response{
StatusCode: base.StatusOK, StatusCode: base.StatusOK,
}, stream, nil }, stream, nil
}, },
onPlay: func(ctx *gortsplib.ServerHandlerOnPlayCtx) (*base.Response, error) { onPlay: func(_ *gortsplib.ServerHandlerOnPlayCtx) (*base.Response, error) {
go func() { go func() {
time.Sleep(100 * time.Millisecond) time.Sleep(100 * time.Millisecond)
err := stream.WritePacketRTP(media0, &rtp.Packet{ err := stream.WritePacketRTP(media0, &rtp.Packet{
@ -195,7 +195,7 @@ func TestRTSPSourceNoPassword(t *testing.T) {
StatusCode: base.StatusOK, StatusCode: base.StatusOK,
}, stream, nil }, stream, nil
}, },
onSetup: func(ctx *gortsplib.ServerHandlerOnSetupCtx) (*base.Response, *gortsplib.ServerStream, error) { onSetup: func(_ *gortsplib.ServerHandlerOnSetupCtx) (*base.Response, *gortsplib.ServerStream, error) {
go func() { go func() {
time.Sleep(100 * time.Millisecond) time.Sleep(100 * time.Millisecond)
err := stream.WritePacketRTP(media0, &rtp.Packet{ err := stream.WritePacketRTP(media0, &rtp.Packet{
@ -216,7 +216,7 @@ func TestRTSPSourceNoPassword(t *testing.T) {
StatusCode: base.StatusOK, StatusCode: base.StatusOK,
}, stream, nil }, stream, nil
}, },
onPlay: func(ctx *gortsplib.ServerHandlerOnPlayCtx) (*base.Response, error) { onPlay: func(_ *gortsplib.ServerHandlerOnPlayCtx) (*base.Response, error) {
return &base.Response{ return &base.Response{
StatusCode: base.StatusOK, StatusCode: base.StatusOK,
}, nil }, nil
@ -263,12 +263,12 @@ func TestRTSPSourceRange(t *testing.T) {
s := gortsplib.Server{ s := gortsplib.Server{
Handler: &testServer{ Handler: &testServer{
onDescribe: func(ctx *gortsplib.ServerHandlerOnDescribeCtx) (*base.Response, *gortsplib.ServerStream, error) { onDescribe: func(_ *gortsplib.ServerHandlerOnDescribeCtx) (*base.Response, *gortsplib.ServerStream, error) {
return &base.Response{ return &base.Response{
StatusCode: base.StatusOK, StatusCode: base.StatusOK,
}, stream, nil }, stream, nil
}, },
onSetup: func(ctx *gortsplib.ServerHandlerOnSetupCtx) (*base.Response, *gortsplib.ServerStream, error) { onSetup: func(_ *gortsplib.ServerHandlerOnSetupCtx) (*base.Response, *gortsplib.ServerStream, error) {
return &base.Response{ return &base.Response{
StatusCode: base.StatusOK, StatusCode: base.StatusOK,
}, stream, nil }, stream, nil