diff --git a/go.mod b/go.mod index 7e337bb..4513f12 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/squat/schemasonnet go 1.25.0 require ( - github.com/gobuffalo/here v0.6.0 + github.com/gobuffalo/here v0.6.7 github.com/google/jsonschema-go v0.4.2 github.com/jsonnet-libs/docsonnet v0.0.6 github.com/markbates/pkger v0.15.1 diff --git a/go.sum b/go.sum index 2f359f8..e251ae2 100644 --- a/go.sum +++ b/go.sum @@ -4,8 +4,9 @@ github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6N github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/gobuffalo/here v0.6.0 h1:hYrd0a6gDmWxBM4TnrGw8mQg24iSVoIkHEk7FodQcBI= github.com/gobuffalo/here v0.6.0/go.mod h1:wAG085dHOYqUpf+Ap+WOdrPTp5IYcDAs/x7PLa8Y5fM= +github.com/gobuffalo/here v0.6.7 h1:hpfhh+kt2y9JLDfhYUxxCRxQol540jsVfKUZzjlbp8o= +github.com/gobuffalo/here v0.6.7/go.mod h1:vuCfanjqckTuRlqAitJz6QC4ABNnS27wLb816UhsPcc= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= @@ -34,8 +35,11 @@ github.com/spf13/pflag v1.0.9/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An github.com/squat/docsonnet v0.0.0-20260323023749-7f0aee931ffa h1:ipHnA/fWcs5oHwhGb5A8rAFj73asiu1q78dn6uzXjwY= github.com/squat/docsonnet v0.0.0-20260323023749-7f0aee931ffa/go.mod h1:p7ulXIGOU2haz5PKySfyq5Ndz0Z8Y6LIx9hmzMMm2eI= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= +github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk= +github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg= golang.org/x/crypto v0.36.0 h1:AnAEvhDddvBdpY+uR+MyHmuZzzNqXSe/GvuDeob5L34= golang.org/x/crypto v0.36.0/go.mod h1:Y4J0ReaxCR1IMaabaSMugxJES1EpwhBHhv2bDHklZvc= @@ -45,7 +49,9 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.7 h1:VUgggvou5XRW9mHwD/yXxIYSMtY0zoKQf/v226p2nyo= gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E= sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY= diff --git a/vendor/github.com/gobuffalo/here/.goreleaser.yml b/vendor/github.com/gobuffalo/here/.goreleaser.yml index 0ea9d65..9a9c2bf 100644 --- a/vendor/github.com/gobuffalo/here/.goreleaser.yml +++ b/vendor/github.com/gobuffalo/here/.goreleaser.yml @@ -38,7 +38,7 @@ changelog: brews: - name: 'here' - github: + tap: owner: 'gobuffalo' name: 'homebrew-tap' install: | diff --git a/vendor/github.com/gobuffalo/here/dir.go b/vendor/github.com/gobuffalo/here/dir.go index ecd75dd..074fac1 100644 --- a/vendor/github.com/gobuffalo/here/dir.go +++ b/vendor/github.com/gobuffalo/here/dir.go @@ -2,6 +2,7 @@ package here import ( "encoding/json" + "fmt" "os" "path/filepath" ) @@ -48,7 +49,7 @@ func (h Here) Dir(p string) (Info, error) { }) if err != nil { - return i, err + return i, fmt.Errorf("here.Dir: %s: %w", p, err) } return h.cache(i.ImportPath, func(p string) (Info, error) { @@ -72,12 +73,16 @@ func fromNonGoDir(dir string) (Info, error) { if nonGoDirRx.MatchString(err.Error()) { return i, nil } - return i, err + return i, fmt.Errorf("here.nonGoDir: %s: %w", dir, err) } if err := json.Unmarshal(b, &i.Module); err != nil { - return i, err + return i, fmt.Errorf("here.nonGoDir: %s: %w", dir, err) } - return i, err + if i.ImportPath == "" && i.Module.Path != "command-line-arguments" { + i.ImportPath = i.Module.Path + } + + return i, nil } diff --git a/vendor/github.com/gobuffalo/here/here.go b/vendor/github.com/gobuffalo/here/here.go index e1d5765..69966a7 100644 --- a/vendor/github.com/gobuffalo/here/here.go +++ b/vendor/github.com/gobuffalo/here/here.go @@ -35,7 +35,7 @@ func run(n string, args ...string) ([]byte, error) { c.Stderr = ebb err := c.Run() if err != nil { - return nil, fmt.Errorf("%s: %s", err, ebb) + return nil, fmt.Errorf("%v %w: %s", c.Args, err, ebb) } return bb.Bytes(), nil @@ -48,7 +48,7 @@ func (h Here) cache(p string, fn func(string) (Info, error)) (Info, error) { } i, err := fn(p) if err != nil { - return i, err + return i, fmt.Errorf("here.cache: %s: %w", p, err) } h.infos.Store(p, i) return i, nil diff --git a/vendor/github.com/gobuffalo/here/parse.go b/vendor/github.com/gobuffalo/here/parse.go index 9227b93..43f6afe 100644 --- a/vendor/github.com/gobuffalo/here/parse.go +++ b/vendor/github.com/gobuffalo/here/parse.go @@ -7,6 +7,8 @@ import ( "strings" ) +var pathrx = regexp.MustCompile("([^:]+)(:(/.+))?") + func (i Info) Parse(p string) (Path, error) { p = strings.TrimSpace(p) p = filepath.Clean(p) @@ -57,7 +59,6 @@ func (i Info) build(p, pkg, name string) (Path, error) { pt.Name = "/" + pt.Name } pt.Name = strings.TrimPrefix(pt.Name, i.Dir) + return pt, nil } - -var pathrx = regexp.MustCompile("([^:]+)(:(/.+))?") diff --git a/vendor/github.com/gobuffalo/here/pkg.go b/vendor/github.com/gobuffalo/here/pkg.go index 31ce170..d79b58a 100644 --- a/vendor/github.com/gobuffalo/here/pkg.go +++ b/vendor/github.com/gobuffalo/here/pkg.go @@ -32,7 +32,7 @@ func (h Here) Package(p string) (Info, error) { }) if err != nil { - return i, err + return i, fmt.Errorf("here.Package: %s: %w", p, err) } h.cache(i.Dir, func(p string) (Info, error) { diff --git a/vendor/modules.txt b/vendor/modules.txt index fda199c..e006550 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -2,8 +2,8 @@ ## explicit github.com/campoy/embedmd github.com/campoy/embedmd/embedmd -# github.com/gobuffalo/here v0.6.0 -## explicit; go 1.13 +# github.com/gobuffalo/here v0.6.7 +## explicit; go 1.16 github.com/gobuffalo/here # github.com/google/go-jsonnet v0.21.0 ## explicit; go 1.23.7