Merge pull request #257 from bmeg/er-framework

External Resource Framework

.github/workflows/tests.yml

@@ -176,6 +176,7 @@ jobs:
         chmod +x grip
         make start-gripper-test
         sleep 5
-        ./grip server --rpc-port 18202 --http-port 18201 --config ./gripper/test-graph/config.yaml &
+        ./grip server --rpc-port 18202 --http-port 18201 --config ./gripper/test-graph/config.yaml --er tableServer=localhost:50051 &
         sleep 5
+        python gripper/test-graph/test_gripper.py http://localhost:18201
         python conformance/run_conformance.py http://localhost:18201 --readOnly swapi

cmd/erclient/main.go

@@ -14,7 +14,7 @@ var source = "main"
 var dataOnly = false
 
 func getClient() *gripper.GripperClient {
-	c := map[string]gripper.DriverConfig{source: {Host: host}}
+	c := map[string]string{source: host}
 	out := gripper.NewGripperClient(c)
 	return out
 }

cmd/list/main.go

@@ -17,6 +17,29 @@ var Cmd = &cobra.Command{
 	Short: "List operations",
 }
 
+var listTablesCmd = &cobra.Command{
+	Use:   "tables",
+	Short: "List tables",
+	Long:  ``,
+	Args:  cobra.NoArgs,
+	RunE: func(cmd *cobra.Command, args []string) error {
+		conn, err := gripql.Connect(rpc.ConfigWithDefaults(host), true)
+		if err != nil {
+			return err
+		}
+
+		resp, err := conn.ListTables()
+		if err != nil {
+			return err
+		}
+
+		for g := range resp {
+			fmt.Printf("%s\t%s\t%s\n", g.Source, g.Name, g.Fields)
+		}
+		return nil
+	},
+}
+
 var listGraphsCmd = &cobra.Command{
 	Use:   "graphs",
 	Short: "List graphs",
@@ -41,7 +64,7 @@ var listGraphsCmd = &cobra.Command{
 }
 
 var listLabelsCmd = &cobra.Command{
-	Use:   "labels <graph>}",
+	Use:   "labels <graph>",
 	Short: "List the vertex and edge labels in a graph",
 	Long:  ``,
 	Args:  cobra.ExactArgs(1),
@@ -73,12 +96,11 @@ var listLabelsCmd = &cobra.Command{
 }
 
 func init() {
-	gflags := listGraphsCmd.Flags()
-	gflags.StringVar(&host, "host", host, "grip server url")
-
-	lflags := listLabelsCmd.Flags()
-	lflags.StringVar(&host, "host", host, "grip server url")
+	listGraphsCmd.Flags().StringVar(&host, "host", host, "grip server url")
+	listLabelsCmd.Flags().StringVar(&host, "host", host, "grip server url")
+	listTablesCmd.Flags().StringVar(&host, "host", host, "grip server url")
 
 	Cmd.AddCommand(listGraphsCmd)
 	Cmd.AddCommand(listLabelsCmd)
+	Cmd.AddCommand(listTablesCmd)
 }

cmd/root.go

@@ -7,7 +7,6 @@ import (
 	"os"
 
 	"github.com/bmeg/grip/cmd/create"
-	"github.com/bmeg/grip/cmd/dig"
 	"github.com/bmeg/grip/cmd/drop"
 	"github.com/bmeg/grip/cmd/dump"
 	"github.com/bmeg/grip/cmd/erclient"
@@ -50,7 +49,6 @@ func init() {
 	RootCmd.PersistentFlags().BoolVar(&enableProf, "pprof", enableProf, "enable pprof on port 6060")
 	RootCmd.AddCommand(create.Cmd)
 	RootCmd.AddCommand(drop.Cmd)
-	RootCmd.AddCommand(dig.Cmd)
 	RootCmd.AddCommand(dump.Cmd)
 	RootCmd.AddCommand(genBashCompletionCmd)
 	RootCmd.AddCommand(info.Cmd)

cmd/server/main.go

@@ -95,4 +95,6 @@ func init() {
 	flags.StringVar(&conf.Logger.Level, "log-level", conf.Logger.Level, "Log level [info, debug, warn, error]")
 	flags.StringVar(&conf.Logger.Formatter, "log-format", conf.Logger.Formatter, "Log format [text, json]")
 	flags.BoolVar(&conf.Server.RequestLogging.Enable, "log-requests", conf.Server.RequestLogging.Enable, "Log all requests")
+
+	flags.StringToStringVarP(&conf.Sources, "er", "e", conf.Sources, "GRIPPER source address")
 }

config/config.go

@@ -13,6 +13,7 @@ import (
 	"github.com/bmeg/grip/elastic"
 	esql "github.com/bmeg/grip/existing-sql"
 	"github.com/bmeg/grip/gripper"
+	"github.com/bmeg/grip/gripql"
 	"github.com/bmeg/grip/log"
 	"github.com/bmeg/grip/mongo"
 	"github.com/bmeg/grip/psql"
@@ -46,6 +47,7 @@ type Config struct {
 	Default   string
 	Graphs    map[string]string
 	Drivers   map[string]DriverConfig
+	Sources   map[string]string
 }
 
 type DriverParams interface {
@@ -74,6 +76,8 @@ func DefaultConfig() *Config {
 
 	c.Drivers = map[string]DriverConfig{}
 
+	c.Sources = map[string]string{}
+
 	c.Logger = log.DefaultLoggerConfig()
 	return c
 }
@@ -162,6 +166,29 @@ func ParseConfigFile(relpath string, conf *Config) error {
 	if err != nil {
 		return fmt.Errorf("failed to parse config at path %s: \n%v", path, err)
 	}
+	for i := range conf.Drivers {
+		if conf.Drivers[i].Gripper != nil {
+			if conf.Drivers[i].Gripper.ConfigFile != "" {
+				gpath := filepath.Join(filepath.Dir(path), conf.Drivers[i].Gripper.ConfigFile)
+
+				gsource, err := ioutil.ReadFile(gpath)
+				if err != nil {
+					return fmt.Errorf("failed to read graph at path %s: \n%v", gpath, err)
+				}
+				// Parse file
+				data := map[string]interface{}{}
+				err = yaml.Unmarshal(gsource, &data)
+				if err != nil {
+					return fmt.Errorf("failed to parse config at path %s: \n%v", path, err)
+				}
+				graph, err := gripql.GraphMapToProto(data)
+				if err != nil {
+					return fmt.Errorf("failed to parse config at path %s: \n%v", path, err)
+				}
+				conf.Drivers[i].Gripper.Mapping, _ = gripper.GraphToConfig(graph)
+			}
+		}
+	}
 	return nil
 }