lint fixes and address comment

Signed-off-by: Tamilmani <[email protected]>

Author: tamilmani1989

cni/network/network.go

@@ -678,9 +678,8 @@ func (plugin *NetPlugin) createEpInfo(opt *createEpInfoOpt) (*network.EndpointIn
 	opt.ifInfo.HostSubnetPrefix.IP = opt.ifInfo.HostSubnetPrefix.IP.Mask(opt.ifInfo.HostSubnetPrefix.Mask)
 	opt.ipamAddConfig.nwCfg.IPAM.Subnet = opt.ifInfo.HostSubnetPrefix.String()
 
-	var masterIfName string
 	// populate endpoint info section
-	masterIfName = plugin.findMasterInterface(opt)
+	masterIfName := plugin.findMasterInterface(opt)
 	if masterIfName == "" {
 		err := plugin.Errorf("Failed to find the master interface")
 		return nil, err

cni/network/network_windows.go

@@ -79,7 +79,7 @@ func (plugin *NetPlugin) getNetworkName(netNs string, interfaceInfo *network.Int
 	}
 
 	if interfaceInfo != nil && interfaceInfo.NICType == cns.ApipaNIC {
-		return swiftv2NetworkNamePrefix + "apipa", nil
+		return swiftv2NetworkNamePrefix + apipaInterfacePrefix, nil
 	}
 
 	// For singletenancy, the network name is simply the nwCfg.Name

cns/endpointmanager/endpointmanager_windows.go

@@ -17,7 +17,7 @@ func (em *EndpointManager) ReleaseIPs(ctx context.Context, ipconfigreq cns.IPCon
 		logger.Errorf("failed to remove HNS endpoint %s", err.Error())
 	}
 
-	return em.cli.ReleaseIPs(ctx, ipconfigreq)
+	return errors.Wrap(em.cli.ReleaseIPs(ctx, ipconfigreq), "failed to release IP from CNS")
 }
 
 // deleteEndpoint API to get the state and then remove assiciated HNS

cns/restserver/ipam.go

@@ -161,6 +161,7 @@ func (service *HTTPRestService) requestIPConfigHandlerHelperStandalone(ctx conte
 		podIPInfoList = append(podIPInfoList, podIPInfo)
 		if resp[i].AllowHostToNCCommunication || resp[i].AllowNCToHostCommunication {
 			apipaIndex = i
+			break
 		}
 	}
 

network/endpoint_windows.go

@@ -404,14 +404,14 @@ func (nw *network) createHostNCApipaEndpoint(cli apipaClient, epInfo *EndpointIn
 
 	if namespace, err = hcn.GetNamespaceByID(epInfo.NetNsPath); err != nil {
 		return nil, fmt.Errorf("Failed to retrieve namespace with GetNamespaceByID for NetNsPath: %s"+
-			" due to error: %v", epInfo.NetNsPath, err)
+			" due to error: %v", epInfo.NetNsPath, err) //nolint
 	}
 
 	logger.Info("Creating HostNCApipaEndpoint for host container connectivity for NC",
 		zap.String("NetworkContainerID", epInfo.NetworkContainerID))
 
 	if hostNCApipaEndpointID, err = cli.CreateHostNCApipaEndpoint(context.TODO(), epInfo.NetworkContainerID); err != nil {
-		return nil, err
+		return nil, err //nolint
 	}
 
 	defer func() {