Addressing comments

Signed-off-by: Alan Protasio <[email protected]>

Author: alanprot

pkg/alertmanager/alertstore/local/store.go

@@ -154,17 +154,17 @@ func (f *Store) reloadConfigs() (map[string]alertspb.AlertConfigDesc, error) {
 		var templates []*alertspb.TemplateDesc
 
 		if _, e := os.Stat(userTemplateDir); e == nil {
-			err = filepath.Walk(filepath.Join(f.cfg.Path, user, templatesDir), func(path string, info os.FileInfo, err error) error {
+			err = filepath.Walk(userTemplateDir, func(templatePath string, info os.FileInfo, err error) error {
 				if err != nil {
-					return errors.Wrapf(err, "unable to walk file path at %s", path)
+					return errors.Wrapf(err, "unable to walk file path at %s", templatePath)
 				}
 				// Ignore files that are directories
 				if info.IsDir() {
 					return nil
 				}
-				content, err := os.ReadFile(path)
+				content, err := os.ReadFile(templatePath)
 				if err != nil {
-					return errors.Wrapf(err, "unable to read alertmanager templates %s", path)
+					return errors.Wrapf(err, "unable to read alertmanager templates %s", templatePath)
 				}
 
 				templates = append(templates, &alertspb.TemplateDesc{
@@ -175,8 +175,10 @@ func (f *Store) reloadConfigs() (map[string]alertspb.AlertConfigDesc, error) {
 			})
 
 			if err != nil {
-				return errors.Wrapf(err, "unable to load alertmanager config %s", path)
+				return errors.Wrapf(err, "unable to list alertmanager templates: %s", userTemplateDir)
 			}
+		} else if !os.IsNotExist(e) {
+			return errors.Wrapf(e, "unable to read alertmanager templates %s", path)
 		}
 
 		configs[user] = alertspb.AlertConfigDesc{

pkg/alertmanager/alertstore/local/store_test.go

@@ -81,7 +81,7 @@ func TestStore_GetAlertConfigs(t *testing.T) {
 	// The storage contains some configs.
 	{
 		user1Cfg := prepareAlertmanagerConfig("user-1")
-		user1Dir, user1TemplateDir := prepareUserDir(t, storeDir, "user-1")
+		user1Dir, user1TemplateDir := prepareUserDir(t, storeDir, true, "user-1")
 		require.NoError(t, os.WriteFile(filepath.Join(user1Dir, "user-1.yaml"), []byte(user1Cfg), os.ModePerm))
 
 		require.NoError(t, os.WriteFile(filepath.Join(user1TemplateDir, "template.tpl"), []byte("testTemplate"), os.ModePerm))
@@ -95,7 +95,7 @@ func TestStore_GetAlertConfigs(t *testing.T) {
 
 		// Add another user config.
 		user2Cfg := prepareAlertmanagerConfig("user-2")
-		user2Dir, _ := prepareUserDir(t, storeDir, "user-2")
+		user2Dir, _ := prepareUserDir(t, storeDir, false, "user-2")
 		require.NoError(t, os.WriteFile(filepath.Join(user2Dir, "user-2.yaml"), []byte(user2Cfg), os.ModePerm))
 
 		configs, err = store.GetAlertConfigs(ctx, []string{"user-1", "user-2"})
@@ -107,11 +107,13 @@ func TestStore_GetAlertConfigs(t *testing.T) {
 	}
 }
 
-func prepareUserDir(t *testing.T, storeDir string, user string) (userDir string, templateDir string) {
+func prepareUserDir(t *testing.T, storeDir string, createTemplateDir bool, user string) (userDir string, templateDir string) {
 	userDir = filepath.Join(storeDir, user)
 	templateDir = filepath.Join(userDir, templatesDir)
 	require.NoError(t, os.MkdirAll(userDir, os.ModePerm))
-	require.NoError(t, os.MkdirAll(templateDir, os.ModePerm))
+	if createTemplateDir {
+		require.NoError(t, os.MkdirAll(templateDir, os.ModePerm))
+	}
 	return
 }