admin/wire
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wire/internal/wire: use on-disk GOPATH in generate tests (google/go-cloud#616)

Browse Source 
The primary motivation is to permit a move to using go/packages instead
of go/loader. go/packages runs exclusively by shelling out to the go
tool, which precludes use of the in-memory "magic" GOPATH being used
up to this point.

This has a secondary effect of removing a lot of code to support "magic"
GOPATH from the test infrastructure. This is on the whole good, but
necessitated a change in the error scrubbing: since the filenames are
no longer fixed, error scrubbing also must remove the leading
$GOPATH/src lines.

Another related change: since all callers of Generate needed to know the
package path in order to write out wire_gen.go (necessitating a
find-only import search) and Generate already has this information,
Generate now returns this information to the caller. This should further
reduce callers' coupling to Wire's load internals. It also eliminates
code duplication.

This should hopefully shake out any difference in path separators for
running on Windows, but I have not tested that yet.

Updates google/go-cloud#78
Updates google/go-cloud#323
This commit is contained in:
Ross Light
2018-11-06 08:44:51 -08:00
parent ab113bf8d1
commit 64470a2452
24 changed files with 301 additions and 367 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
cmd/wire/main.go
View File

@@ -18,14 +18,12 @@
package main
import (
"context"
"errors"
"fmt"
"go/build"
"go/token"
"go/types"
"io/ioutil"
"os"
"path/filepath"
"reflect"
"sort"
"strconv"
@@ -74,25 +72,17 @@ func generate(pkg string) error {
if err != nil {
return err
}
pkgInfo, err := build.Default.Import(pkg, wd, build.FindOnly)
if err != nil {
return err
}
out, errs := wire.Generate(&build.Default, wd, pkg)
out, errs := wire.Generate(context.Background(), wd, os.Environ(), pkg)
if len(errs) > 0 {
logErrors(errs)
return errors.New("generate failed")
}
if len(out) == 0 {
if len(out.Content) == 0 {
// No Wire directives, don't write anything.
fmt.Fprintln(os.Stderr, "wire: no injector found for", pkg)
return nil
}
p := filepath.Join(pkgInfo.Dir, "wire_gen.go")
if err := ioutil.WriteFile(p, out, 0666); err != nil {
return err
}
return nil
return out.Commit()
}
// show runs the show subcommand.
@@ -106,7 +96,7 @@ func show(pkgs ...string) error {
if err != nil {
return err
}
info, errs := wire.Load(&build.Default, wd, pkgs)
info, errs := wire.Load(context.Background(), wd, os.Environ(), pkgs)
if info != nil {
keys := make([]wire.ProviderSetID, 0, len(info.Sets))
for k := range info.Sets {
@@ -185,7 +175,7 @@ func check(pkgs ...string) error {
if err != nil {
return err
}
_, errs := wire.Load(&build.Default, wd, pkgs)
_, errs := wire.Load(context.Background(), wd, os.Environ(), pkgs)
if len(errs) > 0 {
logErrors(errs)
return errors.New("error loading packages")