address linter issues

Author: QxBytes

cni/network/invoker_mock.go

@@ -47,7 +47,7 @@ func NewMockIpamInvoker(ipv6, v4Fail, v6Fail, delegatedVMNIC, delegatedVMNICFail
 
 func NewCustomMockIpamInvoker(customReturn map[string]network.InterfaceInfo) *MockIpamInvoker {
 	return &MockIpamInvoker{
-		add: func(opt IPAMAddConfig) (ipamAddResult IPAMAddResult, err error) {
+		add: func(_ IPAMAddConfig) (ipamAddResult IPAMAddResult, err error) {
 			ipamAddResult = IPAMAddResult{interfaceInfo: make(map[string]network.InterfaceInfo)}
 			ipamAddResult.interfaceInfo = customReturn
 			return ipamAddResult, nil

cni/network/network_linux_test.go

@@ -5,7 +5,6 @@ package network
 
 import (
 	"fmt"
-	"log"
 	"net"
 	"regexp"
 	"testing"
@@ -511,26 +510,26 @@ func TestPluginLinuxAdd(t *testing.T) {
 
 			// compare contents
 			for _, wantedEndpointEntry := range tt.want {
-				epId := "none"
+				epID := "none"
 				for _, endpointInfo := range allEndpoints {
-					log.Printf("%v", endpointInfo.NetworkID)
-					if tt.match(wantedEndpointEntry.epInfo, endpointInfo) {
-						// save the endpoint id before removing it
-						epId = endpointInfo.EndpointID
-						require.Regexp(t, regexp.MustCompile(wantedEndpointEntry.epIDRegex), epId)
+					if !tt.match(wantedEndpointEntry.epInfo, endpointInfo) {
+						continue
+					}
+					// save the endpoint id before removing it
+					epID = endpointInfo.EndpointID
+					require.Regexp(t, regexp.MustCompile(wantedEndpointEntry.epIDRegex), epID)
 
-						// omit endpoint id and ifname fields as they are nondeterministic
-						endpointInfo.EndpointID = ""
-						endpointInfo.IfName = ""
+					// omit endpoint id and ifname fields as they are nondeterministic
+					endpointInfo.EndpointID = ""
+					endpointInfo.IfName = ""
 
-						require.Equal(t, wantedEndpointEntry.epInfo, endpointInfo)
-						break
-					}
+					require.Equal(t, wantedEndpointEntry.epInfo, endpointInfo)
 				}
-				if epId == "none" {
+				if epID == "none" {
 					t.Fail()
 				}
-				tt.plugin.nm.DeleteEndpoint("", epId, nil)
+				err = tt.plugin.nm.DeleteEndpoint("", epID, nil)
+				require.NoError(t, err)
 			}
 
 			// confirm separate entities

cni/network/network_windows_test.go

@@ -955,7 +955,7 @@ func TestPluginWindowsAdd(t *testing.T) {
 					epInfo: &network.EndpointInfo{
 						ContainerID: "test-container",
 						Data: map[string]interface{}{
-							"cnetAddressSpace": ([]string)(nil),
+							"cnetAddressSpace": []string(nil),
 						},
 						Routes:             []network.RouteInfo{},
 						EnableSnatOnHost:   true,
@@ -1010,7 +1010,7 @@ func TestPluginWindowsAdd(t *testing.T) {
 					epInfo: &network.EndpointInfo{
 						ContainerID: "test-container",
 						Data: map[string]interface{}{
-							"cnetAddressSpace": ([]string)(nil),
+							"cnetAddressSpace": []string(nil),
 						},
 						Routes:             []network.RouteInfo{},
 						EnableSnatOnHost:   true,
@@ -1189,25 +1189,26 @@ func TestPluginWindowsAdd(t *testing.T) {
 			allEndpoints, _ := tt.plugin.nm.GetAllEndpoints("")
 			require.Len(t, allEndpoints, len(tt.want))
 			for _, wantedEndpointEntry := range tt.want {
-				epId := "none"
+				epID := "none"
 				for _, endpointInfo := range allEndpoints {
-					if tt.match(wantedEndpointEntry.epInfo, endpointInfo) {
-						// save the endpoint id before removing it
-						epId = endpointInfo.EndpointID
-						require.Regexp(t, regexp.MustCompile(wantedEndpointEntry.epIDRegex), epId)
+					if !tt.match(wantedEndpointEntry.epInfo, endpointInfo) {
+						continue
+					}
+					// save the endpoint id before removing it
+					epID = endpointInfo.EndpointID
+					require.Regexp(t, regexp.MustCompile(wantedEndpointEntry.epIDRegex), epID)
 
-						// omit endpoint id and ifname fields as they are nondeterministic
-						endpointInfo.EndpointID = ""
-						endpointInfo.IfName = ""
+					// omit endpoint id and ifname fields as they are nondeterministic
+					endpointInfo.EndpointID = ""
+					endpointInfo.IfName = ""
 
-						require.Equal(t, wantedEndpointEntry.epInfo, endpointInfo)
-						break
-					}
+					require.Equal(t, wantedEndpointEntry.epInfo, endpointInfo)
 				}
-				if epId == "none" {
+				if epID == "none" {
 					t.Fail()
 				}
-				tt.plugin.nm.DeleteEndpoint("", epId, nil)
+				err = tt.plugin.nm.DeleteEndpoint("", epID, nil)
+				require.NoError(t, err)
 			}
 
 			// ensure deleted