From a816d1a9138f020791aa81cc89f50d2bbbe86709 Mon Sep 17 00:00:00 2001
From: Svilen Markov <7613769+svilenmarkov@users.noreply.github.com>
Date: Fri, 29 Nov 2024 21:12:10 +0000
Subject: [PATCH] Update error messages

---
 internal/glance/config.go | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/internal/glance/config.go b/internal/glance/config.go
index b2ebf88..9568fc7 100644
--- a/internal/glance/config.go
+++ b/internal/glance/config.go
@@ -102,12 +102,12 @@ var includePattern = regexp.MustCompile(`(?m)^(\s*)!include:\s*(.+)$`)
 func parseYAMLIncludes(mainFilePath string) ([]byte, map[string]struct{}, error) {
 	mainFileContents, err := os.ReadFile(mainFilePath)
 	if err != nil {
-		return nil, nil, fmt.Errorf("could not read main YAML file: %w", err)
+		return nil, nil, fmt.Errorf("reading main YAML file: %w", err)
 	}
 
 	mainFileAbsPath, err := filepath.Abs(mainFilePath)
 	if err != nil {
-		return nil, nil, fmt.Errorf("could not get absolute path of main YAML file: %w", err)
+		return nil, nil, fmt.Errorf("getting absolute path of main YAML file: %w", err)
 	}
 	mainFileDir := filepath.Dir(mainFileAbsPath)
 
@@ -136,7 +136,7 @@ func parseYAMLIncludes(mainFilePath string) ([]byte, map[string]struct{}, error)
 
 		fileContents, err = os.ReadFile(includeFilePath)
 		if err != nil {
-			includesLastErr = fmt.Errorf("could not read included file: %w", err)
+			includesLastErr = fmt.Errorf("reading included file %s: %w", includeFilePath, err)
 			return nil
 		}
 
@@ -160,12 +160,12 @@ func configFilesWatcher(
 ) (func() error, error) {
 	watcher, err := fsnotify.NewWatcher()
 	if err != nil {
-		return nil, fmt.Errorf("could not create watcher: %w", err)
+		return nil, fmt.Errorf("creating watcher: %w", err)
 	}
 
 	if err = watcher.Add(mainFilePath); err != nil {
 		watcher.Close()
-		return nil, fmt.Errorf("could not add main file to watcher: %w", err)
+		return nil, fmt.Errorf("adding main file to watcher: %w", err)
 	}
 
 	updateWatchedIncludes := func(previousIncludes map[string]struct{}, newIncludes map[string]struct{}) {
@@ -192,7 +192,7 @@ func configFilesWatcher(
 	checkForContentChangesBeforeCallback := func() {
 		currentContents, currentIncludes, err := parseYAMLIncludes(mainFilePath)
 		if err != nil {
-			onErr(fmt.Errorf("could not parse main file contents for comparison: %w", err))
+			onErr(fmt.Errorf("parsing main file contents for comparison: %w", err))
 			return
 		}