Move workflow and shell cli to graffiti

.gitattributes

@@ -8,10 +8,8 @@ statics/js/dev/*.js linguist-vendored=true
 *_easyjson.go linguist-generated=true
 *_gendecoder.go -diff -merge
 *_gendecoder.go linguist-generated=true
-ebpf/statics/bindata.go -diff -merge
-ebpf/statics/bindata.go linguist-generated=true
-statics/bindata.go -diff -merge
-statics/bindata.go linguist-generated=true
+*/bindata.go -diff -merge
+*/bindata.go linguist-generated=true
 topology/probes/vpp/bin_api/interfaces/* -diff -merge
 topology/probes/vpp/bin_api/interfaces/* linguist-generated=true
 topology/probes/vpp/bin_api/vpe/* -diff -merge

.mk/api.mk

@@ -1,9 +1,9 @@
-.typescript: statics/js/bundle.js js/browser.js js/api.js
+.typescript: statics/js/bundle.js js/browser.js js/api.js graffiti/js/api.js
 
 graffiti/js/api.js: graffiti/js/api.ts
 	cd graffiti/js && npm ci && PATH=`npm bin`:$$PATH tsc --module commonjs --target ES5 api.ts
 
-js/api.js: js/api.ts
+js/api.js: js/api.ts graffiti/js/api.ts
 	cd js && npm ci && PATH=`npm bin`:$$PATH tsc --module commonjs --target ES5 api.ts
 
 js/browser.js: js/browser.ts js/api.ts

analyzer/server.go

@@ -283,6 +283,7 @@ func NewServerFromConfig() (*Server, error) {
 		Peers:               peers,
 		EtcdClient:          etcdClient,
 		TopologyMarshallers: api.TopologyMarshallers,
+		Assets:              &statics.Assets,
 	}
 
 	if config.GetBool("etcd.embedded") {

cmd/client/client.go

@@ -28,6 +28,7 @@ import (
 	gclient "github.com/skydive-project/skydive/graffiti/cmd/client"
 	"github.com/skydive-project/skydive/graffiti/http"
 	"github.com/skydive-project/skydive/graffiti/logging"
+	"github.com/skydive-project/skydive/statics"
 )
 
 var (
@@ -56,15 +57,12 @@ func printJSON(obj interface{}) {
 
 // RegisterClientCommands registers the 'client' CLI subcommands
 func RegisterClientCommands(cmd *cobra.Command) {
-	cmd.AddCommand(AlertCmd)
 	cmd.AddCommand(CaptureCmd)
 	cmd.AddCommand(EdgeRuleCmd)
 	cmd.AddCommand(NodeRuleCmd)
 	cmd.AddCommand(PacketInjectorCmd)
 	cmd.AddCommand(PcapCmd)
-	cmd.AddCommand(ShellCmd)
 	cmd.AddCommand(StatusCmd)
-	cmd.AddCommand(WorkflowCmd)
 }
 
 func init() {
@@ -92,5 +90,7 @@ func init() {
 	config.BindPFlag("tls.client_cert", ClientCmd.PersistentFlags().Lookup("cert"))
 	config.BindPFlag("tls.client_key", ClientCmd.PersistentFlags().Lookup("key"))
 
+	gclient.ShellAssets = &statics.Assets
+
 	RegisterClientCommands(ClientCmd)
 }

go.mod

@@ -50,9 +50,7 @@ require (
 	github.com/lunixbochs/struc v0.0.0-20180408203800-02e4c2afbb2a
 	github.com/lxc/lxd v0.0.0-20200330183600-518f06676866
 	github.com/mailru/easyjson v0.7.6
-	github.com/mattn/go-runewidth v0.0.0-20160315040712-d6bea18f7897 // indirect
 	github.com/mattn/goveralls v0.0.2
-	github.com/mitchellh/go-homedir v1.1.0
 	github.com/mitchellh/mapstructure v1.3.3
 	github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826
 	github.com/networkservicemesh/networkservicemesh/controlplane/api v0.2.0
@@ -63,11 +61,9 @@ require (
 	github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d
 	github.com/olivere/elastic/v7 v7.0.21
 	github.com/op/go-logging v0.0.0-20160315200505-970db520ece7 // indirect
-	github.com/peterh/liner v0.0.0-20160615113019-8975875355a8
 	github.com/pierrec/xxHash v0.1.5
 	github.com/pkg/errors v0.9.1
 	github.com/pmylund/go-cache v2.1.0+incompatible
-	github.com/robertkrimen/otto v0.0.0-20200922221731-ef014fd054ac
 	github.com/safchain/ethtool v0.0.0-20190326074333-42ed695e3de8
 	github.com/safchain/insanelock v0.0.0-20200217234559-cfbf166e05b3
 	github.com/shirou/gopsutil v2.18.12+incompatible

graffiti/alert/server.go

@@ -34,6 +34,7 @@ import (
 	"github.com/skydive-project/skydive/graffiti/api/server"
 	api "github.com/skydive-project/skydive/graffiti/api/server"
 	"github.com/skydive-project/skydive/graffiti/api/types"
+	"github.com/skydive-project/skydive/graffiti/assets"
 	etcd "github.com/skydive-project/skydive/graffiti/etcd/client"
 	"github.com/skydive-project/skydive/graffiti/graph"
 	"github.com/skydive-project/skydive/graffiti/graph/traversal"
@@ -394,10 +395,10 @@ func (a *Server) Stop() {
 }
 
 // NewServer creates a new alerting server
-func NewServer(apiServer *api.Server, pool ws.StructSpeakerPool, graph *graph.Graph, parser *traversal.GremlinTraversalParser, etcdClient *etcd.Client) (*Server, error) {
+func NewServer(apiServer *api.Server, pool ws.StructSpeakerPool, graph *graph.Graph, parser *traversal.GremlinTraversalParser, etcdClient *etcd.Client, assets assets.Assets) (*Server, error) {
 	election := etcdClient.NewElection("/elections/alert-server")
 
-	runtime, err := server.NewWorkflowRuntime(graph, parser, apiServer)
+	runtime, err := server.NewWorkflowRuntime(graph, parser, apiServer, assets)
 	if err != nil {
 		return nil, err
 	}

graffiti/api/server/workflow_runtime.go

@@ -24,14 +24,15 @@ import (
 
 	"github.com/robertkrimen/otto"
 	"github.com/skydive-project/skydive/graffiti/api/types"
+	"github.com/skydive-project/skydive/graffiti/assets"
 	"github.com/skydive-project/skydive/graffiti/graph"
 	"github.com/skydive-project/skydive/graffiti/graph/traversal"
 	"github.com/skydive-project/skydive/graffiti/js"
 )
 
-// NewWorkflowRuntime returns a new Workflow runtime
-func NewWorkflowRuntime(g *graph.Graph, tr *traversal.GremlinTraversalParser, server *Server) (*js.Runtime, error) {
-	runtime, err := js.NewRuntime()
+// NewWorkflowRuntime returns a new workflow runtime
+func NewWorkflowRuntime(g *graph.Graph, tr *traversal.GremlinTraversalParser, server *Server, assets assets.Assets) (*js.Runtime, error) {
+	runtime, err := js.NewRuntime(assets)
 	if err != nil {
 		return nil, err
 	}

graffiti/assets/assets.go

@@ -0,0 +1,23 @@
+/*
+ * Copyright (C) 2020 Sylvain Baubeau
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy ofthe License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specificlanguage governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package assets
+
+// Assets is the interface by an asset provider
+type Assets interface {
+	Asset(name string) ([]byte, error)
+}

cmd/client/alert.go → graffiti/cmd/client/alert.go

@@ -20,12 +20,11 @@ package client
 import (
 	"os"
 
+	"github.com/spf13/cobra"
+
 	gapi "github.com/skydive-project/skydive/graffiti/api/client"
 	"github.com/skydive-project/skydive/graffiti/api/types"
 	"github.com/skydive-project/skydive/graffiti/logging"
-	"github.com/skydive-project/skydive/validator"
-
-	"github.com/spf13/cobra"
 )
 
 var (
@@ -57,10 +56,6 @@ var AlertCreate = &cobra.Command{
 		alert.Trigger = alertTrigger
 		alert.Action = alertAction
 
-		if err := validator.Validate("alert", alert); err != nil {
-			exitOnError(err)
-		}
-
 		if err := CrudClient.Create("alert", &alert, nil); err != nil {
 			exitOnError(err)
 		}

graffiti/cmd/client/client.go

@@ -125,8 +125,11 @@ func init() {
 	ClientCmd.PersistentFlags().StringVarP(&keyfile, "key", "", "", "private key file name")
 	ClientCmd.PersistentFlags().BoolVarP(&skipVerify, "insecure", "", false, "do not check server's certificate")
 
+	ClientCmd.AddCommand(AlertCmd)
 	ClientCmd.AddCommand(QueryCmd)
-	ClientCmd.AddCommand(NodeCmd)
 	ClientCmd.AddCommand(EdgeCmd)
+	ClientCmd.AddCommand(NodeCmd)
+	ClientCmd.AddCommand(ShellCmd)
 	ClientCmd.AddCommand(TopologyCmd)
+	ClientCmd.AddCommand(WorkflowCmd)
 }

cmd/client/liner.go → graffiti/cmd/client/liner.go

@@ -30,7 +30,7 @@ import (
 )
 
 const (
-	promptDefault  = "skydive> "
+	promptDefault  = "shell> "
 	promptContinue = "..... "
 	indent         = "    "
 )

cmd/client/shell.go → graffiti/cmd/client/shell.go

@@ -27,12 +27,17 @@ import (
 	homedir "github.com/mitchellh/go-homedir"
 	"github.com/spf13/cobra"
 
+	"github.com/skydive-project/skydive/graffiti/assets"
 	"github.com/skydive-project/skydive/graffiti/js"
 	"github.com/skydive-project/skydive/graffiti/logging"
 )
 
 var (
 	shellScript string
+	historyFile string
+
+	// ShellAssets holds the extra assets for the JavaScript engine
+	ShellAssets assets.Assets
 
 	// ErrContinue parser error continue input
 	ErrContinue = errors.New("<continue input>")
@@ -68,13 +73,6 @@ func (s *Session) completeWord(line string, pos int) (string, []string, string)
 }
 
 func (s *Session) loadHistory() error {
-	historyFile := ""
-	home, err := homeDir()
-	if err != nil {
-		return fmt.Errorf("Failed to retrieve home directory: %s", err)
-	}
-
-	historyFile = filepath.Join(home, "history")
 	f, err := os.Open(historyFile)
 	if err != nil {
 		if !os.IsNotExist(err) {
@@ -139,24 +137,9 @@ func (s *Session) prompt() error {
 	return nil
 }
 
-func homeDir() (home string, err error) {
-	home = os.Getenv("SKYDIVE_HOME")
-	if home != "" {
-		return
-	}
-
-	home, err = homedir.Dir()
-	if err != nil {
-		return
-	}
-
-	home = filepath.Join(home, ".skydive")
-	return
-}
-
 // NewSession creates a new shell session
 func NewSession() (*Session, error) {
-	runtime, err := js.NewRuntime()
+	runtime, err := js.NewRuntime(ShellAssets)
 	if err != nil {
 		return nil, err
 	}
@@ -195,8 +178,8 @@ func (s *Session) Close() error {
 // ShellCmd skydive shell root command
 var ShellCmd = &cobra.Command{
 	Use:          "shell",
-	Short:        "Shell Command Line Interface",
-	Long:         "Skydive Shell Command Line Interface, yet another shell",
+	Short:        "Gremlin shell",
+	Long:         "Gremlin shell",
 	SilenceUsage: false,
 	Run: func(cmd *cobra.Command, args []string) {
 		s, err := NewSession()
@@ -222,5 +205,14 @@ var ShellCmd = &cobra.Command{
 }
 
 func init() {
+	var history string
+	home, err := homedir.Dir()
+	if err == nil {
+		if executable, err := os.Executable(); err == nil {
+			history = filepath.Join(home, fmt.Sprintf(".%s_history", filepath.Base(executable)))
+		}
+	}
+
+	ShellCmd.Flags().StringVarP(&historyFile, "history", "", history, "path to the command history")
 	ShellCmd.Flags().StringVarP(&shellScript, "script", "", "", "path to a JavaScript to execute")
 }

cmd/client/workflow.go → graffiti/cmd/client/workflow.go

@@ -23,13 +23,11 @@ import (
 	"io/ioutil"
 	"os"
 
+	"github.com/spf13/cobra"
 	"gopkg.in/yaml.v2"
 
 	"github.com/skydive-project/skydive/graffiti/api/types"
 	"github.com/skydive-project/skydive/graffiti/logging"
-	"github.com/skydive-project/skydive/validator"
-
-	"github.com/spf13/cobra"
 )
 
 var (
@@ -60,10 +58,6 @@ func loadWorklow(path string) (*types.Workflow, error) {
 		return nil, err
 	}
 
-	if err := validator.Validate("workflow", workflow); err != nil {
-		return nil, err
-	}
-
 	return workflow, nil
 }
 

graffiti/go.mod

@@ -25,11 +25,13 @@ require (
 	github.com/gorilla/websocket v1.4.2
 	github.com/hashicorp/go-version v1.2.1
 	github.com/mailru/easyjson v0.7.6
+	github.com/mitchellh/go-homedir v1.1.0
 	github.com/mitchellh/hashstructure v1.0.0
 	github.com/mitchellh/mapstructure v1.3.3
 	github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826
 	github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d
 	github.com/olivere/elastic/v7 v7.0.21
+	github.com/peterh/liner v1.2.1
 	github.com/pierrec/xxHash v0.1.5
 	github.com/pkg/errors v0.9.1
 	github.com/pmylund/go-cache v2.1.0+incompatible

graffiti/hub/hub.go

@@ -29,6 +29,7 @@ import (
 
 	"github.com/skydive-project/skydive/graffiti/alert"
 	api "github.com/skydive-project/skydive/graffiti/api/server"
+	"github.com/skydive-project/skydive/graffiti/assets"
 	gc "github.com/skydive-project/skydive/graffiti/common"
 	etcdclient "github.com/skydive-project/skydive/graffiti/etcd/client"
 	etcdserver "github.com/skydive-project/skydive/graffiti/etcd/server"
@@ -62,6 +63,7 @@ type Opts struct {
 	EtcdClient          *etcdclient.Client
 	EtcdServerOpts      *etcdserver.EmbeddedServerOpts
 	Logger              logging.Logger
+	Assets              assets.Assets
 }
 
 type podOrigin struct {
@@ -323,14 +325,8 @@ func NewHub(id string, serviceType service.Type, listen string, g *graph.Graph,
 		return nil, err
 	}
 
-	alertServer, err := alert.NewServer(apiServer, subscriberWSServer, g, tr, opts.EtcdClient)
-	if err != nil {
-		return nil, err
-	}
-
 	hub.httpServer = httpServer
 	hub.apiServer = apiServer
-	hub.alertServer = alertServer
 	hub.podWSServer = podWSServer
 	hub.replicationEndpoint = replicationEndpoint
 	hub.replicationWSServer = replicationWSServer