Merge pull request #268 from thaJeztah/gofumpt_and_updates

gof(ump)t code and update some dependencies

Author: AkihiroSuda

cgroup1/blkio.go

@@ -331,7 +331,6 @@ type deviceKey struct {
 // keyed by major and minor number. Since devices may be mapped multiple times,
 // we err on taking the first occurrence.
 func getDevices(r io.Reader) (map[deviceKey]string, error) {
-
 	var (
 		s       = bufio.NewScanner(r)
 		devices = make(map[deviceKey]string)

cgroup1/blkio_test.go

@@ -45,9 +45,9 @@ func TestGetDevices(t *testing.T) {
 		t.Fatal(err)
 	}
 	for dev, expected := range map[deviceKey]string{
-		deviceKey{7, 0}:   "/dev/loop0",
-		deviceKey{259, 0}: "/dev/nvme0n1",
-		deviceKey{259, 1}: "/dev/nvme0n1p1",
+		{7, 0}:   "/dev/loop0",
+		{259, 0}: "/dev/nvme0n1",
+		{259, 1}: "/dev/nvme0n1p1",
 	} {
 		name, ok := devices[dev]
 		if !ok {

cgroup1/cgroup.go

@@ -158,7 +158,7 @@ func (c *cgroup) subsystemsFilter(subsystems ...Name) []Subsystem {
 		return c.subsystems
 	}
 
-	var filteredSubsystems = []Subsystem{}
+	filteredSubsystems := []Subsystem{}
 	for _, s := range c.subsystems {
 		for _, f := range subsystems {
 			if s.Name() == f {

cgroup1/control.go

@@ -28,7 +28,7 @@ type procType = string
 const (
 	cgroupProcs    procType = "cgroup.procs"
 	cgroupTasks    procType = "tasks"
-	defaultDirPerm          = 0755
+	defaultDirPerm          = 0o755
 )
 
 // defaultFilePerm is a var so that the test framework can change the filemode

cgroup1/memory.go

@@ -472,7 +472,7 @@ func (m *memoryController) memoryEvent(path string, event MemoryEvent) (uintptr,
 	defer evtFile.Close()
 	data := fmt.Sprintf("%d %d %s", efd, evtFile.Fd(), event.Arg())
 	evctlPath := filepath.Join(root, "cgroup.event_control")
-	if err := os.WriteFile(evctlPath, []byte(data), 0700); err != nil {
+	if err := os.WriteFile(evctlPath, []byte(data), 0o700); err != nil {
 		unix.Close(efd)
 		return 0, err
 	}

cgroup1/mock_test.go

@@ -23,7 +23,7 @@ import (
 )
 
 func init() {
-	defaultFilePerm = 0666
+	defaultFilePerm = 0o666
 }
 
 func newMock(tb testing.TB) (*mockCgroup, error) {

cgroup1/rdma.go

@@ -124,7 +124,6 @@ func toRdmaEntry(strEntries []string) []*v1.RdmaEntry {
 }
 
 func (p *rdmaController) Stat(path string, stats *v1.Metrics) error {
-
 	currentData, err := os.ReadFile(filepath.Join(p.Path(path), "rdma.current"))
 	if err != nil {
 		return err

cgroup2/devicefilter_test.go

@@ -77,8 +77,7 @@ func TestDeviceFilter_Privileged(t *testing.T) {
 			Allow:  true,
 		},
 	}
-	expected :=
-		`
+	expected := `
 // load parameters into registers
         0: LdXMemH dst: r2 src: r1 off: 0 imm: 0
         1: LdXMemW dst: r3 src: r1 off: 0 imm: 0

cgroup2/hugetlbv2_test.go

@@ -48,5 +48,4 @@ func TestCgroupv2HugetlbStats(t *testing.T) {
 			break
 		}
 	}
-
 }

cgroup2/manager.go

@@ -47,9 +47,7 @@ const (
 	defaultSlice       = "system.slice"
 )
 
-var (
-	canDelegate bool
-)
+var canDelegate bool
 
 type Event struct {
 	Low     uint64
@@ -818,7 +816,7 @@ func setDevices(path string, devices []specs.LinuxDeviceCgroup) error {
 	if err != nil {
 		return err
 	}
-	dirFD, err := unix.Open(path, unix.O_DIRECTORY|unix.O_RDONLY|unix.O_CLOEXEC, 0600)
+	dirFD, err := unix.Open(path, unix.O_DIRECTORY|unix.O_RDONLY|unix.O_CLOEXEC, 0o600)
 	if err != nil {
 		return fmt.Errorf("cannot get dir FD for %s", path)
 	}