Merge pull request #1443 from mmorel-35/linter

ci(lint): correct gci linter

Author: shirou

.golangci.yml

@@ -46,3 +46,10 @@ linters:
     - structcheck
     - unused
     - varcheck
+
+linters-settings:
+  gci:
+    sections:
+    - standard
+    - default
+    - prefix(github.com/shirou)

cpu/cpu_linux.go

@@ -11,8 +11,9 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/shirou/gopsutil/v3/internal/common"
 	"github.com/tklauser/go-sysconf"
+
+	"github.com/shirou/gopsutil/v3/internal/common"
 )
 
 var ClocksPerSec = float64(100)

cpu/cpu_test.go

@@ -8,8 +8,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/shirou/gopsutil/v3/internal/common"
 	"github.com/stretchr/testify/assert"
+
+	"github.com/shirou/gopsutil/v3/internal/common"
 )
 
 func skipIfNotImplementedErr(t *testing.T, err error) {

disk/disk_linux.go

@@ -16,8 +16,9 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/shirou/gopsutil/v3/internal/common"
 	"golang.org/x/sys/unix"
+
+	"github.com/shirou/gopsutil/v3/internal/common"
 )
 
 const (

host/host_linux.go

@@ -15,8 +15,9 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/shirou/gopsutil/v3/internal/common"
 	"golang.org/x/sys/unix"
+
+	"github.com/shirou/gopsutil/v3/internal/common"
 )
 
 type lsbStruct struct {

mem/mem_linux.go

@@ -14,8 +14,9 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/shirou/gopsutil/v3/internal/common"
 	"golang.org/x/sys/unix"
+
+	"github.com/shirou/gopsutil/v3/internal/common"
 )
 
 type VirtualMemoryExStat struct {

mem/mem_test.go

@@ -6,8 +6,9 @@ import (
 	"runtime"
 	"testing"
 
-	"github.com/shirou/gopsutil/v3/internal/common"
 	"github.com/stretchr/testify/assert"
+
+	"github.com/shirou/gopsutil/v3/internal/common"
 )
 
 func skipIfNotImplementedErr(t *testing.T, err error) {

net/net_linux_test.go

@@ -9,8 +9,9 @@ import (
 	"syscall"
 	"testing"
 
-	"github.com/shirou/gopsutil/v3/internal/common"
 	"github.com/stretchr/testify/assert"
+
+	"github.com/shirou/gopsutil/v3/internal/common"
 )
 
 func TestIOCountersByFileParsing(t *testing.T) {
@@ -248,6 +249,7 @@ entries  searched found new invalid ignore delete deleteList insert insertFailed
 
 	// Function under test
 	stats, err := conntrackStatsFromFile(tmpfile.Name(), true)
+	assert.Nil(t, err)
 	assert.Equal(t, 8, len(stats), "Expected 8 results")
 
 	summary := &ConntrackStat{}
@@ -308,6 +310,7 @@ entries  searched found new invalid ignore delete deleteList insert insertFailed
 
 	// Test summary grouping
 	totals, err := conntrackStatsFromFile(tmpfile.Name(), false)
+	assert.Nil(t, err)
 	for i, st := range totals {
 		assert.Equal(t, summary.Entries, st.Entries)
 		assert.Equal(t, summary.Searched, st.Searched)

process/process_linux.go

@@ -16,11 +16,12 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/tklauser/go-sysconf"
+	"golang.org/x/sys/unix"
+
 	"github.com/shirou/gopsutil/v3/cpu"
 	"github.com/shirou/gopsutil/v3/internal/common"
 	"github.com/shirou/gopsutil/v3/net"
-	"github.com/tklauser/go-sysconf"
-	"golang.org/x/sys/unix"
 )
 
 var pageSize = uint64(os.Getpagesize())

process/process_posix.go

@@ -14,8 +14,9 @@ import (
 	"strings"
 	"syscall"
 
-	"github.com/shirou/gopsutil/v3/internal/common"
 	"golang.org/x/sys/unix"
+
+	"github.com/shirou/gopsutil/v3/internal/common"
 )
 
 type Signal = syscall.Signal

process/process_test.go

@@ -17,8 +17,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/shirou/gopsutil/v3/internal/common"
 	"github.com/stretchr/testify/assert"
+
+	"github.com/shirou/gopsutil/v3/internal/common"
 )
 
 var mu sync.Mutex