fix(CSI-260): lookup of NFS interface group fails when empty name pro…

…vided

pkg/wekafs/apiclient/interfacegroup.go

@@ -9,7 +9,6 @@ import (
 	"k8s.io/apimachinery/pkg/util/rand"
 	"k8s.io/helm/pkg/urlutil"
 	"os"
-	"sort"
 )
 
 type InterfaceGroupType string
@@ -143,7 +142,7 @@ func (a *ApiClient) GetInterfaceGroupByUid(ctx context.Context, uid uuid.UUID, i
 	return nil
 }
 
-func (a *ApiClient) fetchNfsInterfaceGroup(ctx context.Context, name *string, useDefault bool) error {
+func (a *ApiClient) fetchNfsInterfaceGroup(ctx context.Context, name string) error {
 	igs := &[]InterfaceGroup{}
 	err := a.GetInterfaceGroupsByType(ctx, InterfaceGroupTypeNFS, igs)
 	if err != nil {
@@ -152,42 +151,33 @@ func (a *ApiClient) fetchNfsInterfaceGroup(ctx context.Context, name *string, us
 	if len(*igs) == 0 {
 		return errors.New("no nfs interface groups found")
 	}
-	if name != nil {
-		for _, ig := range *igs {
-			if ig.Name == *name {
-				a.NfsInterfaceGroups[*name] = &ig
+	igname := name
+	if name == "" {
+		igname = "default"
+	}
+	for _, ig := range *igs {
+		if ig.Name == name || name == "" {
+			if len(ig.Ips) == 0 {
+				if name == "" {
+					continue
+				}
+				return errors.New("no IP addresses found for nfs interface group \"" + name + "\"")
 			}
+			a.NfsInterfaceGroups[igname] = &ig
+			return nil
 		}
-	} else if useDefault {
-		a.NfsInterfaceGroups["default"] = &(*igs)[0]
 	}
-
-	ig := &InterfaceGroup{}
-	if name != nil {
-		ig = a.NfsInterfaceGroups[*name]
-	} else {
-		ig = a.NfsInterfaceGroups["default"]
-	}
-	if ig == nil {
-		return errors.New("no nfs interface group found")
-	}
-
-	if len(ig.Ips) == 0 {
-		return errors.New("no IP addresses found for nfs interface group")
-	}
-	// Make sure the IPs are always sorted
-	sort.Strings(ig.Ips)
-	return nil
+	return errors.New(fmt.Sprintf("no nfs interface group named '%s' found", name))
 }
 
-func (a *ApiClient) GetNfsInterfaceGroup(ctx context.Context, name *string) *InterfaceGroup {
-	igName := "default"
-	if name != nil {
-		igName = *name
+func (a *ApiClient) GetNfsInterfaceGroup(ctx context.Context, name string) *InterfaceGroup {
+	igName := name
+	if name == "" {
+		igName = "default"
 	}
 	_, ok := a.NfsInterfaceGroups[igName]
 	if !ok {
-		err := a.fetchNfsInterfaceGroup(ctx, name, true)
+		err := a.fetchNfsInterfaceGroup(ctx, name)
 		if err != nil {
 			return nil
 		}
@@ -197,7 +187,7 @@ func (a *ApiClient) GetNfsInterfaceGroup(ctx context.Context, name *string) *Int
 
 // GetNfsMountIp returns the IP address of the NFS interface group to be used for NFS mount
 // TODO: need to do it much more sophisticated way to distribute load
-func (a *ApiClient) GetNfsMountIp(ctx context.Context, interfaceGroupName *string) (string, error) {
+func (a *ApiClient) GetNfsMountIp(ctx context.Context, interfaceGroupName string) (string, error) {
 	ig := a.GetNfsInterfaceGroup(ctx, interfaceGroupName)
 	if ig == nil {
 		return "", errors.New("no NFS interface group found")

pkg/wekafs/apiclient/interfacegroup_test.go

@@ -0,0 +1,44 @@
+package apiclient
+
+import (
+	"context"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestGetNfsInterfaceGroup(t *testing.T) {
+	apiClient := GetApiClientForTest(t)
+	// Mock GetInterfaceGroupsByType method
+
+	// Test case: Valid interface group
+	ig := apiClient.GetNfsInterfaceGroup(context.Background(), "")
+	assert.NotNil(t, ig)
+	assert.Contains(t, apiClient.NfsInterfaceGroups, "default")
+
+	// Test case: Invalid interface group
+	ig = apiClient.GetNfsInterfaceGroup(context.Background(), "NFS")
+	assert.Nil(t, ig)
+
+	// Test case: Invalid interface group
+	ig = apiClient.GetNfsInterfaceGroup(context.Background(), "Data")
+	assert.NotNil(t, ig)
+	assert.Contains(t, apiClient.NfsInterfaceGroups, "Data")
+
+}
+
+func TestGetNfsMountIp(t *testing.T) {
+	apiClient := GetApiClientForTest(t)
+	// Mock GetInterfaceGroupsByType method
+
+	// Test case: Valid interface group
+	ip, err := apiClient.GetNfsMountIp(context.Background(), "")
+	assert.NoError(t, err)
+	assert.NotEmpty(t, ip)
+
+	// Test case: Valid interface group
+	ip, err = apiClient.GetNfsMountIp(context.Background(), "NFS")
+	assert.NoError(t, err)
+	assert.NotEmpty(t, ip)
+
+}

pkg/wekafs/apiclient/nfs_test.go

@@ -16,7 +16,7 @@ var fsName string
 var client *ApiClient
 
 func TestMain(m *testing.M) {
-	flag.StringVar(&endpoint, "api-endpoint", "vm49-1723969301909816-0.lan:14000", "API endpoint for tests")
+	flag.StringVar(&endpoint, "api-endpoint", "vm125-1726039130891528-0.lan:14000", "API endpoint for tests")
 	flag.StringVar(&creds.Username, "api-username", "admin", "API username for tests")
 	flag.StringVar(&creds.Password, "api-password", "AAbb1234", "API password for tests")
 	flag.StringVar(&creds.Organization, "api-org", "Root", "API org for tests")

pkg/wekafs/nfsmount.go

@@ -22,7 +22,7 @@ type nfsMount struct {
 	mountOptions       MountOptions
 	lastUsed           time.Time
 	mountIpAddress     string
-	interfaceGroupName *string
+	interfaceGroupName string
 	clientGroupName    string
 	protocolVersion    apiclient.NfsVersionString
 }

pkg/wekafs/nfsmounter.go

@@ -17,7 +17,7 @@ type nfsMounter struct {
 	debugPath             string
 	selinuxSupport        *bool
 	gc                    *innerPathVolGc
-	interfaceGroupName    *string
+	interfaceGroupName    string
 	clientGroupName       string
 	nfsProtocolVersion    string
 	exclusiveMountOptions []mutuallyExclusiveMountOptionSet
@@ -36,7 +36,7 @@ func newNfsMounter(driver *WekaFsDriver) *nfsMounter {
 	mounter := &nfsMounter{mountMap: make(nfsMountsMap), debugPath: driver.debugPath, selinuxSupport: selinuxSupport, exclusiveMountOptions: driver.config.mutuallyExclusiveOptions}
 	mounter.gc = initInnerPathVolumeGc(mounter)
 	mounter.schedulePeriodicMountGc()
-	mounter.interfaceGroupName = &driver.config.interfaceGroupName
+	mounter.interfaceGroupName = driver.config.interfaceGroupName
 	mounter.clientGroupName = driver.config.clientGroupName
 	mounter.nfsProtocolVersion = driver.config.nfsProtocolVersion