chore: group provides csv and blocklist file name

Author: mvach

app/instances_processor.go

@@ -89,7 +89,7 @@ func (p instancesProcessor) Process(
 			}
 
 			if blocklistsDataProvider.BlockListExists(group) {
-				p.logger.Info(fmt.Sprintf("      using blocklist '%s.yml'", group.SanitizedGroupName()))
+				p.logger.Info(fmt.Sprintf("      using blocklist '%s'", group.BlocklistFileName()))
 			}
 
 			personData, err := csv.NewPersonData(persons, group, fileDataProvider, blocklistsDataProvider, p.logger)
@@ -107,7 +107,7 @@ func (p instancesProcessor) Process(
 			csvFilePath := filepath.Join(
 				rootDir,
 				instance.Hostname,
-				group.SanitizedGroupName()+".csv",
+				group.CSVFileName(),
 			)
 
 			err = csvWriter.Write(csvFilePath, personData.Header(), personData.Records())

config/group.go

@@ -10,7 +10,15 @@ type Group struct {
 	Fields []Field `yaml:"fields"`
 }
 
-func (g Group) SanitizedGroupName() string {
+func (g Group) CSVFileName() string {
+	return g.sanitizedGroupName() + ".csv"
+}
+
+func (g Group) BlocklistFileName() string {
+	return g.sanitizedGroupName() + ".yml"
+}
+
+func (g Group) sanitizedGroupName() string {
 	fileName := g.Name
 	fileName = strings.ReplaceAll(fileName, " ", "_")
 	fileName = strings.ReplaceAll(fileName, ",", ".")

config/group_test.go

@@ -24,7 +24,7 @@ var _ = Describe("Group", func() {
 		os.Remove(tempFile.Name())
 	})
 
-	var _ = Describe("SanitizedGroupName", func() {
+	var _ = Describe("CSVFileName", func() {
 		It("sanitizes group names correctly", func() {
 			yamlContent := `
 ---
@@ -44,7 +44,31 @@ instances:
 			Expect(err).ToNot(HaveOccurred())
 			Expect(cfg).ToNot(BeNil())
 
-			Expect(cfg.Instances[0].Groups[0].SanitizedGroupName()).To(Equal("foo-_.aeoeueAeOeUe-group"))
+			Expect(cfg.Instances[0].Groups[0].CSVFileName()).To(Equal("foo-_.aeoeueAeOeUe-group.csv"))
+		})
+	})
+
+	var _ = Describe("BlocklistFileName", func() {
+		It("sanitizes group names correctly", func() {
+			yamlContent := `
+---
+instances:
+  - hostname: foo
+    token_name: foo
+    groups:
+      - name: foo- ,äöüÄÖÜ-group
+        fields:
+        - foo_field_1
+`
+			_, err := tempFile.Write([]byte(yamlContent))
+			Expect(err).ToNot(HaveOccurred())
+			tempFile.Close()
+
+			cfg, err := config.LoadConfig(tempFile.Name())
+			Expect(err).ToNot(HaveOccurred())
+			Expect(cfg).ToNot(BeNil())
+
+			Expect(cfg.Instances[0].Groups[0].BlocklistFileName()).To(Equal("foo-_.aeoeueAeOeUe-group.yml"))
 		})
 	})
 })

csv/blocklist_data_provider.go

@@ -44,12 +44,9 @@ func NewBlockListDataProvider(dataDir string, logger logger.Logger) BlockListDat
 
 func (bp *blockListDataProvider) IsBlocked(personJson map[string]json.RawMessage, group config.Group) (bool, error) {
 	var entry cacheEntry
-
-	sanitizedGroupName := group.SanitizedGroupName()
-
-	entry, err := bp.loadBlocklist(sanitizedGroupName)
+	entry, err := bp.loadBlocklist(group.BlocklistFileName())
 	if err != nil {
-		return false, fmt.Errorf("failed to load blocklist for group %s: %w", sanitizedGroupName, err)
+		return false, fmt.Errorf("failed to load blocklist %s: %w", group.BlocklistFileName(), err)
 	}
 
 	for _, blockedAddress := range entry.data {
@@ -89,7 +86,7 @@ func (bp *blockListDataProvider) loadBlocklist(name string) (cacheEntry, error)
 		return entry, entry.err
 	}
 
-	path := filepath.Join(bp.dataDir, name+".yml")
+	path := filepath.Join(bp.dataDir, name)
 
 	yamlData, err := os.ReadFile(path)
 	if errors.Is(err, fs.ErrNotExist) {
@@ -135,7 +132,7 @@ func (bp *blockListDataProvider) loadBlocklist(name string) (cacheEntry, error)
 }
 
 func (bp *blockListDataProvider) BlockListExists(group config.Group) bool {
-	blocklistFilePath := filepath.Join(bp.dataDir, group.SanitizedGroupName()+".yml")
+	blocklistFilePath := filepath.Join(bp.dataDir, group.BlocklistFileName())
 	_, err := os.Stat(blocklistFilePath)
 	if err != nil {
 		if os.IsNotExist(err) {