Skip to content

Commit 69ea4bf

Browse files
shiroushirou
authored
Merge pull request #1194 from mmorel-35/master
Enable errorlint and gci linters
2 parents 530dc58 + 8f64de9 commit 69ea4bf

File tree

14 files changed

+41
-24
lines changed

14 files changed

+41
-24
lines changed

‎.golangci.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
linters:
2+
enable:
3+
- errorlint
4+
- gci
5+
- gosimple
6+
- typecheck
27
disable:
38
- deadcode
49
- errcheck

‎cpu/cpu_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package cpu
22

33
import (
4+
"errors"
45
"fmt"
56
"os"
67
"runtime"
@@ -12,7 +13,7 @@ import (
1213
)
1314

1415
func skipIfNotImplementedErr(t *testing.T, err error) {
15-
if err == common.ErrNotImplementedError {
16+
if errors.Is(err, common.ErrNotImplementedError) {
1617
t.Skip("not implemented")
1718
}
1819
}

‎disk/disk_linux.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import (
66
"bufio"
77
"bytes"
88
"context"
9+
"errors"
910
"fmt"
1011
"io/ioutil"
1112
"os"
@@ -224,7 +225,8 @@ func PartitionsWithContext(ctx context.Context, all bool) ([]PartitionStat, erro
224225
filename := common.HostProc("1/mountinfo")
225226
lines, err := common.ReadLines(filename)
226227
if err != nil {
227-
if err != err.(*os.PathError) {
228+
var pathErr *os.PathError
229+
if !errors.As(err, &pathErr) {
228230
return nil, err
229231
}
230232
// if kernel does not support 1/mountinfo, fallback to 1/mounts (<2.6.26)

‎disk/disk_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package disk
22

33
import (
4+
"errors"
45
"fmt"
56
"runtime"
67
"sync"
@@ -10,7 +11,7 @@ import (
1011
)
1112

1213
func skipIfNotImplementedErr(t *testing.T, err error) {
13-
if err == common.ErrNotImplementedError {
14+
if errors.Is(err, common.ErrNotImplementedError) {
1415
t.Skip("not implemented")
1516
}
1617
}

‎host/host.go

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package host
33
import (
44
"context"
55
"encoding/json"
6+
"errors"
67
"os"
78
"runtime"
89
"time"
@@ -70,47 +71,47 @@ func InfoWithContext(ctx context.Context) (*InfoStat, error) {
7071
}
7172

7273
ret.Hostname, err = os.Hostname()
73-
if err != nil && err != common.ErrNotImplementedError {
74+
if err != nil && !errors.Is(err, common.ErrNotImplementedError) {
7475
return nil, err
7576
}
7677

7778
ret.Platform, ret.PlatformFamily, ret.PlatformVersion, err = PlatformInformationWithContext(ctx)
78-
if err != nil && err != common.ErrNotImplementedError {
79+
if err != nil && !errors.Is(err, common.ErrNotImplementedError) {
7980
return nil, err
8081
}
8182

8283
ret.KernelVersion, err = KernelVersionWithContext(ctx)
83-
if err != nil && err != common.ErrNotImplementedError {
84+
if err != nil && !errors.Is(err, common.ErrNotImplementedError) {
8485
return nil, err
8586
}
8687

8788
ret.KernelArch, err = KernelArch()
88-
if err != nil && err != common.ErrNotImplementedError {
89+
if err != nil && !errors.Is(err, common.ErrNotImplementedError) {
8990
return nil, err
9091
}
9192

9293
ret.VirtualizationSystem, ret.VirtualizationRole, err = VirtualizationWithContext(ctx)
93-
if err != nil && err != common.ErrNotImplementedError {
94+
if err != nil && !errors.Is(err, common.ErrNotImplementedError) {
9495
return nil, err
9596
}
9697

9798
ret.BootTime, err = BootTimeWithContext(ctx)
98-
if err != nil && err != common.ErrNotImplementedError {
99+
if err != nil && !errors.Is(err, common.ErrNotImplementedError) {
99100
return nil, err
100101
}
101102

102103
ret.Uptime, err = UptimeWithContext(ctx)
103-
if err != nil && err != common.ErrNotImplementedError {
104+
if err != nil && !errors.Is(err, common.ErrNotImplementedError) {
104105
return nil, err
105106
}
106107

107108
ret.Procs, err = numProcs(ctx)
108-
if err != nil && err != common.ErrNotImplementedError {
109+
if err != nil && !errors.Is(err, common.ErrNotImplementedError) {
109110
return nil, err
110111
}
111112

112113
ret.HostID, err = HostIDWithContext(ctx)
113-
if err != nil && err != common.ErrNotImplementedError {
114+
if err != nil && !errors.Is(err, common.ErrNotImplementedError) {
114115
return nil, err
115116
}
116117

‎host/host_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package host
22

33
import (
4+
"errors"
45
"fmt"
56
"os"
67
"sync"
@@ -10,7 +11,7 @@ import (
1011
)
1112

1213
func skipIfNotImplementedErr(t *testing.T, err error) {
13-
if err == common.ErrNotImplementedError {
14+
if errors.Is(err, common.ErrNotImplementedError) {
1415
t.Skip("not implemented")
1516
}
1617
}

‎internal/common/sleep_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package common_test
22

33
import (
44
"context"
5+
"errors"
56
"testing"
67
"time"
78

@@ -13,7 +14,7 @@ func TestSleep(test *testing.T) {
1314
var t = func(name string, ctx context.Context, expected error) {
1415
test.Run(name, func(test *testing.T) {
1516
var err = common.Sleep(ctx, dt)
16-
if err != expected {
17+
if !errors.Is(err, expected) {
1718
test.Errorf("expected %v, got %v", expected, err)
1819
}
1920
})

‎load/load_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
package load
22

33
import (
4+
"errors"
45
"fmt"
56
"testing"
67

78
"github.com/shirou/gopsutil/v3/internal/common"
89
)
910

1011
func skipIfNotImplementedErr(t testing.TB, err error) {
11-
if err == common.ErrNotImplementedError {
12+
if errors.Is(err, common.ErrNotImplementedError) {
1213
t.Skip("not implemented")
1314
}
1415
}

‎mem/mem_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package mem
22

33
import (
4+
"errors"
45
"fmt"
56
"runtime"
67
"testing"
@@ -10,7 +11,7 @@ import (
1011
)
1112

1213
func skipIfNotImplementedErr(t *testing.T, err error) {
13-
if err == common.ErrNotImplementedError {
14+
if errors.Is(err, common.ErrNotImplementedError) {
1415
t.Skip("not implemented")
1516
}
1617
}

‎net/net_linux.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -468,7 +468,7 @@ func connectionsPidMaxWithoutUidsWithContext(ctx context.Context, kind string, p
468468
}
469469
}
470470
if err != nil {
471-
return nil, fmt.Errorf("cound not get pid(s), %d: %s", pid, err)
471+
return nil, fmt.Errorf("cound not get pid(s), %d: %w", pid, err)
472472
}
473473
return statsFromInodes(root, pid, tmap, inodes, skipUids)
474474
}
@@ -672,7 +672,7 @@ func getProcInodesAll(root string, max int) (map[string][]inodeMap, error) {
672672
t, err := getProcInodes(root, pid, max)
673673
if err != nil {
674674
// skip if permission error or no longer exists
675-
if os.IsPermission(err) || os.IsNotExist(err) || err == io.EOF {
675+
if os.IsPermission(err) || os.IsNotExist(err) || errors.Is(err, io.EOF) {
676676
continue
677677
}
678678
return ret, err
@@ -702,7 +702,7 @@ func decodeAddress(family uint32, src string) (Addr, error) {
702702
}
703703
decoded, err := hex.DecodeString(addr)
704704
if err != nil {
705-
return Addr{}, fmt.Errorf("decode error, %s", err)
705+
return Addr{}, fmt.Errorf("decode error, %w", err)
706706
}
707707
var ip net.IP
708708
// Assumes this is little_endian

‎net/net_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package net
22

33
import (
4+
"errors"
45
"fmt"
56
"math"
67
"os"
@@ -11,7 +12,7 @@ import (
1112
)
1213

1314
func skipIfNotImplementedErr(t *testing.T, err error) {
14-
if err == common.ErrNotImplementedError {
15+
if errors.Is(err, common.ErrNotImplementedError) {
1516
t.Skip("not implemented")
1617
}
1718
}

‎process/process.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ func (p *Process) IsRunningWithContext(ctx context.Context) (bool, error) {
281281
return false, err
282282
}
283283
p2, err := NewProcessWithContext(ctx, p.Pid)
284-
if err == ErrorProcessNotRunning {
284+
if errors.Is(err, ErrorProcessNotRunning) {
285285
return false, nil
286286
}
287287
createTime2, err := p2.CreateTimeWithContext(ctx)

‎process/process_posix.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ package process
44

55
import (
66
"context"
7+
"errors"
78
"fmt"
89
"os"
910
"os/user"
@@ -122,8 +123,8 @@ func PidExistsWithContext(ctx context.Context, pid int32) (bool, error) {
122123
if err.Error() == "os: process already finished" {
123124
return false, nil
124125
}
125-
errno, ok := err.(syscall.Errno)
126-
if !ok {
126+
var errno syscall.Errno
127+
if !errors.As(err, &errno) {
127128
return false, err
128129
}
129130
switch errno {

‎process/process_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package process
22

33
import (
4+
"errors"
45
"fmt"
56
"io/ioutil"
67
"net"
@@ -23,7 +24,7 @@ import (
2324
var mu sync.Mutex
2425

2526
func skipIfNotImplementedErr(t *testing.T, err error) {
26-
if err == common.ErrNotImplementedError {
27+
if errors.Is(err, common.ErrNotImplementedError) {
2728
t.Skip("not implemented")
2829
}
2930
}

0 commit comments

Comments
 (0)