Fixes according to linter

Author: catherinetcai

pkg/bgp/peer_config.go

@@ -218,7 +218,8 @@ func validatePeerConfigs(
 	}
 	if len(remoteIPs) != len(ports) && len(ports) != 0 {
 		return fmt.Errorf("invalid peer router config. The number of ports should either be zero, or "+
-			"one per peer router. If blank items are used, it will default to standard BGP port, %s. ", strconv.Itoa(options.DefaultBgpPort))
+			"one per peer router. If blank items are used, it will default to standard BGP port, %s. ",
+			strconv.Itoa(options.DefaultBgpPort))
 	}
 	if len(remoteIPs) != len(localIPs) && len(localIPs) != 0 {
 		return fmt.Errorf("invalid peer router config. The number of localIPs should either be zero, or "+

pkg/controllers/routing/bgp_peers.go

@@ -93,9 +93,13 @@ func (nrc *NetworkRoutingController) syncInternalPeers() {
 		sourceNodeIsIPv4 := nrc.krNode.GetPrimaryNodeIP().To4() != nil
 
 		if targetNodeIsIPv4 != sourceNodeIsIPv4 {
-			klog.Warningf("Not peering with Node %s as it's primary IP (%s) uses a different protocol than "+
-				"our primary IP (%s)", node.Name, targetNode.GetPrimaryNodeIP(),
-				nrc.krNode.GetPrimaryNodeIP())
+			klog.Warningf(
+				"Not peering with Node %s as it's primary IP (%s) uses a different protocol than "+
+					"our primary IP (%s)",
+				node.Name,
+				targetNode.GetPrimaryNodeIP(),
+				nrc.krNode.GetPrimaryNodeIP(),
+			)
 			continue
 		}
 
@@ -128,7 +132,10 @@ func (nrc *NetworkRoutingController) syncInternalPeers() {
 			if targetNode.IsIPv4Capable() {
 				afiSafi := gobgpapi.AfiSafi{
 					Config: &gobgpapi.AfiSafiConfig{
-						Family:  &gobgpapi.Family{Afi: gobgpapi.Family_AFI_IP, Safi: gobgpapi.Family_SAFI_UNICAST},
+						Family: &gobgpapi.Family{
+							Afi:  gobgpapi.Family_AFI_IP,
+							Safi: gobgpapi.Family_SAFI_UNICAST,
+						},
 						Enabled: true,
 					},
 					MpGracefulRestart: &gobgpapi.MpGracefulRestart{
@@ -143,7 +150,10 @@ func (nrc *NetworkRoutingController) syncInternalPeers() {
 			if targetNode.IsIPv6Capable() {
 				afiSafi := gobgpapi.AfiSafi{
 					Config: &gobgpapi.AfiSafiConfig{
-						Family:  &gobgpapi.Family{Afi: gobgpapi.Family_AFI_IP6, Safi: gobgpapi.Family_SAFI_UNICAST},
+						Family: &gobgpapi.Family{
+							Afi:  gobgpapi.Family_AFI_IP6,
+							Safi: gobgpapi.Family_SAFI_UNICAST,
+						},
 						Enabled: true,
 					},
 					MpGracefulRestart: &gobgpapi.MpGracefulRestart{
@@ -173,7 +183,11 @@ func (nrc *NetworkRoutingController) syncInternalPeers() {
 			Peer: n,
 		}); err != nil {
 			if !strings.Contains(err.Error(), "can't overwrite the existing peer") {
-				klog.Errorf("Failed to add node %s as peer due to %s", targetNode.GetPrimaryNodeIP(), err)
+				klog.Errorf(
+					"Failed to add node %s as peer due to %s",
+					targetNode.GetPrimaryNodeIP(),
+					err,
+				)
 			}
 		}
 	}
@@ -203,8 +217,12 @@ func (nrc *NetworkRoutingController) syncInternalPeers() {
 }
 
 // connectToExternalBGPPeers adds all the configured eBGP peers (global or node specific) as neighbours
-func (nrc *NetworkRoutingController) connectToExternalBGPPeers(server *gobgp.BgpServer, peerNeighbors []*gobgpapi.Peer,
-	bgpGracefulRestart bool, bgpGracefulRestartDeferralTime time.Duration, bgpGracefulRestartTime time.Duration,
+func (nrc *NetworkRoutingController) connectToExternalBGPPeers(
+	server *gobgp.BgpServer,
+	peerNeighbors []*gobgpapi.Peer,
+	bgpGracefulRestart bool,
+	bgpGracefulRestartDeferralTime time.Duration,
+	bgpGracefulRestartTime time.Duration,
 	peerMultihopTTL uint8,
 ) error {
 	for _, n := range peerNeighbors {
@@ -217,16 +235,23 @@ func (nrc *NetworkRoutingController) connectToExternalBGPPeers(server *gobgp.Bgp
 		}
 		peeringAddressForNeighbor := net.ParseIP(n.Transport.LocalAddress)
 		if peeringAddressForNeighbor == nil {
-			klog.Errorf("unable to parse our local address for peer (%s), not peering with this peer (%s)",
-				n.Transport.LocalAddress, neighborIPStr)
+			klog.Errorf(
+				"unable to parse our local address for peer (%s), not peering with this peer (%s)",
+				n.Transport.LocalAddress,
+				neighborIPStr,
+			)
 		}
 
 		neighborIsIPv4 := neighborIP.To4() != nil
 		peeringAddressIsIPv4 := peeringAddressForNeighbor.To4() != nil
 		if neighborIsIPv4 != peeringAddressIsIPv4 {
-			klog.Warningf("Not peering with configured peer as it's primary IP (%s) uses a different "+
-				"protocol than our configured local-address (%s). Its possible that this can be resolved by setting "+
-				"the local address appropriately", neighborIP, peeringAddressForNeighbor)
+			klog.Warningf(
+				"Not peering with configured peer as it's primary IP (%s) uses a different "+
+					"protocol than our configured local-address (%s). Its possible that this can be resolved by setting "+
+					"the local address appropriately",
+				neighborIP,
+				peeringAddressForNeighbor,
+			)
 			continue
 		}
 
@@ -242,7 +267,10 @@ func (nrc *NetworkRoutingController) connectToExternalBGPPeers(server *gobgp.Bgp
 				n.AfiSafis = []*gobgpapi.AfiSafi{
 					{
 						Config: &gobgpapi.AfiSafiConfig{
-							Family:  &gobgpapi.Family{Afi: gobgpapi.Family_AFI_IP, Safi: gobgpapi.Family_SAFI_UNICAST},
+							Family: &gobgpapi.Family{
+								Afi:  gobgpapi.Family_AFI_IP,
+								Safi: gobgpapi.Family_SAFI_UNICAST,
+							},
 							Enabled: true,
 						},
 						MpGracefulRestart: &gobgpapi.MpGracefulRestart{
@@ -256,7 +284,10 @@ func (nrc *NetworkRoutingController) connectToExternalBGPPeers(server *gobgp.Bgp
 			if nrc.krNode.IsIPv6Capable() {
 				afiSafi := gobgpapi.AfiSafi{
 					Config: &gobgpapi.AfiSafiConfig{
-						Family:  &gobgpapi.Family{Afi: gobgpapi.Family_AFI_IP6, Safi: gobgpapi.Family_SAFI_UNICAST},
+						Family: &gobgpapi.Family{
+							Afi:  gobgpapi.Family_AFI_IP6,
+							Safi: gobgpapi.Family_SAFI_UNICAST,
+						},
 						Enabled: true,
 					},
 					MpGracefulRestart: &gobgpapi.MpGracefulRestart{
@@ -286,7 +317,11 @@ func (nrc *NetworkRoutingController) connectToExternalBGPPeers(server *gobgp.Bgp
 }
 
 // Does validation and returns neighbor configs
-func newGlobalPeers(peerConfigs bgp.PeerConfigs, holdtime float64, localAddress string) ([]*gobgpapi.Peer, error) {
+func newGlobalPeers(
+	peerConfigs bgp.PeerConfigs,
+	holdtime float64,
+	localAddress string,
+) []*gobgpapi.Peer {
 	peers := make([]*gobgpapi.Peer, 0)
 
 	ips := peerConfigs.RemoteIPs()
@@ -330,7 +365,7 @@ func newGlobalPeers(peerConfigs bgp.PeerConfigs, holdtime float64, localAddress
 		peers = append(peers, peer)
 	}
 
-	return peers, nil
+	return peers
 }
 
 func (nrc *NetworkRoutingController) newNodeEventHandler() cache.ResourceEventHandler {
@@ -367,8 +402,10 @@ func (nrc *NetworkRoutingController) newNodeEventHandler() cache.ResourceEventHa
 			// In this case even if we can't get the NodeIP that's alright as the node is being removed anyway and
 			// future node lister operations that happen in OnNodeUpdate won't be affected as the node won't be returned
 			if err == nil && targetNode != nil {
-				klog.Infof("Received node %s removed update from watch API, so remove node from peer",
-					targetNode.GetPrimaryNodeIP())
+				klog.Infof(
+					"Received node %s removed update from watch API, so remove node from peer",
+					targetNode.GetPrimaryNodeIP(),
+				)
 			} else {
 				klog.Infof("Received node (IP unavailable) removed update from watch API, so remove node " +
 					"from peer")