Merge pull request #238 from secrethub/feature/fix-template-error

Rephrase template processing error

Author: Marton6

internals/secrethub/run.go

@@ -37,7 +37,7 @@ var (
 	ErrReadEnvFile            = errRun.Code("env_file_read_error").ErrorPref("could not read the environment file %s: %s")
 	ErrEnvDirNotFound         = errRun.Code("env_dir_not_found").Error(fmt.Sprintf("could not find specified environment. Make sure you have executed `%s set`.", ApplicationName))
 	ErrTemplate               = errRun.Code("invalid_template").ErrorPref("could not parse template at line %d: %s")
-	ErrTemplateFile           = errRun.Code("invalid_template_file").ErrorPref("template file '%s' is invalid: %s")
+	ErrParsingTemplate        = errRun.Code("template_parsing_failed").ErrorPref("error while processing template file '%s': %s")
 	ErrInvalidTemplateVar     = errRun.Code("invalid_template_var").ErrorPref("template variable '%s' is invalid: template variables may only contain uppercase letters, digits, and the '_' (underscore) and are not allowed to start with a number")
 	ErrSecretsNotAllowedInKey = errRun.Code("secret_in_key").Error("secrets are not allowed in run template keys")
 )
@@ -418,7 +418,7 @@ func ReadEnvFile(filepath string, vars map[string]string, parser tpl.Parser) (En
 	}
 	env, err := NewEnv(r, vars, parser)
 	if err != nil {
-		return EnvFile{}, err
+		return EnvFile{}, ErrParsingTemplate(filepath, err)
 	}
 	return EnvFile{
 		path: filepath,
@@ -436,7 +436,7 @@ type EnvFile struct {
 func (e EnvFile) Env(secrets map[string]string, sr tpl.SecretReader) (map[string]string, error) {
 	env, err := e.env.Env(secrets, sr)
 	if err != nil {
-		return nil, ErrTemplateFile(e.path, err)
+		return nil, ErrParsingTemplate(e.path, err)
 	}
 	return env, nil
 }