From 2a1ee8fb6a12f2df70b0ce4e71846382aa3df45c Mon Sep 17 00:00:00 2001
From: Jye Cusch <jye.cusch@nitric.io>
Date: Thu, 25 Jul 2024 10:05:01 +1000
Subject: [PATCH] fix: improve error messages when failing to load yaml files
 (#754)

---
 pkg/project/config.go      | 2 +-
 pkg/project/project.go     | 2 +-
 pkg/project/stack/stack.go | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkg/project/config.go b/pkg/project/config.go
index 7034038ac..ac286f8c9 100644
--- a/pkg/project/config.go
+++ b/pkg/project/config.go
@@ -93,7 +93,7 @@ func ConfigurationFromFile(fs afero.Fs, filePath string) (*ProjectConfiguration,
 	info, err := fs.Stat(filePath)
 	if err != nil {
 		if os.IsNotExist(err) {
-			return nil, fmt.Errorf("nitric.yaml not found in %s. A nitric project is required to load configuration", absProjectDir)
+			return nil, fmt.Errorf("nitric.yaml not found in %s. Check that you are in the root directory of a nitric project", absProjectDir)
 		}
 
 		return nil, err
diff --git a/pkg/project/project.go b/pkg/project/project.go
index d8dbd8158..8ad9c99e9 100644
--- a/pkg/project/project.go
+++ b/pkg/project/project.go
@@ -425,7 +425,7 @@ func fromProjectConfiguration(projectConfig *ProjectConfiguration, fs afero.Fs)
 func FromFile(fs afero.Fs, filepath string) (*Project, error) {
 	projectConfig, err := ConfigurationFromFile(fs, filepath)
 	if err != nil {
-		return nil, fmt.Errorf("unable to load nitric.yaml, are you currently in a nitric project?: %w", err)
+		return nil, fmt.Errorf("error loading nitric.yaml: %w", err)
 	}
 
 	return fromProjectConfiguration(projectConfig, fs)
diff --git a/pkg/project/stack/stack.go b/pkg/project/stack/stack.go
index 7cdfc5204..3f9740931 100644
--- a/pkg/project/stack/stack.go
+++ b/pkg/project/stack/stack.go
@@ -169,7 +169,7 @@ func configFromFile[T any](fs afero.Fs, filePath string) (*StackConfig[T], error
 	stackConfig := &StackConfig[T]{}
 
 	if err := yaml.Unmarshal(stackFileContents, stackConfig); err != nil {
-		return nil, err
+		return nil, fmt.Errorf("unable to parse stack file '%s': %w", filePath, err)
 	}
 
 	stackConfig.Name, err = GetStackNameFromFileName(filePath)