refactor: Remove old error handling library

Removes the old error handling library and switches to plain
fmt.Errorf calls.

There are several reasons for this:

* There are no useful types or handling here anyways, so output format
  is the only priority.
* Users don't care about getting stacktraces.
* My emotional wellbeing.

Fin de siècle.
This commit is contained in:
Vincent Ambo 2018-03-09 15:17:54 +01:00 committed by Vincent Ambo
parent b8722ce83b
commit 3aa2cb8d3e
7 changed files with 13 additions and 78 deletions

View file

@ -10,9 +10,9 @@
package context
import (
"fmt"
"path"
"github.com/polydawn/meep"
"github.com/tazjin/kontemplate/util"
)
@ -51,9 +51,8 @@ type Context struct {
BaseDir string
}
type ContextLoadingError struct {
meep.AllTraits
Filename string
func contextLoadingError(filename string, cause error) error {
return fmt.Errorf("Context loading failed on file %s due to: \n%v", filename, cause)
}
// Attempt to load and deserialise a Context from the specified file.
@ -62,10 +61,7 @@ func LoadContextFromFile(filename string) (*Context, error) {
err := util.LoadJsonOrYaml(filename, &c)
if err != nil {
return nil, meep.New(
&ContextLoadingError{Filename: filename},
meep.Cause(err),
)
return nil, contextLoadingError(filename, err)
}
c.ResourceSets = flattenPrepareResourceSetPaths(&c.ResourceSets)
@ -74,10 +70,7 @@ func LoadContextFromFile(filename string) (*Context, error) {
err = c.loadImportedVariables()
if err != nil {
return nil, meep.New(
&ContextLoadingError{Filename: filename},
meep.Cause(err),
)
return nil, contextLoadingError(filename, err)
}
return &c, nil