Doc Updates [WIP]

.github/workflows/tests.yml

@@ -1,6 +1,6 @@
 name: Go
 
-on: [pull_request]
+on: [ pull_request ]
 
 jobs:
 
@@ -43,6 +43,9 @@ jobs:
         ./grip server --rpc-port 18202 --http-port 18201 --config ./test/badger.yml &
         sleep 5
         make test-conformance
+    - name: GRIDs unit tests
+      run: |
+        go test ./test/... -config badger.yml
 
   gridsTest:
     needs: build

cmd/server/main.go

@@ -7,7 +7,6 @@ import (
 	"os/signal"
 
 	"github.com/bmeg/grip/config"
-	"github.com/bmeg/grip/gripql"
 	"github.com/bmeg/grip/log"
 	"github.com/bmeg/grip/server"
 	_ "github.com/go-sql-driver/mysql" //import so mysql will register as a sql driver
@@ -18,12 +17,11 @@ import (
 
 var conf = &config.Config{}
 var configFile string
-var schemaFile string
 
 // Run runs an Grip server.
 // This opens a database and starts an API server.
 // This blocks indefinitely.
-func Run(conf *config.Config, schemas map[string]*gripql.Graph, baseDir string) error {
+func Run(conf *config.Config, baseDir string) error {
 	log.ConfigureLogger(conf.Logger)
 	log.WithFields(log.Fields{"Config": conf}).Info("Starting Server")
 
@@ -36,7 +34,7 @@ func Run(conf *config.Config, schemas map[string]*gripql.Graph, baseDir string)
 		cancel()
 	}()
 
-	srv, err := server.NewGripServer(conf, schemas, baseDir)
+	srv, err := server.NewGripServer(conf, baseDir, nil)
 	if err != nil {
 		return err
 	}
@@ -84,24 +82,13 @@ var Cmd = &cobra.Command{
 		return nil
 	},
 	RunE: func(cmd *cobra.Command, args []string) error {
-		schemaMap := make(map[string]*gripql.Graph)
-		if schemaFile != "" {
-			schemas, err := gripql.ParseYAMLGraphFile(schemaFile)
-			if err != nil {
-				return fmt.Errorf("error processing schema file: %v", err)
-			}
-			for _, s := range schemas {
-				schemaMap[s.Graph] = s
-			}
-		}
-		return Run(conf, schemaMap, configFile)
+		return Run(conf, configFile)
 	},
 }
 
 func init() {
 	flags := Cmd.Flags()
 	flags.StringVarP(&configFile, "config", "c", configFile, "Config file")
-	flags.StringVarP(&schemaFile, "schema", "s", schemaFile, "Schema file")
 	flags.StringVar(&conf.Server.HTTPPort, "http-port", conf.Server.HTTPPort, "HTTP port")
 	flags.StringVar(&conf.Server.RPCPort, "rpc-port", conf.Server.RPCPort, "TCP+RPC port")
 	flags.BoolVar(&conf.Server.ReadOnly, "read-only", conf.Server.ReadOnly, "Start server in read-only mode")

contrib/grip.yml

@@ -1,8 +1,10 @@
-Database: mongo
+Default: mongo
 
 Server:
   HTTPPort: 80
   ContentDir: /usr/share/grip
-MongoDB:
-  URL: localhost
-  DBName: grip
+Drivers:
+  mongo:
+    MongoDB:
+      URL: mongodb://localhost:27017
+      DBName: grip

engine/core/optimize.go

@@ -21,8 +21,10 @@ func IndexStartOptimize(pipe []*gripql.GraphStatement) []*gripql.GraphStatement
 			break
 		}
 		if i == 0 {
-			if _, ok := step.GetStatement().(*gripql.GraphStatement_V); ok {
-				//lookupV = lv
+			if v, ok := step.GetStatement().(*gripql.GraphStatement_V); ok {
+				if v.V != nil && len(v.V.Values) > 0 {
+					break
+				}
 			} else {
 				break
 			}

go.mod

@@ -42,6 +42,7 @@ require (
 	github.com/kr/pretty v0.1.0
 	github.com/lib/pq v1.2.0
 	github.com/logrusorgru/aurora v0.0.0-20190428105938-cea283e61946
+	github.com/machinebox/graphql v0.2.2
 	github.com/mitchellh/mapstructure v1.1.2 // indirect
 	github.com/mongodb/mongo-tools-common v4.0.18+incompatible
 	github.com/oliveagle/jsonpath v0.0.0-20180606110733-2e52cf6e6852

go.sum

@@ -319,6 +319,8 @@ github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/logrusorgru/aurora v0.0.0-20181002194514-a7b3b318ed4e/go.mod h1:7rIyQOR62GCctdiQpZ/zOJlFyk6y+94wXzv6RNZgaR4=
 github.com/logrusorgru/aurora v0.0.0-20190428105938-cea283e61946 h1:z+WaKrgu3kCpcdnbK9YG+JThpOCd1nU5jO5ToVmSlR4=
 github.com/logrusorgru/aurora v0.0.0-20190428105938-cea283e61946/go.mod h1:7rIyQOR62GCctdiQpZ/zOJlFyk6y+94wXzv6RNZgaR4=
+github.com/machinebox/graphql v0.2.2 h1:dWKpJligYKhYKO5A2gvNhkJdQMNZeChZYyBbrZkBZfo=
+github.com/machinebox/graphql v0.2.2/go.mod h1:F+kbVMHuwrQ5tYgU9JXlnskM8nOaFxCAEolaQybkjWA=
 github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
 github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
 github.com/mailru/easyjson v0.0.0-20180730094502-03f2033d19d5 h1:0x4qcEHDpruK6ML/m/YSlFUUu0UpRD3I2PHsNCuGnyA=

graphql/handler.go

@@ -40,6 +40,11 @@ func NewHTTPHandler(rpcAddress, user, password string) (http.Handler, error) {
 	if err != nil {
 		return nil, err
 	}
+	return NewClientHTTPHandler(client)
+}
+
+// NewClientHTTPHandler initilizes a new GraphQLHandler
+func NewClientHTTPHandler(client gripql.Client) (http.Handler, error) {
 	h := &Handler{
 		client:   client,
 		handlers: map[string]*graphHandler{},
@@ -164,16 +169,20 @@ func buildObject(name string, obj map[string]interface{}) (*graphql.Object, erro
 
 		// handle map
 		if x, ok := val.(map[string]interface{}); ok {
-			objFields[key], err = buildObjectField(key, x)
+			// make object name parent_field
+			objFields[key], err = buildObjectField(name+"_"+key, x)
 
 			// handle slice
 		} else if x, ok := val.([]interface{}); ok {
 			objFields[key], err = buildSliceField(key, x)
 
 			// handle string
 		} else if x, ok := val.(string); ok {
-			objFields[key], err = buildField(x)
-
+			if f, err := buildField(x); err == nil {
+				objFields[key] = f
+			} else {
+				log.WithFields(log.Fields{"object": name, "field": key, "error": err}).Error("graphql: buildField ignoring field")
+			}
 			// handle other cases
 		} else {
 			err = fmt.Errorf("unhandled type: %T %v", val, val)
@@ -260,6 +269,7 @@ func buildQueryObject(client gripql.Client, graph string, objects map[string]*gr
 			Resolve: func(p graphql.ResolveParams) (interface{}, error) {
 				q := gripql.V().HasLabel(label)
 				if id, ok := p.Args["id"].(string); ok {
+					fmt.Printf("Doing %s id=%s query", label, id)
 					q = gripql.V(id).HasLabel(label)
 				}
 				result, err := client.Traversal(&gripql.GraphQuery{Graph: graph, Query: q.Statements})
@@ -268,6 +278,7 @@ func buildQueryObject(client gripql.Client, graph string, objects map[string]*gr
 				}
 				out := []interface{}{}
 				for r := range result {
+					fmt.Printf("ID query traversal: %s\n", r)
 					d := r.GetVertex().GetDataMap()
 					d["id"] = r.GetVertex().Gid
 					out = append(out, d)
@@ -285,7 +296,7 @@ func buildQueryObject(client gripql.Client, graph string, objects map[string]*gr
 			Fields: queryFields,
 		},
 	)
-
+	fmt.Printf("Query fields: %s\n", queryFields)
 	return query
 }
 

server/server.go

@@ -48,39 +48,54 @@ type GripServer struct {
 }
 
 // NewGripServer initializes a GRPC server to connect to the graph store
-func NewGripServer(conf *config.Config, schemas map[string]*gripql.Graph, baseDir string) (*GripServer, error) {
+func NewGripServer(conf *config.Config, baseDir string, drivers map[string]gdbi.GraphDB) (*GripServer, error) {
 	_, err := os.Stat(conf.Server.WorkDir)
 	if os.IsNotExist(err) {
 		err = os.Mkdir(conf.Server.WorkDir, 0700)
 		if err != nil {
 			return nil, fmt.Errorf("creating work dir: %v", err)
 		}
 	}
-	if schemas == nil {
-		schemas = make(map[string]*gripql.Graph)
-	}
+	schemas := make(map[string]*gripql.Graph)
 
 	gdbs := map[string]gdbi.GraphDB{}
+	if drivers != nil {
+		for i, d := range drivers {
+			gdbs[i] = d
+		}
+	}
 	for name, dConfig := range conf.Drivers {
-		g, err := StartDriver(dConfig, baseDir)
-		if err == nil {
-			gdbs[name] = g
+		if _, ok := gdbs[name]; !ok {
+			g, err := StartDriver(dConfig, baseDir)
+			if err == nil {
+				gdbs[name] = g
+			}
 		}
 	}
 
 	server := &GripServer{dbs: gdbs, conf: conf, schemas: schemas}
+	/*
 	for graph, schema := range schemas {
 		if !server.graphExists(graph) {
 			_, err := server.AddGraph(context.Background(), &gripql.GraphID{Graph: graph})
 			if err != nil {
 				return nil, fmt.Errorf("error creating graph defined by schema '%s': %v", graph, err)
 			}
 		}
-		err = server.addSchemaGraph(context.Background(), schema)
-		if err != nil {
-			return nil, err
+	}*/
+
+	if conf.Default == "" {
+		//if no default is found set it to the first driver found
+		for i := range gdbs {
+			if conf.Default == "" {
+				conf.Default = i
+			}
 		}
 	}
+	if _, ok := gdbs[conf.Default]; !ok {
+		return nil, fmt.Errorf("Default driver '%s' does not exist", conf.Default)
+	}
+	fmt.Printf("Default graph driver: %s\n", conf.Default)
 	server.updateGraphMap()
 	return server, nil
 }
@@ -176,16 +191,19 @@ func (server *GripServer) Serve(pctx context.Context) error {
 	mux := http.NewServeMux()
 
 	// Setup GraphQL handler
-	user := ""
-	password := ""
-	if len(server.conf.Server.BasicAuth) > 0 {
-		user = server.conf.Server.BasicAuth[0].User
-		password = server.conf.Server.BasicAuth[0].Password
-	}
-	gqlHandler, err := graphql.NewHTTPHandler(server.conf.Server.RPCAddress(), user, password)
-	if err != nil {
-		return fmt.Errorf("setting up GraphQL handler: %v", err)
-	}
+	/*
+		user := ""
+		password := ""
+		if len(server.conf.Server.BasicAuth) > 0 {
+			user = server.conf.Server.BasicAuth[0].User
+			password = server.conf.Server.BasicAuth[0].Password
+		}
+		gqlHandler, err := graphql.NewHTTPHandler(server.conf.Server.RPCAddress(), user, password)
+		if err != nil {
+			return fmt.Errorf("setting up GraphQL handler: %v", err)
+		}*/
+	gqlHandler, err := graphql.NewClientHTTPHandler(gripql.WrapClient(gripql.NewQueryDirectClient(server), nil))
+
 	mux.Handle("/graphql/", gqlHandler)
 
 	// Setup web ui handler

test/graphql/graphql_query_test.go

@@ -0,0 +1,110 @@
+package graphql
+
+import (
+	"fmt"
+	//"io/ioutil"
+	//"net/http"
+	//"bytes"
+	"context"
+	"testing"
+
+	//"encoding/json"
+
+	"github.com/machinebox/graphql"
+	"github.com/oliveagle/jsonpath"
+)
+
+var tests = [][]string{
+	{
+		`
+      query {
+        Character(id:"1"){
+          id
+          name
+          starships_to_Starship {
+            name
+          }
+        }
+      }
+    `,
+		`{}`,
+	},
+}
+
+func TestQuerySet(t *testing.T) {
+	url := fmt.Sprintf("http://%s/graphql/%s", GraphQLAddr, GraphName)
+	client := graphql.NewClient(url)
+
+	for _, pair := range tests {
+		req := graphql.NewRequest(pair[0])
+
+		ctx := context.Background()
+		respData := map[string]interface{}{}
+		if err := client.Run(ctx, req, &respData); err != nil {
+			t.Error(err)
+		}
+		//out, err := json.Marshal(respData)
+		//if err != nil {
+		//  t.Error(err)
+		//}
+		//fmt.Printf("out: %s\n", out)
+	}
+}
+
+func TestCharacterQuery(t *testing.T) {
+	url := fmt.Sprintf("http://%s/graphql/%s", GraphQLAddr, GraphName)
+	client := graphql.NewClient(url)
+
+	// make a request
+	req := graphql.NewRequest(`
+    query {
+      Character(id:"Character:1"){
+        id
+        name
+        starships_to_Starship {
+          name
+        }
+      }
+    }
+  `)
+
+	ctx := context.Background()
+	respData := map[string]interface{}{}
+	if err := client.Run(ctx, req, &respData); err != nil {
+		t.Error(err)
+	}
+
+	out, err := jsonpath.JsonPathLookup(respData, "$.Character[0].id")
+	if err != nil {
+		t.Error(err)
+	}
+	if idStr, ok := out.(string); ok {
+		if idStr != "Character:1" {
+			t.Errorf("id mismatch: %s != %s", "Character:1", idStr)
+		}
+	} else {
+		t.Errorf("ID not string")
+	}
+}
+
+func TestIntrospectionQuery(t *testing.T) {
+	url := fmt.Sprintf("http://%s/graphql/%s", GraphQLAddr, GraphName)
+	client := graphql.NewClient(url)
+
+	// make a request
+	req := graphql.NewRequest(`{
+     __type(name:"Character") {
+        fields {
+           name
+           description
+        }
+     }
+  }`)
+
+	ctx := context.Background()
+	respData := map[string]interface{}{}
+	if err := client.Run(ctx, req, &respData); err != nil {
+		t.Error(err)
+	}
+	//fmt.Printf("Response: %#v\n", respData)
+}