Merge pull request #1781 from TessaIO/fix-swap-empty-line

fix: take into consideration possibility of having empty line in swap file

source/memory/memory.go

@@ -131,7 +131,7 @@ func (s *memorySource) GetFeatures() *nfdv1alpha1.Features {
 // detectSwap detects Swap node information
 func detectSwap() (map[string]string, error) {
 	procBasePath := hostpath.ProcDir.Path("swaps")
-	lines, err := getNumberOfLinesFromFile(procBasePath)
+	lines, err := getNumberOfNonEmptyLinesFromFile(procBasePath)
 	if err != nil {
 		return nil, fmt.Errorf("failed to read swaps file: %w", err)
 	}
@@ -195,12 +195,18 @@ func readNdDeviceInfo(path string) nfdv1alpha1.InstanceFeature {
 	return *nfdv1alpha1.NewInstanceFeature(attrs)
 }
 
-func getNumberOfLinesFromFile(path string) (int, error) {
+func getNumberOfNonEmptyLinesFromFile(path string) (int, error) {
 	data, err := os.ReadFile(path)
 	if err != nil {
 		return 0, err
 	}
-	return len(strings.Split(string(data), "\n")), nil
+	length := 0
+	for _, line := range strings.Split(string(data), "\n") {
+		if strings.TrimSpace(line) != "" {
+			length++
+		}
+	}
+	return length, nil
 }
 
 func init() {

source/memory/memory_test.go

@@ -54,7 +54,7 @@ func TestGetNumberofLinesFromFile(t *testing.T) {
 		},
 	}
 	for _, tc := range tc {
-		actual, err := getNumberOfLinesFromFile(tc.path)
+		actual, err := getNumberOfNonEmptyLinesFromFile(tc.path)
 		if tc.expectErr {
 			assert.NotNil(t, err, "should get an error")
 		}

source/memory/testdata/noswap

@@ -1 +1 @@
-Filename                          Type        Size     Used    Priority
+Filename                          Type        Size     Used    Priority

source/memory/testdata/swap

@@ -1,2 +1,2 @@
 Filename                          Type        Size     Used    Priority
-dummyfile   partition   65555   0       -1
+dummyfile   partition   65555   0       -1