Fix Remaining lint issues

This commit handles remaining lint issues.

Signed-off-by: Adrian Chiris <adrianc@nvidia.com>

cmd/sriovdp/manager.go

@@ -39,7 +39,6 @@ type cliParams struct {
 type resourceManager struct {
 	cliParams
 	pluginWatchMode bool
-	socketSuffix    string
 	rFactory        types.ResourceFactory
 	configList      []*types.ResourceConfig
 	resourceServers []types.ResourceServer

go.mod

@@ -13,7 +13,7 @@ require (
 	github.com/pkg/errors v0.9.1
 	github.com/stretchr/testify v1.5.1
 	github.com/vishvananda/netlink v1.1.0
-	golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4
+	golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4 // indirect
 	golang.org/x/sys v0.0.0-20210510120138-977fb7262007 // indirect
 	google.golang.org/grpc v1.28.1
 	k8s.io/kubelet v0.18.1

pkg/factory/factory_test.go

@@ -124,7 +124,7 @@ var _ = Describe("Factory", func() {
 				}
 
 				var selectors json.RawMessage
-				err := selectors.UnmarshalJSON([]byte(`
+				err = selectors.UnmarshalJSON([]byte(`
 					[
 						{
 							"vendors": ["8086"],
@@ -187,7 +187,7 @@ var _ = Describe("Factory", func() {
 				}
 
 				var selectors json.RawMessage
-				err := selectors.UnmarshalJSON([]byte(`
+				err = selectors.UnmarshalJSON([]byte(`
 					[
 						{
 							"vendors": ["8086"],

pkg/netdevice/netDeviceProvider.go

@@ -110,9 +110,14 @@ func hasDefaultRoute(pciAddr string) (bool, error) {
 			link, err := netlink.LinkByName(ifName)
 			if err != nil {
 				glog.Errorf("expected to get valid host interface with name %s: %q", ifName, err)
+				continue
 			}
 
 			routes, err := netlink.RouteList(link, netlink.FAMILY_V4) // IPv6 routes: all interface has at least one link local route entry
+			if err != nil {
+				glog.Errorf("failed to get routes for interface: %s, %q", ifName, err)
+				continue
+			}
 			for _, r := range routes {
 				if r.Dst == nil {
 					glog.Infof("excluding interface %s:  default route found: %+v", ifName, r)
@@ -125,6 +130,7 @@ func hasDefaultRoute(pciAddr string) (bool, error) {
 	return false, nil
 }
 
+//nolint:gocyclo
 func (np *netDeviceProvider) GetFilteredDevices(devices []types.PciDevice, rc *types.ResourceConfig) ([]types.PciDevice, error) {
 	filteredDevice := devices
 	nf, ok := rc.SelectorObj.(*types.NetDeviceSelectors)

pkg/resources/pciDevice.go

@@ -28,8 +28,6 @@ type pciDevice struct {
 	basePciDevice *ghw.PCIDevice
 	pfAddr        string
 	driver        string
-	vendor        string
-	product       string
 	vfID          int
 	numa          string
 	apiDevice     *pluginapi.Device

pkg/resources/server.go

@@ -15,6 +15,7 @@
 package resources
 
 import (
+	"context"
 	"fmt"
 	"net"
 	"os"
@@ -25,7 +26,6 @@ import (
 	"github.com/k8snetworkplumbingwg/sriov-network-device-plugin/pkg/types"
 
 	"github.com/golang/glog"
-	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 	pluginapi "k8s.io/kubelet/pkg/apis/deviceplugin/v1beta1"
 	registerapi "k8s.io/kubelet/pkg/apis/pluginregistration/v1"
@@ -71,11 +71,8 @@ func NewResourceServer(prefix, suffix string, pluginWatch bool, rp types.Resourc
 }
 
 func (rs *resourceServer) register() error {
-	kubeletEndpoint := filepath.Join(types.DeprecatedSockDir, types.KubeEndPoint)
-	conn, err := grpc.Dial(kubeletEndpoint, grpc.WithInsecure(),
-		grpc.WithDialer(func(addr string, timeout time.Duration) (net.Conn, error) {
-			return net.DialTimeout("unix", addr, timeout)
-		}))
+	kubeletEndpoint := "unix:" + filepath.Join(types.DeprecatedSockDir, types.KubeEndPoint)
+	conn, err := grpc.Dial(kubeletEndpoint, grpc.WithInsecure())
 	if err != nil {
 		glog.Errorf("%s device plugin unable connect to Kubelet : %v", rs.resourcePool.GetResourceName(), err)
 		return err
@@ -219,12 +216,8 @@ func (rs *resourceServer) Start() error {
 		}
 	}()
 	// Wait for server to start by launching a blocking connection
-	conn, err := grpc.Dial(rs.sockPath, grpc.WithInsecure(), grpc.WithBlock(),
-		grpc.WithTimeout(serverStartTimeout),
-		grpc.WithDialer(func(addr string, timeout time.Duration) (net.Conn, error) {
-			return net.DialTimeout("unix", addr, timeout)
-		}),
-	)
+	ctx, _ := context.WithTimeout(context.TODO(), serverStartTimeout)
+	conn, err := grpc.DialContext(ctx, "unix:"+rs.sockPath, grpc.WithInsecure(), grpc.WithBlock())
 
 	if err != nil {
 		glog.Errorf("error. unable to establish test connection with %s gRPC server: %v", resourceName, err)

pkg/resources/testing.go

@@ -47,11 +47,7 @@ func (s *fakeRegistrationServer) dial() (registerapi.RegistrationClient, *grpc.C
 	ctx, cancel := context.WithTimeout(context.Background(), dialTimeout)
 	defer cancel()
 
-	c, err := grpc.DialContext(ctx, sockPath, grpc.WithInsecure(), grpc.WithBlock(),
-		grpc.WithDialer(func(addr string, timeout time.Duration) (net.Conn, error) {
-			return net.DialTimeout("unix", addr, timeout)
-		}),
-	)
+	c, err := grpc.DialContext(ctx, "unix:"+sockPath, grpc.WithInsecure(), grpc.WithBlock())
 
 	if err != nil {
 		return nil, nil, fmt.Errorf("failed to dial socket %s, err: %v", sockPath, err)

pkg/utils/testing.go

@@ -31,7 +31,7 @@ func (fs *FakeFilesystem) Use() func() {
 		}
 	}
 	for filename, body := range fs.Files {
-		err := ioutil.WriteFile(path.Join(fs.RootDir, filename), body, 0644)
+		err := ioutil.WriteFile(path.Join(fs.RootDir, filename), body, 0600)
 		if err != nil {
 			panic(fmt.Errorf("error creating fake file: %s", err.Error()))
 		}
@@ -48,7 +48,7 @@ func (fs *FakeFilesystem) Use() func() {
 	if err != nil {
 		panic(fmt.Errorf("error reading file: %s", err.Error()))
 	}
-	err = ioutil.WriteFile(path.Join(fs.RootDir, "usr/share/hwdata/pci.ids"), pciData, 0644)
+	err = ioutil.WriteFile(path.Join(fs.RootDir, "usr/share/hwdata/pci.ids"), pciData, 0600)
 	if err != nil {
 		panic(fmt.Errorf("error creating fake file: %s", err.Error()))
 	}

pkg/utils/utils.go

@@ -27,6 +27,7 @@ import (
 
 var (
 	sysBusPci = "/sys/bus/pci/devices"
+	devDir    = "/dev"
 )
 
 const (
@@ -260,32 +261,32 @@ func GetVFIODeviceFile(dev string) (devFileHost, devFileContainer string, err er
 	_, err = os.Lstat(devPath)
 	if err != nil {
 		err = fmt.Errorf("GetVFIODeviceFile(): Could not get directory information for device: %s, Err: %v", dev, err)
-		return
+		return devFileHost, devFileContainer, err
 	}
 
 	iommuDir := filepath.Join(devPath, "iommu_group")
 	if err != nil {
 		err = fmt.Errorf("GetVFIODeviceFile(): error reading iommuDir %v", err)
-		return
+		return devFileHost, devFileContainer, err
 	}
 
 	dirInfo, err := os.Lstat(iommuDir)
 	if err != nil {
 		err = fmt.Errorf("GetVFIODeviceFile(): unable to find iommu_group %v", err)
-		return
+		return devFileHost, devFileContainer, err
 	}
 
 	if dirInfo.Mode()&os.ModeSymlink == 0 {
 		err = fmt.Errorf("GetVFIODeviceFile(): invalid symlink to iommu_group %v", err)
-		return
+		return devFileHost, devFileContainer, err
 	}
 
 	linkName, err := filepath.EvalSymlinks(iommuDir)
 	if err != nil {
 		err = fmt.Errorf("GetVFIODeviceFile(): error reading symlink to iommu_group %v", err)
-		return
+		return devFileHost, devFileContainer, err
 	}
-	devFileContainer = filepath.Join("/dev", "vfio", filepath.Base(linkName))
+	devFileContainer = filepath.Join(devDir, "vfio", filepath.Base(linkName))
 	devFileHost = devFileContainer
 
 	// Get a file path to the iommu group name
@@ -299,11 +300,11 @@ func GetVFIODeviceFile(dev string) (devFileHost, devFileContainer string, err er
 		// if the iommu group name == vfio-noiommu then we are in a VM, adjust path to vfio device
 		if vName == "vfio-noiommu" {
 			linkName = filepath.Join(filepath.Dir(linkName), "noiommu-"+filepath.Base(linkName))
-			devFileHost = filepath.Join("/dev/vfio", filepath.Base(linkName))
+			devFileHost = filepath.Join(devDir, "vfio", filepath.Base(linkName))
 		}
 	}
 
-	return
+	return devFileHost, devFileContainer, err
 }
 
 // GetUIODeviceFile returns a vfio device files for vfio-pci bound PCI device's PCI address
@@ -323,7 +324,7 @@ func GetUIODeviceFile(dev string) (devFile string, err error) {
 
 	// uio directory should only contain one directory e.g uio1
 	// assuption is there's a corresponding device file in /dev e.g. /dev/uio1
-	devFile = filepath.Join("/dev", files[0].Name())
+	devFile = filepath.Join(devDir, files[0].Name())
 
 	return
 }