rbac: move to graffiti

datadope-io · Apr 19, 2020 · 98e2b39 · 98e2b39
1 parent 2bcb99e
commit 98e2b39
Show file tree

Hide file tree

Showing 14 changed files with 12 additions and 12 deletions.
diff --git a/api/server/config.go b/api/server/config.go
@@ -9,9 +9,9 @@ import (
 
 	"github.com/skydive-project/skydive/config"
 	"github.com/skydive-project/skydive/graffiti/graph"
+	"github.com/skydive-project/skydive/graffiti/rbac"
 	shttp "github.com/skydive-project/skydive/http"
 	"github.com/skydive-project/skydive/logging"
-	"github.com/skydive-project/skydive/rbac"
 )
 
 type configAPI struct {

diff --git a/api/server/pcap.go b/api/server/pcap.go
@@ -25,9 +25,9 @@ import (
 	"github.com/skydive-project/skydive/config"
 	"github.com/skydive-project/skydive/flow"
 	"github.com/skydive-project/skydive/flow/storage"
+	"github.com/skydive-project/skydive/graffiti/rbac"
 	shttp "github.com/skydive-project/skydive/http"
 	"github.com/skydive-project/skydive/logging"
-	"github.com/skydive-project/skydive/rbac"
 )
 
 // PcapAPI exposes the pcap injector API

diff --git a/api/server/workflow_call.go b/api/server/workflow_call.go
@@ -29,9 +29,9 @@ import (
 	api "github.com/skydive-project/skydive/graffiti/api/server"
 	"github.com/skydive-project/skydive/graffiti/graph"
 	"github.com/skydive-project/skydive/graffiti/graph/traversal"
+	"github.com/skydive-project/skydive/graffiti/rbac"
 	shttp "github.com/skydive-project/skydive/http"
 	"github.com/skydive-project/skydive/js"
-	"github.com/skydive-project/skydive/rbac"
 )
 
 // WorkflowCallAPIHandler based on BasicAPIHandler

diff --git a/config/rbac.go b/config/rbac.go
@@ -28,8 +28,8 @@ import (
 	"github.com/casbin/casbin/model"
 	"github.com/casbin/casbin/persist"
 	etcd "github.com/coreos/etcd/client"
+	"github.com/skydive-project/skydive/graffiti/rbac"
 	"github.com/skydive-project/skydive/logging"
-	"github.com/skydive-project/skydive/rbac"
 	"github.com/skydive-project/skydive/statics"
 )
 

diff --git a/graffiti/api/server/server.go b/graffiti/api/server/server.go
@@ -50,10 +50,10 @@ import (
 	yaml "gopkg.in/yaml.v2"
 
 	"github.com/skydive-project/skydive/graffiti/api/rest"
+	"github.com/skydive-project/skydive/graffiti/rbac"
 	"github.com/skydive-project/skydive/graffiti/service"
 	shttp "github.com/skydive-project/skydive/http"
 	"github.com/skydive-project/skydive/logging"
-	"github.com/skydive-project/skydive/rbac"
 )
 
 // Validator is the interface to implement to validate REST resources

diff --git a/graffiti/api/server/status.go b/graffiti/api/server/status.go
@@ -22,9 +22,9 @@ import (
 	"net/http"
 
 	auth "github.com/abbot/go-http-auth"
+	"github.com/skydive-project/skydive/graffiti/rbac"
 	shttp "github.com/skydive-project/skydive/http"
 	"github.com/skydive-project/skydive/logging"
-	"github.com/skydive-project/skydive/rbac"
 )
 
 // StatusReporter is the interface to report the status of a service

diff --git a/graffiti/api/server/topology.go b/graffiti/api/server/topology.go
@@ -29,9 +29,9 @@ import (
 	auth "github.com/abbot/go-http-auth"
 	"github.com/skydive-project/skydive/graffiti/graph"
 	"github.com/skydive-project/skydive/graffiti/graph/traversal"
+	"github.com/skydive-project/skydive/graffiti/rbac"
 	shttp "github.com/skydive-project/skydive/http"
 	"github.com/skydive-project/skydive/logging"
-	"github.com/skydive-project/skydive/rbac"
 )
 
 // TopologyMarshaller is used to output a gremlin step

diff --git a/rbac/enforcer.go → graffiti/rbac/enforcer.go b/rbac/enforcer.go → graffiti/rbac/enforcer.go
diff --git a/rbac/etcdadapter.go → graffiti/rbac/etcdadapter.go b/rbac/etcdadapter.go → graffiti/rbac/etcdadapter.go
diff --git a/rbac/etcdwatcher.go → graffiti/rbac/etcdwatcher.go b/rbac/etcdwatcher.go → graffiti/rbac/etcdwatcher.go
diff --git a/graffiti/websocket/server.go b/graffiti/websocket/server.go
@@ -27,10 +27,10 @@ import (
 	auth "github.com/abbot/go-http-auth"
 	"github.com/gorilla/websocket"
 
+	"github.com/skydive-project/skydive/graffiti/rbac"
 	"github.com/skydive-project/skydive/graffiti/service"
 	shttp "github.com/skydive-project/skydive/http"
 	"github.com/skydive-project/skydive/logging"
-	"github.com/skydive-project/skydive/rbac"
 )
 
 type clientPromoter func(c *wsIncomingClient) (Speaker, error)

diff --git a/http/auth.go b/http/auth.go
@@ -24,10 +24,10 @@ import (
 	"errors"
 	"net/http"
 
+	auth "github.com/abbot/go-http-auth"
 	"github.com/gorilla/context"
 
-	auth "github.com/abbot/go-http-auth"
-	"github.com/skydive-project/skydive/rbac"
+	"github.com/skydive-project/skydive/graffiti/rbac"
 )
 
 var (

diff --git a/http/server.go b/http/server.go
@@ -31,9 +31,9 @@ import (
 	"github.com/gorilla/handlers"
 	"github.com/gorilla/mux"
 
+	"github.com/skydive-project/skydive/graffiti/rbac"
 	"github.com/skydive-project/skydive/graffiti/service"
 	"github.com/skydive-project/skydive/logging"
-	"github.com/skydive-project/skydive/rbac"
 )
 
 // PathPrefix describes the prefix of the path of an URL

diff --git a/ui/server.go b/ui/server.go
@@ -28,9 +28,9 @@ import (
 	"sync"
 
 	auth "github.com/abbot/go-http-auth"
+	"github.com/skydive-project/skydive/graffiti/rbac"
 	shttp "github.com/skydive-project/skydive/http"
 	"github.com/skydive-project/skydive/logging"
-	"github.com/skydive-project/skydive/rbac"
 	"github.com/skydive-project/skydive/statics"
 )