address linter issues

Author: QxBytes

dhcp/dhcp_windows.go

@@ -87,24 +87,24 @@ func (s *Socket) Close() error {
 func (c *DHCP) getIPv4InterfaceAddresses(ifName string) ([]net.IP, error) {
 	nic, err := c.netioClient.GetNetworkInterfaceByName(ifName)
 	if err != nil {
-		return []net.IP{}, err
+		return []net.IP{}, errors.Wrap(err, "failed to get interface by name to find ipv4 addresses")
 	}
 	addresses, err := c.netioClient.GetNetworkInterfaceAddrs(nic)
 	if err != nil {
-		return []net.IP{}, err
+		return []net.IP{}, errors.Wrap(err, "failed to get interface addresses")
 	}
 	ret := []net.IP{}
 	for _, address := range addresses {
 		// check if the ip is ipv4 and parse it
-		ip, _, err := net.ParseCIDR(address.String())
-		if err != nil || ip.To4() == nil {
+		ip, _, cidrErr := net.ParseCIDR(address.String())
+		if cidrErr != nil || ip.To4() == nil {
 			continue
 		}
 		ret = append(ret, ip)
 	}
 
 	c.logger.Info("Interface addresses found", zap.Any("foundIPs", addresses), zap.Any("selectedIPs", ret))
-	return ret, err
+	return ret, nil
 }
 
 func (c *DHCP) verifyIPv4InterfaceAddressCount(ifName string, count, maxRuns int, sleep time.Duration) error {
@@ -118,7 +118,7 @@ func (c *DHCP) verifyIPv4InterfaceAddressCount(ifName string, count, maxRuns int
 		}
 		return nil
 	})
-	return addressCountErr
+	return errors.Wrap(addressCountErr, "failed to verify interface ipv4 address count")
 }
 
 // issues a dhcp discover request on an interface by finding the secondary's ip and sending on its ip

network/network_windows.go

@@ -46,6 +46,7 @@ const (
 	defaultIPv6Route = "::/0"
 	// Default IPv6 nextHop
 	defaultIPv6NextHop = "fe80::1234:5678:9abc"
+	dhcpTimeout        = 15 * time.Second
 )
 
 // Windows implementation of route.
@@ -438,8 +439,7 @@ func (nm *networkManager) newNetworkImplHnsV2(nwInfo *EndpointInfo, extIf *exter
 func (nm *networkManager) sendDHCPDiscoverOnSecondary(client dhcpClient, mac net.HardwareAddr, ifName string) error {
 	// issue dhcp discover packet to ensure mapping created for dns via wireserver to work
 	// we do not use the response for anything
-	timeout := 15 * time.Second
-	ctx, cancel := context.WithDeadline(context.Background(), time.Now().Add(timeout))
+	ctx, cancel := context.WithDeadline(context.Background(), time.Now().Add(dhcpTimeout))
 	defer cancel()
 	logger.Info("Sending DHCP packet", zap.Any("macAddress", mac), zap.String("ifName", ifName))
 	err := client.DiscoverRequest(ctx, mac, ifName)