Merge pull request #330 from SUSE/sap-do-not-add-repetead-workloads

collectors/sap: Don't repeat workloads

Author: mssola

internal/collectors/sap.go

@@ -4,6 +4,7 @@ import (
 	"os"
 	"path"
 	"regexp"
+	"slices"
 
 	"github.com/SUSE/connect-ng/internal/util"
 )
@@ -26,10 +27,13 @@ func getMatchedSubdirectories(absolutePath string, matcher *regexp.Regexp) ([]st
 	}
 	match := []string{}
 	for _, subDirectory := range subDirectories {
+
 		// filter for nil values from FindStringSubmatch
 		matches := matcher.FindStringSubmatch(subDirectory.Name())
 		if len(matches) >= 2 {
-			match = append(match, matches[1])
+			if !slices.Contains(match, matches[1]) {
+				match = append(match, matches[1])
+			}
 		}
 	}
 	return match, nil

internal/collectors/sap_test.go

@@ -153,6 +153,27 @@ func TestSAPRunWithMultipleWorkloads(t *testing.T) {
 	assert.Equal(expected, res, "Result mismatch when there are workloads")
 }
 
+func TestSAPRunWithDuplicatedWorkloads(t *testing.T) {
+	assert := assert.New(t)
+	sap := SAP{}
+	expected := Result{"sap": []map[string]interface{}{
+		{
+			"system_id":      "DEV",
+			"instance_types": []string{"ASCS", "J"},
+		},
+	}}
+
+	mockUtilFileExists(true)
+	mockLocalOsReaddir(map[string][]string{
+		"/usr/sap":     []string{"DEV", ".config"},
+		"/usr/sap/DEV": []string{"ASCS01", "ASCS01", "J01"}, // NOTE: duplicated!
+	})
+
+	res, err := sap.run(ARCHITECTURE_X86_64)
+	assert.NoError(err)
+	assert.Equal(expected, res, "Result mismatch when there are workloads")
+}
+
 func TestSAPRunWithNoWorkloadDetected(t *testing.T) {
 	assert := assert.New(t)
 	sap := SAP{}