Merge pull request #807 from bart0sh/PR121-add-wsl-check

lint: enable wsl check

Author: mythi

.golangci.yml

@@ -42,6 +42,7 @@ linters:
     - unused
     - varcheck
     - whitespace
+    - wsl
 
 linters-settings:
   gofmt:

cmd/dlb_plugin/dlb_plugin.go

@@ -57,13 +57,15 @@ func (dp *DevicePlugin) Scan(notifier dpapi.Notifier) error {
 	defer dp.scanTicker.Stop()
 
 	var prevDevTree dpapi.DeviceTree
+
 	for {
 		devTree := dp.scan()
 
 		if !reflect.DeepEqual(prevDevTree, devTree) {
 			klog.V(1).Info("DLB scan update: pf: ", len(devTree[deviceTypePF]), " / vf: ", len(devTree[deviceTypeVF]))
 			prevDevTree = devTree
 		}
+
 		notifier.Notify(devTree)
 
 		select {

cmd/dlb_plugin/dlb_plugin_test.go

@@ -55,6 +55,7 @@ func createTestFiles(devfs string, devfsdirs []string, sysfs string, pfDevs []st
 		if err := os.MkdirAll(path.Join(sysfs, pfDev, "device"), 0750); err != nil {
 			return errors.Wrap(err, "Failed to create fake device directory")
 		}
+
 		if err := os.WriteFile(path.Join(sysfs, pfDev, "device", "sriov_numvfs"), []byte(sriovnumvfs[index]), 0600); err != nil {
 			return errors.Wrap(err, "Failed to create fake device directory")
 		}

cmd/dsa_plugin/dsa_plugin.go

@@ -50,6 +50,8 @@ func main() {
 	if plugin == nil {
 		klog.Fatal("Cannot create device plugin, please check above error messages.")
 	}
+
 	manager := dpapi.NewManager(namespace, plugin)
+
 	manager.Run()
 }

cmd/fpga_admissionwebhook/main.go

@@ -43,8 +43,11 @@ func init() {
 }
 
 func main() {
-	var metricsAddr string
-	var enableLeaderElection bool
+	var (
+		metricsAddr          string
+		enableLeaderElection bool
+	)
+
 	flag.StringVar(&metricsAddr, "metrics-addr", ":8080", "The address the metric endpoint binds to.")
 	flag.BoolVar(&enableLeaderElection, "enable-leader-election", false,
 		"Enable leader election for controller manager. "+
@@ -91,6 +94,7 @@ func main() {
 	}
 
 	setupLog.Info("starting manager")
+
 	if err := mgr.Start(ctrl.SetupSignalHandler()); err != nil {
 		setupLog.Error(err, "problem running manager")
 		os.Exit(1)

cmd/fpga_crihook/main.go

@@ -79,12 +79,14 @@ func (dev *Device) getName() string {
 	if len(dev.name) == 0 {
 		dev.name = filepath.Base(dev.Path)
 	}
+
 	return dev.name
 }
 
 func decodeJSONStream(reader io.Reader, dest interface{}) error {
 	decoder := json.NewDecoder(reader)
 	err := decoder.Decode(&dest)
+
 	return errors.WithStack(err)
 }
 
@@ -110,13 +112,15 @@ func newHookEnv(bitstreamDir string, config string, newPort newPortFun) *hookEnv
 
 func (he *hookEnv) getConfig(stdinJ *Stdin) (*Config, error) {
 	configPath := filepath.Join(stdinJ.Bundle, he.config)
+
 	configFile, err := os.Open(configPath)
 	if err != nil {
 		return nil, errors.WithStack(err)
 	}
 	defer configFile.Close()
 
 	var config Config
+
 	err = decodeJSONStream(configFile, &config)
 	if err != nil {
 		return nil, errors.WithMessage(err, "can't decode "+configPath)
@@ -129,13 +133,15 @@ func (he *hookEnv) getConfig(stdinJ *Stdin) (*Config, error) {
 	if len(config.Linux.Devices) == 0 {
 		return nil, errors.Errorf("%s: linux.devices is empty", configPath)
 	}
+
 	return &config, nil
 }
 
 func (he *hookEnv) getFPGAParams(config *Config) ([]fpgaParams, error) {
 	// parse FPGA_REGION_N and FPGA_AFU_N environment variables
 	regionEnv := make(map[string]string)
 	afuEnv := make(map[string]string)
+
 	for _, env := range config.Process.Env {
 		splitted := strings.SplitN(env, "=", 2)
 		if strings.HasPrefix(splitted[0], fpgaRegionEnvPrefix) {
@@ -156,6 +162,7 @@ func (he *hookEnv) getFPGAParams(config *Config) ([]fpgaParams, error) {
 	}
 
 	params := []fpgaParams{}
+
 	for num, region := range regionEnv {
 		afu, ok := afuEnv[num]
 		if !ok {
@@ -164,6 +171,7 @@ func (he *hookEnv) getFPGAParams(config *Config) ([]fpgaParams, error) {
 
 		// Find a device suitable for the region/interface id
 		found := false
+
 		for _, dev := range config.Linux.Devices {
 			deviceName := dev.getName()
 			// skip non-FPGA devices
@@ -175,10 +183,12 @@ func (he *hookEnv) getFPGAParams(config *Config) ([]fpgaParams, error) {
 			if dev.processed {
 				continue
 			}
+
 			port, err := he.newPort(deviceName)
 			if err != nil {
 				return nil, err
 			}
+
 			if interfaceUUID := port.GetInterfaceUUID(); interfaceUUID == region {
 				params = append(params,
 					fpgaParams{
@@ -189,18 +199,22 @@ func (he *hookEnv) getFPGAParams(config *Config) ([]fpgaParams, error) {
 				)
 				dev.processed = true
 				found = true
+
 				break
 			}
 		}
+
 		if !found {
 			return nil, errors.Errorf("can't find appropriate device for region %s", region)
 		}
 	}
+
 	return params, nil
 }
 
 func getStdin(reader io.Reader) (*Stdin, error) {
 	var stdinJ Stdin
+
 	err := decodeJSONStream(reader, &stdinJ)
 	if err != nil {
 		return nil, err

cmd/fpga_crihook/main_test.go

@@ -36,6 +36,7 @@ func createTestDirs(sysfs string, sysfsDirs []string, sysfsFiles map[string][]by
 			return errors.Wrap(err, "Failed to create fake device directory")
 		}
 	}
+
 	for filename, body := range sysfsFiles {
 		err := os.WriteFile(path.Join(sysfs, filename), body, 0600)
 		if err != nil {
@@ -189,13 +190,15 @@ type testFpgaPort struct {
 func (p *testFpgaPort) GetInterfaceUUID() (id string) {
 	uuid := p.interfaceUUIDS[p.callNo]
 	p.callNo++
+
 	return uuid
 }
 
 // GetAcceleratorTypeUUID returns AFU UUID.
 func (p *testFpgaPort) GetAcceleratorTypeUUID() string {
 	uuid := p.accelTypeUUIDS[p.callNo]
 	p.callNo++
+
 	return uuid
 }
 
@@ -204,6 +207,7 @@ func (p *testFpgaPort) PR(bs bitstream.File, dryRun bool) error {
 	if p.failProgramming {
 		return errors.New("fail to program device")
 	}
+
 	return nil
 }
 
@@ -219,6 +223,7 @@ func TestGetFPGAParams(t *testing.T) {
 	if err != nil {
 		t.Fatalf("can't create temporary directory: %+v", err)
 	}
+
 	defer os.RemoveAll(tmpdir)
 
 	sysfsTest := path.Join(tmpdir, "sys", "class", "fpga")
@@ -336,6 +341,7 @@ func TestProcess(t *testing.T) {
 	if err != nil {
 		t.Fatalf("can't create temporary directory: %+v", err)
 	}
+
 	defer os.RemoveAll(tmpdir)
 
 	sysfs := path.Join(tmpdir, "sys", "class", "fpga")

cmd/fpga_plugin/dfl_test.go

@@ -312,6 +312,7 @@ func TestScanFPGAsDFL(t *testing.T) {
 	if err != nil {
 		t.Fatalf("can't create temporary directory: %+v", err)
 	}
+
 	sysfs := path.Join(tmpdir, "sys")
 	dev := path.Join(tmpdir, "dev")
 	tcases := []struct {

cmd/fpga_plugin/fpga_plugin.go

@@ -65,15 +65,18 @@ func getRegionDevelTree(devices []device) dpapi.DeviceTree {
 			if region.interfaceID == unhealthyInterfaceID {
 				health = pluginapi.Unhealthy
 			}
+
 			devType := fmt.Sprintf("%s-%s", regionMode, region.interfaceID)
 			devNodes := make([]pluginapi.DeviceSpec, len(region.afus)+1)
+
 			for num, afu := range region.afus {
 				devNodes[num] = pluginapi.DeviceSpec{
 					HostPath:      afu.devNode,
 					ContainerPath: afu.devNode,
 					Permissions:   "rw",
 				}
 			}
+
 			devNodes[len(region.afus)] = pluginapi.DeviceSpec{
 				HostPath:      region.devNode,
 				ContainerPath: region.devNode,
@@ -97,15 +100,18 @@ func getRegionTree(devices []device) dpapi.DeviceTree {
 			if region.interfaceID == unhealthyInterfaceID {
 				health = pluginapi.Unhealthy
 			}
+
 			devType := fmt.Sprintf("%s-%s", regionMode, region.interfaceID)
 			devNodes := make([]pluginapi.DeviceSpec, len(region.afus))
+
 			for num, afu := range region.afus {
 				devNodes[num] = pluginapi.DeviceSpec{
 					HostPath:      afu.devNode,
 					ContainerPath: afu.devNode,
 					Permissions:   "rw",
 				}
 			}
+
 			regionTree.AddDevice(devType, region.id, dpapi.NewDeviceInfo(health, devNodes, nil, nil))
 		}
 	}
@@ -124,11 +130,13 @@ func getAfuTree(devices []device) dpapi.DeviceTree {
 				if afu.afuID == unhealthyAfuID {
 					health = pluginapi.Unhealthy
 				}
+
 				devType, err := fpga.GetAfuDevType(region.interfaceID, afu.afuID)
 				if err != nil {
 					klog.Warningf("failed to get devtype: %+v", err)
 					continue
 				}
+
 				devNodes := []pluginapi.DeviceSpec{
 					{
 						HostPath:      afu.devNode,
@@ -182,16 +190,20 @@ type devicePlugin struct {
 
 // newDevicePlugin returns new instance of devicePlugin.
 func newDevicePlugin(mode string, rootPath string) (*devicePlugin, error) {
-	var dp *devicePlugin
-	var err error
+	var (
+		dp  *devicePlugin
+		err error
+	)
 
 	sysfsPathOPAE := path.Join(rootPath, sysfsDirectoryOPAE)
 	devfsPath := path.Join(rootPath, devfsDirectory)
+
 	if _, err = os.Stat(sysfsPathOPAE); os.IsNotExist(err) {
 		sysfsPathDFL := path.Join(rootPath, sysfsDirectoryDFL)
 		if _, err = os.Stat(sysfsPathDFL); os.IsNotExist(err) {
 			return nil, errors.Errorf("kernel driver is not loaded: neither %s nor %s sysfs entry exists", sysfsPathOPAE, sysfsPathDFL)
 		}
+
 		dp, err = newDevicePluginDFL(sysfsPathDFL, devfsPath, mode)
 	} else {
 		dp, err = newDevicePluginOPAE(sysfsPathOPAE, devfsPath, mode)
@@ -224,6 +236,7 @@ func (dp *devicePlugin) PostAllocate(response *pluginapi.AllocateResponse) error
 // Scan starts scanning FPGA devices on the host.
 func (dp *devicePlugin) Scan(notifier dpapi.Notifier) error {
 	defer dp.scanTicker.Stop()
+
 	for {
 		devTree, err := dp.scanFPGAs()
 		if err != nil {
@@ -242,20 +255,23 @@ func (dp *devicePlugin) Scan(notifier dpapi.Notifier) error {
 
 func (dp *devicePlugin) getRegions(deviceFiles []os.DirEntry) ([]region, error) {
 	regions := map[string]region{}
+
 	for _, deviceFile := range deviceFiles {
 		name := deviceFile.Name()
 		if dp.portReg.MatchString(name) {
 			port, err := dp.newPort(name)
 			if err != nil {
 				return nil, errors.Wrapf(err, "can't get port info for %s", name)
 			}
+
 			fme, err := port.GetFME()
 			if err != nil {
 				return nil, errors.Wrapf(err, "can't get FME info for %s", name)
 			}
 
 			afuInfo := afu{id: port.GetName(), afuID: port.GetAcceleratorTypeUUID(), devNode: port.GetDevPath()}
 			regionName := fme.GetName()
+
 			reg, ok := regions[regionName]
 			if ok {
 				reg.afus = append(reg.afus, afuInfo)
@@ -264,11 +280,13 @@ func (dp *devicePlugin) getRegions(deviceFiles []os.DirEntry) ([]region, error)
 			}
 		}
 	}
+
 	result := make([]region, 0, len(regions))
 	// Get list of regions from the map
 	for _, reg := range regions {
 		result = append(result, reg)
 	}
+
 	return result, nil
 }
 
@@ -280,6 +298,7 @@ func (dp *devicePlugin) scanFPGAs() (dpapi.DeviceTree, error) {
 	}
 
 	devices := []device{}
+
 	for _, file := range files {
 		devName := file.Name()
 
@@ -301,6 +320,7 @@ func (dp *devicePlugin) scanFPGAs() (dpapi.DeviceTree, error) {
 			devices = append(devices, device{name: devName, regions: regions})
 		}
 	}
+
 	return dp.getDevTree(devices), nil
 }
 
@@ -327,10 +347,12 @@ func getPluginParams(mode string) (getDevTreeFunc, string, error) {
 }
 
 func main() {
-	var mode string
-	var kubeconfig string
-	var master string
-	var nodename string
+	var (
+		mode       string
+		kubeconfig string
+		master     string
+		nodename   string
+	)
 
 	flag.StringVar(&kubeconfig, "kubeconfig", "", "absolute path to the kubeconfig file")
 	flag.StringVar(&master, "master", "", "master url")