Merge pull request 99designs#1016 from 99designs/federation-entity-type

Create a non generated federation _Entity type
cgxxv · Feb 7, 2020 · 5290844 · 5290844
2 parents a1de04e + c23164e
commit 5290844
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 22 deletions.
diff --git a/plugin/federation/federation.go b/plugin/federation/federation.go
@@ -50,7 +50,12 @@ func (f *federation) MutateConfig(cfg *config.Config) error {
 	builtins := config.TypeMap{
 		"_Service": {
 			Model: config.StringList{
-				"github.com/99designs/gqlgen/plugin/federation.Service",
+				"github.com/99designs/gqlgen/plugin/federation/fedruntime.Service",
+			},
+		},
+		"_Entity": {
+			Model: config.StringList{
+				"github.com/99designs/gqlgen/plugin/federation/fedruntime.Entity",
 			},
 		},
 		"_Any": {
@@ -361,10 +366,3 @@ func (f *federation) getSDL(c *config.Config) (string, error) {
 	formatter.NewFormatter(&buf).FormatSchema(schema)
 	return buf.String(), nil
 }
-
-// Service is the service object that the
-// generated.go file will return for the _service
-// query
-type Service struct {
-	SDL string `json:"sdl"`
-}
diff --git a/plugin/federation/federation.gotpl b/plugin/federation/federation.gotpl
@@ -2,20 +2,20 @@
 {{ reserveImport "errors"  }}
 {{ reserveImport "fmt"  }}
 
-{{ reserveImport "github.com/99designs/gqlgen/plugin/federation" }}
+{{ reserveImport "github.com/99designs/gqlgen/plugin/federation/fedruntime" }}
 
-func (ec *executionContext) __resolve__service(ctx context.Context) (federation.Service, error) {
+func (ec *executionContext) __resolve__service(ctx context.Context) (fedruntime.Service, error) {
 	if ec.DisableIntrospection {
-		return federation.Service{}, errors.New("federated introspection disabled")
+		return fedruntime.Service{}, errors.New("federated introspection disabled")
 	}
-	return federation.Service{
+	return fedruntime.Service{
 		SDL: `{{.SDL}}`,
 	}, nil
 }
 
 {{if .Entities}}
-func (ec *executionContext) __resolve_entities(ctx context.Context, representations []map[string]interface{}) ([]_Entity, error) {
-	list := []_Entity{}
+func (ec *executionContext) __resolve_entities(ctx context.Context, representations []map[string]interface{}) ([]fedruntime.Entity, error) {
+	list := []fedruntime.Entity{}
 	for _, rep := range representations {
 		typeName, ok := rep["__typename"].(string)
 		if !ok {

diff --git a/plugin/federation/fedruntime/runtime.go b/plugin/federation/fedruntime/runtime.go
@@ -0,0 +1,13 @@
+package fedruntime
+
+// Service is the service object that the
+// generated.go file will return for the _service
+// query
+type Service struct {
+	SDL string `json:"sdl"`
+}
+
+// Everything with a @key implements this
+type Entity interface {
+	Is_Entity()
+}
diff --git a/plugin/modelgen/models.go b/plugin/modelgen/models.go
@@ -83,11 +83,6 @@ func (m *Plugin) MutateConfig(cfg *config.Config) error {
 		if cfg.Models.UserDefined(schemaType.Name) {
 			continue
 		}
-		ent := false
-		if schemaType.Directives.ForName("key") != nil {
-			hasEntity = true
-			ent = true
-		}
 		switch schemaType.Kind {
 		case ast.Interface, ast.Union:
 			it := &Interface{
@@ -108,9 +103,6 @@ func (m *Plugin) MutateConfig(cfg *config.Config) error {
 				it.Implements = append(it.Implements, implementor.Name)
 			}
 
-			if ent { // only when Object. Directive validation should have occurred on InputObject otherwise.
-				it.Implements = append(it.Implements, "_Entity")
-			}
 			for _, field := range schemaType.Fields {
 				var typ types.Type
 				fieldDef := cfg.Schema.Types[field.Type.Name()]