From a6c37ec4caed671e2b0716f2fe99e8363773ee9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Ko=C5=82odziejczyk?= Date: Mon, 30 May 2022 09:33:20 +0200 Subject: [PATCH 1/3] Upgrade go tools version, change repo path --- README.md | 10 +++++---- cmd/example.go | 2 +- cmd/generate.go | 10 ++++----- cmd/init.go | 6 ++--- codegen/config/config.go | 6 ++--- codegen/config/config_test.go | 22 +++++++++---------- codegen/generator/executer_generator.go | 8 +++---- codegen/generator/field_resolver_generator.go | 8 +++---- codegen/generator/generator.go | 8 +++---- codegen/generator/init.go | 6 ++--- codegen/generator/middleware_generator.go | 8 +++---- codegen/generator/model_generator.go | 4 ++-- .../generator/mutation_resolver_generator.go | 8 +++---- codegen/generator/query_resolver_generator.go | 8 +++---- codegen/generator/webhook_generator.go | 8 +++---- codegen/parser/parser.go | 4 ++-- codegen/rewriter/rewriter.go | 6 ++--- examples/lambda/generated/generated.go | 6 ++--- examples/lambda/model/models_gen.go | 2 +- examples/lambda/resolvers/field.resolver.go | 4 ++-- .../lambda/resolvers/middleware.resolver.go | 2 +- .../lambda/resolvers/mutation.resolver.go | 2 +- examples/lambda/resolvers/query.resolver.go | 4 ++-- examples/lambda/resolvers/webhook.resolver.go | 2 +- examples/server.go | 6 ++--- go.mod | 4 ++-- internal/mod_test.go | 2 +- internal/packages_test.go | 6 ++--- lambda.yaml | 2 +- main.go | 2 +- test_resources/faulty1.yaml | 2 +- test_resources/faulty2.yaml | 2 +- test_resources/faulty3.yaml | 2 +- test_resources/faulty4.yaml | 2 +- test_resources/faulty5.yaml | 2 +- 35 files changed, 94 insertions(+), 92 deletions(-) diff --git a/README.md b/README.md index cb2de52..011808d 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ # dgraph-lambda-go +*Note: this is a fork, for the original project by Schartey go to https://github.com/Schartey/dgraph-lambda-go* + Go Library written to build Dgraph Lambda servers as an alternative to the [Dgraph JS Lambda Server](https://github.com/dgraph-io/dgraph-lambda) It is currently in **development**! Please create an issue if something is not working correctly. @@ -9,10 +11,10 @@ If you would like to support me please visit my [:coffee:](https://ko-fi.com/sch ## Getting started - Create project ```go mod init``` -- To install dgraph-lambda-go run the command ```go get -d github.com/schartey/dgraph-lambda-go``` in your project directory. -- Then initialize the project by running ```go run github.com/schartey/dgraph-lambda-go init```. +- To install dgraph-lambda-go run the command ```go get -d github.com/miko/dgraph-lambda-go``` in your project directory. +- Then initialize the project by running ```go run github.com/miko/dgraph-lambda-go init```. - Set path to your graphql schema in lambda.yaml -- Generate types and resolvers ```go run github.com/schartey/dgraph-lambda-go generate``` +- Generate types and resolvers ```go run github.com/miko/dgraph-lambda-go generate``` - Implement your lambda resolvers - Run your server ```go run server.go``` @@ -36,7 +38,7 @@ When first initializing the lambda server it will generate a basic lambda.yaml f - "Home" autobind: - - "github.com/schartey/dgraph-lambda-go/examples/models" + - "github.com/miko/dgraph-lambda-go/examples/models" resolver: dir: lambda/resolvers diff --git a/cmd/example.go b/cmd/example.go index 066a9a7..4545015 100644 --- a/cmd/example.go +++ b/cmd/example.go @@ -1,7 +1,7 @@ package cmd import ( - "github.com/schartey/dgraph-lambda-go/examples" + "github.com/miko/dgraph-lambda-go/examples" "github.com/urfave/cli/v2" ) diff --git a/cmd/generate.go b/cmd/generate.go index c67736b..64d33fa 100644 --- a/cmd/generate.go +++ b/cmd/generate.go @@ -1,11 +1,11 @@ package cmd import ( - "github.com/schartey/dgraph-lambda-go/codegen/config" - "github.com/schartey/dgraph-lambda-go/codegen/generator" - "github.com/schartey/dgraph-lambda-go/codegen/parser" - "github.com/schartey/dgraph-lambda-go/codegen/rewriter" - "github.com/schartey/dgraph-lambda-go/internal" + "github.com/miko/dgraph-lambda-go/codegen/config" + "github.com/miko/dgraph-lambda-go/codegen/generator" + "github.com/miko/dgraph-lambda-go/codegen/parser" + "github.com/miko/dgraph-lambda-go/codegen/rewriter" + "github.com/miko/dgraph-lambda-go/internal" "github.com/urfave/cli/v2" ) diff --git a/cmd/init.go b/cmd/init.go index eb7fb80..8141e7f 100644 --- a/cmd/init.go +++ b/cmd/init.go @@ -1,9 +1,9 @@ package cmd import ( - "github.com/schartey/dgraph-lambda-go/codegen/config" - "github.com/schartey/dgraph-lambda-go/codegen/generator" - "github.com/schartey/dgraph-lambda-go/internal" + "github.com/miko/dgraph-lambda-go/codegen/config" + "github.com/miko/dgraph-lambda-go/codegen/generator" + "github.com/miko/dgraph-lambda-go/internal" "github.com/urfave/cli/v2" ) diff --git a/codegen/config/config.go b/codegen/config/config.go index 5b89173..6490461 100644 --- a/codegen/config/config.go +++ b/codegen/config/config.go @@ -10,9 +10,9 @@ import ( "strings" "github.com/pkg/errors" - "github.com/schartey/dgraph-lambda-go/codegen/graphql" - "github.com/schartey/dgraph-lambda-go/codegen/parser" - "github.com/schartey/dgraph-lambda-go/internal" + "github.com/miko/dgraph-lambda-go/codegen/graphql" + "github.com/miko/dgraph-lambda-go/codegen/parser" + "github.com/miko/dgraph-lambda-go/internal" "github.com/vektah/gqlparser/v2" "github.com/vektah/gqlparser/v2/ast" "golang.org/x/tools/go/packages" diff --git a/codegen/config/config_test.go b/codegen/config/config_test.go index 60f2053..ec99f14 100644 --- a/codegen/config/config_test.go +++ b/codegen/config/config_test.go @@ -6,12 +6,12 @@ import ( "path/filepath" "testing" - "github.com/schartey/dgraph-lambda-go/codegen/parser" - "github.com/schartey/dgraph-lambda-go/internal" + "github.com/miko/dgraph-lambda-go/codegen/parser" + "github.com/miko/dgraph-lambda-go/internal" "github.com/stretchr/testify/assert" ) -var autobindValues = []string{"github.com/schartey/dgraph-lambda-go/examples/models"} +var autobindValues = []string{"github.com/miko/dgraph-lambda-go/examples/models"} var models = []string{"User", "Author", "Apple", "Figure", "Hotel"} var fieldResolvers = []string{"User.reputation", "User.rank", "User.active", "Post.additionalInfo", "Figure.size"} @@ -22,7 +22,7 @@ var mutationResolvers = []string{"newAuthor"} var middlewareResolvers = []string{"user", "admin"} func Test_LoadConfig(t *testing.T) { - config, err := LoadConfigFile("github.com/schartey/dgraph-lambda-go", "../../lambda.yaml") + config, err := LoadConfigFile("github.com/miko/dgraph-lambda-go", "../../lambda.yaml") assert.NoError(t, err) err = config.LoadConfig("../../lambda.yaml") assert.NoError(t, err) @@ -32,38 +32,38 @@ func Test_LoadConfig(t *testing.T) { assert.Equal(t, "generated", config.Exec.Package) assert.Equal(t, "examples/lambda/model/models_gen.go", config.Model.Filename) assert.Equal(t, "model", config.Model.Package) - assert.Equal(t, "github.com/schartey/dgraph-lambda-go/examples/models", config.AutoBind[0]) + assert.Equal(t, "github.com/miko/dgraph-lambda-go/examples/models", config.AutoBind[0]) assert.Equal(t, "follow-schema", config.Resolver.Layout) assert.Equal(t, "examples/lambda/resolvers", config.Resolver.Dir) assert.Equal(t, "resolvers", config.Resolver.Package) assert.Equal(t, "{resolver}.resolver.go", config.Resolver.FilenameTemplate) assert.Equal(t, true, config.Server.Standalone) - assert.Equal(t, "github.com/schartey/dgraph-lambda-go", config.Root) + assert.Equal(t, "github.com/miko/dgraph-lambda-go", config.Root) assert.NotNil(t, config.DefaultModelPackage) assert.Equal(t, "model", config.DefaultModelPackage.Name) - assert.Equal(t, "github.com/schartey/dgraph-lambda-go/examples/lambda/model", config.DefaultModelPackage.PkgPath) + assert.Equal(t, "github.com/miko/dgraph-lambda-go/examples/lambda/model", config.DefaultModelPackage.PkgPath) assert.Equal(t, 3, len(config.Sources)) assert.Contains(t, config.Sources[2].Name, "dgraph-lambda-go/examples/test.graphql") } func Test_LoadConfig_Fail(t *testing.T) { // Non existent file - _, err := LoadConfigFile("github.com/schartey/dgraph-lambda-go", "./lambda.yaml") + _, err := LoadConfigFile("github.com/miko/dgraph-lambda-go", "./lambda.yaml") assert.Error(t, err) // Invalid file type - _, err = LoadConfigFile("github.com/schartey/dgraph-lambda-go", "./config.go") + _, err = LoadConfigFile("github.com/miko/dgraph-lambda-go", "./config.go") assert.Error(t, err) for i := 1; i < 6; i++ { // Invalid file type - _, err = LoadConfigFile("github.com/schartey/dgraph-lambda-go", fmt.Sprintf("../../test_resources/faulty%d.yaml", i)) + _, err = LoadConfigFile("github.com/miko/dgraph-lambda-go", fmt.Sprintf("../../test_resources/faulty%d.yaml", i)) assert.Error(t, err) } } func Test_loadSchema(t *testing.T) { - config, err := LoadConfigFile("github.com/schartey/dgraph-lambda-go", "../../lambda.yaml") + config, err := LoadConfigFile("github.com/miko/dgraph-lambda-go", "../../lambda.yaml") assert.NoError(t, err) err = config.LoadConfig("../../lambda.yaml") assert.NoError(t, err) diff --git a/codegen/generator/executer_generator.go b/codegen/generator/executer_generator.go index 9c2e94f..d0ada02 100644 --- a/codegen/generator/executer_generator.go +++ b/codegen/generator/executer_generator.go @@ -6,9 +6,9 @@ import ( "path" "text/template" - "github.com/schartey/dgraph-lambda-go/codegen/config" - "github.com/schartey/dgraph-lambda-go/codegen/parser" - "github.com/schartey/dgraph-lambda-go/codegen/rewriter" + "github.com/miko/dgraph-lambda-go/codegen/config" + "github.com/miko/dgraph-lambda-go/codegen/parser" + "github.com/miko/dgraph-lambda-go/codegen/rewriter" ) func generateExecuter(c *config.Config, parsedTree *parser.Tree, r *rewriter.Rewriter) error { @@ -64,7 +64,7 @@ func generateExecuter(c *config.Config, parsedTree *parser.Tree, r *rewriter.Rew pkgs["errors"] = types.NewPackage("errors", "errors") pkgs["http"] = types.NewPackage("net/http", "http") pkgs["strings"] = types.NewPackage("strings", "strings") - pkgs["api"] = types.NewPackage("github.com/schartey/dgraph-lambda-go/api", "api") + pkgs["api"] = types.NewPackage("github.com/miko/dgraph-lambda-go/api", "api") if len(parsedTree.ResolverTree.FieldResolvers) > 0 || len(parsedTree.ResolverTree.Queries) > 0 || diff --git a/codegen/generator/field_resolver_generator.go b/codegen/generator/field_resolver_generator.go index 60598d3..2f89d7e 100644 --- a/codegen/generator/field_resolver_generator.go +++ b/codegen/generator/field_resolver_generator.go @@ -7,9 +7,9 @@ import ( "path" "text/template" - "github.com/schartey/dgraph-lambda-go/codegen/config" - "github.com/schartey/dgraph-lambda-go/codegen/parser" - "github.com/schartey/dgraph-lambda-go/codegen/rewriter" + "github.com/miko/dgraph-lambda-go/codegen/config" + "github.com/miko/dgraph-lambda-go/codegen/parser" + "github.com/miko/dgraph-lambda-go/codegen/rewriter" ) func generateFieldResolvers(c *config.Config, parsedTree *parser.Tree, r *rewriter.Rewriter) error { @@ -35,7 +35,7 @@ func generateFieldResolvers(c *config.Config, parsedTree *parser.Tree, r *rewrit } if len(parsedTree.ResolverTree.FieldResolvers) > 0 { pkgs["context"] = types.NewPackage("context", "context") - pkgs["api"] = types.NewPackage("github.com/schartey/dgraph-lambda-go/api", "api") + pkgs["api"] = types.NewPackage("github.com/miko/dgraph-lambda-go/api", "api") } err = fieldResolverTemplate.Execute(f, struct { diff --git a/codegen/generator/generator.go b/codegen/generator/generator.go index 725bfe4..7678126 100644 --- a/codegen/generator/generator.go +++ b/codegen/generator/generator.go @@ -7,10 +7,10 @@ import ( "unicode" "github.com/pkg/errors" - "github.com/schartey/dgraph-lambda-go/codegen/config" - "github.com/schartey/dgraph-lambda-go/codegen/graphql" - "github.com/schartey/dgraph-lambda-go/codegen/parser" - "github.com/schartey/dgraph-lambda-go/codegen/rewriter" + "github.com/miko/dgraph-lambda-go/codegen/config" + "github.com/miko/dgraph-lambda-go/codegen/graphql" + "github.com/miko/dgraph-lambda-go/codegen/parser" + "github.com/miko/dgraph-lambda-go/codegen/rewriter" ) func Generate(c *config.Config, p *parser.Tree, r *rewriter.Rewriter) error { diff --git a/codegen/generator/init.go b/codegen/generator/init.go index d9756be..3b29156 100644 --- a/codegen/generator/init.go +++ b/codegen/generator/init.go @@ -8,7 +8,7 @@ import ( "text/template" "github.com/pkg/errors" - "github.com/schartey/dgraph-lambda-go/codegen/config" + "github.com/miko/dgraph-lambda-go/codegen/config" ) func GenerateConfig(filename string) error { @@ -119,7 +119,7 @@ model: package: model autobind: - # - "github.com/schartey/dgraph-lambda-go/examples/models" + # - "github.com/miko/dgraph-lambda-go/examples/models" resolver: dir: lambda/resolvers @@ -146,7 +146,7 @@ import ( "github.com/go-chi/chi" {{ end }} - "github.com/schartey/dgraph-lambda-go/api" + "github.com/miko/dgraph-lambda-go/api" "{{ .GeneratedPath }}" "{{ .ResolverPath }}" ) diff --git a/codegen/generator/middleware_generator.go b/codegen/generator/middleware_generator.go index 91135ff..8067218 100644 --- a/codegen/generator/middleware_generator.go +++ b/codegen/generator/middleware_generator.go @@ -7,9 +7,9 @@ import ( "path" "text/template" - "github.com/schartey/dgraph-lambda-go/codegen/config" - "github.com/schartey/dgraph-lambda-go/codegen/parser" - "github.com/schartey/dgraph-lambda-go/codegen/rewriter" + "github.com/miko/dgraph-lambda-go/codegen/config" + "github.com/miko/dgraph-lambda-go/codegen/parser" + "github.com/miko/dgraph-lambda-go/codegen/rewriter" ) func generateMiddleware(c *config.Config, parsedTree *parser.Tree, r *rewriter.Rewriter) error { @@ -25,7 +25,7 @@ func generateMiddleware(c *config.Config, parsedTree *parser.Tree, r *rewriter.R pkgs := make(map[string]*types.Package) if len(parsedTree.Middleware) > 0 { - pkgs["api"] = types.NewPackage("github.com/schartey/dgraph-lambda-go/api", "api") + pkgs["api"] = types.NewPackage("github.com/miko/dgraph-lambda-go/api", "api") } err = middlewareResolverTemplate.Execute(f, struct { diff --git a/codegen/generator/model_generator.go b/codegen/generator/model_generator.go index 00aa1eb..1686fa9 100644 --- a/codegen/generator/model_generator.go +++ b/codegen/generator/model_generator.go @@ -6,8 +6,8 @@ import ( "os" "text/template" - "github.com/schartey/dgraph-lambda-go/codegen/config" - "github.com/schartey/dgraph-lambda-go/codegen/parser" + "github.com/miko/dgraph-lambda-go/codegen/config" + "github.com/miko/dgraph-lambda-go/codegen/parser" "golang.org/x/tools/go/packages" ) diff --git a/codegen/generator/mutation_resolver_generator.go b/codegen/generator/mutation_resolver_generator.go index 68a6a2b..3945fc8 100644 --- a/codegen/generator/mutation_resolver_generator.go +++ b/codegen/generator/mutation_resolver_generator.go @@ -8,9 +8,9 @@ import ( "path" "text/template" - "github.com/schartey/dgraph-lambda-go/codegen/config" - "github.com/schartey/dgraph-lambda-go/codegen/parser" - "github.com/schartey/dgraph-lambda-go/codegen/rewriter" + "github.com/miko/dgraph-lambda-go/codegen/config" + "github.com/miko/dgraph-lambda-go/codegen/parser" + "github.com/miko/dgraph-lambda-go/codegen/rewriter" ) func generateMutationResolvers(c *config.Config, parsedTree *parser.Tree, r *rewriter.Rewriter) error { @@ -38,7 +38,7 @@ func generateMutationResolvers(c *config.Config, parsedTree *parser.Tree, r *rew } if len(parsedTree.ResolverTree.Mutations) > 0 { pkgs["context"] = types.NewPackage("context", "context") - pkgs["api"] = types.NewPackage("github.com/schartey/dgraph-lambda-go/api", "api") + pkgs["api"] = types.NewPackage("github.com/miko/dgraph-lambda-go/api", "api") } err = mutationResolverTemplate.Execute(f, struct { diff --git a/codegen/generator/query_resolver_generator.go b/codegen/generator/query_resolver_generator.go index e30d160..f34f4da 100644 --- a/codegen/generator/query_resolver_generator.go +++ b/codegen/generator/query_resolver_generator.go @@ -8,9 +8,9 @@ import ( "path" "text/template" - "github.com/schartey/dgraph-lambda-go/codegen/config" - "github.com/schartey/dgraph-lambda-go/codegen/parser" - "github.com/schartey/dgraph-lambda-go/codegen/rewriter" + "github.com/miko/dgraph-lambda-go/codegen/config" + "github.com/miko/dgraph-lambda-go/codegen/parser" + "github.com/miko/dgraph-lambda-go/codegen/rewriter" ) func generateQueryResolvers(c *config.Config, parsedTree *parser.Tree, r *rewriter.Rewriter) error { @@ -39,7 +39,7 @@ func generateQueryResolvers(c *config.Config, parsedTree *parser.Tree, r *rewrit } if len(parsedTree.ResolverTree.Queries) > 0 { pkgs["context"] = types.NewPackage("context", "context") - pkgs["api"] = types.NewPackage("github.com/schartey/dgraph-lambda-go/api", "api") + pkgs["api"] = types.NewPackage("github.com/miko/dgraph-lambda-go/api", "api") } err = queryResolverTemplate.Execute(f, struct { diff --git a/codegen/generator/webhook_generator.go b/codegen/generator/webhook_generator.go index 67ea0f6..8364773 100644 --- a/codegen/generator/webhook_generator.go +++ b/codegen/generator/webhook_generator.go @@ -7,9 +7,9 @@ import ( "path" "text/template" - "github.com/schartey/dgraph-lambda-go/codegen/config" - "github.com/schartey/dgraph-lambda-go/codegen/parser" - "github.com/schartey/dgraph-lambda-go/codegen/rewriter" + "github.com/miko/dgraph-lambda-go/codegen/config" + "github.com/miko/dgraph-lambda-go/codegen/parser" + "github.com/miko/dgraph-lambda-go/codegen/rewriter" ) func generateWebhook(c *config.Config, parsedTree *parser.Tree, r *rewriter.Rewriter) error { @@ -35,7 +35,7 @@ func generateWebhook(c *config.Config, parsedTree *parser.Tree, r *rewriter.Rewr if len(models) > 0 { pkgs["context"] = types.NewPackage("context", "context") - pkgs["api"] = types.NewPackage("github.com/schartey/dgraph-lambda-go/api", "api") + pkgs["api"] = types.NewPackage("github.com/miko/dgraph-lambda-go/api", "api") } err = webhookResolverTemplate.Execute(f, struct { diff --git a/codegen/parser/parser.go b/codegen/parser/parser.go index 15ea44a..188dda2 100644 --- a/codegen/parser/parser.go +++ b/codegen/parser/parser.go @@ -7,8 +7,8 @@ import ( "go/types" "regexp" - "github.com/schartey/dgraph-lambda-go/codegen/graphql" - "github.com/schartey/dgraph-lambda-go/internal" + "github.com/miko/dgraph-lambda-go/codegen/graphql" + "github.com/miko/dgraph-lambda-go/internal" "github.com/vektah/gqlparser/v2/ast" ) diff --git a/codegen/rewriter/rewriter.go b/codegen/rewriter/rewriter.go index af1a685..e3215ad 100644 --- a/codegen/rewriter/rewriter.go +++ b/codegen/rewriter/rewriter.go @@ -5,9 +5,9 @@ import ( "path" "strings" - "github.com/schartey/dgraph-lambda-go/codegen/config" - "github.com/schartey/dgraph-lambda-go/codegen/parser" - "github.com/schartey/dgraph-lambda-go/internal" + "github.com/miko/dgraph-lambda-go/codegen/config" + "github.com/miko/dgraph-lambda-go/codegen/parser" + "github.com/miko/dgraph-lambda-go/internal" ) type Rewriter struct { diff --git a/examples/lambda/generated/generated.go b/examples/lambda/generated/generated.go index 1c1db8c..e8f19c6 100644 --- a/examples/lambda/generated/generated.go +++ b/examples/lambda/generated/generated.go @@ -7,9 +7,9 @@ import ( "net/http" "strings" - "github.com/schartey/dgraph-lambda-go/api" - "github.com/schartey/dgraph-lambda-go/examples/lambda/model" - "github.com/schartey/dgraph-lambda-go/examples/lambda/resolvers" + "github.com/miko/dgraph-lambda-go/api" + "github.com/miko/dgraph-lambda-go/examples/lambda/model" + "github.com/miko/dgraph-lambda-go/examples/lambda/resolvers" ) type Executer struct { diff --git a/examples/lambda/model/models_gen.go b/examples/lambda/model/models_gen.go index 8755bbf..3e2ff85 100644 --- a/examples/lambda/model/models_gen.go +++ b/examples/lambda/model/models_gen.go @@ -6,7 +6,7 @@ import ( "strconv" "time" - "github.com/schartey/dgraph-lambda-go/examples/models" + "github.com/miko/dgraph-lambda-go/examples/models" "github.com/twpayne/go-geom" ) diff --git a/examples/lambda/resolvers/field.resolver.go b/examples/lambda/resolvers/field.resolver.go index 35ac0a2..2cb6e09 100644 --- a/examples/lambda/resolvers/field.resolver.go +++ b/examples/lambda/resolvers/field.resolver.go @@ -3,8 +3,8 @@ package resolvers import ( "context" - "github.com/schartey/dgraph-lambda-go/api" - "github.com/schartey/dgraph-lambda-go/examples/lambda/model" + "github.com/miko/dgraph-lambda-go/api" + "github.com/miko/dgraph-lambda-go/examples/lambda/model" ) type FieldResolverInterface interface { diff --git a/examples/lambda/resolvers/middleware.resolver.go b/examples/lambda/resolvers/middleware.resolver.go index aead5db..0fd14ce 100644 --- a/examples/lambda/resolvers/middleware.resolver.go +++ b/examples/lambda/resolvers/middleware.resolver.go @@ -1,7 +1,7 @@ package resolvers import ( - "github.com/schartey/dgraph-lambda-go/api" + "github.com/miko/dgraph-lambda-go/api" ) type MiddlewareResolverInterface interface { diff --git a/examples/lambda/resolvers/mutation.resolver.go b/examples/lambda/resolvers/mutation.resolver.go index bf5d697..e0243d2 100644 --- a/examples/lambda/resolvers/mutation.resolver.go +++ b/examples/lambda/resolvers/mutation.resolver.go @@ -3,7 +3,7 @@ package resolvers import ( "context" - "github.com/schartey/dgraph-lambda-go/api" + "github.com/miko/dgraph-lambda-go/api" ) type MutationResolverInterface interface { diff --git a/examples/lambda/resolvers/query.resolver.go b/examples/lambda/resolvers/query.resolver.go index ac1a8eb..ae00783 100644 --- a/examples/lambda/resolvers/query.resolver.go +++ b/examples/lambda/resolvers/query.resolver.go @@ -3,8 +3,8 @@ package resolvers import ( "context" - "github.com/schartey/dgraph-lambda-go/api" - "github.com/schartey/dgraph-lambda-go/examples/lambda/model" + "github.com/miko/dgraph-lambda-go/api" + "github.com/miko/dgraph-lambda-go/examples/lambda/model" ) type QueryResolverInterface interface { diff --git a/examples/lambda/resolvers/webhook.resolver.go b/examples/lambda/resolvers/webhook.resolver.go index 3f9176c..2b876e1 100644 --- a/examples/lambda/resolvers/webhook.resolver.go +++ b/examples/lambda/resolvers/webhook.resolver.go @@ -3,7 +3,7 @@ package resolvers import ( "context" - "github.com/schartey/dgraph-lambda-go/api" + "github.com/miko/dgraph-lambda-go/api" ) type WebhookResolverInterface interface { diff --git a/examples/server.go b/examples/server.go index 45bb5a0..8ccc72f 100644 --- a/examples/server.go +++ b/examples/server.go @@ -10,9 +10,9 @@ import ( "time" "github.com/go-chi/chi" - "github.com/schartey/dgraph-lambda-go/api" - "github.com/schartey/dgraph-lambda-go/examples/lambda/generated" - "github.com/schartey/dgraph-lambda-go/examples/lambda/resolvers" + "github.com/miko/dgraph-lambda-go/api" + "github.com/miko/dgraph-lambda-go/examples/lambda/generated" + "github.com/miko/dgraph-lambda-go/examples/lambda/resolvers" ) func RunWithServer() { diff --git a/go.mod b/go.mod index 1d3f6ec..9f8a372 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/schartey/dgraph-lambda-go +module github.com/miko/dgraph-lambda-go go 1.16 @@ -17,7 +17,7 @@ require ( golang.org/x/mod v0.5.1 golang.org/x/net v0.0.0-20211108170745-6635138e15ea // indirect golang.org/x/sys v0.0.0-20211107104306-e0b2ad06fe42 // indirect - golang.org/x/tools v0.1.7 + golang.org/x/tools v0.1.8 gopkg.in/yaml.v2 v2.4.0 gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect ) diff --git a/internal/mod_test.go b/internal/mod_test.go index a2363d1..d6e5add 100644 --- a/internal/mod_test.go +++ b/internal/mod_test.go @@ -37,5 +37,5 @@ func Test_GetModuleName(t *testing.T) { moduleName, err := GetModuleName() assert.NoError(t, err) - assert.Equal(t, "github.com/schartey/dgraph-lambda-go", moduleName) + assert.Equal(t, "github.com/miko/dgraph-lambda-go", moduleName) } diff --git a/internal/packages_test.go b/internal/packages_test.go index 4ee308c..4a9dbfc 100644 --- a/internal/packages_test.go +++ b/internal/packages_test.go @@ -9,12 +9,12 @@ import ( func Test_Packages(t *testing.T) { packages := &Packages{} - pkg, err := packages.Load("github.com/schartey/dgraph-lambda-go/internal") + pkg, err := packages.Load("github.com/miko/dgraph-lambda-go/internal") assert.NoError(t, err) assert.Equal(t, "internal", pkg.Name) - assert.Equal(t, "github.com/schartey/dgraph-lambda-go/internal", pkg.PkgPath) + assert.Equal(t, "github.com/miko/dgraph-lambda-go/internal", pkg.PkgPath) - cached, err := packages.PackageFromPath("github.com/schartey/dgraph-lambda-go/internal") + cached, err := packages.PackageFromPath("github.com/miko/dgraph-lambda-go/internal") assert.NoError(t, err) assert.Equal(t, pkg, cached) } diff --git a/lambda.yaml b/lambda.yaml index 7e9adb4..f8d9d48 100644 --- a/lambda.yaml +++ b/lambda.yaml @@ -10,7 +10,7 @@ model: package: model autobind: - - "github.com/schartey/dgraph-lambda-go/examples/models" + - "github.com/miko/dgraph-lambda-go/examples/models" resolver: layout: follow-schema diff --git a/main.go b/main.go index 4d179cf..fef24ce 100644 --- a/main.go +++ b/main.go @@ -1,7 +1,7 @@ package main import ( - "github.com/schartey/dgraph-lambda-go/cmd" + "github.com/miko/dgraph-lambda-go/cmd" ) func main() { diff --git a/test_resources/faulty1.yaml b/test_resources/faulty1.yaml index 2f126b4..e27b5b7 100644 --- a/test_resources/faulty1.yaml +++ b/test_resources/faulty1.yaml @@ -9,7 +9,7 @@ model: package: model autobind: - - "github.com/schartey/dgraph-lambda-go/examples/models" + - "github.com/miko/dgraph-lambda-go/examples/models" resolver: layout: follow-schema diff --git a/test_resources/faulty2.yaml b/test_resources/faulty2.yaml index 4d62510..a582a7b 100644 --- a/test_resources/faulty2.yaml +++ b/test_resources/faulty2.yaml @@ -9,7 +9,7 @@ model: package: model autobind: - - "github.com/schartey/dgraph-lambda-go/examples/models" + - "github.com/miko/dgraph-lambda-go/examples/models" resolver: layout: follow-schema diff --git a/test_resources/faulty3.yaml b/test_resources/faulty3.yaml index 10dd1b3..0b70fa8 100644 --- a/test_resources/faulty3.yaml +++ b/test_resources/faulty3.yaml @@ -9,7 +9,7 @@ model: package: model autobind: - - "github.com/schartey/dgraph-lambda-go/examples/models" + - "github.com/miko/dgraph-lambda-go/examples/models" resolver: layout: follow-schema diff --git a/test_resources/faulty4.yaml b/test_resources/faulty4.yaml index 6011361..e5b67a1 100644 --- a/test_resources/faulty4.yaml +++ b/test_resources/faulty4.yaml @@ -9,7 +9,7 @@ model: filename: examples/lambda/model/models_gen.go autobind: - - "github.com/schartey/dgraph-lambda-go/examples/models" + - "github.com/miko/dgraph-lambda-go/examples/models" resolver: layout: follow-schema diff --git a/test_resources/faulty5.yaml b/test_resources/faulty5.yaml index 05d4577..e9d879a 100644 --- a/test_resources/faulty5.yaml +++ b/test_resources/faulty5.yaml @@ -9,7 +9,7 @@ model: package: model autobind: - - "github.com/schartey/dgraph-lambda-go/examples/models" + - "github.com/miko/dgraph-lambda-go/examples/models" resolver: layout: follow-schema From 2fc69b3fc9a86c446b9dad288df77c4c8f38d0ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Ko=C5=82odziejczyk?= Date: Mon, 30 May 2022 09:43:19 +0200 Subject: [PATCH 2/3] Update go.sum --- go.sum | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/go.sum b/go.sum index 2e8dc74..8cc0302 100644 --- a/go.sum +++ b/go.sum @@ -88,18 +88,17 @@ github.com/urfave/cli/v2 v2.3.0 h1:qph92Y649prgesehzOrQjdWyxFOp/QVM+6imKHad91M= github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI= github.com/vektah/gqlparser/v2 v2.2.0 h1:bAc3slekAAJW6sZTi07aGq0OrfaCjj4jxARAaC7g2EM= github.com/vektah/gqlparser/v2 v2.2.0/go.mod h1:i3mQIGIrbK2PD1RrCeMTlVbkF2FJ6WkU1KJlJlC+3F4= -github.com/yuin/goldmark v1.4.0/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= +github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.5.1 h1:OJxoQ/rynoF0dcCdI7cLPktw/hR2cueqYfjm43oqK38= golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191003171128-d98b1b443823/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211108170745-6635138e15ea h1:FosBMXtOc8Tp9Hbo4ltl1WJSrTVewZU8MPnTPY2HdH8= golang.org/x/net v0.0.0-20211108170745-6635138e15ea/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -112,19 +111,20 @@ golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200121082415-34d275377bf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211107104306-e0b2ad06fe42 h1:G2DDmludOQZoWbpCr7OKDxnl478ZBGMcOhrv+ooX/Q4= golang.org/x/sys v0.0.0-20211107104306-e0b2ad06fe42/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190125232054-d66bd3c5d5a6/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190624222133-a101b041ded4/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.1.7 h1:6j8CgantCy3yc8JGBqkDLMKWqZ0RDU2g1HVgacojGWQ= -golang.org/x/tools v0.1.7/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo= +golang.org/x/tools v0.1.8 h1:P1HhGGuLW4aAclzjtmJdf0mJOjVUZUzOTqkAkWL+l6w= +golang.org/x/tools v0.1.8/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= From 8f48dc3a385ccf6cf158d4e874531b306a88ebff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Ko=C5=82odziejczyk?= Date: Mon, 30 May 2022 09:51:35 +0200 Subject: [PATCH 3/3] Replace type with xtype as a parameter name --- codegen/generator/generator.go | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/codegen/generator/generator.go b/codegen/generator/generator.go index 7678126..734539b 100644 --- a/codegen/generator/generator.go +++ b/codegen/generator/generator.go @@ -6,11 +6,11 @@ import ( "strings" "unicode" - "github.com/pkg/errors" "github.com/miko/dgraph-lambda-go/codegen/config" "github.com/miko/dgraph-lambda-go/codegen/graphql" "github.com/miko/dgraph-lambda-go/codegen/parser" "github.com/miko/dgraph-lambda-go/codegen/rewriter" + "github.com/pkg/errors" ) func Generate(c *config.Config, p *parser.Tree, r *rewriter.Rewriter) error { @@ -96,10 +96,18 @@ func args(args []*parser.Argument) string { return strings.Join(arglist, ",") } +//Replace reserved words which could cause go compiler to fail +var ReservedMap map[string]string = map[string]string{ + "type": "xtype", +} + func argsW(args []*parser.Argument) string { var arglist []string for _, arg := range args { + if replaced, exists := ReservedMap[arg.Name]; exists { + arg.Name = replaced + } arglist = append(arglist, fmt.Sprintf("%s %s", arg.Name, pointer(arg.GoType, arg.IsArray))) } return strings.Join(arglist, ",")