fix dependabot v2 deletion.

shirou · Nov 30, 2021 · 3827c6f · 3827c6f
1 parent f9323fb
commit 3827c6f
Show file tree

Hide file tree

Showing 241 changed files with 14 additions and 7,224 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -4,3 +4,7 @@ updates:
   directory: /
   schedule:
     interval: daily
+- package-ecosystem: github-actions
+  directory: /
+  schedule:
+    interval: daily
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -20,4 +20,3 @@ jobs:
         with:
           args: --verbose
           version: latest
-          working-directory: v3
diff --git a/cpu/cpu.go b/cpu/cpu.go
diff --git a/v3/cpu/cpu_aix.go → cpu/cpu_aix.go b/v3/cpu/cpu_aix.go → cpu/cpu_aix.go
diff --git a/cpu/cpu_darwin.go b/cpu/cpu_darwin.go
diff --git a/cpu/cpu_darwin_cgo.go b/cpu/cpu_darwin_cgo.go
diff --git a/cpu/cpu_darwin_nocgo.go b/cpu/cpu_darwin_nocgo.go
diff --git a/cpu/cpu_dragonfly.go b/cpu/cpu_dragonfly.go
diff --git a/cpu/cpu_dragonfly_amd64.go b/cpu/cpu_dragonfly_amd64.go
diff --git a/cpu/cpu_fallback.go b/cpu/cpu_fallback.go
@@ -1,4 +1,4 @@
-// +build !darwin,!linux,!freebsd,!openbsd,!solaris,!windows,!dragonfly,!plan9
+// +build !darwin,!linux,!freebsd,!openbsd,!solaris,!windows,!dragonfly,!plan9,!aix
 
 package cpu
 

diff --git a/cpu/cpu_freebsd.go b/cpu/cpu_freebsd.go
diff --git a/cpu/cpu_freebsd_386.go b/cpu/cpu_freebsd_386.go
diff --git a/cpu/cpu_freebsd_amd64.go b/cpu/cpu_freebsd_amd64.go
diff --git a/cpu/cpu_freebsd_arm.go b/cpu/cpu_freebsd_arm.go
diff --git a/cpu/cpu_freebsd_arm64.go b/cpu/cpu_freebsd_arm64.go
diff --git a/cpu/cpu_freebsd_test.go b/cpu/cpu_freebsd_test.go
diff --git a/cpu/cpu_linux.go b/cpu/cpu_linux.go
@@ -240,7 +240,7 @@ func parseStatLine(line string) (*TimesStat, error) {
 		return nil, errors.New("stat does not contain cpu info")
 	}
 
-	if strings.HasPrefix(fields[0], "cpu") == false {
+	if !strings.HasPrefix(fields[0], "cpu") {
 		return nil, errors.New("not contain cpu")
 	}
 

diff --git a/cpu/cpu_linux_test.go b/cpu/cpu_linux_test.go
diff --git a/cpu/cpu_openbsd.go b/cpu/cpu_openbsd.go
diff --git a/cpu/cpu_plan9.go b/cpu/cpu_plan9.go
diff --git a/cpu/cpu_plan9_test.go b/cpu/cpu_plan9_test.go
diff --git a/cpu/cpu_solaris.go b/cpu/cpu_solaris.go
diff --git a/cpu/cpu_solaris_test.go b/cpu/cpu_solaris_test.go
diff --git a/cpu/cpu_test.go b/cpu/cpu_test.go
diff --git a/cpu/cpu_windows.go b/cpu/cpu_windows.go
diff --git a/cpu/testdata/freebsd/1cpu_2core.txt b/cpu/testdata/freebsd/1cpu_2core.txt
diff --git a/cpu/testdata/freebsd/1cpu_4core.txt b/cpu/testdata/freebsd/1cpu_4core.txt
diff --git a/cpu/testdata/freebsd/2cpu_4core.txt b/cpu/testdata/freebsd/2cpu_4core.txt
diff --git a/cpu/testdata/linux/1037/proc/cpuinfo b/cpu/testdata/linux/1037/proc/cpuinfo
diff --git a/cpu/testdata/linux/424/proc/stat b/cpu/testdata/linux/424/proc/stat
diff --git a/cpu/testdata/plan9/2cores/dev/cputype b/cpu/testdata/plan9/2cores/dev/cputype
diff --git a/cpu/testdata/plan9/2cores/dev/sysstat b/cpu/testdata/plan9/2cores/dev/sysstat
diff --git a/cpu/testdata/plan9/2cores/dev/time b/cpu/testdata/plan9/2cores/dev/time
diff --git a/cpu/testdata/plan9/2cores/proc/1/status b/cpu/testdata/plan9/2cores/proc/1/status
diff --git a/cpu/testdata/plan9/2cores/proc/331/.gitkeep b/cpu/testdata/plan9/2cores/proc/331/.gitkeep
diff --git a/cpu/testdata/plan9/2cores/proc/54384/status b/cpu/testdata/plan9/2cores/proc/54384/status
diff --git a/cpu/testdata/plan9/2cores/proc/54412/status b/cpu/testdata/plan9/2cores/proc/54412/status
diff --git a/cpu/testdata/plan9/2cores/proc/72/status b/cpu/testdata/plan9/2cores/proc/72/status
diff --git a/cpu/testdata/solaris/1cpu_1core_isainfo.txt b/cpu/testdata/solaris/1cpu_1core_isainfo.txt
diff --git a/cpu/testdata/solaris/1cpu_1core_psrinfo.txt b/cpu/testdata/solaris/1cpu_1core_psrinfo.txt
diff --git a/cpu/testdata/solaris/2cpu_12core_isainfo.txt b/cpu/testdata/solaris/2cpu_12core_isainfo.txt
diff --git a/cpu/testdata/solaris/2cpu_12core_psrinfo.txt b/cpu/testdata/solaris/2cpu_12core_psrinfo.txt
diff --git a/cpu/testdata/solaris/2cpu_1core_isainfo.txt b/cpu/testdata/solaris/2cpu_1core_isainfo.txt
diff --git a/cpu/testdata/solaris/2cpu_1core_psrinfo.txt b/cpu/testdata/solaris/2cpu_1core_psrinfo.txt
diff --git a/cpu/testdata/solaris/2cpu_8core_isainfo.txt b/cpu/testdata/solaris/2cpu_8core_isainfo.txt
diff --git a/cpu/testdata/solaris/2cpu_8core_psrinfo.txt b/cpu/testdata/solaris/2cpu_8core_psrinfo.txt
diff --git a/disk/disk.go b/disk/disk.go
diff --git a/v3/disk/disk_aix.go → disk/disk_aix.go b/v3/disk/disk_aix.go → disk/disk_aix.go
diff --git a/disk/disk_darwin.go b/disk/disk_darwin.go
diff --git a/disk/disk_darwin_cgo.go b/disk/disk_darwin_cgo.go
diff --git a/disk/disk_darwin_nocgo.go b/disk/disk_darwin_nocgo.go
diff --git a/disk/disk_fallback.go b/disk/disk_fallback.go
@@ -1,4 +1,4 @@
-// +build !darwin,!linux,!freebsd,!openbsd,!windows,!solaris
+// +build !darwin,!linux,!freebsd,!openbsd,!windows,!solaris,!aix
 
 package disk
 

diff --git a/disk/disk_freebsd.go b/disk/disk_freebsd.go
diff --git a/disk/disk_freebsd_386.go b/disk/disk_freebsd_386.go
diff --git a/disk/disk_freebsd_amd64.go b/disk/disk_freebsd_amd64.go
diff --git a/disk/disk_freebsd_arm.go b/disk/disk_freebsd_arm.go
diff --git a/disk/disk_freebsd_arm64.go b/disk/disk_freebsd_arm64.go
diff --git a/disk/disk_linux.go b/disk/disk_linux.go
@@ -349,7 +349,7 @@ func IOCountersWithContext(ctx context.Context, names ...string) (map[string]IOC
 	if err != nil {
 		return nil, err
 	}
-	ret := make(map[string]IOCountersStat, 0)
+	ret := make(map[string]IOCountersStat)
 	empty := IOCountersStat{}
 
 	// use only basename such as "/dev/sda1" to "sda1"

diff --git a/disk/disk_openbsd.go b/disk/disk_openbsd.go
diff --git a/disk/disk_openbsd_386.go b/disk/disk_openbsd_386.go
diff --git a/disk/disk_openbsd_amd64.go b/disk/disk_openbsd_amd64.go
diff --git a/disk/disk_openbsd_arm64.go b/disk/disk_openbsd_arm64.go
diff --git a/disk/disk_solaris.go b/disk/disk_solaris.go
diff --git a/disk/disk_test.go b/disk/disk_test.go
diff --git a/disk/disk_unix.go b/disk/disk_unix.go
diff --git a/disk/disk_windows.go b/disk/disk_windows.go
diff --git a/disk/iostat_darwin.c b/disk/iostat_darwin.c
diff --git a/disk/iostat_darwin.h b/disk/iostat_darwin.h
diff --git a/disk/types_freebsd.go b/disk/types_freebsd.go
diff --git a/disk/types_openbsd.go b/disk/types_openbsd.go
diff --git a/docker/docker.go b/docker/docker.go
diff --git a/docker/docker_linux.go b/docker/docker_linux.go
diff --git a/docker/docker_linux_test.go b/docker/docker_linux_test.go
diff --git a/docker/docker_notlinux.go b/docker/docker_notlinux.go
diff --git a/docker/main_test.go b/docker/main_test.go
diff --git a/go.mod b/go.mod
diff --git a/go.sum b/go.sum
diff --git a/host/freebsd_headers/utxdb.h b/host/freebsd_headers/utxdb.h
diff --git a/host/host.go b/host/host.go
diff --git a/host/host_bsd.go b/host/host_bsd.go
diff --git a/host/host_darwin.go b/host/host_darwin.go
diff --git a/host/host_darwin_386.go b/host/host_darwin_386.go
diff --git a/host/host_darwin_amd64.go b/host/host_darwin_amd64.go
diff --git a/host/host_darwin_arm64.go b/host/host_darwin_arm64.go
diff --git a/host/host_darwin_cgo.go b/host/host_darwin_cgo.go
diff --git a/host/host_darwin_nocgo.go b/host/host_darwin_nocgo.go
diff --git a/host/host_fallback.go b/host/host_fallback.go
diff --git a/host/host_freebsd.go b/host/host_freebsd.go
diff --git a/host/host_freebsd_386.go b/host/host_freebsd_386.go
diff --git a/host/host_freebsd_amd64.go b/host/host_freebsd_amd64.go
diff --git a/host/host_freebsd_arm.go b/host/host_freebsd_arm.go
diff --git a/host/host_freebsd_arm64.go b/host/host_freebsd_arm64.go
diff --git a/host/host_linux.go b/host/host_linux.go
diff --git a/host/host_linux_386.go b/host/host_linux_386.go
diff --git a/host/host_linux_amd64.go b/host/host_linux_amd64.go
diff --git a/host/host_linux_arm.go b/host/host_linux_arm.go
diff --git a/host/host_linux_arm64.go b/host/host_linux_arm64.go
diff --git a/host/host_linux_mips.go b/host/host_linux_mips.go
diff --git a/host/host_linux_mips64.go b/host/host_linux_mips64.go
diff --git a/host/host_linux_mips64le.go b/host/host_linux_mips64le.go
diff --git a/host/host_linux_mipsle.go b/host/host_linux_mipsle.go
diff --git a/host/host_linux_ppc64le.go b/host/host_linux_ppc64le.go
diff --git a/host/host_linux_riscv64.go b/host/host_linux_riscv64.go
diff --git a/host/host_linux_s390x.go b/host/host_linux_s390x.go
diff --git a/host/host_linux_test.go b/host/host_linux_test.go
diff --git a/host/host_openbsd.go b/host/host_openbsd.go
diff --git a/host/host_openbsd_386.go b/host/host_openbsd_386.go
diff --git a/host/host_openbsd_amd64.go b/host/host_openbsd_amd64.go
diff --git a/host/host_openbsd_arm64.go b/host/host_openbsd_arm64.go
diff --git a/host/host_posix.go b/host/host_posix.go
diff --git a/host/host_solaris.go b/host/host_solaris.go
diff --git a/host/host_test.go b/host/host_test.go
diff --git a/host/host_windows.go b/host/host_windows.go
diff --git a/host/smc_darwin.c b/host/smc_darwin.c
diff --git a/host/smc_darwin.h b/host/smc_darwin.h
diff --git a/host/types.go b/host/types.go
diff --git a/host/types_darwin.go b/host/types_darwin.go
diff --git a/host/types_freebsd.go b/host/types_freebsd.go
diff --git a/host/types_linux.go b/host/types_linux.go
diff --git a/host/types_openbsd.go b/host/types_openbsd.go
diff --git a/internal/common/binary.go b/internal/common/binary.go
diff --git a/internal/common/common.go b/internal/common/common.go
diff --git a/internal/common/common_darwin.go b/internal/common/common_darwin.go
diff --git a/internal/common/common_freebsd.go b/internal/common/common_freebsd.go
diff --git a/internal/common/common_linux.go b/internal/common/common_linux.go
diff --git a/internal/common/common_openbsd.go b/internal/common/common_openbsd.go
diff --git a/internal/common/common_test.go b/internal/common/common_test.go
diff --git a/internal/common/common_unix.go b/internal/common/common_unix.go
@@ -41,8 +41,7 @@ func CallLsofWithContext(ctx context.Context, invoke Invoker, pid int32, args ..
 }
 
 func CallPgrepWithContext(ctx context.Context, invoke Invoker, pid int32) ([]int32, error) {
-	var cmd []string
-	cmd = []string{"-P", strconv.Itoa(int(pid))}
+	cmd := []string{"-P", strconv.Itoa(int(pid))}
 	pgrep, err := exec.LookPath("pgrep")
 	if err != nil {
 		return []int32{}, err

diff --git a/internal/common/common_windows.go b/internal/common/common_windows.go
diff --git a/internal/common/sleep.go b/internal/common/sleep.go
diff --git a/internal/common/sleep_test.go b/internal/common/sleep_test.go
diff --git a/load/load.go b/load/load.go
diff --git a/v3/load/load_aix.go → load/load_aix.go b/v3/load/load_aix.go → load/load_aix.go
diff --git a/load/load_bsd.go b/load/load_bsd.go
diff --git a/load/load_darwin.go b/load/load_darwin.go
diff --git a/load/load_fallback.go b/load/load_fallback.go
@@ -1,4 +1,4 @@
-// +build !darwin,!linux,!freebsd,!openbsd,!windows,!solaris
+// +build !darwin,!linux,!freebsd,!openbsd,!windows,!solaris,!aix
 
 package load
 

diff --git a/load/load_freebsd.go b/load/load_freebsd.go
diff --git a/load/load_linux.go b/load/load_linux.go
diff --git a/load/load_openbsd.go b/load/load_openbsd.go
diff --git a/load/load_solaris.go b/load/load_solaris.go
diff --git a/load/load_test.go b/load/load_test.go
diff --git a/load/load_windows.go b/load/load_windows.go
diff --git a/mem/mem.go b/mem/mem.go
diff --git a/v3/mem/mem_aix.go → mem/mem_aix.go b/v3/mem/mem_aix.go → mem/mem_aix.go
diff --git a/mem/mem_bsd.go b/mem/mem_bsd.go
diff --git a/mem/mem_bsd_test.go b/mem/mem_bsd_test.go
diff --git a/mem/mem_darwin.go b/mem/mem_darwin.go
diff --git a/mem/mem_darwin_cgo.go b/mem/mem_darwin_cgo.go
diff --git a/mem/mem_darwin_nocgo.go b/mem/mem_darwin_nocgo.go
diff --git a/mem/mem_darwin_test.go b/mem/mem_darwin_test.go
diff --git a/mem/mem_fallback.go b/mem/mem_fallback.go
@@ -1,4 +1,4 @@
-// +build !darwin,!linux,!freebsd,!openbsd,!solaris,!windows,!plan9
+// +build !darwin,!linux,!freebsd,!openbsd,!solaris,!windows,!plan9,!aix
 
 package mem
 

diff --git a/mem/mem_freebsd.go b/mem/mem_freebsd.go
diff --git a/mem/mem_linux.go b/mem/mem_linux.go
diff --git a/mem/mem_linux_test.go b/mem/mem_linux_test.go
diff --git a/mem/mem_openbsd.go b/mem/mem_openbsd.go
diff --git a/mem/mem_openbsd_386.go b/mem/mem_openbsd_386.go
diff --git a/mem/mem_openbsd_amd64.go b/mem/mem_openbsd_amd64.go
diff --git a/mem/mem_openbsd_arm64.go b/mem/mem_openbsd_arm64.go
diff --git a/mem/mem_plan9.go b/mem/mem_plan9.go
diff --git a/mem/mem_plan9_test.go b/mem/mem_plan9_test.go
diff --git a/mem/mem_solaris.go b/mem/mem_solaris.go
diff --git a/mem/mem_solaris_test.go b/mem/mem_solaris_test.go
diff --git a/mem/mem_test.go b/mem/mem_test.go
diff --git a/mem/mem_windows.go b/mem/mem_windows.go
diff --git a/mem/testdata/linux/virtualmemory/intelcorei5/proc/meminfo b/mem/testdata/linux/virtualmemory/intelcorei5/proc/meminfo
diff --git a/mem/testdata/linux/virtualmemory/issue1002/proc/meminfo b/mem/testdata/linux/virtualmemory/issue1002/proc/meminfo
diff --git a/mem/testdata/plan9/virtualmemory/dev/swap b/mem/testdata/plan9/virtualmemory/dev/swap
diff --git a/mem/types_openbsd.go b/mem/types_openbsd.go
diff --git a/net/net.go b/net/net.go
@@ -131,7 +131,7 @@ func (l *ConntrackStatList) Append(c *ConntrackStat) {
 }
 
 func (l *ConntrackStatList) Items() []ConntrackStat {
-	items := make([]ConntrackStat, len(l.items), len(l.items))
+	items := make([]ConntrackStat, len(l.items))
 	for i, el := range l.items {
 		items[i] = *el
 	}

diff --git a/net/net_aix.go b/net/net_aix.go
diff --git a/net/net_darwin.go b/net/net_darwin.go
diff --git a/net/net_darwin_test.go b/net/net_darwin_test.go
diff --git a/net/net_fallback.go b/net/net_fallback.go
diff --git a/net/net_freebsd.go b/net/net_freebsd.go
diff --git a/net/net_linux.go b/net/net_linux.go
@@ -140,7 +140,7 @@ func IOCountersByFileWithContext(ctx context.Context, pernic bool, filename stri
 		ret = append(ret, nic)
 	}
 
-	if pernic == false {
+	if !pernic {
 		return getIOCountersAll(ret)
 	}
 

diff --git a/net/net_linux_netlink_test.go b/net/net_linux_netlink_test.go
diff --git a/net/net_linux_test.go b/net/net_linux_test.go
diff --git a/net/net_openbsd.go b/net/net_openbsd.go
diff --git a/net/net_test.go b/net/net_test.go
diff --git a/net/net_unix.go b/net/net_unix.go
diff --git a/net/net_windows.go b/net/net_windows.go
diff --git a/process/process.go b/process/process.go
diff --git a/process/process_bsd.go b/process/process_bsd.go
diff --git a/process/process_darwin.go b/process/process_darwin.go
diff --git a/process/process_darwin_386.go b/process/process_darwin_386.go
diff --git a/process/process_darwin_amd64.go b/process/process_darwin_amd64.go
diff --git a/process/process_darwin_amd64.go.cgo b/process/process_darwin_amd64.go.cgo
diff --git a/process/process_darwin_arm64.go b/process/process_darwin_arm64.go
diff --git a/process/process_darwin_cgo.go b/process/process_darwin_cgo.go
diff --git a/process/process_darwin_nocgo.go b/process/process_darwin_nocgo.go
diff --git a/process/process_fallback.go b/process/process_fallback.go
diff --git a/process/process_freebsd.go b/process/process_freebsd.go
diff --git a/process/process_freebsd_386.go b/process/process_freebsd_386.go
diff --git a/process/process_freebsd_amd64.go b/process/process_freebsd_amd64.go
diff --git a/process/process_freebsd_arm.go b/process/process_freebsd_arm.go
diff --git a/process/process_freebsd_arm64.go b/process/process_freebsd_arm64.go
diff --git a/process/process_linux.go b/process/process_linux.go
@@ -726,10 +726,7 @@ func (p *Process) fillFromIOWithContext(ctx context.Context) (*IOCountersStat, e
 		if err != nil {
 			return nil, err
 		}
-		param := field[0]
-		if strings.HasSuffix(param, ":") {
-			param = param[:len(param)-1]
-		}
+		param := strings.TrimSuffix(field[0], ":")
 		switch param {
 		case "syscr":
 			ret.ReadCount = t

diff --git a/process/process_linux_test.go b/process/process_linux_test.go
diff --git a/process/process_openbsd.go b/process/process_openbsd.go
diff --git a/process/process_openbsd_386.go b/process/process_openbsd_386.go
diff --git a/process/process_openbsd_amd64.go b/process/process_openbsd_amd64.go
diff --git a/process/process_openbsd_arm64.go b/process/process_openbsd_arm64.go
diff --git a/process/process_plan9.go b/process/process_plan9.go
diff --git a/process/process_posix.go b/process/process_posix.go
diff --git a/process/process_posix_test.go b/process/process_posix_test.go
diff --git a/process/process_race_test.go b/process/process_race_test.go
diff --git a/process/process_solaris.go b/process/process_solaris.go
diff --git a/process/process_test.go b/process/process_test.go
diff --git a/process/process_windows.go b/process/process_windows.go
diff --git a/process/process_windows_386.go b/process/process_windows_386.go
diff --git a/process/process_windows_amd64.go b/process/process_windows_amd64.go
diff --git a/process/testdata/darwin/ps-ax-opid_fail b/process/testdata/darwin/ps-ax-opid_fail
diff --git a/process/testdata/linux/1/comm b/process/testdata/linux/1/comm
diff --git a/process/testdata/linux/1/status b/process/testdata/linux/1/status
diff --git a/process/testdata/linux/1060/comm b/process/testdata/linux/1060/comm
diff --git a/process/testdata/linux/1060/status b/process/testdata/linux/1060/status
diff --git a/process/testdata/linux/68927/comm b/process/testdata/linux/68927/comm
diff --git a/process/testdata/linux/68927/stat b/process/testdata/linux/68927/stat
diff --git a/process/testdata/lx_brandz/1/stat b/process/testdata/lx_brandz/1/stat
diff --git a/process/types_darwin.go b/process/types_darwin.go
diff --git a/process/types_freebsd.go b/process/types_freebsd.go
diff --git a/process/types_openbsd.go b/process/types_openbsd.go
diff --git a/v3/cpu/cpu_fallback.go b/v3/cpu/cpu_fallback.go