Dependency updates

This commit is contained in:
Stash Dev
2019-05-27 12:34:26 -07:00
parent 69917999ef
commit 4b037e1040
359 changed files with 60172 additions and 18749 deletions

View File

@@ -7,6 +7,8 @@ import (
"github.com/pkg/errors"
)
// Pointer is a resolvr which resolves
// a file from a different box.
type Pointer struct {
ForwardBox string
ForwardPath string
@@ -14,6 +16,8 @@ type Pointer struct {
var _ resolver.Resolver = Pointer{}
// Resolve attempts to find the file in the specific box
// with the specified key
func (p Pointer) Resolve(box string, path string) (file.File, error) {
plog.Debug(p, "Resolve", "box", box, "path", path, "forward-box", p.ForwardBox, "forward-path", p.ForwardPath)
b, err := findBox(p.ForwardBox)
@@ -25,5 +29,5 @@ func (p Pointer) Resolve(box string, path string) (file.File, error) {
return f, errors.WithStack(errors.Wrap(err, path))
}
plog.Debug(p, "Resolve", "box", box, "path", path, "file", f)
return f, nil
return file.NewFileR(path, f)
}