Skip to content
This repository was archived by the owner on Jan 23, 2026. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmd/dev.go
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ Examples:

project, err := theproject.Project.GetProject(ctx, log, theproject.APIURL, apiKey)
if err != nil {
errsystem.New(errsystem.ErrInvalidConfiguration, err, errsystem.WithContextMessage(fmt.Sprintf("Failed to get project: %s", err))).ShowErrorAndExit()
errsystem.New(errsystem.ErrInvalidConfiguration, err, errsystem.WithUserMessage("Failed to validate project (%s) using the provided API key from the .env file in %s. This is most likely due to the API key being invalid or the project has been deleted.", theproject.Project.ProjectId, dir), errsystem.WithContextMessage(fmt.Sprintf("Failed to get project: %s", err))).ShowErrorAndExit()
}

orgId := project.OrgId
Expand Down
4 changes: 2 additions & 2 deletions internal/errsystem/errsystem.go
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,9 @@ func (e *errSystem) Error() string {
}

// WithUserMessage adds a user-friendly message to the error.
func WithUserMessage(message string) option {
func WithUserMessage(message string, args ...any) option {
return func(e *errSystem) {
e.message = message
e.message = fmt.Sprintf(message, args...)
}
}

Expand Down
4 changes: 2 additions & 2 deletions internal/project/project.go
Original file line number Diff line number Diff line change
Expand Up @@ -556,7 +556,7 @@ func ResolveProjectDir(logger logger.Logger, cmd *cobra.Command, required bool)
cwd, err := os.Getwd()
if err != nil {
errsystem.New(errsystem.ErrEnvironmentVariablesNotSet, err,
errsystem.WithUserMessage(fmt.Sprintf("Failed to get current directory: %s", err))).ShowErrorAndExit()
errsystem.WithUserMessage("Failed to get current working directory: %s", err)).ShowErrorAndExit()
}
dir := cwd
dirFlag, _ := cmd.Flags().GetString("dir")
Expand All @@ -570,7 +570,7 @@ func ResolveProjectDir(logger logger.Logger, cmd *cobra.Command, required bool)
abs, err := filepath.Abs(dir)
if err != nil {
errsystem.New(errsystem.ErrEnvironmentVariablesNotSet, err,
errsystem.WithUserMessage(fmt.Sprintf("Failed to get absolute path: %s", err))).ShowErrorAndExit()
errsystem.WithUserMessage("Failed to get absolute path to %s: %s", dir, err)).ShowErrorAndExit()
}
if !ProjectExists(abs) && required {
dir = viper.GetString("preferences.project_dir")
Expand Down
Loading