From b84dda261269418b4b48204dea426f1336b7fddf Mon Sep 17 00:00:00 2001 From: Ben Kraft Date: Tue, 28 Sep 2021 14:56:49 -0700 Subject: [PATCH] Add clearer error text a few places (#117) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Summary: It's nice to be clear here because it may be your first interaction with genqlient! ## Test plan: make check Author: benjaminjkraft Reviewers: StevenACoffman, benjaminjkraft, dnerdy Required Reviewers: Approved By: StevenACoffman Checks: ✅ Test (1.17), ✅ Test (1.16), ✅ Test (1.15), ✅ Test (1.14), ✅ Lint, ✅ Test (1.17), ✅ Test (1.16), ✅ Test (1.15), ✅ Test (1.14), ✅ Lint Pull Request URL: https://github.com/Khan/genqlient/pull/117 --- generate/config.go | 4 ++-- generate/generate.go | 3 ++- generate/testdata/snapshots/TestGenerateErrors-NoQuery-go | 2 +- .../testdata/snapshots/TestGenerateErrors-NoQuery-graphql | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/generate/config.go b/generate/config.go index 5aa11ca..f23e668 100644 --- a/generate/config.go +++ b/generate/config.go @@ -117,8 +117,8 @@ func initConfig(filename string) error { } w, err := os.OpenFile(filename, os.O_WRONLY|os.O_CREATE|os.O_EXCL, 0o644) if err != nil { - return err + return errorf(nil, "unable to write default genqlient.yaml: %v", err) } _, err = io.Copy(w, r) - return err + return errorf(nil, "unable to write default genqlient.yaml: %v", err) } diff --git a/generate/generate.go b/generate/generate.go index 5ca4ace..ecf2722 100644 --- a/generate/generate.go +++ b/generate/generate.go @@ -316,7 +316,8 @@ func Generate(config *Config) (map[string][]byte, error) { // way. (As-is, we generate a broken file, with just (unused) imports.) if len(document.Operations) == 0 { // Hard to have a position when there are no operations :( - return nil, errorf(nil, "no queries found, looked in: %v", + return nil, errorf(nil, + "no queries found, looked in: %v (configure this in genqlient.yaml)", strings.Join(config.Operations, ", ")) } diff --git a/generate/testdata/snapshots/TestGenerateErrors-NoQuery-go b/generate/testdata/snapshots/TestGenerateErrors-NoQuery-go index 31df7bf..8527255 100644 --- a/generate/testdata/snapshots/TestGenerateErrors-NoQuery-go +++ b/generate/testdata/snapshots/TestGenerateErrors-NoQuery-go @@ -1 +1 @@ -no queries found, looked in: testdata/errors/NoQuery.go +no queries found, looked in: testdata/errors/NoQuery.go (configure this in genqlient.yaml) diff --git a/generate/testdata/snapshots/TestGenerateErrors-NoQuery-graphql b/generate/testdata/snapshots/TestGenerateErrors-NoQuery-graphql index fe31004..45b85de 100644 --- a/generate/testdata/snapshots/TestGenerateErrors-NoQuery-graphql +++ b/generate/testdata/snapshots/TestGenerateErrors-NoQuery-graphql @@ -1 +1 @@ -no queries found, looked in: testdata/errors/NoQuery.graphql +no queries found, looked in: testdata/errors/NoQuery.graphql (configure this in genqlient.yaml)