Merge pull request #709 from hj-johannes-lee/govet-fieldalignment

Add govet-fieldalignment linter check

Author: bart0sh

.golangci.yml

@@ -48,6 +48,8 @@ linters-settings:
     min-confidence: 0.9
   govet:
     check-shadowing: true
+    enable:
+    - "fieldalignment"
   gocyclo:
     min-complexity: 15
   gocognit:

cmd/fpga_crihook/main.go

@@ -60,9 +60,8 @@ type newPortFun func(string) (fpga.Port, error)
 
 // Device defines structure for Config.Linux.Devices entries.
 type Device struct {
-	// these fields are set by the hook
-	name      string
-	processed bool
+	// this field is set by the hook
+	name string
 
 	// these are set by JSON decoder
 	Path  string `json:"path"`
@@ -71,6 +70,9 @@ type Device struct {
 	Minor int    `json:"minor"`
 	UID   int    `json:"uid"`
 	GID   int    `json:"gid"`
+
+	// this field is set by the hook
+	processed bool
 }
 
 func (dev *Device) getName() string {
@@ -87,9 +89,9 @@ func decodeJSONStream(reader io.Reader, dest interface{}) error {
 }
 
 type hookEnv struct {
+	newPort      newPortFun
 	bitstreamDir string
 	config       string
-	newPort      newPortFun
 }
 
 type fpgaParams struct {

cmd/fpga_crihook/main_test.go

@@ -179,9 +179,9 @@ func TestGetConfig(t *testing.T) {
 // testFpgaPort represent Fake FPGA Port device for testing purposes.
 type testFpgaPort struct {
 	fpga.Port
-	callNo          int
 	interfaceUUIDS  []string
 	accelTypeUUIDS  []string
+	callNo          int
 	failProgramming bool
 }
 
@@ -229,12 +229,12 @@ func TestGetFPGAParams(t *testing.T) {
 		stdinJSON          string
 		configJSON         string
 		afuIDPath          string
-		sysfsdirs          []string
-		sysfsfiles         map[string][]byte
-		expectedErr        bool
 		expectedRegion     string
 		expectedAFU        string
 		expectedPortDevice string
+		sysfsfiles         map[string][]byte
+		sysfsdirs          []string
+		expectedErr        bool
 	}{
 		{
 			name:       "valid setup",
@@ -343,9 +343,9 @@ func TestProcess(t *testing.T) {
 		name        string
 		stdinJSON   string
 		configJSON  string
-		sysfsdirs   []string
-		sysfsfiles  map[string][]byte
 		newPort     newPortFun
+		sysfsfiles  map[string][]byte
+		sysfsdirs   []string
 		expectedErr bool
 	}{
 		{

cmd/fpga_plugin/dfl_test.go

@@ -315,13 +315,13 @@ func TestScanFPGAsDFL(t *testing.T) {
 	sysfs := path.Join(tmpdir, "sys")
 	dev := path.Join(tmpdir, "dev")
 	tcases := []struct {
-		name                string
-		mode                string
-		devs                []string
 		sysfsdirs           []string
 		sysfsfiles          map[string][]byte
 		newPort             newPortFunc
 		expectedDevTreeKeys map[string][]string
+		name                string
+		mode                string
+		devs                []string
 	}{
 		{
 			name: "Valid DFL scan in af mode",

cmd/fpga_plugin/fpga_plugin.go

@@ -174,10 +174,10 @@ type devicePlugin struct {
 	getDevTree getDevTreeFunc
 	newPort    newPortFunc
 
-	annotationValue string
-
 	scanTicker *time.Ticker
 	scanDone   chan bool
+
+	annotationValue string
 }
 
 // newDevicePlugin returns new instance of devicePlugin.

cmd/fpga_plugin/fpga_plugin_test.go

@@ -191,12 +191,12 @@ func TestScan(t *testing.T) {
 	dev := path.Join(root, "dev")
 
 	tcases := []struct {
-		name       string
-		mode       string
-		devs       []string
 		sysfsdirs  []string
 		sysfsfiles map[string][]byte
 		newPort    newPortFunc
+		name       string
+		mode       string
+		devs       []string
 	}{
 		{
 			name: "valid OPAE scan in af mode",

cmd/fpga_plugin/opae_test.go

@@ -267,13 +267,13 @@ func TestScanFPGAsOPAE(t *testing.T) {
 	sysfs := path.Join(tmpdir, "sys")
 	dev := path.Join(tmpdir, "dev")
 	tcases := []struct {
-		name                string
-		mode                string
-		devs                []string
 		sysfsdirs           []string
 		sysfsfiles          map[string][]byte
 		newPort             newPortFunc
 		expectedDevTreeKeys map[string][]string
+		name                string
+		mode                string
+		devs                []string
 	}{
 		{
 			name: "Valid OPAE scan in af mode",

cmd/gpu_nfdhook/labeler.go

@@ -44,12 +44,12 @@ const (
 type labelMap map[string]string
 
 type labeler struct {
-	sysfsDRMDir   string
-	debugfsDRIDir string
-
 	gpuDeviceReg     *regexp.Regexp
 	controlDeviceReg *regexp.Regexp
 	labels           labelMap
+
+	sysfsDRMDir   string
+	debugfsDRIDir string
 }
 
 func newLabeler(sysfsDRMDir, debugfsDRIDir string) *labeler {

cmd/gpu_nfdhook/labeler_test.go

@@ -23,14 +23,14 @@ import (
 )
 
 type testcase struct {
-	sysfsdirs      []string
-	sysfsfiles     map[string][]byte
-	name           string
-	memoryOverride uint64
-	memoryReserved uint64
 	capabilityFile map[string][]byte
 	expectedRetval error
 	expectedLabels labelMap
+	name           string
+	sysfsfiles     map[string][]byte
+	sysfsdirs      []string
+	memoryOverride uint64
+	memoryReserved uint64
 }
 
 //nolint:funlen

cmd/gpu_plugin/gpu_plugin.go

@@ -59,18 +59,18 @@ type cliOptions struct {
 }
 
 type devicePlugin struct {
-	sysfsDir string
-	devfsDir string
-
-	options cliOptions
-
 	gpuDeviceReg     *regexp.Regexp
 	controlDeviceReg *regexp.Regexp
 
 	scanTicker *time.Ticker
 	scanDone   chan bool
 
 	resMan rm.ResourceManager
+
+	sysfsDir string
+	devfsDir string
+
+	options cliOptions
 }
 
 func newDevicePlugin(sysfsDir, devfsDir string, options cliOptions) *devicePlugin {