chore: appease the linter, pt 1 of ? (#922)

Author: rbtr

cni/network/network.go

@@ -674,9 +674,8 @@ func (plugin *netPlugin) Add(args *cniSkel.CmdArgs) error {
 	}
 
 	epPolicies := getPoliciesFromRuntimeCfg(nwCfg)
-	for _, epPolicy := range epPolicies {
-		epInfo.Policies = append(epInfo.Policies, epPolicy)
-	}
+
+	epInfo.Policies = append(epInfo.Policies, epPolicies...)
 
 	// Populate addresses.
 	for _, ipconfig := range result.IPs {

cnm/plugin/main.go

@@ -207,7 +207,7 @@ func main() {
 
 	// Relay these incoming signals to OS signal channel.
 	osSignalChannel := make(chan os.Signal, 1)
-	signal.Notify(osSignalChannel, os.Interrupt, os.Kill, syscall.SIGTERM)
+	signal.Notify(osSignalChannel, os.Interrupt, syscall.SIGTERM)
 
 	// Wait until receiving a signal.
 	select {

cnms/service/networkmonitor.go

@@ -139,7 +139,7 @@ func main() {
 	tb.ConnectToTelemetryService(telemetryNumRetries, telemetryWaitTimeInMilliseconds)
 	defer tb.Close()
 
-	for true {
+	for {
 		config.Store, err = store.NewJsonFileStore(platform.CNIRuntimePath + pluginName + ".json")
 		if err != nil {
 			fmt.Printf("[monitor] Failed to create store: %v\n", err)
@@ -178,6 +178,4 @@ func main() {
 		time.Sleep(time.Duration(timeout) * time.Second)
 		nm = nil
 	}
-
-	log.Close()
 }

cns/service/main.go

@@ -48,7 +48,6 @@ const (
 	name                              = "azure-cns"
 	pluginName                        = "azure-vnet"
 	defaultCNINetworkConfigFileName   = "10-azure.conflist"
-	configFileName                    = "config.json"
 	dncApiVersion                     = "?api-version=2018-03-01"
 	poolIPAMRefreshRateInMilliseconds = 1000
 
@@ -321,19 +320,14 @@ func sendRegisterNodeRequest(
 	nodeRegisterRequest cns.NodeRegisterRequest,
 	registerURL string) (bool, error) {
 
-	var (
-		body     bytes.Buffer
-		response *http.Response
-		err      = fmt.Errorf("")
-	)
-
-	err = json.NewEncoder(&body).Encode(nodeRegisterRequest)
+	var body bytes.Buffer
+	err := json.NewEncoder(&body).Encode(nodeRegisterRequest)
 	if err != nil {
 		log.Errorf("[Azure CNS] Failed to register node while encoding json failed with non-retriable err %v", err)
 		return false, err
 	}
 
-	response, err = httpc.Post(registerURL, "application/json", &body)
+	response, err := httpc.Post(registerURL, "application/json", &body)
 	if err != nil {
 		logger.Errorf("[Azure CNS] Failed to register node with retriable err: %+v", err)
 		return false, nil
@@ -610,10 +604,8 @@ func main() {
 			// Periodically poll DNC for node updates
 			tickerChannel := time.Tick(time.Duration(cnsconfig.ManagedSettings.NodeSyncIntervalInSeconds) * time.Second)
 			for {
-				select {
-				case <-tickerChannel:
-					httpRestService.SyncNodeStatus(ep, vnet, node, json.RawMessage{})
-				}
+				<-tickerChannel
+				httpRestService.SyncNodeStatus(ep, vnet, node, json.RawMessage{})
 			}
 		}(privateEndpoint, infravnet, nodeID)
 	}

network/bridge_endpointclient_linux.go

@@ -44,9 +44,7 @@ func NewLinuxBridgeEndpointClient(
 		mode:              mode,
 	}
 
-	for _, ipAddr := range extIf.IPAddresses {
-		client.hostIPAddresses = append(client.hostIPAddresses, ipAddr)
-	}
+	client.hostIPAddresses = append(client.hostIPAddresses, extIf.IPAddresses...)
 
 	return client
 }

network/endpoint.go

@@ -218,13 +218,9 @@ func (ep *endpoint) getInfo() *EndpointInfo {
 		NetworkContainerID:       ep.NetworkContainerID,
 	}
 
-	for _, route := range ep.Routes {
-		info.Routes = append(info.Routes, route)
-	}
+	info.Routes = append(info.Routes, ep.Routes...)
 
-	for _, gw := range ep.Gateways {
-		info.Gateways = append(info.Gateways, gw)
-	}
+	info.Gateways = append(info.Gateways, ep.Gateways...)
 
 	// Call the platform implementation.
 	ep.getInfoImpl(info)

network/endpoint_linux.go

@@ -211,10 +211,7 @@ func (nw *network) newEndpointImpl(epInfo *EndpointInfo) (*endpoint, error) {
 		PODNameSpace:             epInfo.PODNameSpace,
 	}
 
-	for _, route := range epInfo.Routes {
-		ep.Routes = append(ep.Routes, route)
-	}
-
+	ep.Routes = append(ep.Routes, epInfo.Routes...)
 	return ep, nil
 }
 
@@ -381,9 +378,7 @@ func (nw *network) updateEndpointImpl(existingEpInfo *EndpointInfo, targetEpInfo
 	}
 
 	// Update existing endpoint state with the new routes to persist
-	for _, route := range targetEpInfo.Routes {
-		ep.Routes = append(ep.Routes, route)
-	}
+	ep.Routes = append(ep.Routes, targetEpInfo.Routes...)
 
 	return ep, nil
 }

network/epcommon/endpoint_common.go

@@ -189,7 +189,7 @@ func BlockIPAddresses(bridgeName string, action string) error {
 func EnableIPForwarding(ifName string) error {
 	// Enable ip forwading on linux vm.
 	// sysctl -w net.ipv4.ip_forward=1
-	cmd := fmt.Sprintf(enableIPForwardCmd)
+	cmd := fmt.Sprint(enableIPForwardCmd)
 	_, err := platform.ExecuteCommand(cmd)
 	if err != nil {
 		log.Printf("[net] Enable ipforwarding failed with: %v", err)
@@ -206,7 +206,7 @@ func EnableIPForwarding(ifName string) error {
 }
 
 func EnableIPV6Forwarding() error {
-	cmd := fmt.Sprintf(enableIPV6ForwardCmd)
+	cmd := fmt.Sprint(enableIPV6ForwardCmd)
 	_, err := platform.ExecuteCommand(cmd)
 	if err != nil {
 		log.Printf("[net] Enable ipv6 forwarding failed with: %v", err)

network/manager.go

@@ -27,7 +27,10 @@ const (
 )
 
 var (
-	Ipv4DefaultRouteDstPrefix = net.IPNet{net.IPv4zero, net.IPv4Mask(0, 0, 0, 0)}
+	Ipv4DefaultRouteDstPrefix = net.IPNet{
+		IP:   net.IPv4zero,
+		Mask: net.IPv4Mask(0, 0, 0, 0),
+	}
 )
 
 type NetworkClient interface {

network/network_linux.go

@@ -68,7 +68,6 @@ func (nm *networkManager) newNetworkImpl(nwInfo *NetworkInfo, extIf *externalInt
 		handleCommonOptions(extIf.BridgeName, nwInfo)
 	case opModeTransparent:
 		handleCommonOptions(extIf.Name, nwInfo)
-		break
 	default:
 		return nil, errNetworkModeInvalid
 	}