From 62fa6f35950ae9664c6414420e946a5994939596 Mon Sep 17 00:00:00 2001 From: Vihas Makwana Date: Thu, 12 Dec 2024 16:18:05 +0530 Subject: [PATCH] chore: go sys and fix build tags --- .github/workflows/ci.yml | 4 ++-- cgroup/doc.go | 2 +- examples/ss/ss.go | 1 + examples/ss/ss_other.go | 1 + go.mod | 2 +- go.sum | 4 ++-- psnotify/psnotify.go | 1 + psnotify/psnotify_bsd.go | 1 + psnotify/psnotify_test.go | 1 + sigar_aix.go | 3 ++- sigar_darwin.go | 1 + sigar_linux_common.go | 1 + sigar_openbsd.go | 1 + sigar_stub.go | 1 + sigar_unix.go | 1 + sys/linux/inetdiag.go | 1 + sys/linux/inetdiag_test.go | 1 + sys/linux/netlink.go | 1 + sys/linux/netlink_test.go | 1 + sys/linux/sysconf_cgo.go | 1 + sys/linux/sysconf_nocgo.go | 1 + sys/windows/fix_generated.go | 3 ++- sys/windows/ntquery.go | 1 + sys/windows/privileges.go | 1 + sys/windows/privileges_test.go | 1 + sys/windows/version.go | 1 + 26 files changed, 30 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d865c97b3..2599ceda6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,9 +21,9 @@ lint: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - - uses: actions/setup-go@v4 + - uses: actions/setup-go@v5 with: go-version-file: 'go.mod' diff --git a/cgroup/doc.go b/cgroup/doc.go index 25a81a8df..53252028d 100644 --- a/cgroup/doc.go +++ b/cgroup/doc.go @@ -2,7 +2,7 @@ // control groups, a Linux kernel feature for grouping tasks to track and limit // resource usage. // -// Terminology +// # Terminology // // A cgroup is a collection of processes that are bound to a set of limits. // diff --git a/examples/ss/ss.go b/examples/ss/ss.go index eac09af97..7f1e96cde 100644 --- a/examples/ss/ss.go +++ b/examples/ss/ss.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux package main diff --git a/examples/ss/ss_other.go b/examples/ss/ss_other.go index 7b1e0680d..e01d68e60 100644 --- a/examples/ss/ss_other.go +++ b/examples/ss/ss_other.go @@ -1,3 +1,4 @@ +//go:build !linux // +build !linux package main diff --git a/go.mod b/go.mod index a8fd36188..1903f996a 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.22.9 require ( github.com/pkg/errors v0.9.1 github.com/stretchr/testify v1.4.0 - golang.org/x/sys v0.0.0-20180810173357-98c5dad5d1a0 + golang.org/x/sys v0.26.0 ) require ( diff --git a/go.sum b/go.sum index 3a816f715..223502abf 100644 --- a/go.sum +++ b/go.sum @@ -7,8 +7,8 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= -golang.org/x/sys v0.0.0-20180810173357-98c5dad5d1a0 h1:8H8QZJ30plJyIVj60H3lr8TZGIq2Fh3Cyrs/ZNg1foU= -golang.org/x/sys v0.0.0-20180810173357-98c5dad5d1a0/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo= +golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= diff --git a/psnotify/psnotify.go b/psnotify/psnotify.go index 5fb6f8c30..8aa972a55 100644 --- a/psnotify/psnotify.go +++ b/psnotify/psnotify.go @@ -1,5 +1,6 @@ // Copyright (c) 2012 VMware, Inc. +//go:build darwin || freebsd || netbsd || openbsd || linux // +build darwin freebsd netbsd openbsd linux package psnotify diff --git a/psnotify/psnotify_bsd.go b/psnotify/psnotify_bsd.go index e147d7638..4e61a5647 100644 --- a/psnotify/psnotify_bsd.go +++ b/psnotify/psnotify_bsd.go @@ -1,5 +1,6 @@ // Copyright (c) 2012 VMware, Inc. +//go:build darwin || freebsd || netbsd || openbsd // +build darwin freebsd netbsd openbsd // Go interface to BSD kqueue process events. diff --git a/psnotify/psnotify_test.go b/psnotify/psnotify_test.go index a72d0afad..dd6cd8b5b 100644 --- a/psnotify/psnotify_test.go +++ b/psnotify/psnotify_test.go @@ -1,5 +1,6 @@ // Copyright (c) 2012 VMware, Inc. +//go:build darwin || freebsd || netbsd || openbsd || linux // +build darwin freebsd netbsd openbsd linux package psnotify diff --git a/sigar_aix.go b/sigar_aix.go index bcdb7ca7a..56a689bd7 100644 --- a/sigar_aix.go +++ b/sigar_aix.go @@ -1,3 +1,4 @@ +//go:build aix // +build aix package gosigar @@ -403,7 +404,7 @@ func (self *ProcState) Get(pid int) error { return nil } -//Get returns the current memory usage of a process +// Get returns the current memory usage of a process func (self *ProcMem) Get(pid int) error { info := C.struct_procsinfo64{} cpid := C.pid_t(pid) diff --git a/sigar_darwin.go b/sigar_darwin.go index 8de53229e..fd04fd3ea 100644 --- a/sigar_darwin.go +++ b/sigar_darwin.go @@ -1,3 +1,4 @@ +//go:build !386 // +build !386 package gosigar diff --git a/sigar_linux_common.go b/sigar_linux_common.go index e2c5e246d..266f01a68 100644 --- a/sigar_linux_common.go +++ b/sigar_linux_common.go @@ -1,5 +1,6 @@ // Copyright (c) 2012 VMware, Inc. +//go:build freebsd || linux // +build freebsd linux package gosigar diff --git a/sigar_openbsd.go b/sigar_openbsd.go index c537f029f..6cfad1c10 100644 --- a/sigar_openbsd.go +++ b/sigar_openbsd.go @@ -1,5 +1,6 @@ // Copyright (c) 2016 Jasper Lievisse Adriaanse . +//go:build openbsd // +build openbsd package gosigar diff --git a/sigar_stub.go b/sigar_stub.go index 4156439df..69a693f00 100644 --- a/sigar_stub.go +++ b/sigar_stub.go @@ -1,3 +1,4 @@ +//go:build !aix && !darwin && !freebsd && !linux && !openbsd && !windows // +build !aix,!darwin,!freebsd,!linux,!openbsd,!windows package gosigar diff --git a/sigar_unix.go b/sigar_unix.go index e423419f9..c30adc650 100644 --- a/sigar_unix.go +++ b/sigar_unix.go @@ -1,5 +1,6 @@ // Copyright (c) 2012 VMware, Inc. +//go:build aix || darwin || freebsd || linux // +build aix darwin freebsd linux package gosigar diff --git a/sys/linux/inetdiag.go b/sys/linux/inetdiag.go index cca3f2cfc..27d51d73e 100644 --- a/sys/linux/inetdiag.go +++ b/sys/linux/inetdiag.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux package linux diff --git a/sys/linux/inetdiag_test.go b/sys/linux/inetdiag_test.go index d4ff64b5e..b00d2115b 100644 --- a/sys/linux/inetdiag_test.go +++ b/sys/linux/inetdiag_test.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux package linux diff --git a/sys/linux/netlink.go b/sys/linux/netlink.go index 9db842998..aa356eeed 100644 --- a/sys/linux/netlink.go +++ b/sys/linux/netlink.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux package linux diff --git a/sys/linux/netlink_test.go b/sys/linux/netlink_test.go index 099812ff5..f71d9829c 100644 --- a/sys/linux/netlink_test.go +++ b/sys/linux/netlink_test.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux package linux diff --git a/sys/linux/sysconf_cgo.go b/sys/linux/sysconf_cgo.go index e557a66e6..af0bf2bf0 100644 --- a/sys/linux/sysconf_cgo.go +++ b/sys/linux/sysconf_cgo.go @@ -1,3 +1,4 @@ +//go:build linux && cgo // +build linux,cgo package linux diff --git a/sys/linux/sysconf_nocgo.go b/sys/linux/sysconf_nocgo.go index 005e0c123..accdd0c48 100644 --- a/sys/linux/sysconf_nocgo.go +++ b/sys/linux/sysconf_nocgo.go @@ -1,3 +1,4 @@ +//go:build !cgo || !linux // +build !cgo !linux package linux diff --git a/sys/windows/fix_generated.go b/sys/windows/fix_generated.go index 80bc6de65..567896634 100644 --- a/sys/windows/fix_generated.go +++ b/sys/windows/fix_generated.go @@ -15,7 +15,8 @@ // specific language governing permissions and limitations // under the License. -//+build ignore +//go:build ignore +// +build ignore package main diff --git a/sys/windows/ntquery.go b/sys/windows/ntquery.go index 85de365e1..18b3c267c 100644 --- a/sys/windows/ntquery.go +++ b/sys/windows/ntquery.go @@ -1,3 +1,4 @@ +//go:build windows // +build windows package windows diff --git a/sys/windows/privileges.go b/sys/windows/privileges.go index 28c78fd22..754f96370 100644 --- a/sys/windows/privileges.go +++ b/sys/windows/privileges.go @@ -1,3 +1,4 @@ +//go:build windows // +build windows package windows diff --git a/sys/windows/privileges_test.go b/sys/windows/privileges_test.go index 0bce86da6..e015cde58 100644 --- a/sys/windows/privileges_test.go +++ b/sys/windows/privileges_test.go @@ -1,3 +1,4 @@ +//go:build windows // +build windows package windows diff --git a/sys/windows/version.go b/sys/windows/version.go index d0bca89c1..7e9b7f3d0 100644 --- a/sys/windows/version.go +++ b/sys/windows/version.go @@ -1,3 +1,4 @@ +//go:build windows // +build windows package windows