Skip to content

Commit

Permalink
return error level above, gofumpt test file
Browse files Browse the repository at this point in the history
  • Loading branch information
bogdanNovikovDell authored and mdutka-dell committed Apr 15, 2024
1 parent dc1c29f commit d93a4dc
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 7 deletions.
2 changes: 1 addition & 1 deletion service/node.go
Original file line number Diff line number Diff line change
Expand Up @@ -1531,7 +1531,7 @@ func (s *service) addNodeInformationIntoArray(ctx context.Context, array *Storag
log.Debugf("Fetching IP address of custom network for NFS I/O traffic")
nodeIps, err = utils.GetNFSClientIP(s.opts.allowedNetworks)
if err != nil {
log.Error("Failed to find IP address corresponding to the allowed network with error", err.Error())
log.Fatalf("Failed to find IP address corresponding to the allowed network with error %s", err.Error())
return err
}
} else {
Expand Down
2 changes: 1 addition & 1 deletion service/utils/emcutils.go
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ func GetNFSClientIP(allowedNetworks []string) ([]string, error) {
}
nodeIPs, err := GetAddresses(allowedNetworks, addrs)
if err != nil {
panic(err)
return nil, err
}
return nodeIPs, nil
}
Expand Down
13 changes: 8 additions & 5 deletions service/utils/emcutils_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ import (
)

func TestGetAddresses(t *testing.T) {

type errorTestCases struct {
description string
addrs []net.Addr
Expand All @@ -49,16 +48,20 @@ func TestGetAddresses(t *testing.T) {
},
{
description: "multiple networks, multiple addresses-successful",
addrs: []net.Addr{&net.IPNet{IP: net.ParseIP("192.168.1.1"), Mask: net.CIDRMask(24, 32)},
&net.IPNet{IP: net.ParseIP("192.168.2.1"), Mask: net.CIDRMask(24, 32)}},
addrs: []net.Addr{
&net.IPNet{IP: net.ParseIP("192.168.1.1"), Mask: net.CIDRMask(24, 32)},
&net.IPNet{IP: net.ParseIP("192.168.2.1"), Mask: net.CIDRMask(24, 32)},
},
networkAddresses: []string{"192.168.1.0/24", "192.168.2.0/24"},
expectedAddresses: []string{"192.168.1.1", "192.168.2.1"},
expectedError: "",
},
{
description: "multiple networks, one erroneous address",
addrs: []net.Addr{&net.IPNet{IP: net.ParseIP("192.168.1.1"), Mask: net.CIDRMask(24, 32)},
&net.IPNet{IP: net.ParseIP("192.168.3.1"), Mask: net.CIDRMask(24, 32)}},
addrs: []net.Addr{
&net.IPNet{IP: net.ParseIP("192.168.1.1"), Mask: net.CIDRMask(24, 32)},
&net.IPNet{IP: net.ParseIP("192.168.3.1"), Mask: net.CIDRMask(24, 32)},
},
networkAddresses: []string{"192.168.1.0/24", "192.168.2.0/24"},
expectedAddresses: []string{"192.168.1.1"},
expectedError: "",
Expand Down

0 comments on commit d93a4dc

Please sign in to comment.