Skip to content

Commit

Permalink
Add suggestion to error message
Browse files Browse the repository at this point in the history
  • Loading branch information
lelandbatey committed Dec 17, 2016
1 parent 0157d43 commit 14683d3
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 14 deletions.
2 changes: 1 addition & 1 deletion cmd/truss/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ func parseServiceDefinition(cfg *truss.Config) (deftree.Deftree, *svcdef.Svcdef,
// Create the svcdef
sd, err := svcdef.New(pbgoFiles, pbFiles)
if err != nil {
return nil, nil, errors.Wrapf(err, "failed to create service definition")
return nil, nil, errors.Wrapf(err, "failed to create service definition; did you pass ALL the protobuf files to truss?")
}

// Create the Deftree
Expand Down
2 changes: 1 addition & 1 deletion svcdef/consolidate_http_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ service Map {
}
}`
// From code, build our SvcDef
sd, err := New([]io.Reader{strings.NewReader(goCode)}, []io.Reader{strings.NewReader(protoCode)})
sd, err := New(map[string]io.Reader{"/tmp/notreal": strings.NewReader(goCode)}, map[string]io.Reader{"/tmp/alsonotreal": strings.NewReader(protoCode)})
if err != nil {
t.Fatal(err)
}
Expand Down
9 changes: 0 additions & 9 deletions svcdef/recopy-testdata.sh

This file was deleted.

6 changes: 3 additions & 3 deletions svcdef/svcdef_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ func TestSvcdef(t *testing.T) {
t.Fatal(err)
}

sd, err := New([]io.Reader{gf}, []io.Reader{pf})
sd, err := New(map[string]io.Reader{"./test-go.txt": gf}, map[string]io.Reader{"./test-proto.txt": pf})
if err != nil {
t.Fatal(err)
}
Expand Down Expand Up @@ -46,7 +46,7 @@ type NestedTypeRequest struct {
B []*NestedMessageB
C EnumType
}`
sd, err := New([]io.Reader{strings.NewReader(caseCode)}, nil)
sd, err := New(map[string]io.Reader{"/tmp/notreal": strings.NewReader(caseCode)}, nil)
if err != nil {
t.Fatal(err)
}
Expand Down Expand Up @@ -109,7 +109,7 @@ type MsgWithMap struct {
Beta map[int64]*NestedMessageC
}
`
sd, err := New([]io.Reader{strings.NewReader(caseCode)}, nil)
sd, err := New(map[string]io.Reader{"/tmp/notreal": strings.NewReader(caseCode)}, nil)
if err != nil {
t.Fatal(err)
}
Expand Down

0 comments on commit 14683d3

Please sign in to comment.