Update Gopkg.*

4 files changed, 44 insertions, 77 deletions

diff --git a/vendor/github.com/99designs/gqlgen/cmd/ambient.go b/vendor/github.com/99designs/gqlgen/cmd/ambient.go
new file mode 100644
index 00000000..7838fdf1
--- /dev/null
+++ b/vendor/github.com/99designs/gqlgen/cmd/ambient.go
@@ -0,0 +1,10 @@
+package cmd
+
+import (
+	// Import and ignore the ambient imports listed below so dependency managers
+	// don't prune unused code for us. Both lists should be kept in sync.
+	_ "github.com/99designs/gqlgen/graphql"
+	_ "github.com/99designs/gqlgen/graphql/introspection"
+	_ "github.com/vektah/gqlparser"
+	_ "github.com/vektah/gqlparser/ast"
+)
diff --git a/vendor/github.com/99designs/gqlgen/cmd/gen.go b/vendor/github.com/99designs/gqlgen/cmd/gen.go
index 3842f02b..c69858b4 100644
--- a/vendor/github.com/99designs/gqlgen/cmd/gen.go
+++ b/vendor/github.com/99designs/gqlgen/cmd/gen.go
@@ -2,10 +2,10 @@ package cmd
 
 import (
 	"fmt"
-	"io/ioutil"
 	"os"
 
-	"github.com/99designs/gqlgen/codegen"
+	"github.com/99designs/gqlgen/api"
+	"github.com/99designs/gqlgen/codegen/config"
 	"github.com/pkg/errors"
 	"github.com/urfave/cli"
 )
@@ -18,43 +18,27 @@ var genCmd = cli.Command{
 		cli.StringFlag{Name: "config, c", Usage: "the config filename"},
 	},
 	Action: func(ctx *cli.Context) {
-		var config *codegen.Config
+		var cfg *config.Config
 		var err error
 		if configFilename := ctx.String("config"); configFilename != "" {
-			config, err = codegen.LoadConfig(configFilename)
+			cfg, err = config.LoadConfig(configFilename)
 			if err != nil {
 				fmt.Fprintln(os.Stderr, err.Error())
 				os.Exit(1)
 			}
 		} else {
-			config, err = codegen.LoadConfigFromDefaultLocations()
+			cfg, err = config.LoadConfigFromDefaultLocations()
 			if os.IsNotExist(errors.Cause(err)) {
-				config = codegen.DefaultConfig()
+				cfg = config.DefaultConfig()
 			} else if err != nil {
 				fmt.Fprintln(os.Stderr, err.Error())
-				os.Exit(1)
-			}
-		}
-
-		for _, filename := range config.SchemaFilename {
-			var schemaRaw []byte
-			schemaRaw, err = ioutil.ReadFile(filename)
-			if err != nil {
-				fmt.Fprintln(os.Stderr, "unable to open schema: "+err.Error())
-				os.Exit(1)
+				os.Exit(2)
 			}
-			config.SchemaStr[filename] = string(schemaRaw)
-		}
-
-		if err = config.Check(); err != nil {
-			fmt.Fprintln(os.Stderr, "invalid config format: "+err.Error())
-			os.Exit(1)
 		}
 
-		err = codegen.Generate(*config)
-		if err != nil {
+		if err = api.Generate(cfg); err != nil {
 			fmt.Fprintln(os.Stderr, err.Error())
-			os.Exit(2)
+			os.Exit(3)
 		}
 	},
 }
diff --git a/vendor/github.com/99designs/gqlgen/cmd/init.go b/vendor/github.com/99designs/gqlgen/cmd/init.go
index 1e7c18b9..e07bed97 100644
--- a/vendor/github.com/99designs/gqlgen/cmd/init.go
+++ b/vendor/github.com/99designs/gqlgen/cmd/init.go
@@ -7,10 +7,13 @@ import (
 	"os"
 	"strings"
 
-	"github.com/99designs/gqlgen/codegen"
+	"github.com/99designs/gqlgen/api"
+	"github.com/99designs/gqlgen/plugin/servergen"
+
+	"github.com/99designs/gqlgen/codegen/config"
 	"github.com/pkg/errors"
 	"github.com/urfave/cli"
-	"gopkg.in/yaml.v2"
+	yaml "gopkg.in/yaml.v2"
 )
 
 var configComment = `
@@ -68,46 +71,27 @@ var initCmd = cli.Command{
 	},
 }
 
-func GenerateGraphServer(config *codegen.Config, serverFilename string) {
-	for _, filename := range config.SchemaFilename {
-		schemaRaw, err := ioutil.ReadFile(filename)
-		if err != nil {
-			fmt.Fprintln(os.Stderr, "unable to open schema: "+err.Error())
-			os.Exit(1)
-		}
-		config.SchemaStr[filename] = string(schemaRaw)
-	}
-
-	if err := config.Check(); err != nil {
-		fmt.Fprintln(os.Stderr, "invalid config format: "+err.Error())
-		os.Exit(1)
-	}
-
-	if err := codegen.Generate(*config); err != nil {
-		fmt.Fprintln(os.Stderr, err.Error())
-		os.Exit(1)
-	}
-
-	if err := codegen.GenerateServer(*config, serverFilename); err != nil {
+func GenerateGraphServer(cfg *config.Config, serverFilename string) {
+	err := api.Generate(cfg, api.AddPlugin(servergen.New(serverFilename)))
+	if err != nil {
 		fmt.Fprintln(os.Stderr, err.Error())
-		os.Exit(1)
 	}
 
 	fmt.Fprintf(os.Stdout, "Exec \"go run ./%s\" to start GraphQL server\n", serverFilename)
 }
 
-func initConfig(ctx *cli.Context) *codegen.Config {
-	var config *codegen.Config
+func initConfig(ctx *cli.Context) *config.Config {
+	var cfg *config.Config
 	var err error
 	configFilename := ctx.String("config")
 	if configFilename != "" {
-		config, err = codegen.LoadConfig(configFilename)
+		cfg, err = config.LoadConfig(configFilename)
 	} else {
-		config, err = codegen.LoadConfigFromDefaultLocations()
+		cfg, err = config.LoadConfigFromDefaultLocations()
 	}
 
-	if config != nil {
-		fmt.Fprintf(os.Stderr, "init failed: a configuration file already exists at %s\n", config.FilePath)
+	if cfg != nil {
+		fmt.Fprintf(os.Stderr, "init failed: a configuration file already exists\n")
 		os.Exit(1)
 	}
 
@@ -119,9 +103,9 @@ func initConfig(ctx *cli.Context) *codegen.Config {
 	if configFilename == "" {
 		configFilename = "gqlgen.yml"
 	}
-	config = codegen.DefaultConfig()
+	cfg = config.DefaultConfig()
 
-	config.Resolver = codegen.PackageConfig{
+	cfg.Resolver = config.PackageConfig{
 		Filename: "resolver.go",
 		Type:     "Resolver",
 	}
@@ -129,23 +113,21 @@ func initConfig(ctx *cli.Context) *codegen.Config {
 	var buf bytes.Buffer
 	buf.WriteString(strings.TrimSpace(configComment))
 	buf.WriteString("\n\n")
-	{
-		var b []byte
-		b, err = yaml.Marshal(config)
-		if err != nil {
-			fmt.Fprintln(os.Stderr, "unable to marshal yaml: "+err.Error())
-			os.Exit(1)
-		}
-		buf.Write(b)
+	var b []byte
+	b, err = yaml.Marshal(cfg)
+	if err != nil {
+		fmt.Fprintln(os.Stderr, "unable to marshal yaml: "+err.Error())
+		os.Exit(1)
 	}
+	buf.Write(b)
 
 	err = ioutil.WriteFile(configFilename, buf.Bytes(), 0644)
 	if err != nil {
-		fmt.Fprintln(os.Stderr, "unable to write config file: "+err.Error())
+		fmt.Fprintln(os.Stderr, "unable to write cfg file: "+err.Error())
 		os.Exit(1)
 	}
 
-	return config
+	return cfg
 }
 
 func initSchema(schemaFilename string) {
diff --git a/vendor/github.com/99designs/gqlgen/cmd/root.go b/vendor/github.com/99designs/gqlgen/cmd/root.go
index 519c2e1a..dc2970ac 100644
--- a/vendor/github.com/99designs/gqlgen/cmd/root.go
+++ b/vendor/github.com/99designs/gqlgen/cmd/root.go
@@ -7,7 +7,6 @@ import (
 	"os"
 
 	"github.com/99designs/gqlgen/graphql"
-	"github.com/99designs/gqlgen/internal/gopath"
 	"github.com/urfave/cli"
 
 	// Required since otherwise dep will prune away these unused packages before codegen has a chance to run
@@ -23,14 +22,6 @@ func Execute() {
 	app.Flags = genCmd.Flags
 	app.Version = graphql.Version
 	app.Before = func(context *cli.Context) error {
-		pwd, err := os.Getwd()
-		if err != nil {
-			return fmt.Errorf("unable to determine current workding dir: %s\n", err.Error())
-		}
-
-		if !gopath.Contains(pwd) {
-			return fmt.Errorf("gqlgen must be run from inside your $GOPATH\n")
-		}
 		if context.Bool("verbose") {
 			log.SetFlags(0)
 		} else {
@@ -47,7 +38,7 @@ func Execute() {
 	}
 
 	if err := app.Run(os.Args); err != nil {
-		fmt.Fprintf(os.Stderr, err.Error())
+		fmt.Fprint(os.Stderr, err.Error())
 		os.Exit(1)
 	}
 }