[-] apply non-recursive yaml dir reading, fixes #1368

replace `WalkDir` with `filepath.Glob`, those functions never intended
to be recursive in the first place

Author: pashagolub

internal/metrics/yaml.go

@@ -3,11 +3,9 @@ package metrics
 import (
 	"context"
 	_ "embed"
-	"io/fs"
 	"maps"
 	"os"
 	"path/filepath"
-	"strings"
 	"sync"
 
 	"gopkg.in/yaml.v3"
@@ -66,21 +64,18 @@ func (fmr *fileMetricReader) getMetrics() (metrics *Metrics, err error) {
 	}
 	switch mode := fi.Mode(); {
 	case mode.IsDir():
-		err = filepath.WalkDir(fmr.path, func(path string, d fs.DirEntry, err error) error {
-			if err != nil {
-				return err
-			}
-			ext := strings.ToLower(filepath.Ext(d.Name()))
-			if d.IsDir() || ext != ".yaml" && ext != ".yml" {
-				return nil
-			}
+		var matches []string
+		if matches, err = filepath.Glob(filepath.Join(fmr.path, "*.y*ml")); err != nil {
+			return nil, err
+		}
+		for _, path := range matches {
 			var m *Metrics
-			if m, err = fmr.loadMetricsFromFile(path); err == nil {
-				maps.Copy(metrics.PresetDefs, m.PresetDefs)
-				maps.Copy(metrics.MetricDefs, m.MetricDefs)
+			if m, err = fmr.loadMetricsFromFile(path); err != nil {
+				return nil, err
 			}
-			return err
-		})
+			maps.Copy(metrics.PresetDefs, m.PresetDefs)
+			maps.Copy(metrics.MetricDefs, m.MetricDefs)
+		}
 	case mode.IsRegular():
 		metrics, err = fmr.loadMetricsFromFile(fmr.path)
 	}

internal/metrics/yaml_test.go

@@ -375,11 +375,11 @@ func TestMetricsDir(t *testing.T) {
 	metrics2File, err := yaml.Marshal(metrics2)
 	a.NoError(err)
 
-	// write data to different files in a folder
+	// write data to different files in a folder: one .yaml and one .yml
 	tempDir := t.TempDir()
 	err = os.WriteFile(filepath.Join(tempDir, "metrics1.yaml"), metrics1File, 0644)
 	a.NoError(err)
-	err = os.WriteFile(filepath.Join(tempDir, "metrics2.yaml"), metrics2File, 0644)
+	err = os.WriteFile(filepath.Join(tempDir, "metrics2.yml"), metrics2File, 0644)
 	a.NoError(err)
 
 	// use folder of yaml files for metrics configs

internal/sources/yaml.go

@@ -103,20 +103,17 @@ func (fcr *fileSourcesReaderWriter) getSources() (dbs Sources, err error) {
 	}
 	switch mode := fi.Mode(); {
 	case mode.IsDir():
-		err = filepath.WalkDir(fcr.path, func(path string, d fs.DirEntry, err error) error {
-			if err != nil {
-				return err
-			}
-			ext := strings.ToLower(filepath.Ext(d.Name()))
-			if d.IsDir() || ext != ".yaml" && ext != ".yml" {
-				return nil
-			}
+		var matches []string
+		if matches, err = filepath.Glob(filepath.Join(fcr.path, "*.y*ml")); err != nil {
+			return
+		}
+		for _, path := range matches {
 			var mdbs Sources
-			if mdbs, err = fcr.loadSourcesFromFile(path); err == nil {
-				dbs = append(dbs, mdbs...)
+			if mdbs, err = fcr.loadSourcesFromFile(path); err != nil {
+				return
 			}
-			return err
-		})
+			dbs = append(dbs, mdbs...)
+		}
 	case mode.IsRegular():
 		dbs, err = fcr.loadSourcesFromFile(fcr.path)
 	}

internal/sources/yaml_test.go

@@ -99,6 +99,27 @@ func TestYAMLGetMonitoredDatabases(t *testing.T) {
 		a.Error(err)
 		a.Nil(dbs)
 	})
+
+	t.Run("directory with yaml and yml files", func(t *testing.T) {
+		tmpDir := t.TempDir()
+		yamlContent1 := `
+- name: dir_test1
+  conn_str: postgresql://localhost/test1
+`
+		yamlContent2 := `
+- name: dir_test2
+  conn_str: postgresql://localhost/test2
+`
+		err := os.WriteFile(filepath.Join(tmpDir, "sources.yaml"), []byte(yamlContent1), 0644)
+		a.NoError(err)
+		err = os.WriteFile(filepath.Join(tmpDir, "sources.yml"), []byte(yamlContent2), 0644)
+		a.NoError(err)
+		yamlrw, err := sources.NewYAMLSourcesReaderWriter(ctx, tmpDir)
+		a.NoError(err)
+		dbs, err := yamlrw.GetSources()
+		a.NoError(err)
+		a.Len(dbs, 2)
+	})
 }
 
 func TestYAMLDeleteDatabase(t *testing.T) {