Skip to content

Commit 0155169

Browse files
committed
fix(node.go): embed root cause errors in returned errors
1 parent acd0a94 commit 0155169

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

pkg/utils/node.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -183,12 +183,12 @@ func (n *KRNode) FindBestIPv4NodeAddress() net.IP {
183183
func (n *LocalKRNode) GetNodeMTU() (int, error) {
184184
links, err := n.linkQ.LinkList()
185185
if err != nil {
186-
return 0, errors.New("failed to get list of links")
186+
return 0, fmt.Errorf("failed to get list of links: %w", err)
187187
}
188188
for _, link := range links {
189189
addresses, err := n.linkQ.AddrList(link, netlink.FAMILY_ALL)
190190
if err != nil {
191-
return 0, errors.New("failed to get list of addr")
191+
return 0, fmt.Errorf("failed to get list of addr: %w", err)
192192
}
193193
for _, addr := range addresses {
194194
if addr.IP.Equal(n.PrimaryIP) {
@@ -289,7 +289,7 @@ func GetNodeObject(clientset kubernetes.Interface, hostnameOverride string) (*ap
289289
if hostnameOverride != "" {
290290
node, err := clientset.CoreV1().Nodes().Get(context.Background(), hostnameOverride, metav1.GetOptions{})
291291
if err != nil {
292-
return nil, fmt.Errorf("unable to get node %s, due to: %v", hostnameOverride, err)
292+
return nil, fmt.Errorf("unable to get node %s, due to: %w", hostnameOverride, err)
293293
}
294294
return node, nil
295295
}
@@ -299,7 +299,7 @@ func GetNodeObject(clientset kubernetes.Interface, hostnameOverride string) (*ap
299299
if nodeName != "" {
300300
node, err := clientset.CoreV1().Nodes().Get(context.Background(), nodeName, metav1.GetOptions{})
301301
if err != nil {
302-
return nil, fmt.Errorf("unable to get node %s, due to: %v", nodeName, err)
302+
return nil, fmt.Errorf("unable to get node %s, due to: %w", nodeName, err)
303303
}
304304
return node, nil
305305
}
@@ -308,7 +308,7 @@ func GetNodeObject(clientset kubernetes.Interface, hostnameOverride string) (*ap
308308
hostName, _ := os.Hostname()
309309
node, err := clientset.CoreV1().Nodes().Get(context.Background(), hostName, metav1.GetOptions{})
310310
if err != nil {
311-
return nil, fmt.Errorf("failed to identify the node by NODE_NAME, %s or --hostname-override: %v", hostName, err)
311+
return nil, fmt.Errorf("failed to identify the node by NODE_NAME, %s or --hostname-override: %w", hostName, err)
312312
}
313313

314314
return node, nil
@@ -375,13 +375,13 @@ func GetNodeSubnet(nodeIP net.IP, linkQ LocalLinkQuerier) (net.IPNet, string, er
375375

376376
links, err := linkQ.LinkList()
377377
if err != nil {
378-
return net.IPNet{}, "", errors.New("failed to get list of links")
378+
return net.IPNet{}, "", fmt.Errorf("failed to get list of links: %w", err)
379379
}
380380

381381
for _, link := range links {
382382
addresses, err := linkQ.AddrList(link, netlink.FAMILY_ALL)
383383
if err != nil {
384-
return net.IPNet{}, "", errors.New("failed to get list of addrs")
384+
return net.IPNet{}, "", fmt.Errorf("failed to get list of addrs: %w", err)
385385
}
386386
for _, addr := range addresses {
387387
if addr.IP.Equal(nodeIP) {

pkg/utils/node_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -842,11 +842,11 @@ func Test_GetNodeSubnet(t *testing.T) {
842842
"error getting list of links",
843843
net.ParseIP("10.0.0.1"),
844844
func(myMock *MockLocalLinkQuerier) {
845-
myMock.On("LinkList").Return([]netlink.Link{}, errors.New("failed to get list of links"))
845+
myMock.On("LinkList").Return([]netlink.Link{}, errors.New("embedded LinkList error"))
846846
},
847847
net.IPNet{},
848848
"",
849-
errors.New("failed to get list of links"),
849+
errors.New("failed to get list of links: embedded LinkList error"),
850850
},
851851
{
852852
"error getting addrs",
@@ -855,11 +855,11 @@ func Test_GetNodeSubnet(t *testing.T) {
855855
myMock.On("LinkList").Return(
856856
[]netlink.Link{&netlink.Dummy{LinkAttrs: netlink.LinkAttrs{Name: "eth0"}}}, nil)
857857
myMock.On("AddrList", mock.Anything, mock.Anything).Return(
858-
[]netlink.Addr{}, errors.New("failed to get list of addrs"))
858+
[]netlink.Addr{}, errors.New("embedded LinkList error"))
859859
},
860860
net.IPNet{},
861861
"",
862-
errors.New("failed to get list of addrs"),
862+
errors.New("failed to get list of addrs: embedded LinkList error"),
863863
},
864864
}
865865

0 commit comments

Comments
 (0)