diff --git a/controller/config.go b/controller/config.go index d51cfa1bc..6391fdd2a 100644 --- a/controller/config.go +++ b/controller/config.go @@ -20,16 +20,16 @@ import ( "bytes" "fmt" "github.com/michaelquigley/pfxlog" - "github.com/netfoundry/ziti-fabric/controller/db" - "github.com/netfoundry/ziti-fabric/controller/network" - "github.com/netfoundry/ziti-fabric/pb/ctrl_pb" - "github.com/netfoundry/ziti-fabric/pb/mgmt_pb" - "github.com/netfoundry/ziti-fabric/router/xgress" - "github.com/netfoundry/ziti-foundation/channel2" - "github.com/netfoundry/ziti-foundation/config" - "github.com/netfoundry/ziti-foundation/identity/identity" - "github.com/netfoundry/ziti-foundation/metrics" - "github.com/netfoundry/ziti-foundation/transport" + "github.com/openziti/fabric/controller/db" + "github.com/openziti/fabric/controller/network" + "github.com/openziti/fabric/pb/ctrl_pb" + "github.com/openziti/fabric/pb/mgmt_pb" + "github.com/openziti/fabric/router/xgress" + "github.com/openziti/foundation/channel2" + "github.com/openziti/foundation/config" + "github.com/openziti/foundation/identity/identity" + "github.com/openziti/foundation/metrics" + "github.com/openziti/foundation/transport" "gopkg.in/yaml.v2" "io/ioutil" "time" diff --git a/controller/controller.go b/controller/controller.go index 86f1dfc24..bb27a81df 100644 --- a/controller/controller.go +++ b/controller/controller.go @@ -20,20 +20,20 @@ import ( "encoding/json" "fmt" "github.com/michaelquigley/pfxlog" - "github.com/netfoundry/ziti-fabric/controller/handler_ctrl" - "github.com/netfoundry/ziti-fabric/controller/handler_mgmt" - "github.com/netfoundry/ziti-fabric/controller/network" - "github.com/netfoundry/ziti-fabric/controller/xctrl" - "github.com/netfoundry/ziti-fabric/controller/xctrl_example" - "github.com/netfoundry/ziti-fabric/controller/xmgmt" - "github.com/netfoundry/ziti-fabric/controller/xt" - "github.com/netfoundry/ziti-fabric/controller/xt_ha" - "github.com/netfoundry/ziti-fabric/controller/xt_random" - "github.com/netfoundry/ziti-fabric/controller/xt_smartrouting" - "github.com/netfoundry/ziti-fabric/controller/xt_weighted" - "github.com/netfoundry/ziti-foundation/channel2" - "github.com/netfoundry/ziti-foundation/profiler" - "github.com/netfoundry/ziti-foundation/util/concurrenz" + "github.com/openziti/fabric/controller/handler_ctrl" + "github.com/openziti/fabric/controller/handler_mgmt" + "github.com/openziti/fabric/controller/network" + "github.com/openziti/fabric/controller/xctrl" + "github.com/openziti/fabric/controller/xctrl_example" + "github.com/openziti/fabric/controller/xmgmt" + "github.com/openziti/fabric/controller/xt" + "github.com/openziti/fabric/controller/xt_ha" + "github.com/openziti/fabric/controller/xt_random" + "github.com/openziti/fabric/controller/xt_smartrouting" + "github.com/openziti/fabric/controller/xt_weighted" + "github.com/openziti/foundation/channel2" + "github.com/openziti/foundation/profiler" + "github.com/openziti/foundation/util/concurrenz" ) type Controller struct { diff --git a/controller/db/base_store.go b/controller/db/base_store.go index ad3fff050..ae5781cfa 100644 --- a/controller/db/base_store.go +++ b/controller/db/base_store.go @@ -17,7 +17,7 @@ package db import ( - "github.com/netfoundry/ziti-foundation/storage/boltz" + "github.com/openziti/foundation/storage/boltz" ) type store interface { diff --git a/controller/db/migration.go b/controller/db/migration.go index f7c1cdfdd..36e2169e8 100644 --- a/controller/db/migration.go +++ b/controller/db/migration.go @@ -1,9 +1,9 @@ package db import ( - "github.com/netfoundry/ziti-fabric/controller/xt_smartrouting" - "github.com/netfoundry/ziti-foundation/storage/ast" - "github.com/netfoundry/ziti-foundation/storage/boltz" + "github.com/openziti/fabric/controller/xt_smartrouting" + "github.com/openziti/foundation/storage/ast" + "github.com/openziti/foundation/storage/boltz" "github.com/pkg/errors" "strings" "time" diff --git a/controller/db/router_store.go b/controller/db/router_store.go index 5fb48e48f..7495eba92 100644 --- a/controller/db/router_store.go +++ b/controller/db/router_store.go @@ -17,8 +17,8 @@ package db import ( - "github.com/netfoundry/ziti-foundation/storage/ast" - "github.com/netfoundry/ziti-foundation/storage/boltz" + "github.com/openziti/foundation/storage/ast" + "github.com/openziti/foundation/storage/boltz" ) import ( diff --git a/controller/db/service_store.go b/controller/db/service_store.go index aee0c83ff..bc61a0114 100644 --- a/controller/db/service_store.go +++ b/controller/db/service_store.go @@ -17,10 +17,10 @@ package db import ( - "github.com/netfoundry/ziti-fabric/controller/xt" - "github.com/netfoundry/ziti-fabric/controller/xt_smartrouting" - "github.com/netfoundry/ziti-foundation/storage/ast" - "github.com/netfoundry/ziti-foundation/storage/boltz" + "github.com/openziti/fabric/controller/xt" + "github.com/openziti/fabric/controller/xt_smartrouting" + "github.com/openziti/foundation/storage/ast" + "github.com/openziti/foundation/storage/boltz" "go.etcd.io/bbolt" ) diff --git a/controller/db/stores.go b/controller/db/stores.go index 2a64a99fe..1fa81c6ba 100644 --- a/controller/db/stores.go +++ b/controller/db/stores.go @@ -17,7 +17,7 @@ package db import ( - "github.com/netfoundry/ziti-foundation/storage/boltz" + "github.com/openziti/foundation/storage/boltz" "reflect" ) diff --git a/controller/db/terminator_store.go b/controller/db/terminator_store.go index a6cdae380..7c0efc592 100644 --- a/controller/db/terminator_store.go +++ b/controller/db/terminator_store.go @@ -19,10 +19,10 @@ package db import ( "encoding/binary" "github.com/michaelquigley/pfxlog" - "github.com/netfoundry/ziti-fabric/controller/xt" - "github.com/netfoundry/ziti-foundation/storage/ast" - "github.com/netfoundry/ziti-foundation/storage/boltz" - "github.com/netfoundry/ziti-foundation/util/sequence" + "github.com/openziti/fabric/controller/xt" + "github.com/openziti/foundation/storage/ast" + "github.com/openziti/foundation/storage/boltz" + "github.com/openziti/foundation/util/sequence" "go.etcd.io/bbolt" ) diff --git a/controller/db/terminator_store_test.go b/controller/db/terminator_store_test.go index 006b78b49..d9ff0c6e6 100644 --- a/controller/db/terminator_store_test.go +++ b/controller/db/terminator_store_test.go @@ -19,8 +19,8 @@ package db import ( "fmt" "github.com/google/uuid" - "github.com/netfoundry/ziti-fabric/controller/xt" - "github.com/netfoundry/ziti-foundation/util/stringz" + "github.com/openziti/fabric/controller/xt" + "github.com/openziti/foundation/util/stringz" "go.etcd.io/bbolt" "math" "testing" diff --git a/controller/db/testing.go b/controller/db/testing.go index 8744caf65..8d9bc2d2b 100644 --- a/controller/db/testing.go +++ b/controller/db/testing.go @@ -3,7 +3,7 @@ package db import ( "github.com/google/uuid" "github.com/michaelquigley/pfxlog" - "github.com/netfoundry/ziti-foundation/storage/boltz" + "github.com/openziti/foundation/storage/boltz" "go.etcd.io/bbolt" "testing" ) diff --git a/controller/handler_common/common.go b/controller/handler_common/common.go index c58118320..3b4952cf0 100644 --- a/controller/handler_common/common.go +++ b/controller/handler_common/common.go @@ -2,7 +2,7 @@ package handler_common import ( "github.com/michaelquigley/pfxlog" - "github.com/netfoundry/ziti-foundation/channel2" + "github.com/openziti/foundation/channel2" ) func SendSuccess(request *channel2.Message, ch channel2.Channel, message string) { diff --git a/controller/handler_ctrl/accept.go b/controller/handler_ctrl/accept.go index e7082fb94..e1848d366 100644 --- a/controller/handler_ctrl/accept.go +++ b/controller/handler_ctrl/accept.go @@ -18,9 +18,9 @@ package handler_ctrl import ( "github.com/michaelquigley/pfxlog" - "github.com/netfoundry/ziti-fabric/controller/network" - "github.com/netfoundry/ziti-fabric/controller/xctrl" - "github.com/netfoundry/ziti-foundation/channel2" + "github.com/openziti/fabric/controller/network" + "github.com/openziti/fabric/controller/xctrl" + "github.com/openziti/foundation/channel2" ) type CtrlAccepter struct { diff --git a/controller/handler_ctrl/bind.go b/controller/handler_ctrl/bind.go index 236303422..932df19a0 100644 --- a/controller/handler_ctrl/bind.go +++ b/controller/handler_ctrl/bind.go @@ -17,10 +17,10 @@ package handler_ctrl import ( - "github.com/netfoundry/ziti-fabric/controller/network" - "github.com/netfoundry/ziti-fabric/controller/xctrl" - "github.com/netfoundry/ziti-fabric/trace" - "github.com/netfoundry/ziti-foundation/channel2" + "github.com/openziti/fabric/controller/network" + "github.com/openziti/fabric/controller/xctrl" + "github.com/openziti/fabric/trace" + "github.com/openziti/foundation/channel2" ) type bindHandler struct { diff --git a/controller/handler_ctrl/close.go b/controller/handler_ctrl/close.go index 1fc86b268..63fcacada 100644 --- a/controller/handler_ctrl/close.go +++ b/controller/handler_ctrl/close.go @@ -18,8 +18,8 @@ package handler_ctrl import ( "github.com/michaelquigley/pfxlog" - "github.com/netfoundry/ziti-fabric/controller/network" - "github.com/netfoundry/ziti-foundation/channel2" + "github.com/openziti/fabric/controller/network" + "github.com/openziti/foundation/channel2" ) type closeHandler struct { diff --git a/controller/handler_ctrl/connect.go b/controller/handler_ctrl/connect.go index e1470fd02..b25bf3998 100644 --- a/controller/handler_ctrl/connect.go +++ b/controller/handler_ctrl/connect.go @@ -22,9 +22,9 @@ import ( "errors" "fmt" "github.com/michaelquigley/pfxlog" - "github.com/netfoundry/ziti-fabric/controller/network" - "github.com/netfoundry/ziti-fabric/controller/xctrl" - "github.com/netfoundry/ziti-foundation/channel2" + "github.com/openziti/fabric/controller/network" + "github.com/openziti/fabric/controller/xctrl" + "github.com/openziti/foundation/channel2" ) type ConnectHandler struct { diff --git a/controller/handler_ctrl/create_terminator.go b/controller/handler_ctrl/create_terminator.go index 2a21e344c..e9e39da2c 100644 --- a/controller/handler_ctrl/create_terminator.go +++ b/controller/handler_ctrl/create_terminator.go @@ -19,11 +19,11 @@ package handler_ctrl import ( "github.com/golang/protobuf/proto" "github.com/michaelquigley/pfxlog" - "github.com/netfoundry/ziti-fabric/controller/handler_common" - "github.com/netfoundry/ziti-fabric/controller/network" - "github.com/netfoundry/ziti-fabric/controller/xt" - "github.com/netfoundry/ziti-fabric/pb/ctrl_pb" - "github.com/netfoundry/ziti-foundation/channel2" + "github.com/openziti/fabric/controller/handler_common" + "github.com/openziti/fabric/controller/network" + "github.com/openziti/fabric/controller/xt" + "github.com/openziti/fabric/pb/ctrl_pb" + "github.com/openziti/foundation/channel2" ) type createTerminatorHandler struct { diff --git a/controller/handler_ctrl/fault.go b/controller/handler_ctrl/fault.go index 1bb80ec08..2836ae964 100644 --- a/controller/handler_ctrl/fault.go +++ b/controller/handler_ctrl/fault.go @@ -20,10 +20,10 @@ import ( "errors" "github.com/golang/protobuf/proto" "github.com/michaelquigley/pfxlog" - "github.com/netfoundry/ziti-fabric/controller/network" - "github.com/netfoundry/ziti-fabric/pb/ctrl_pb" - "github.com/netfoundry/ziti-foundation/channel2" - "github.com/netfoundry/ziti-foundation/identity/identity" + "github.com/openziti/fabric/controller/network" + "github.com/openziti/fabric/pb/ctrl_pb" + "github.com/openziti/foundation/channel2" + "github.com/openziti/foundation/identity/identity" ) type faultHandler struct { diff --git a/controller/handler_ctrl/inspect.go b/controller/handler_ctrl/inspect.go index 711885996..e18945576 100644 --- a/controller/handler_ctrl/inspect.go +++ b/controller/handler_ctrl/inspect.go @@ -20,9 +20,9 @@ import ( "fmt" "github.com/golang/protobuf/proto" "github.com/michaelquigley/pfxlog" - "github.com/netfoundry/ziti-fabric/controller/network" - "github.com/netfoundry/ziti-fabric/pb/ctrl_pb" - "github.com/netfoundry/ziti-foundation/channel2" + "github.com/openziti/fabric/controller/network" + "github.com/openziti/fabric/pb/ctrl_pb" + "github.com/openziti/foundation/channel2" ) type inspectHandler struct { diff --git a/controller/handler_ctrl/link.go b/controller/handler_ctrl/link.go index caaafef1e..21a8e4994 100644 --- a/controller/handler_ctrl/link.go +++ b/controller/handler_ctrl/link.go @@ -19,10 +19,10 @@ package handler_ctrl import ( "github.com/golang/protobuf/proto" "github.com/michaelquigley/pfxlog" - "github.com/netfoundry/ziti-fabric/controller/network" - "github.com/netfoundry/ziti-fabric/pb/ctrl_pb" - "github.com/netfoundry/ziti-foundation/channel2" - "github.com/netfoundry/ziti-foundation/identity/identity" + "github.com/openziti/fabric/controller/network" + "github.com/openziti/fabric/pb/ctrl_pb" + "github.com/openziti/foundation/channel2" + "github.com/openziti/foundation/identity/identity" ) type linkHandler struct { diff --git a/controller/handler_ctrl/metrics.go b/controller/handler_ctrl/metrics.go index 8df73881d..71b6f2bee 100644 --- a/controller/handler_ctrl/metrics.go +++ b/controller/handler_ctrl/metrics.go @@ -19,10 +19,10 @@ package handler_ctrl import ( "github.com/golang/protobuf/proto" "github.com/michaelquigley/pfxlog" - "github.com/netfoundry/ziti-fabric/controller/network" - "github.com/netfoundry/ziti-foundation/channel2" - "github.com/netfoundry/ziti-foundation/metrics" - "github.com/netfoundry/ziti-foundation/metrics/metrics_pb" + "github.com/openziti/fabric/controller/network" + "github.com/openziti/foundation/channel2" + "github.com/openziti/foundation/metrics" + "github.com/openziti/foundation/metrics/metrics_pb" ) type metricsHandler struct { diff --git a/controller/handler_ctrl/remove_terminator.go b/controller/handler_ctrl/remove_terminator.go index c81ccece6..fa75f3ac4 100644 --- a/controller/handler_ctrl/remove_terminator.go +++ b/controller/handler_ctrl/remove_terminator.go @@ -19,10 +19,10 @@ package handler_ctrl import ( "github.com/golang/protobuf/proto" "github.com/michaelquigley/pfxlog" - "github.com/netfoundry/ziti-fabric/controller/handler_common" - "github.com/netfoundry/ziti-fabric/controller/network" - "github.com/netfoundry/ziti-fabric/pb/ctrl_pb" - "github.com/netfoundry/ziti-foundation/channel2" + "github.com/openziti/fabric/controller/handler_common" + "github.com/openziti/fabric/controller/network" + "github.com/openziti/fabric/pb/ctrl_pb" + "github.com/openziti/foundation/channel2" ) type removeTerminatorHandler struct { diff --git a/controller/handler_ctrl/session_request.go b/controller/handler_ctrl/session_request.go index d7838d917..8b49fc2e0 100644 --- a/controller/handler_ctrl/session_request.go +++ b/controller/handler_ctrl/session_request.go @@ -19,11 +19,11 @@ package handler_ctrl import ( "github.com/golang/protobuf/proto" "github.com/michaelquigley/pfxlog" - "github.com/netfoundry/ziti-fabric/controller/network" - "github.com/netfoundry/ziti-fabric/ctrl_msg" - "github.com/netfoundry/ziti-fabric/pb/ctrl_pb" - "github.com/netfoundry/ziti-foundation/channel2" - "github.com/netfoundry/ziti-foundation/identity/identity" + "github.com/openziti/fabric/controller/network" + "github.com/openziti/fabric/ctrl_msg" + "github.com/openziti/fabric/pb/ctrl_pb" + "github.com/openziti/foundation/channel2" + "github.com/openziti/foundation/identity/identity" "time" ) diff --git a/controller/handler_ctrl/update_terminator.go b/controller/handler_ctrl/update_terminator.go index 24c2831e3..faee0ab45 100644 --- a/controller/handler_ctrl/update_terminator.go +++ b/controller/handler_ctrl/update_terminator.go @@ -19,12 +19,12 @@ package handler_ctrl import ( "fmt" "github.com/golang/protobuf/proto" - "github.com/netfoundry/ziti-fabric/controller/handler_common" - "github.com/netfoundry/ziti-fabric/controller/network" - "github.com/netfoundry/ziti-fabric/controller/xt" - "github.com/netfoundry/ziti-fabric/pb/ctrl_pb" - "github.com/netfoundry/ziti-foundation/channel2" - "github.com/netfoundry/ziti-foundation/storage/boltz" + "github.com/openziti/fabric/controller/handler_common" + "github.com/openziti/fabric/controller/network" + "github.com/openziti/fabric/controller/xt" + "github.com/openziti/fabric/pb/ctrl_pb" + "github.com/openziti/foundation/channel2" + "github.com/openziti/foundation/storage/boltz" "math" ) diff --git a/controller/handler_mgmt/accept.go b/controller/handler_mgmt/accept.go index ba6186636..c2812a8b2 100644 --- a/controller/handler_mgmt/accept.go +++ b/controller/handler_mgmt/accept.go @@ -18,7 +18,7 @@ package handler_mgmt import ( "github.com/michaelquigley/pfxlog" - "github.com/netfoundry/ziti-foundation/channel2" + "github.com/openziti/foundation/channel2" ) type MgmtAccepter struct { diff --git a/controller/handler_mgmt/bind.go b/controller/handler_mgmt/bind.go index 358a80edb..54ca7313d 100644 --- a/controller/handler_mgmt/bind.go +++ b/controller/handler_mgmt/bind.go @@ -17,10 +17,10 @@ package handler_mgmt import ( - "github.com/netfoundry/ziti-fabric/controller/network" - "github.com/netfoundry/ziti-fabric/controller/xmgmt" - "github.com/netfoundry/ziti-fabric/trace" - "github.com/netfoundry/ziti-foundation/channel2" + "github.com/openziti/fabric/controller/network" + "github.com/openziti/fabric/controller/xmgmt" + "github.com/openziti/fabric/trace" + "github.com/openziti/foundation/channel2" ) type BindHandler struct { diff --git a/controller/handler_mgmt/close.go b/controller/handler_mgmt/close.go index 56075500c..b1f4c1615 100644 --- a/controller/handler_mgmt/close.go +++ b/controller/handler_mgmt/close.go @@ -18,7 +18,7 @@ package handler_mgmt import ( "github.com/michaelquigley/pfxlog" - "github.com/netfoundry/ziti-foundation/channel2" + "github.com/openziti/foundation/channel2" ) type xmgmtCloseHandler struct { diff --git a/controller/handler_mgmt/connect.go b/controller/handler_mgmt/connect.go index b90b8524f..2b988c6f8 100644 --- a/controller/handler_mgmt/connect.go +++ b/controller/handler_mgmt/connect.go @@ -18,8 +18,8 @@ package handler_mgmt import ( "crypto/x509" - "github.com/netfoundry/ziti-fabric/controller/network" - "github.com/netfoundry/ziti-foundation/channel2" + "github.com/openziti/fabric/controller/network" + "github.com/openziti/foundation/channel2" ) type ConnectHandler struct { diff --git a/controller/handler_mgmt/create_router.go b/controller/handler_mgmt/create_router.go index f9aef6c91..baee62e22 100644 --- a/controller/handler_mgmt/create_router.go +++ b/controller/handler_mgmt/create_router.go @@ -19,10 +19,10 @@ package handler_mgmt import ( "github.com/golang/protobuf/proto" "github.com/michaelquigley/pfxlog" - "github.com/netfoundry/ziti-fabric/controller/handler_common" - "github.com/netfoundry/ziti-fabric/controller/network" - "github.com/netfoundry/ziti-fabric/pb/mgmt_pb" - "github.com/netfoundry/ziti-foundation/channel2" + "github.com/openziti/fabric/controller/handler_common" + "github.com/openziti/fabric/controller/network" + "github.com/openziti/fabric/pb/mgmt_pb" + "github.com/openziti/foundation/channel2" ) type createRouterHandler struct { diff --git a/controller/handler_mgmt/create_service.go b/controller/handler_mgmt/create_service.go index aaaaf87bb..d8aa8da6e 100644 --- a/controller/handler_mgmt/create_service.go +++ b/controller/handler_mgmt/create_service.go @@ -18,11 +18,11 @@ package handler_mgmt import ( "github.com/golang/protobuf/proto" - "github.com/netfoundry/ziti-fabric/controller/handler_common" - "github.com/netfoundry/ziti-fabric/controller/models" - "github.com/netfoundry/ziti-fabric/controller/network" - "github.com/netfoundry/ziti-fabric/pb/mgmt_pb" - "github.com/netfoundry/ziti-foundation/channel2" + "github.com/openziti/fabric/controller/handler_common" + "github.com/openziti/fabric/controller/models" + "github.com/openziti/fabric/controller/network" + "github.com/openziti/fabric/pb/mgmt_pb" + "github.com/openziti/foundation/channel2" ) type createServiceHandler struct { diff --git a/controller/handler_mgmt/create_terminator.go b/controller/handler_mgmt/create_terminator.go index 8928949b9..23d3a7667 100644 --- a/controller/handler_mgmt/create_terminator.go +++ b/controller/handler_mgmt/create_terminator.go @@ -18,11 +18,11 @@ package handler_mgmt import ( "github.com/golang/protobuf/proto" - "github.com/netfoundry/ziti-fabric/controller/handler_common" - "github.com/netfoundry/ziti-fabric/controller/models" - "github.com/netfoundry/ziti-fabric/controller/network" - "github.com/netfoundry/ziti-fabric/pb/mgmt_pb" - "github.com/netfoundry/ziti-foundation/channel2" + "github.com/openziti/fabric/controller/handler_common" + "github.com/openziti/fabric/controller/models" + "github.com/openziti/fabric/controller/network" + "github.com/openziti/fabric/pb/mgmt_pb" + "github.com/openziti/foundation/channel2" "github.com/pkg/errors" ) diff --git a/controller/handler_mgmt/get_service.go b/controller/handler_mgmt/get_service.go index 6e613e88c..c32515c2f 100644 --- a/controller/handler_mgmt/get_service.go +++ b/controller/handler_mgmt/get_service.go @@ -19,10 +19,10 @@ package handler_mgmt import ( "github.com/golang/protobuf/proto" "github.com/michaelquigley/pfxlog" - "github.com/netfoundry/ziti-fabric/controller/handler_common" - "github.com/netfoundry/ziti-fabric/controller/network" - "github.com/netfoundry/ziti-fabric/pb/mgmt_pb" - "github.com/netfoundry/ziti-foundation/channel2" + "github.com/openziti/fabric/controller/handler_common" + "github.com/openziti/fabric/controller/network" + "github.com/openziti/fabric/pb/mgmt_pb" + "github.com/openziti/foundation/channel2" ) type getServiceHandler struct { diff --git a/controller/handler_mgmt/get_terminator.go b/controller/handler_mgmt/get_terminator.go index f555466a8..46fed9646 100644 --- a/controller/handler_mgmt/get_terminator.go +++ b/controller/handler_mgmt/get_terminator.go @@ -20,10 +20,10 @@ import ( "github.com/golang/protobuf/proto" "github.com/golang/protobuf/ptypes" "github.com/michaelquigley/pfxlog" - "github.com/netfoundry/ziti-fabric/controller/handler_common" - "github.com/netfoundry/ziti-fabric/controller/network" - "github.com/netfoundry/ziti-fabric/pb/mgmt_pb" - "github.com/netfoundry/ziti-foundation/channel2" + "github.com/openziti/fabric/controller/handler_common" + "github.com/openziti/fabric/controller/network" + "github.com/openziti/fabric/pb/mgmt_pb" + "github.com/openziti/foundation/channel2" ) type getTerminatorHandler struct { diff --git a/controller/handler_mgmt/inspect.go b/controller/handler_mgmt/inspect.go index b0c34fedc..4578569cb 100644 --- a/controller/handler_mgmt/inspect.go +++ b/controller/handler_mgmt/inspect.go @@ -20,11 +20,11 @@ import ( "fmt" "github.com/golang/protobuf/proto" "github.com/michaelquigley/pfxlog" - "github.com/netfoundry/ziti-fabric/controller/network" - "github.com/netfoundry/ziti-fabric/pb/ctrl_pb" - "github.com/netfoundry/ziti-fabric/pb/mgmt_pb" - "github.com/netfoundry/ziti-foundation/channel2" - "github.com/netfoundry/ziti-foundation/util/debugz" + "github.com/openziti/fabric/controller/network" + "github.com/openziti/fabric/pb/ctrl_pb" + "github.com/openziti/fabric/pb/mgmt_pb" + "github.com/openziti/foundation/channel2" + "github.com/openziti/foundation/util/debugz" "regexp" "strings" "sync" diff --git a/controller/handler_mgmt/list_links.go b/controller/handler_mgmt/list_links.go index 3903174c6..bdffc465f 100644 --- a/controller/handler_mgmt/list_links.go +++ b/controller/handler_mgmt/list_links.go @@ -19,10 +19,10 @@ package handler_mgmt import ( "github.com/golang/protobuf/proto" "github.com/michaelquigley/pfxlog" - "github.com/netfoundry/ziti-fabric/controller/handler_common" - "github.com/netfoundry/ziti-fabric/controller/network" - "github.com/netfoundry/ziti-fabric/pb/mgmt_pb" - "github.com/netfoundry/ziti-foundation/channel2" + "github.com/openziti/fabric/controller/handler_common" + "github.com/openziti/fabric/controller/network" + "github.com/openziti/fabric/pb/mgmt_pb" + "github.com/openziti/foundation/channel2" ) type listLinksHandler struct { diff --git a/controller/handler_mgmt/list_routers.go b/controller/handler_mgmt/list_routers.go index 6e75f7b1d..9a1ced074 100644 --- a/controller/handler_mgmt/list_routers.go +++ b/controller/handler_mgmt/list_routers.go @@ -20,10 +20,10 @@ import ( "fmt" "github.com/golang/protobuf/proto" "github.com/michaelquigley/pfxlog" - "github.com/netfoundry/ziti-fabric/controller/handler_common" - "github.com/netfoundry/ziti-fabric/controller/network" - "github.com/netfoundry/ziti-fabric/pb/mgmt_pb" - "github.com/netfoundry/ziti-foundation/channel2" + "github.com/openziti/fabric/controller/handler_common" + "github.com/openziti/fabric/controller/network" + "github.com/openziti/fabric/pb/mgmt_pb" + "github.com/openziti/foundation/channel2" "reflect" ) diff --git a/controller/handler_mgmt/list_services.go b/controller/handler_mgmt/list_services.go index 66ff672a7..a9d55e1c0 100644 --- a/controller/handler_mgmt/list_services.go +++ b/controller/handler_mgmt/list_services.go @@ -20,10 +20,10 @@ import ( "fmt" "github.com/golang/protobuf/proto" "github.com/michaelquigley/pfxlog" - "github.com/netfoundry/ziti-fabric/controller/handler_common" - "github.com/netfoundry/ziti-fabric/controller/network" - "github.com/netfoundry/ziti-fabric/pb/mgmt_pb" - "github.com/netfoundry/ziti-foundation/channel2" + "github.com/openziti/fabric/controller/handler_common" + "github.com/openziti/fabric/controller/network" + "github.com/openziti/fabric/pb/mgmt_pb" + "github.com/openziti/foundation/channel2" "reflect" ) diff --git a/controller/handler_mgmt/list_sessions.go b/controller/handler_mgmt/list_sessions.go index 8bab2b0b8..e7747aed4 100644 --- a/controller/handler_mgmt/list_sessions.go +++ b/controller/handler_mgmt/list_sessions.go @@ -19,10 +19,10 @@ package handler_mgmt import ( "github.com/golang/protobuf/proto" "github.com/michaelquigley/pfxlog" - "github.com/netfoundry/ziti-fabric/controller/handler_common" - "github.com/netfoundry/ziti-fabric/controller/network" - "github.com/netfoundry/ziti-fabric/pb/mgmt_pb" - "github.com/netfoundry/ziti-foundation/channel2" + "github.com/openziti/fabric/controller/handler_common" + "github.com/openziti/fabric/controller/network" + "github.com/openziti/fabric/pb/mgmt_pb" + "github.com/openziti/foundation/channel2" ) type listSessionsHandler struct { diff --git a/controller/handler_mgmt/list_terminators.go b/controller/handler_mgmt/list_terminators.go index c826a07f8..8e0b569ed 100644 --- a/controller/handler_mgmt/list_terminators.go +++ b/controller/handler_mgmt/list_terminators.go @@ -20,10 +20,10 @@ import ( "fmt" "github.com/golang/protobuf/proto" "github.com/michaelquigley/pfxlog" - "github.com/netfoundry/ziti-fabric/controller/handler_common" - "github.com/netfoundry/ziti-fabric/controller/network" - "github.com/netfoundry/ziti-fabric/pb/mgmt_pb" - "github.com/netfoundry/ziti-foundation/channel2" + "github.com/openziti/fabric/controller/handler_common" + "github.com/openziti/fabric/controller/network" + "github.com/openziti/fabric/pb/mgmt_pb" + "github.com/openziti/foundation/channel2" "reflect" ) diff --git a/controller/handler_mgmt/remove_router.go b/controller/handler_mgmt/remove_router.go index 7a8dd9d5c..c79ea5ef3 100644 --- a/controller/handler_mgmt/remove_router.go +++ b/controller/handler_mgmt/remove_router.go @@ -19,10 +19,10 @@ package handler_mgmt import ( "github.com/golang/protobuf/proto" "github.com/michaelquigley/pfxlog" - "github.com/netfoundry/ziti-fabric/controller/handler_common" - "github.com/netfoundry/ziti-fabric/controller/network" - "github.com/netfoundry/ziti-fabric/pb/mgmt_pb" - "github.com/netfoundry/ziti-foundation/channel2" + "github.com/openziti/fabric/controller/handler_common" + "github.com/openziti/fabric/controller/network" + "github.com/openziti/fabric/pb/mgmt_pb" + "github.com/openziti/foundation/channel2" ) type removeRouterHandler struct { diff --git a/controller/handler_mgmt/remove_service.go b/controller/handler_mgmt/remove_service.go index 712f0a6ba..9f3bd01b0 100644 --- a/controller/handler_mgmt/remove_service.go +++ b/controller/handler_mgmt/remove_service.go @@ -19,10 +19,10 @@ package handler_mgmt import ( "github.com/golang/protobuf/proto" "github.com/michaelquigley/pfxlog" - "github.com/netfoundry/ziti-fabric/controller/handler_common" - "github.com/netfoundry/ziti-fabric/controller/network" - "github.com/netfoundry/ziti-fabric/pb/mgmt_pb" - "github.com/netfoundry/ziti-foundation/channel2" + "github.com/openziti/fabric/controller/handler_common" + "github.com/openziti/fabric/controller/network" + "github.com/openziti/fabric/pb/mgmt_pb" + "github.com/openziti/foundation/channel2" ) type removeServiceHandler struct { diff --git a/controller/handler_mgmt/remove_session.go b/controller/handler_mgmt/remove_session.go index 6736a7e66..96c0741ad 100644 --- a/controller/handler_mgmt/remove_session.go +++ b/controller/handler_mgmt/remove_session.go @@ -19,11 +19,11 @@ package handler_mgmt import ( "github.com/golang/protobuf/proto" "github.com/michaelquigley/pfxlog" - "github.com/netfoundry/ziti-fabric/controller/handler_common" - "github.com/netfoundry/ziti-fabric/controller/network" - "github.com/netfoundry/ziti-fabric/pb/mgmt_pb" - "github.com/netfoundry/ziti-foundation/channel2" - "github.com/netfoundry/ziti-foundation/identity/identity" + "github.com/openziti/fabric/controller/handler_common" + "github.com/openziti/fabric/controller/network" + "github.com/openziti/fabric/pb/mgmt_pb" + "github.com/openziti/foundation/channel2" + "github.com/openziti/foundation/identity/identity" ) type removeSessionHandler struct { diff --git a/controller/handler_mgmt/remove_terminator.go b/controller/handler_mgmt/remove_terminator.go index 24ad2e77b..52a27f2dc 100644 --- a/controller/handler_mgmt/remove_terminator.go +++ b/controller/handler_mgmt/remove_terminator.go @@ -19,10 +19,10 @@ package handler_mgmt import ( "github.com/golang/protobuf/proto" "github.com/michaelquigley/pfxlog" - "github.com/netfoundry/ziti-fabric/controller/handler_common" - "github.com/netfoundry/ziti-fabric/controller/network" - "github.com/netfoundry/ziti-fabric/pb/mgmt_pb" - "github.com/netfoundry/ziti-foundation/channel2" + "github.com/openziti/fabric/controller/handler_common" + "github.com/openziti/fabric/controller/network" + "github.com/openziti/fabric/pb/mgmt_pb" + "github.com/openziti/foundation/channel2" ) type removeTerminatorHandler struct { diff --git a/controller/handler_mgmt/set_link_cost.go b/controller/handler_mgmt/set_link_cost.go index 83c7b0ec2..0c843b5c7 100644 --- a/controller/handler_mgmt/set_link_cost.go +++ b/controller/handler_mgmt/set_link_cost.go @@ -20,11 +20,11 @@ import ( "fmt" "github.com/golang/protobuf/proto" "github.com/michaelquigley/pfxlog" - "github.com/netfoundry/ziti-fabric/controller/handler_common" - "github.com/netfoundry/ziti-fabric/controller/network" - "github.com/netfoundry/ziti-fabric/pb/mgmt_pb" - "github.com/netfoundry/ziti-foundation/channel2" - "github.com/netfoundry/ziti-foundation/identity/identity" + "github.com/openziti/fabric/controller/handler_common" + "github.com/openziti/fabric/controller/network" + "github.com/openziti/fabric/pb/mgmt_pb" + "github.com/openziti/foundation/channel2" + "github.com/openziti/foundation/identity/identity" ) type setLinkCostHandler struct { diff --git a/controller/handler_mgmt/set_link_down.go b/controller/handler_mgmt/set_link_down.go index 3688e3184..6dbc8bc2e 100644 --- a/controller/handler_mgmt/set_link_down.go +++ b/controller/handler_mgmt/set_link_down.go @@ -20,11 +20,11 @@ import ( "fmt" "github.com/golang/protobuf/proto" "github.com/michaelquigley/pfxlog" - "github.com/netfoundry/ziti-fabric/controller/handler_common" - "github.com/netfoundry/ziti-fabric/controller/network" - "github.com/netfoundry/ziti-fabric/pb/mgmt_pb" - "github.com/netfoundry/ziti-foundation/channel2" - "github.com/netfoundry/ziti-foundation/identity/identity" + "github.com/openziti/fabric/controller/handler_common" + "github.com/openziti/fabric/controller/network" + "github.com/openziti/fabric/pb/mgmt_pb" + "github.com/openziti/foundation/channel2" + "github.com/openziti/foundation/identity/identity" ) type setLinkDownHandler struct { diff --git a/controller/handler_mgmt/set_terminator_cost.go b/controller/handler_mgmt/set_terminator_cost.go index 2b893c17b..1f499a324 100644 --- a/controller/handler_mgmt/set_terminator_cost.go +++ b/controller/handler_mgmt/set_terminator_cost.go @@ -19,12 +19,12 @@ package handler_mgmt import ( "fmt" "github.com/golang/protobuf/proto" - "github.com/netfoundry/ziti-fabric/controller/handler_common" - "github.com/netfoundry/ziti-fabric/controller/network" - "github.com/netfoundry/ziti-fabric/controller/xt" - "github.com/netfoundry/ziti-fabric/pb/mgmt_pb" - "github.com/netfoundry/ziti-foundation/channel2" - "github.com/netfoundry/ziti-foundation/storage/boltz" + "github.com/openziti/fabric/controller/handler_common" + "github.com/openziti/fabric/controller/network" + "github.com/openziti/fabric/controller/xt" + "github.com/openziti/fabric/pb/mgmt_pb" + "github.com/openziti/foundation/channel2" + "github.com/openziti/foundation/storage/boltz" "math" ) diff --git a/controller/handler_mgmt/stream_metrics.go b/controller/handler_mgmt/stream_metrics.go index a38d0d36a..631ddea31 100644 --- a/controller/handler_mgmt/stream_metrics.go +++ b/controller/handler_mgmt/stream_metrics.go @@ -20,12 +20,12 @@ import ( "github.com/golang/protobuf/proto" "github.com/golang/protobuf/ptypes/timestamp" "github.com/michaelquigley/pfxlog" - "github.com/netfoundry/ziti-fabric/controller/handler_common" - "github.com/netfoundry/ziti-fabric/controller/network" - "github.com/netfoundry/ziti-fabric/pb/mgmt_pb" - "github.com/netfoundry/ziti-foundation/channel2" - "github.com/netfoundry/ziti-foundation/metrics" - "github.com/netfoundry/ziti-foundation/metrics/metrics_pb" + "github.com/openziti/fabric/controller/handler_common" + "github.com/openziti/fabric/controller/network" + "github.com/openziti/fabric/pb/mgmt_pb" + "github.com/openziti/foundation/channel2" + "github.com/openziti/foundation/metrics" + "github.com/openziti/foundation/metrics/metrics_pb" "regexp" ) diff --git a/controller/handler_mgmt/stream_sessions.go b/controller/handler_mgmt/stream_sessions.go index 1becbe9d5..1945e5096 100644 --- a/controller/handler_mgmt/stream_sessions.go +++ b/controller/handler_mgmt/stream_sessions.go @@ -19,11 +19,11 @@ package handler_mgmt import ( "github.com/golang/protobuf/proto" "github.com/michaelquigley/pfxlog" - "github.com/netfoundry/ziti-fabric/controller/handler_common" - "github.com/netfoundry/ziti-fabric/controller/network" - "github.com/netfoundry/ziti-fabric/pb/mgmt_pb" - "github.com/netfoundry/ziti-foundation/channel2" - "github.com/netfoundry/ziti-foundation/identity/identity" + "github.com/openziti/fabric/controller/handler_common" + "github.com/openziti/fabric/controller/network" + "github.com/openziti/fabric/pb/mgmt_pb" + "github.com/openziti/foundation/channel2" + "github.com/openziti/foundation/identity/identity" ) type streamSessionsHandler struct { diff --git a/controller/handler_mgmt/stream_toggle_pipe_traces.go b/controller/handler_mgmt/stream_toggle_pipe_traces.go index 84721f7bc..51161c6bf 100644 --- a/controller/handler_mgmt/stream_toggle_pipe_traces.go +++ b/controller/handler_mgmt/stream_toggle_pipe_traces.go @@ -19,13 +19,13 @@ package handler_mgmt import ( "fmt" "github.com/golang/protobuf/proto" - "github.com/netfoundry/ziti-fabric/controller/handler_common" - "github.com/netfoundry/ziti-fabric/controller/network" - "github.com/netfoundry/ziti-fabric/pb/ctrl_pb" - "github.com/netfoundry/ziti-fabric/pb/mgmt_pb" - "github.com/netfoundry/ziti-fabric/trace" - "github.com/netfoundry/ziti-foundation/channel2" - trace_pb "github.com/netfoundry/ziti-foundation/trace/pb" + "github.com/openziti/fabric/controller/handler_common" + "github.com/openziti/fabric/controller/network" + "github.com/openziti/fabric/pb/ctrl_pb" + "github.com/openziti/fabric/pb/mgmt_pb" + "github.com/openziti/fabric/trace" + "github.com/openziti/foundation/channel2" + trace_pb "github.com/openziti/foundation/trace/pb" "sync" "time" ) diff --git a/controller/handler_mgmt/stream_traces.go b/controller/handler_mgmt/stream_traces.go index f9d27c4b8..3cc2e5aba 100644 --- a/controller/handler_mgmt/stream_traces.go +++ b/controller/handler_mgmt/stream_traces.go @@ -19,12 +19,12 @@ package handler_mgmt import ( "github.com/golang/protobuf/proto" "github.com/michaelquigley/pfxlog" - "github.com/netfoundry/ziti-fabric/controller/handler_common" - "github.com/netfoundry/ziti-fabric/controller/network" - "github.com/netfoundry/ziti-fabric/pb/mgmt_pb" - "github.com/netfoundry/ziti-fabric/trace" - "github.com/netfoundry/ziti-foundation/channel2" - "github.com/netfoundry/ziti-foundation/trace/pb" + "github.com/openziti/fabric/controller/handler_common" + "github.com/openziti/fabric/controller/network" + "github.com/openziti/fabric/pb/mgmt_pb" + "github.com/openziti/fabric/trace" + "github.com/openziti/foundation/channel2" + "github.com/openziti/foundation/trace/pb" ) type streamTracesHandler struct { diff --git a/controller/models/base_model.go b/controller/models/base_model.go index edcfc56e2..2ea8ebc28 100644 --- a/controller/models/base_model.go +++ b/controller/models/base_model.go @@ -17,8 +17,8 @@ package models import ( - "github.com/netfoundry/ziti-foundation/storage/ast" - "github.com/netfoundry/ziti-foundation/storage/boltz" + "github.com/openziti/foundation/storage/ast" + "github.com/openziti/foundation/storage/boltz" "github.com/pkg/errors" "go.etcd.io/bbolt" "time" diff --git a/controller/network/assembly.go b/controller/network/assembly.go index 71cadb14c..50cff72ca 100644 --- a/controller/network/assembly.go +++ b/controller/network/assembly.go @@ -19,9 +19,9 @@ package network import ( "github.com/golang/protobuf/proto" "github.com/michaelquigley/pfxlog" - "github.com/netfoundry/ziti-fabric/pb/ctrl_pb" - "github.com/netfoundry/ziti-foundation/channel2" - "github.com/netfoundry/ziti-foundation/util/info" + "github.com/openziti/fabric/pb/ctrl_pb" + "github.com/openziti/foundation/channel2" + "github.com/openziti/foundation/util/info" ) func (network *Network) assemble() { diff --git a/controller/network/circuit.go b/controller/network/circuit.go index 5e99ae90b..da05b928a 100644 --- a/controller/network/circuit.go +++ b/controller/network/circuit.go @@ -18,8 +18,8 @@ package network import ( "fmt" - "github.com/netfoundry/ziti-fabric/pb/ctrl_pb" - "github.com/netfoundry/ziti-foundation/identity/identity" + "github.com/openziti/fabric/pb/ctrl_pb" + "github.com/openziti/foundation/identity/identity" ) type Circuit struct { diff --git a/controller/network/circuit_test.go b/controller/network/circuit_test.go index 01fe1556b..5f0ad8658 100644 --- a/controller/network/circuit_test.go +++ b/controller/network/circuit_test.go @@ -17,12 +17,12 @@ package network import ( - "github.com/netfoundry/ziti-fabric/controller/db" - "github.com/netfoundry/ziti-fabric/controller/models" - "github.com/netfoundry/ziti-foundation/channel2" - "github.com/netfoundry/ziti-foundation/identity/identity" - "github.com/netfoundry/ziti-foundation/transport" - "github.com/netfoundry/ziti-foundation/transport/tcp" + "github.com/openziti/fabric/controller/db" + "github.com/openziti/fabric/controller/models" + "github.com/openziti/foundation/channel2" + "github.com/openziti/foundation/identity/identity" + "github.com/openziti/foundation/transport" + "github.com/openziti/foundation/transport/tcp" "github.com/stretchr/testify/assert" "testing" ) diff --git a/controller/network/controllers.go b/controller/network/controllers.go index 84c64f5a2..fba2441b7 100644 --- a/controller/network/controllers.go +++ b/controller/network/controllers.go @@ -17,10 +17,10 @@ package network import ( - "github.com/netfoundry/ziti-fabric/controller/db" - "github.com/netfoundry/ziti-fabric/controller/models" - "github.com/netfoundry/ziti-foundation/storage/ast" - "github.com/netfoundry/ziti-foundation/storage/boltz" + "github.com/openziti/fabric/controller/db" + "github.com/openziti/fabric/controller/models" + "github.com/openziti/foundation/storage/ast" + "github.com/openziti/foundation/storage/boltz" "go.etcd.io/bbolt" ) diff --git a/controller/network/link.go b/controller/network/link.go index 1df3679f8..ced6d2f58 100644 --- a/controller/network/link.go +++ b/controller/network/link.go @@ -17,8 +17,8 @@ package network import ( - "github.com/netfoundry/ziti-foundation/identity/identity" - "github.com/netfoundry/ziti-foundation/util/info" + "github.com/openziti/foundation/identity/identity" + "github.com/openziti/foundation/util/info" ) type Link struct { diff --git a/controller/network/link_controller.go b/controller/network/link_controller.go index cdb0cf77f..416a451e5 100644 --- a/controller/network/link_controller.go +++ b/controller/network/link_controller.go @@ -17,8 +17,8 @@ package network import ( - "github.com/netfoundry/ziti-foundation/identity/identity" - "github.com/netfoundry/ziti-foundation/util/sequence" + "github.com/openziti/foundation/identity/identity" + "github.com/openziti/foundation/util/sequence" "github.com/orcaman/concurrent-map" "math" ) diff --git a/controller/network/link_controller_test.go b/controller/network/link_controller_test.go index c4ccc9a16..a439dec41 100644 --- a/controller/network/link_controller_test.go +++ b/controller/network/link_controller_test.go @@ -17,7 +17,7 @@ package network import ( - "github.com/netfoundry/ziti-foundation/identity/identity" + "github.com/openziti/foundation/identity/identity" "github.com/stretchr/testify/assert" "testing" ) diff --git a/controller/network/network.go b/controller/network/network.go index 8ccab4d39..7d2cb135f 100644 --- a/controller/network/network.go +++ b/controller/network/network.go @@ -22,17 +22,17 @@ import ( "fmt" "github.com/golang/protobuf/proto" "github.com/michaelquigley/pfxlog" - "github.com/netfoundry/ziti-fabric/controller/db" - "github.com/netfoundry/ziti-fabric/controller/xt" - "github.com/netfoundry/ziti-fabric/pb/ctrl_pb" - "github.com/netfoundry/ziti-fabric/trace" - "github.com/netfoundry/ziti-foundation/channel2" - "github.com/netfoundry/ziti-foundation/identity/identity" - "github.com/netfoundry/ziti-foundation/metrics" - "github.com/netfoundry/ziti-foundation/metrics/metrics_pb" - "github.com/netfoundry/ziti-foundation/storage/boltz" - "github.com/netfoundry/ziti-foundation/util/concurrenz" - "github.com/netfoundry/ziti-foundation/util/sequence" + "github.com/openziti/fabric/controller/db" + "github.com/openziti/fabric/controller/xt" + "github.com/openziti/fabric/pb/ctrl_pb" + "github.com/openziti/fabric/trace" + "github.com/openziti/foundation/channel2" + "github.com/openziti/foundation/identity/identity" + "github.com/openziti/foundation/metrics" + "github.com/openziti/foundation/metrics/metrics_pb" + "github.com/openziti/foundation/storage/boltz" + "github.com/openziti/foundation/util/concurrenz" + "github.com/openziti/foundation/util/sequence" errors2 "github.com/pkg/errors" "github.com/sirupsen/logrus" "sort" diff --git a/controller/network/path_test.go b/controller/network/path_test.go index ef525791c..2a5970dd6 100644 --- a/controller/network/path_test.go +++ b/controller/network/path_test.go @@ -17,9 +17,9 @@ package network import ( - "github.com/netfoundry/ziti-fabric/controller/db" - "github.com/netfoundry/ziti-foundation/identity/identity" - "github.com/netfoundry/ziti-foundation/transport/tcp" + "github.com/openziti/fabric/controller/db" + "github.com/openziti/foundation/identity/identity" + "github.com/openziti/foundation/transport/tcp" "github.com/stretchr/testify/assert" "testing" ) diff --git a/controller/network/router.go b/controller/network/router.go index 8765b6254..f51250acb 100644 --- a/controller/network/router.go +++ b/controller/network/router.go @@ -17,11 +17,11 @@ package network import ( - "github.com/netfoundry/ziti-fabric/controller/db" - "github.com/netfoundry/ziti-fabric/controller/models" - "github.com/netfoundry/ziti-foundation/channel2" - "github.com/netfoundry/ziti-foundation/storage/boltz" - "github.com/netfoundry/ziti-foundation/util/concurrenz" + "github.com/openziti/fabric/controller/db" + "github.com/openziti/fabric/controller/models" + "github.com/openziti/foundation/channel2" + "github.com/openziti/foundation/storage/boltz" + "github.com/openziti/foundation/util/concurrenz" "github.com/orcaman/concurrent-map" "github.com/pkg/errors" "go.etcd.io/bbolt" diff --git a/controller/network/service.go b/controller/network/service.go index 2853a7383..91a18049b 100644 --- a/controller/network/service.go +++ b/controller/network/service.go @@ -18,9 +18,9 @@ package network import ( "github.com/michaelquigley/pfxlog" - "github.com/netfoundry/ziti-fabric/controller/db" - "github.com/netfoundry/ziti-fabric/controller/models" - "github.com/netfoundry/ziti-foundation/storage/boltz" + "github.com/openziti/fabric/controller/db" + "github.com/openziti/fabric/controller/models" + "github.com/openziti/foundation/storage/boltz" "github.com/orcaman/concurrent-map" "github.com/pkg/errors" "go.etcd.io/bbolt" diff --git a/controller/network/session.go b/controller/network/session.go index 469bc9c6a..d4eaaf564 100644 --- a/controller/network/session.go +++ b/controller/network/session.go @@ -17,8 +17,8 @@ package network import ( - "github.com/netfoundry/ziti-fabric/controller/xt" - "github.com/netfoundry/ziti-foundation/identity/identity" + "github.com/openziti/fabric/controller/xt" + "github.com/openziti/foundation/identity/identity" "github.com/orcaman/concurrent-map" ) diff --git a/controller/network/session_lifecycle.go b/controller/network/session_lifecycle.go index 09e6e5f0e..e54a77f2b 100644 --- a/controller/network/session_lifecycle.go +++ b/controller/network/session_lifecycle.go @@ -17,7 +17,7 @@ package network import ( - "github.com/netfoundry/ziti-foundation/identity/identity" + "github.com/openziti/foundation/identity/identity" ) type SessionLifeCycleListener interface { diff --git a/controller/network/smart.go b/controller/network/smart.go index 22d96c5ad..3df68ce22 100644 --- a/controller/network/smart.go +++ b/controller/network/smart.go @@ -18,7 +18,7 @@ package network import ( "github.com/michaelquigley/pfxlog" - "github.com/netfoundry/ziti-foundation/identity/identity" + "github.com/openziti/foundation/identity/identity" "sort" ) diff --git a/controller/network/terminator.go b/controller/network/terminator.go index c08dfb420..0bc6f4967 100644 --- a/controller/network/terminator.go +++ b/controller/network/terminator.go @@ -14,10 +14,10 @@ package network import ( - "github.com/netfoundry/ziti-fabric/controller/db" - "github.com/netfoundry/ziti-fabric/controller/models" - "github.com/netfoundry/ziti-fabric/controller/xt" - "github.com/netfoundry/ziti-foundation/storage/boltz" + "github.com/openziti/fabric/controller/db" + "github.com/openziti/fabric/controller/models" + "github.com/openziti/fabric/controller/xt" + "github.com/openziti/foundation/storage/boltz" "github.com/pkg/errors" "go.etcd.io/bbolt" "reflect" diff --git a/controller/xctrl/ops.go b/controller/xctrl/ops.go index 95e728e4a..b71bb4b7d 100644 --- a/controller/xctrl/ops.go +++ b/controller/xctrl/ops.go @@ -17,8 +17,8 @@ package xctrl import ( - "github.com/netfoundry/ziti-fabric/pb/ctrl_pb" - "github.com/netfoundry/ziti-foundation/channel2" + "github.com/openziti/fabric/pb/ctrl_pb" + "github.com/openziti/foundation/channel2" "time" ) diff --git a/controller/xctrl/xctrl.go b/controller/xctrl/xctrl.go index a13e88897..c4053c891 100644 --- a/controller/xctrl/xctrl.go +++ b/controller/xctrl/xctrl.go @@ -17,9 +17,9 @@ package xctrl import ( - "github.com/netfoundry/ziti-foundation/channel2" - "github.com/netfoundry/ziti-foundation/config" - "github.com/netfoundry/ziti-foundation/storage/boltz" + "github.com/openziti/foundation/channel2" + "github.com/openziti/foundation/config" + "github.com/openziti/foundation/storage/boltz" ) type Xctrl interface { diff --git a/controller/xctrl_example/example.go b/controller/xctrl_example/example.go index 4b83eb948..0cff63322 100644 --- a/controller/xctrl_example/example.go +++ b/controller/xctrl_example/example.go @@ -21,9 +21,9 @@ import ( "encoding/binary" "errors" "github.com/michaelquigley/pfxlog" - "github.com/netfoundry/ziti-fabric/controller/xctrl" - "github.com/netfoundry/ziti-foundation/channel2" - "github.com/netfoundry/ziti-foundation/storage/boltz" + "github.com/openziti/fabric/controller/xctrl" + "github.com/openziti/foundation/channel2" + "github.com/openziti/foundation/storage/boltz" "time" ) diff --git a/controller/xctrl_example/receive.go b/controller/xctrl_example/receive.go index 33f9c1efd..331640a4d 100644 --- a/controller/xctrl_example/receive.go +++ b/controller/xctrl_example/receive.go @@ -20,7 +20,7 @@ import ( "bytes" "encoding/binary" "github.com/michaelquigley/pfxlog" - "github.com/netfoundry/ziti-foundation/channel2" + "github.com/openziti/foundation/channel2" ) type receiveHandler struct{} diff --git a/controller/xmgmt/xmgmt.go b/controller/xmgmt/xmgmt.go index 4b7cde871..8dbdc287c 100644 --- a/controller/xmgmt/xmgmt.go +++ b/controller/xmgmt/xmgmt.go @@ -17,8 +17,8 @@ package xmgmt import ( - "github.com/netfoundry/ziti-foundation/channel2" - "github.com/netfoundry/ziti-foundation/config" + "github.com/openziti/foundation/channel2" + "github.com/openziti/foundation/config" ) type Xmgmt interface { diff --git a/controller/xt/registry.go b/controller/xt/registry.go index 96fc5a28d..1725ad8e4 100644 --- a/controller/xt/registry.go +++ b/controller/xt/registry.go @@ -17,7 +17,7 @@ package xt import ( - "github.com/netfoundry/ziti-foundation/storage/boltz" + "github.com/openziti/foundation/storage/boltz" "sync" "sync/atomic" ) diff --git a/controller/xt_common/cost_visitor.go b/controller/xt_common/cost_visitor.go index 9a1bec164..8d85e206f 100644 --- a/controller/xt_common/cost_visitor.go +++ b/controller/xt_common/cost_visitor.go @@ -1,7 +1,7 @@ package xt_common import ( - "github.com/netfoundry/ziti-fabric/controller/xt" + "github.com/openziti/fabric/controller/xt" "math" ) diff --git a/controller/xt_ha/impl.go b/controller/xt_ha/impl.go index 92c68a12d..f9d53a4e3 100644 --- a/controller/xt_ha/impl.go +++ b/controller/xt_ha/impl.go @@ -17,7 +17,7 @@ package xt_ha import ( - "github.com/netfoundry/ziti-fabric/controller/xt" + "github.com/openziti/fabric/controller/xt" "sync/atomic" ) diff --git a/controller/xt_random/impl.go b/controller/xt_random/impl.go index a7e529146..b1c863676 100644 --- a/controller/xt_random/impl.go +++ b/controller/xt_random/impl.go @@ -17,7 +17,7 @@ package xt_random import ( - "github.com/netfoundry/ziti-fabric/controller/xt" + "github.com/openziti/fabric/controller/xt" "math/rand" ) diff --git a/controller/xt_smartrouting/impl.go b/controller/xt_smartrouting/impl.go index 144b15fdf..330a36165 100644 --- a/controller/xt_smartrouting/impl.go +++ b/controller/xt_smartrouting/impl.go @@ -17,8 +17,8 @@ package xt_smartrouting import ( - "github.com/netfoundry/ziti-fabric/controller/xt" - "github.com/netfoundry/ziti-fabric/controller/xt_common" + "github.com/openziti/fabric/controller/xt" + "github.com/openziti/fabric/controller/xt_common" "math" "time" ) diff --git a/controller/xt_weighted/impl.go b/controller/xt_weighted/impl.go index b73ae2115..c46dfa0d3 100644 --- a/controller/xt_weighted/impl.go +++ b/controller/xt_weighted/impl.go @@ -17,8 +17,8 @@ package xt_weighted import ( - "github.com/netfoundry/ziti-fabric/controller/xt" - "github.com/netfoundry/ziti-fabric/controller/xt_common" + "github.com/openziti/fabric/controller/xt" + "github.com/openziti/fabric/controller/xt_common" "math" "math/rand" "time" diff --git a/ctrl_msg/messages.go b/ctrl_msg/messages.go index 8138a9c94..3ed55e4e6 100644 --- a/ctrl_msg/messages.go +++ b/ctrl_msg/messages.go @@ -17,7 +17,7 @@ package ctrl_msg import ( - "github.com/netfoundry/ziti-foundation/channel2" + "github.com/openziti/foundation/channel2" ) const ( diff --git a/docs/json_api_gateway.md b/docs/json_api_gateway.md index 33f29e8a6..683b01ecd 100644 --- a/docs/json_api_gateway.md +++ b/docs/json_api_gateway.md @@ -2,7 +2,7 @@ Launch the `ziti-fabric-gw` like this: - $ bin/ziti-fabric-gw run src/github.com/netfoundry/ziti-fabric/fabric/etc/gw.yml + $ bin/ziti-fabric-gw run src/github.com/openziti/fabric/fabric/etc/gw.yml Client access like this: @@ -49,8 +49,8 @@ Client access like this: To use `ziti-fabric-gw` with a plain HTTP listener (without TLS), comment out the `certPath` and `keyPath` lines in `gw.yml`: # Comment out the following lines to disable the TLS listener - #certPath: src/github.com/netfoundry/ziti-fabric/fabric/etc/ca/intermediate/certs/mgmt-gw.cert.pem - #keyPath: src/github.com/netfoundry/ziti-fabric/fabric/etc/ca/intermediate/private/mgmt-gw.key.pem + #certPath: src/github.com/openziti/fabric/fabric/etc/ca/intermediate/certs/mgmt-gw.cert.pem + #keyPath: src/github.com/openziti/fabric/fabric/etc/ca/intermediate/private/mgmt-gw.key.pem And then the listener can be accessed with plain HTTP: diff --git a/docs/local_development.md b/docs/local_development.md index c57dfcb3f..7e600e047 100644 --- a/docs/local_development.md +++ b/docs/local_development.md @@ -4,13 +4,13 @@ If you're going to be working on the Ziti fabric, or just want to track the late First, install the golang environment for your platform. Visit http://golang.org to download your installer. -As of this update, we're currently using version `1.13` of golang. +As of this update, we're currently using version `1.14` of golang. Make sure that `go` is in your path: ``` $ go version -go version go1.13.4 linux/amd64 +go version go1.14.3 linux/amd64 ``` Consider using a separate directory to contain the `GOPATH` for your `ziti-fabric` development (instead of just using `~/go`). I like to put mine in `~/local/ziti-fabric`, but you can root it wherever you'd like. This will contain the dependent package sources, and built binaries. @@ -18,8 +18,8 @@ Consider using a separate directory to contain the `GOPATH` for your `ziti-fabri Essentially: ``` -mkdir -p ~/local/ziti-fabric -export GOPATH=~/local/ziti-fabric +mkdir -p ~/local/ziti +export GOPATH=~/local/ziti ``` Include `GOPATH/bin` in your shell's `PATH`: @@ -33,21 +33,21 @@ When you've got your `GOPATH` ready, you'll want to clone the repositories. I li ``` mkdir ~/repos cd ~/repos -git clone https://github.com/netfoundry/ziti-cmd.git -git clone https://github.com/netfoundry/ziti-fabric.git +git clone https://github.com/openziti/ziti.git +git clone https://github.com/openziti/fabric.git ``` We're going to need to update the `go.mod` file in the root of `ziti-cmd`, using the `replace` directive to point the `ziti-cmd` build at our local `ziti-fabric` development tree. ``` -cd ~/repos/ziti-cmd +cd ~/repos/ziti vi go.mod ``` The top of the file should look like this: ``` -module github.com/netfoundry/ziti-cmd +module github.com/openziti/ziti go 1.13 @@ -57,11 +57,11 @@ require ( We're going to add a `replace` line, like this: ``` -module github.com/netfoundry/ziti-cmd +module github.com/openziti/ziti go 1.13 -replace github.com/netfoundry/ziti-fabric => ../ziti-fabric +replace github.com/openziti/fabric => ../fabric require ( ``` @@ -71,13 +71,13 @@ With that change made, you can alter the contents of your local clone of `ziti-f Build the tree: ``` -$ cd ~/repos/ziti-cmd +$ cd ~/repos/ziti $ go install ./... ``` The binaries will be placed in `$GOPATH/bin`. -The development configuration files live in `ziti-fabric/etc`, and contain relative paths, which expect the executables to be started from the root of `ziti-fabric` (ensure that `~/local/ziti-fabric/bin` (`$GOPATH/bin`) is in your shell's `PATH`). +The development configuration files live in `fabric/etc`, and contain relative paths, which expect the executables to be started from the root of `ziti-fabric` (ensure that `~/local/ziti-fabric/bin` (`$GOPATH/bin`) is in your shell's `PATH`). ``` $ cd ~repos/ziti-cmd @@ -91,7 +91,7 @@ You'll want to open a number of terminal windows. All commands are executed rela ### Launch The Controller ``` -$ cd ~repos/ziti-cmd +$ cd ~repos/ziti $ ziti-controller run etc/ctrl.yml ``` @@ -175,7 +175,7 @@ $ ziti-fabric-test loop2 listener Launch a `loop2` dialer (begin generating load): ``` -$ ziti-fabric-test loop2 dialer src/github.com/netfoundry/ziti-fabric/fabric/etc/loop2/10-ambient.loop2.yml +$ ziti-fabric-test loop2 dialer src/github.com/openziti/fabric/fabric/etc/loop2/10-ambient.loop2.yml ``` Take a look at the various `loop2` scenario configurations in `etc/loop2` for examples illustrating different workloads. diff --git a/pb/ctrl_pb/decoder.go b/pb/ctrl_pb/decoder.go index 0286df4bb..91bf01c2e 100644 --- a/pb/ctrl_pb/decoder.go +++ b/pb/ctrl_pb/decoder.go @@ -20,9 +20,9 @@ import ( "fmt" "github.com/golang/protobuf/proto" "github.com/michaelquigley/pfxlog" - "github.com/netfoundry/ziti-fabric/ctrl_msg" - "github.com/netfoundry/ziti-foundation/channel2" - "github.com/netfoundry/ziti-foundation/metrics/metrics_pb" + "github.com/openziti/fabric/ctrl_msg" + "github.com/openziti/foundation/channel2" + "github.com/openziti/foundation/metrics/metrics_pb" "strconv" "strings" ) diff --git a/pb/ctrl_pb/impl.go b/pb/ctrl_pb/impl.go index 04180a873..78c770ed2 100644 --- a/pb/ctrl_pb/impl.go +++ b/pb/ctrl_pb/impl.go @@ -16,7 +16,7 @@ package ctrl_pb -import "github.com/netfoundry/ziti-fabric/controller/xt" +import "github.com/openziti/fabric/controller/xt" func (request *InspectRequest) GetContentType() int32 { return int32(ContentType_InspectRequestType) diff --git a/pb/mgmt_pb/decoder.go b/pb/mgmt_pb/decoder.go index 03cb969b9..0d73ff063 100644 --- a/pb/mgmt_pb/decoder.go +++ b/pb/mgmt_pb/decoder.go @@ -20,7 +20,7 @@ import ( "fmt" "github.com/golang/protobuf/proto" "github.com/michaelquigley/pfxlog" - "github.com/netfoundry/ziti-foundation/channel2" + "github.com/openziti/foundation/channel2" ) type Decoder struct{} diff --git a/router/accepter.go b/router/accepter.go index 72a5dafda..cdebe4578 100644 --- a/router/accepter.go +++ b/router/accepter.go @@ -1,8 +1,8 @@ package router import ( - forwarder2 "github.com/netfoundry/ziti-fabric/router/forwarder" - "github.com/netfoundry/ziti-fabric/router/xlink" + forwarder2 "github.com/openziti/fabric/router/forwarder" + "github.com/openziti/fabric/router/xlink" "github.com/sirupsen/logrus" ) diff --git a/router/config.go b/router/config.go index 45d7a685b..e8511850e 100644 --- a/router/config.go +++ b/router/config.go @@ -20,13 +20,13 @@ import ( "bytes" "fmt" "github.com/michaelquigley/pfxlog" - "github.com/netfoundry/ziti-fabric/pb/ctrl_pb" - "github.com/netfoundry/ziti-fabric/router/forwarder" - "github.com/netfoundry/ziti-fabric/router/xgress" - "github.com/netfoundry/ziti-foundation/channel2" - "github.com/netfoundry/ziti-foundation/config" - "github.com/netfoundry/ziti-foundation/identity/identity" - "github.com/netfoundry/ziti-foundation/transport" + "github.com/openziti/fabric/pb/ctrl_pb" + "github.com/openziti/fabric/router/forwarder" + "github.com/openziti/fabric/router/xgress" + "github.com/openziti/foundation/channel2" + "github.com/openziti/foundation/config" + "github.com/openziti/foundation/identity/identity" + "github.com/openziti/foundation/transport" "github.com/spf13/pflag" "gopkg.in/yaml.v2" "io/ioutil" diff --git a/router/forwarder/forwarder.go b/router/forwarder/forwarder.go index 7d46f7191..3c0b0bff5 100644 --- a/router/forwarder/forwarder.go +++ b/router/forwarder/forwarder.go @@ -19,13 +19,13 @@ package forwarder import ( "errors" "github.com/michaelquigley/pfxlog" - "github.com/netfoundry/ziti-fabric/pb/ctrl_pb" - "github.com/netfoundry/ziti-fabric/router/xgress" - "github.com/netfoundry/ziti-fabric/router/xlink" - "github.com/netfoundry/ziti-fabric/trace" - "github.com/netfoundry/ziti-foundation/identity/identity" - "github.com/netfoundry/ziti-foundation/metrics" - "github.com/netfoundry/ziti-foundation/util/info" + "github.com/openziti/fabric/pb/ctrl_pb" + "github.com/openziti/fabric/router/xgress" + "github.com/openziti/fabric/router/xlink" + "github.com/openziti/fabric/trace" + "github.com/openziti/foundation/identity/identity" + "github.com/openziti/foundation/metrics" + "github.com/openziti/foundation/util/info" "time" ) diff --git a/router/forwarder/tables.go b/router/forwarder/tables.go index 1009f39a7..06743a0ee 100644 --- a/router/forwarder/tables.go +++ b/router/forwarder/tables.go @@ -18,9 +18,9 @@ package forwarder import ( "fmt" - "github.com/netfoundry/ziti-fabric/router/xgress" - "github.com/netfoundry/ziti-foundation/identity/identity" - "github.com/netfoundry/ziti-foundation/util/info" + "github.com/openziti/fabric/router/xgress" + "github.com/openziti/foundation/identity/identity" + "github.com/openziti/foundation/util/info" "github.com/orcaman/concurrent-map" "reflect" ) diff --git a/router/handler_ctrl/bind.go b/router/handler_ctrl/bind.go index e26d3b28b..2420604a3 100644 --- a/router/handler_ctrl/bind.go +++ b/router/handler_ctrl/bind.go @@ -17,13 +17,13 @@ package handler_ctrl import ( - "github.com/netfoundry/ziti-fabric/controller/xctrl" - "github.com/netfoundry/ziti-fabric/router/forwarder" - "github.com/netfoundry/ziti-fabric/router/xgress" - "github.com/netfoundry/ziti-fabric/router/xlink" - "github.com/netfoundry/ziti-fabric/trace" - "github.com/netfoundry/ziti-foundation/channel2" - "github.com/netfoundry/ziti-foundation/identity/identity" + "github.com/openziti/fabric/controller/xctrl" + "github.com/openziti/fabric/router/forwarder" + "github.com/openziti/fabric/router/xgress" + "github.com/openziti/fabric/router/xlink" + "github.com/openziti/fabric/trace" + "github.com/openziti/foundation/channel2" + "github.com/openziti/foundation/identity/identity" ) type bindHandler struct { diff --git a/router/handler_ctrl/dial.go b/router/handler_ctrl/dial.go index 507ea5a74..9323894a6 100644 --- a/router/handler_ctrl/dial.go +++ b/router/handler_ctrl/dial.go @@ -19,11 +19,11 @@ package handler_ctrl import ( "fmt" "github.com/golang/protobuf/proto" - "github.com/netfoundry/ziti-fabric/pb/ctrl_pb" - "github.com/netfoundry/ziti-fabric/router/xgress" - "github.com/netfoundry/ziti-fabric/router/xlink" - "github.com/netfoundry/ziti-foundation/channel2" - "github.com/netfoundry/ziti-foundation/identity/identity" + "github.com/openziti/fabric/pb/ctrl_pb" + "github.com/openziti/fabric/router/xgress" + "github.com/openziti/fabric/router/xlink" + "github.com/openziti/foundation/channel2" + "github.com/openziti/foundation/identity/identity" "github.com/sirupsen/logrus" ) diff --git a/router/handler_ctrl/inspect.go b/router/handler_ctrl/inspect.go index 5dd8fb3be..502ec6a04 100644 --- a/router/handler_ctrl/inspect.go +++ b/router/handler_ctrl/inspect.go @@ -19,10 +19,10 @@ package handler_ctrl import ( "github.com/golang/protobuf/proto" "github.com/michaelquigley/pfxlog" - "github.com/netfoundry/ziti-fabric/pb/ctrl_pb" - "github.com/netfoundry/ziti-foundation/channel2" - "github.com/netfoundry/ziti-foundation/identity/identity" - "github.com/netfoundry/ziti-foundation/util/debugz" + "github.com/openziti/fabric/pb/ctrl_pb" + "github.com/openziti/foundation/channel2" + "github.com/openziti/foundation/identity/identity" + "github.com/openziti/foundation/util/debugz" "strings" ) diff --git a/router/handler_ctrl/route.go b/router/handler_ctrl/route.go index 98dbed1b8..f00bdd893 100644 --- a/router/handler_ctrl/route.go +++ b/router/handler_ctrl/route.go @@ -20,12 +20,12 @@ import ( "fmt" "github.com/golang/protobuf/proto" "github.com/michaelquigley/pfxlog" - "github.com/netfoundry/ziti-fabric/pb/ctrl_pb" - "github.com/netfoundry/ziti-fabric/router/forwarder" - "github.com/netfoundry/ziti-fabric/router/handler_xgress" - "github.com/netfoundry/ziti-fabric/router/xgress" - "github.com/netfoundry/ziti-foundation/channel2" - "github.com/netfoundry/ziti-foundation/identity/identity" + "github.com/openziti/fabric/pb/ctrl_pb" + "github.com/openziti/fabric/router/forwarder" + "github.com/openziti/fabric/router/handler_xgress" + "github.com/openziti/fabric/router/xgress" + "github.com/openziti/foundation/channel2" + "github.com/openziti/foundation/identity/identity" ) type routeHandler struct { diff --git a/router/handler_ctrl/start_xgress.go b/router/handler_ctrl/start_xgress.go index 432bbc58a..6ec0c2775 100644 --- a/router/handler_ctrl/start_xgress.go +++ b/router/handler_ctrl/start_xgress.go @@ -18,10 +18,10 @@ package handler_ctrl import ( "github.com/michaelquigley/pfxlog" - "github.com/netfoundry/ziti-fabric/pb/ctrl_pb" - "github.com/netfoundry/ziti-fabric/router/forwarder" - "github.com/netfoundry/ziti-foundation/channel2" - "github.com/netfoundry/ziti-foundation/identity/identity" + "github.com/openziti/fabric/pb/ctrl_pb" + "github.com/openziti/fabric/router/forwarder" + "github.com/openziti/foundation/channel2" + "github.com/openziti/foundation/identity/identity" ) type startXgressHandler struct { diff --git a/router/handler_ctrl/toggle_pipe_traces.go b/router/handler_ctrl/toggle_pipe_traces.go index 8294493df..cfce9e950 100644 --- a/router/handler_ctrl/toggle_pipe_traces.go +++ b/router/handler_ctrl/toggle_pipe_traces.go @@ -19,11 +19,11 @@ package handler_ctrl import ( "github.com/golang/protobuf/proto" "github.com/michaelquigley/pfxlog" - "github.com/netfoundry/ziti-fabric/pb/ctrl_pb" - "github.com/netfoundry/ziti-fabric/trace" - "github.com/netfoundry/ziti-foundation/channel2" - "github.com/netfoundry/ziti-foundation/identity/identity" - trace_pb "github.com/netfoundry/ziti-foundation/trace/pb" + "github.com/openziti/fabric/pb/ctrl_pb" + "github.com/openziti/fabric/trace" + "github.com/openziti/foundation/channel2" + "github.com/openziti/foundation/identity/identity" + trace_pb "github.com/openziti/foundation/trace/pb" ) func newTraceHandler(appId *identity.TokenId, controller trace.Controller) *traceHandler { diff --git a/router/handler_ctrl/unroute.go b/router/handler_ctrl/unroute.go index 9c25bf288..d2533a311 100644 --- a/router/handler_ctrl/unroute.go +++ b/router/handler_ctrl/unroute.go @@ -19,10 +19,10 @@ package handler_ctrl import ( "github.com/golang/protobuf/proto" "github.com/michaelquigley/pfxlog" - "github.com/netfoundry/ziti-fabric/pb/ctrl_pb" - "github.com/netfoundry/ziti-fabric/router/forwarder" - "github.com/netfoundry/ziti-foundation/channel2" - "github.com/netfoundry/ziti-foundation/identity/identity" + "github.com/openziti/fabric/pb/ctrl_pb" + "github.com/openziti/fabric/router/forwarder" + "github.com/openziti/foundation/channel2" + "github.com/openziti/foundation/identity/identity" ) type unrouteHandler struct { diff --git a/router/handler_ctrl/validate_terminators.go b/router/handler_ctrl/validate_terminators.go index 67fe190cd..64f516d4b 100644 --- a/router/handler_ctrl/validate_terminators.go +++ b/router/handler_ctrl/validate_terminators.go @@ -19,9 +19,9 @@ package handler_ctrl import ( "github.com/golang/protobuf/proto" "github.com/michaelquigley/pfxlog" - "github.com/netfoundry/ziti-fabric/pb/ctrl_pb" - "github.com/netfoundry/ziti-fabric/router/xgress" - "github.com/netfoundry/ziti-foundation/channel2" + "github.com/openziti/fabric/pb/ctrl_pb" + "github.com/openziti/fabric/router/xgress" + "github.com/openziti/foundation/channel2" ) type validateTerminatorsHandler struct { diff --git a/router/handler_link/accepter.go b/router/handler_link/accepter.go index 891f2abbd..0dd9f507d 100644 --- a/router/handler_link/accepter.go +++ b/router/handler_link/accepter.go @@ -1,14 +1,14 @@ package handler_link import ( - "github.com/netfoundry/ziti-fabric/router/forwarder" - metrics2 "github.com/netfoundry/ziti-fabric/router/metrics" - "github.com/netfoundry/ziti-fabric/router/xgress" - "github.com/netfoundry/ziti-fabric/router/xlink" - "github.com/netfoundry/ziti-fabric/router/xlink_transport" - "github.com/netfoundry/ziti-fabric/trace" - "github.com/netfoundry/ziti-foundation/channel2" - "github.com/netfoundry/ziti-foundation/metrics" + "github.com/openziti/fabric/router/forwarder" + metrics2 "github.com/openziti/fabric/router/metrics" + "github.com/openziti/fabric/router/xgress" + "github.com/openziti/fabric/router/xlink" + "github.com/openziti/fabric/router/xlink_transport" + "github.com/openziti/fabric/trace" + "github.com/openziti/foundation/channel2" + "github.com/openziti/foundation/metrics" ) func NewChannelAccepter(c xgress.CtrlChannel, f *forwarder.Forwarder, fo *forwarder.Options, mr metrics.Registry) xlink_transport.ChannelAccepter { diff --git a/router/handler_link/ack.go b/router/handler_link/ack.go index 0eabd379e..2b0bc4b8a 100644 --- a/router/handler_link/ack.go +++ b/router/handler_link/ack.go @@ -18,10 +18,10 @@ package handler_link import ( "github.com/michaelquigley/pfxlog" - "github.com/netfoundry/ziti-fabric/router/forwarder" - "github.com/netfoundry/ziti-fabric/router/xgress" - "github.com/netfoundry/ziti-fabric/router/xlink" - "github.com/netfoundry/ziti-foundation/channel2" + "github.com/openziti/fabric/router/forwarder" + "github.com/openziti/fabric/router/xgress" + "github.com/openziti/fabric/router/xlink" + "github.com/openziti/foundation/channel2" ) type ackHandler struct { diff --git a/router/handler_link/close.go b/router/handler_link/close.go index 5847a6828..ac87ea79c 100644 --- a/router/handler_link/close.go +++ b/router/handler_link/close.go @@ -19,11 +19,11 @@ package handler_link import ( "github.com/golang/protobuf/proto" "github.com/michaelquigley/pfxlog" - "github.com/netfoundry/ziti-fabric/pb/ctrl_pb" - "github.com/netfoundry/ziti-fabric/router/forwarder" - "github.com/netfoundry/ziti-fabric/router/xgress" - "github.com/netfoundry/ziti-fabric/router/xlink" - "github.com/netfoundry/ziti-foundation/channel2" + "github.com/openziti/fabric/pb/ctrl_pb" + "github.com/openziti/fabric/router/forwarder" + "github.com/openziti/fabric/router/xgress" + "github.com/openziti/fabric/router/xlink" + "github.com/openziti/foundation/channel2" ) type closeHandler struct { diff --git a/router/handler_link/error.go b/router/handler_link/error.go index f6b962b2d..f6a03fc48 100644 --- a/router/handler_link/error.go +++ b/router/handler_link/error.go @@ -19,10 +19,10 @@ package handler_link import ( "github.com/golang/protobuf/proto" "github.com/michaelquigley/pfxlog" - "github.com/netfoundry/ziti-fabric/pb/ctrl_pb" - "github.com/netfoundry/ziti-fabric/router/xgress" - "github.com/netfoundry/ziti-fabric/router/xlink" - "github.com/netfoundry/ziti-foundation/channel2" + "github.com/openziti/fabric/pb/ctrl_pb" + "github.com/openziti/fabric/router/xgress" + "github.com/openziti/fabric/router/xlink" + "github.com/openziti/foundation/channel2" ) type errorHandler struct { diff --git a/router/handler_link/payload.go b/router/handler_link/payload.go index 5ccc122bb..9cf71747f 100644 --- a/router/handler_link/payload.go +++ b/router/handler_link/payload.go @@ -18,11 +18,11 @@ package handler_link import ( "github.com/michaelquigley/pfxlog" - "github.com/netfoundry/ziti-fabric/router/forwarder" - "github.com/netfoundry/ziti-fabric/router/xgress" - "github.com/netfoundry/ziti-fabric/router/xlink" - "github.com/netfoundry/ziti-foundation/channel2" - "github.com/netfoundry/ziti-foundation/identity/identity" + "github.com/openziti/fabric/router/forwarder" + "github.com/openziti/fabric/router/xgress" + "github.com/openziti/fabric/router/xlink" + "github.com/openziti/foundation/channel2" + "github.com/openziti/foundation/identity/identity" ) type payloadHandler struct { diff --git a/router/handler_xgress/bind.go b/router/handler_xgress/bind.go index 3fcfbc6f7..85702296d 100644 --- a/router/handler_xgress/bind.go +++ b/router/handler_xgress/bind.go @@ -17,10 +17,10 @@ package handler_xgress import ( - "github.com/netfoundry/ziti-fabric/router/forwarder" - "github.com/netfoundry/ziti-fabric/router/metrics" - "github.com/netfoundry/ziti-fabric/router/xgress" - "github.com/netfoundry/ziti-foundation/identity/identity" + "github.com/openziti/fabric/router/forwarder" + "github.com/openziti/fabric/router/metrics" + "github.com/openziti/fabric/router/xgress" + "github.com/openziti/foundation/identity/identity" ) type bindHandler struct { diff --git a/router/handler_xgress/close.go b/router/handler_xgress/close.go index eb0b0344f..43c5b50b7 100644 --- a/router/handler_xgress/close.go +++ b/router/handler_xgress/close.go @@ -19,10 +19,10 @@ package handler_xgress import ( "github.com/golang/protobuf/proto" "github.com/michaelquigley/pfxlog" - "github.com/netfoundry/ziti-fabric/pb/ctrl_pb" - "github.com/netfoundry/ziti-fabric/router/forwarder" - "github.com/netfoundry/ziti-fabric/router/xgress" - "github.com/netfoundry/ziti-foundation/channel2" + "github.com/openziti/fabric/pb/ctrl_pb" + "github.com/openziti/fabric/router/forwarder" + "github.com/openziti/fabric/router/xgress" + "github.com/openziti/foundation/channel2" ) type closeHandler struct { diff --git a/router/handler_xgress/receive.go b/router/handler_xgress/receive.go index 8586c470f..80aa301a8 100644 --- a/router/handler_xgress/receive.go +++ b/router/handler_xgress/receive.go @@ -18,8 +18,8 @@ package handler_xgress import ( "github.com/michaelquigley/pfxlog" - "github.com/netfoundry/ziti-fabric/router/forwarder" - "github.com/netfoundry/ziti-fabric/router/xgress" + "github.com/openziti/fabric/router/forwarder" + "github.com/openziti/fabric/router/xgress" ) type receiveHandler struct { diff --git a/router/metrics/peekhandler.go b/router/metrics/peekhandler.go index 4b898caab..6f85ef15a 100644 --- a/router/metrics/peekhandler.go +++ b/router/metrics/peekhandler.go @@ -18,9 +18,9 @@ package metrics import ( "github.com/michaelquigley/pfxlog" - "github.com/netfoundry/ziti-fabric/router/xgress" - "github.com/netfoundry/ziti-foundation/channel2" - "github.com/netfoundry/ziti-foundation/metrics" + "github.com/openziti/fabric/router/xgress" + "github.com/openziti/foundation/channel2" + "github.com/openziti/foundation/metrics" "time" ) diff --git a/router/monitor_darwin.go b/router/monitor_darwin.go index 6f16348b1..31528b8c5 100644 --- a/router/monitor_darwin.go +++ b/router/monitor_darwin.go @@ -18,7 +18,7 @@ package router import ( "github.com/michaelquigley/pfxlog" - "github.com/netfoundry/ziti-fabric/router/forwarder" + "github.com/openziti/fabric/router/forwarder" "os" "os/signal" "syscall" diff --git a/router/monitor_linux.go b/router/monitor_linux.go index 6f16348b1..31528b8c5 100644 --- a/router/monitor_linux.go +++ b/router/monitor_linux.go @@ -18,7 +18,7 @@ package router import ( "github.com/michaelquigley/pfxlog" - "github.com/netfoundry/ziti-fabric/router/forwarder" + "github.com/openziti/fabric/router/forwarder" "os" "os/signal" "syscall" diff --git a/router/monitor_windows.go b/router/monitor_windows.go index beae15329..46707fdde 100644 --- a/router/monitor_windows.go +++ b/router/monitor_windows.go @@ -17,7 +17,7 @@ package router import ( - "github.com/netfoundry/ziti-fabric/router/forwarder" + "github.com/openziti/fabric/router/forwarder" "time" ) diff --git a/router/router.go b/router/router.go index c1703cfe2..db65b5e88 100644 --- a/router/router.go +++ b/router/router.go @@ -20,25 +20,25 @@ import ( "encoding/json" "fmt" "github.com/michaelquigley/pfxlog" - "github.com/netfoundry/ziti-fabric/controller/network" - "github.com/netfoundry/ziti-fabric/controller/xctrl" - "github.com/netfoundry/ziti-fabric/router/forwarder" - "github.com/netfoundry/ziti-fabric/router/handler_ctrl" - "github.com/netfoundry/ziti-fabric/router/handler_link" - "github.com/netfoundry/ziti-fabric/router/handler_xgress" - "github.com/netfoundry/ziti-fabric/router/xgress" - "github.com/netfoundry/ziti-fabric/router/xgress_proxy" - "github.com/netfoundry/ziti-fabric/router/xgress_proxy_udp" - "github.com/netfoundry/ziti-fabric/router/xgress_transport" - "github.com/netfoundry/ziti-fabric/router/xgress_transport_udp" - "github.com/netfoundry/ziti-fabric/router/xlink" - "github.com/netfoundry/ziti-fabric/router/xlink_transport" - "github.com/netfoundry/ziti-fabric/router/xlink_transwarp" - "github.com/netfoundry/ziti-foundation/channel2" - "github.com/netfoundry/ziti-foundation/metrics" - "github.com/netfoundry/ziti-foundation/profiler" - "github.com/netfoundry/ziti-foundation/util/concurrenz" - "github.com/netfoundry/ziti-foundation/util/info" + "github.com/openziti/fabric/controller/network" + "github.com/openziti/fabric/controller/xctrl" + "github.com/openziti/fabric/router/forwarder" + "github.com/openziti/fabric/router/handler_ctrl" + "github.com/openziti/fabric/router/handler_link" + "github.com/openziti/fabric/router/handler_xgress" + "github.com/openziti/fabric/router/xgress" + "github.com/openziti/fabric/router/xgress_proxy" + "github.com/openziti/fabric/router/xgress_proxy_udp" + "github.com/openziti/fabric/router/xgress_transport" + "github.com/openziti/fabric/router/xgress_transport_udp" + "github.com/openziti/fabric/router/xlink" + "github.com/openziti/fabric/router/xlink_transport" + "github.com/openziti/fabric/router/xlink_transwarp" + "github.com/openziti/foundation/channel2" + "github.com/openziti/foundation/metrics" + "github.com/openziti/foundation/profiler" + "github.com/openziti/foundation/util/concurrenz" + "github.com/openziti/foundation/util/info" "github.com/sirupsen/logrus" "math/rand" "time" diff --git a/router/xgress/ctrl.go b/router/xgress/ctrl.go index 1da24503d..62af53a0a 100644 --- a/router/xgress/ctrl.go +++ b/router/xgress/ctrl.go @@ -17,7 +17,7 @@ package xgress import ( - "github.com/netfoundry/ziti-foundation/channel2" + "github.com/openziti/foundation/channel2" ) type CtrlChannel interface { diff --git a/router/xgress/decoder.go b/router/xgress/decoder.go index b80675514..23d8aaa35 100644 --- a/router/xgress/decoder.go +++ b/router/xgress/decoder.go @@ -19,7 +19,7 @@ package xgress import ( "fmt" "github.com/michaelquigley/pfxlog" - "github.com/netfoundry/ziti-foundation/channel2" + "github.com/openziti/foundation/channel2" ) type Decoder struct{} diff --git a/router/xgress/messages.go b/router/xgress/messages.go index eeca793de..8cdf6fe9b 100644 --- a/router/xgress/messages.go +++ b/router/xgress/messages.go @@ -19,8 +19,8 @@ package xgress import ( "encoding/binary" "fmt" - "github.com/netfoundry/ziti-foundation/channel2" - "github.com/netfoundry/ziti-foundation/util/uuidz" + "github.com/openziti/foundation/channel2" + "github.com/openziti/foundation/util/uuidz" "github.com/sirupsen/logrus" "math" ) diff --git a/router/xgress/payload_buffer.go b/router/xgress/payload_buffer.go index 3191d4c08..db5c6d6bf 100644 --- a/router/xgress/payload_buffer.go +++ b/router/xgress/payload_buffer.go @@ -20,8 +20,8 @@ import ( "errors" "fmt" "github.com/michaelquigley/pfxlog" - "github.com/netfoundry/ziti-foundation/identity/identity" - "github.com/netfoundry/ziti-foundation/util/info" + "github.com/openziti/foundation/identity/identity" + "github.com/openziti/foundation/util/info" "github.com/orcaman/concurrent-map" "time" ) diff --git a/router/xgress/readuntil.go b/router/xgress/readuntil.go index 58fbdadde..60c692e69 100644 --- a/router/xgress/readuntil.go +++ b/router/xgress/readuntil.go @@ -18,7 +18,7 @@ package xgress import ( "errors" - "github.com/netfoundry/ziti-foundation/transport" + "github.com/openziti/foundation/transport" ) func ReadUntilNewline(peer transport.Connection) ([]byte, error) { diff --git a/router/xgress/request.go b/router/xgress/request.go index c5a8a0cc5..7f7ac3d86 100644 --- a/router/xgress/request.go +++ b/router/xgress/request.go @@ -20,11 +20,11 @@ import ( "encoding/json" "github.com/golang/protobuf/proto" "github.com/michaelquigley/pfxlog" - "github.com/netfoundry/ziti-fabric/ctrl_msg" - "github.com/netfoundry/ziti-fabric/pb/ctrl_pb" - "github.com/netfoundry/ziti-foundation/channel2" - "github.com/netfoundry/ziti-foundation/identity/identity" - "github.com/netfoundry/ziti-foundation/transport" + "github.com/openziti/fabric/ctrl_msg" + "github.com/openziti/fabric/pb/ctrl_pb" + "github.com/openziti/foundation/channel2" + "github.com/openziti/foundation/identity/identity" + "github.com/openziti/foundation/transport" "github.com/pkg/errors" "io" "time" diff --git a/router/xgress/xgress.go b/router/xgress/xgress.go index 7698d52ec..3c026566e 100644 --- a/router/xgress/xgress.go +++ b/router/xgress/xgress.go @@ -19,10 +19,10 @@ package xgress import ( "fmt" "github.com/michaelquigley/pfxlog" - "github.com/netfoundry/ziti-foundation/identity/identity" - "github.com/netfoundry/ziti-foundation/util/concurrenz" - "github.com/netfoundry/ziti-foundation/util/info" - "github.com/netfoundry/ziti-foundation/util/mathz" + "github.com/openziti/foundation/identity/identity" + "github.com/openziti/foundation/util/concurrenz" + "github.com/openziti/foundation/util/info" + "github.com/openziti/foundation/util/mathz" "github.com/sirupsen/logrus" "io" "math/rand" diff --git a/router/xgress_proxy/connection.go b/router/xgress_proxy/connection.go index 7dadf6feb..4a909383a 100644 --- a/router/xgress_proxy/connection.go +++ b/router/xgress_proxy/connection.go @@ -16,7 +16,7 @@ package xgress_proxy -import "github.com/netfoundry/ziti-foundation/transport" +import "github.com/openziti/foundation/transport" type proxyXgressConnection struct { transport.Connection diff --git a/router/xgress_proxy/factory.go b/router/xgress_proxy/factory.go index 1de2aef76..3b4e780da 100644 --- a/router/xgress_proxy/factory.go +++ b/router/xgress_proxy/factory.go @@ -18,8 +18,8 @@ package xgress_proxy import ( "fmt" - "github.com/netfoundry/ziti-fabric/router/xgress" - "github.com/netfoundry/ziti-foundation/identity/identity" + "github.com/openziti/fabric/router/xgress" + "github.com/openziti/foundation/identity/identity" ) func NewFactory(id *identity.TokenId, ctrl xgress.CtrlChannel) xgress.Factory { diff --git a/router/xgress_proxy/listener.go b/router/xgress_proxy/listener.go index 8f8aa147a..0da7abf49 100644 --- a/router/xgress_proxy/listener.go +++ b/router/xgress_proxy/listener.go @@ -19,9 +19,9 @@ package xgress_proxy import ( "fmt" "github.com/michaelquigley/pfxlog" - "github.com/netfoundry/ziti-fabric/router/xgress" - "github.com/netfoundry/ziti-foundation/identity/identity" - "github.com/netfoundry/ziti-foundation/transport" + "github.com/openziti/fabric/router/xgress" + "github.com/openziti/foundation/identity/identity" + "github.com/openziti/foundation/transport" ) func newListener(id *identity.TokenId, ctrl xgress.CtrlChannel, options *xgress.Options, service string) xgress.Listener { diff --git a/router/xgress_proxy_udp/factory.go b/router/xgress_proxy_udp/factory.go index 46f8d2220..802b54854 100644 --- a/router/xgress_proxy_udp/factory.go +++ b/router/xgress_proxy_udp/factory.go @@ -18,7 +18,7 @@ package xgress_proxy_udp import ( "fmt" - "github.com/netfoundry/ziti-fabric/router/xgress" + "github.com/openziti/fabric/router/xgress" ) func NewFactory(ctrl xgress.CtrlChannel) xgress.Factory { diff --git a/router/xgress_proxy_udp/listener.go b/router/xgress_proxy_udp/listener.go index 09a3d0d65..485564798 100644 --- a/router/xgress_proxy_udp/listener.go +++ b/router/xgress_proxy_udp/listener.go @@ -18,9 +18,9 @@ package xgress_proxy_udp import ( "fmt" - "github.com/netfoundry/ziti-fabric/router/xgress" - "github.com/netfoundry/ziti-fabric/router/xgress_udp" - "github.com/netfoundry/ziti-foundation/transport/udp" + "github.com/openziti/fabric/router/xgress" + "github.com/openziti/fabric/router/xgress_udp" + "github.com/openziti/foundation/transport/udp" "github.com/sirupsen/logrus" "net" "time" diff --git a/router/xgress_transport/client.go b/router/xgress_transport/client.go index 6de938361..e08e32eec 100644 --- a/router/xgress_transport/client.go +++ b/router/xgress_transport/client.go @@ -18,9 +18,9 @@ package xgress_transport import ( "errors" - "github.com/netfoundry/ziti-fabric/router/xgress" - "github.com/netfoundry/ziti-foundation/identity/identity" - "github.com/netfoundry/ziti-foundation/transport" + "github.com/openziti/fabric/router/xgress" + "github.com/openziti/foundation/identity/identity" + "github.com/openziti/foundation/transport" ) // ClientDial dials the given xgress address and handles authentication, returning an authed connection or an error diff --git a/router/xgress_transport/connection.go b/router/xgress_transport/connection.go index dac87cb8f..007e8d082 100644 --- a/router/xgress_transport/connection.go +++ b/router/xgress_transport/connection.go @@ -17,7 +17,7 @@ package xgress_transport import ( - "github.com/netfoundry/ziti-foundation/transport" + "github.com/openziti/foundation/transport" ) type transportXgresscConn struct { diff --git a/router/xgress_transport/dialer.go b/router/xgress_transport/dialer.go index 0ad369ace..76297c61a 100644 --- a/router/xgress_transport/dialer.go +++ b/router/xgress_transport/dialer.go @@ -18,9 +18,9 @@ package xgress_transport import ( "fmt" - "github.com/netfoundry/ziti-fabric/router/xgress" - "github.com/netfoundry/ziti-foundation/identity/identity" - "github.com/netfoundry/ziti-foundation/transport" + "github.com/openziti/fabric/router/xgress" + "github.com/openziti/foundation/identity/identity" + "github.com/openziti/foundation/transport" ) type dialer struct { diff --git a/router/xgress_transport/factory.go b/router/xgress_transport/factory.go index 552f07dda..0d000a424 100644 --- a/router/xgress_transport/factory.go +++ b/router/xgress_transport/factory.go @@ -17,8 +17,8 @@ package xgress_transport import ( - "github.com/netfoundry/ziti-fabric/router/xgress" - "github.com/netfoundry/ziti-foundation/identity/identity" + "github.com/openziti/fabric/router/xgress" + "github.com/openziti/foundation/identity/identity" ) type factory struct { diff --git a/router/xgress_transport/listener.go b/router/xgress_transport/listener.go index b21d16751..049a43b9e 100644 --- a/router/xgress_transport/listener.go +++ b/router/xgress_transport/listener.go @@ -19,9 +19,9 @@ package xgress_transport import ( "fmt" "github.com/michaelquigley/pfxlog" - "github.com/netfoundry/ziti-fabric/router/xgress" - "github.com/netfoundry/ziti-foundation/identity/identity" - "github.com/netfoundry/ziti-foundation/transport" + "github.com/openziti/fabric/router/xgress" + "github.com/openziti/foundation/identity/identity" + "github.com/openziti/foundation/transport" ) type listener struct { diff --git a/router/xgress_transport_udp/connection.go b/router/xgress_transport_udp/connection.go index 0246e4eda..6f205fcc6 100644 --- a/router/xgress_transport_udp/connection.go +++ b/router/xgress_transport_udp/connection.go @@ -17,8 +17,8 @@ package xgress_transport_udp import ( - "github.com/netfoundry/ziti-fabric/router/xgress" - "github.com/netfoundry/ziti-foundation/transport/udp" + "github.com/openziti/fabric/router/xgress" + "github.com/openziti/foundation/transport/udp" "net" ) diff --git a/router/xgress_transport_udp/dialer.go b/router/xgress_transport_udp/dialer.go index 940928e5a..01df7d23a 100644 --- a/router/xgress_transport_udp/dialer.go +++ b/router/xgress_transport_udp/dialer.go @@ -18,9 +18,9 @@ package xgress_transport_udp import ( "fmt" - "github.com/netfoundry/ziti-fabric/router/xgress" - "github.com/netfoundry/ziti-fabric/router/xgress_udp" - "github.com/netfoundry/ziti-foundation/identity/identity" + "github.com/openziti/fabric/router/xgress" + "github.com/openziti/fabric/router/xgress_udp" + "github.com/openziti/foundation/identity/identity" "github.com/sirupsen/logrus" "net" ) diff --git a/router/xgress_transport_udp/factory.go b/router/xgress_transport_udp/factory.go index 9b566aa8e..e838cb7ba 100644 --- a/router/xgress_transport_udp/factory.go +++ b/router/xgress_transport_udp/factory.go @@ -17,8 +17,8 @@ package xgress_transport_udp import ( - "github.com/netfoundry/ziti-fabric/router/xgress" - "github.com/netfoundry/ziti-foundation/identity/identity" + "github.com/openziti/fabric/router/xgress" + "github.com/openziti/foundation/identity/identity" ) func NewFactory(id *identity.TokenId, ctrl xgress.CtrlChannel) xgress.Factory { diff --git a/router/xgress_transport_udp/listener.go b/router/xgress_transport_udp/listener.go index a97dd30f0..0c58f9bcb 100644 --- a/router/xgress_transport_udp/listener.go +++ b/router/xgress_transport_udp/listener.go @@ -19,10 +19,10 @@ package xgress_transport_udp import ( "fmt" "github.com/michaelquigley/pfxlog" - "github.com/netfoundry/ziti-fabric/router/xgress" - "github.com/netfoundry/ziti-fabric/router/xgress_udp" - "github.com/netfoundry/ziti-foundation/identity/identity" - "github.com/netfoundry/ziti-foundation/transport/udp" + "github.com/openziti/fabric/router/xgress" + "github.com/openziti/fabric/router/xgress_udp" + "github.com/openziti/foundation/identity/identity" + "github.com/openziti/foundation/transport/udp" "net" "time" ) diff --git a/router/xlink/xlink.go b/router/xlink/xlink.go index 57953db07..c01fe792a 100644 --- a/router/xlink/xlink.go +++ b/router/xlink/xlink.go @@ -17,8 +17,8 @@ package xlink import ( - "github.com/netfoundry/ziti-fabric/router/xgress" - "github.com/netfoundry/ziti-foundation/identity/identity" + "github.com/openziti/fabric/router/xgress" + "github.com/openziti/foundation/identity/identity" ) type Factory interface { diff --git a/router/xlink_transport/accepter.go b/router/xlink_transport/accepter.go index d576d9258..e0bada689 100644 --- a/router/xlink_transport/accepter.go +++ b/router/xlink_transport/accepter.go @@ -1,8 +1,8 @@ package xlink_transport import ( - "github.com/netfoundry/ziti-fabric/router/xlink" - "github.com/netfoundry/ziti-foundation/channel2" + "github.com/openziti/fabric/router/xlink" + "github.com/openziti/foundation/channel2" ) // ChannelAccepter can be implemented and provided to the factory to perform channel2 binding and other channel setup diff --git a/router/xlink_transport/config.go b/router/xlink_transport/config.go index ca7249cc2..e9f887471 100644 --- a/router/xlink_transport/config.go +++ b/router/xlink_transport/config.go @@ -18,8 +18,8 @@ package xlink_transport import ( "fmt" - "github.com/netfoundry/ziti-foundation/channel2" - "github.com/netfoundry/ziti-foundation/transport" + "github.com/openziti/foundation/channel2" + "github.com/openziti/foundation/transport" "reflect" ) diff --git a/router/xlink_transport/dialer.go b/router/xlink_transport/dialer.go index 48fc776d6..33f41670a 100644 --- a/router/xlink_transport/dialer.go +++ b/router/xlink_transport/dialer.go @@ -18,10 +18,10 @@ package xlink_transport import ( "fmt" - "github.com/netfoundry/ziti-fabric/router/xlink" - "github.com/netfoundry/ziti-foundation/channel2" - "github.com/netfoundry/ziti-foundation/identity/identity" - "github.com/netfoundry/ziti-foundation/transport" + "github.com/openziti/fabric/router/xlink" + "github.com/openziti/foundation/channel2" + "github.com/openziti/foundation/identity/identity" + "github.com/openziti/foundation/transport" "github.com/sirupsen/logrus" ) diff --git a/router/xlink_transport/factory.go b/router/xlink_transport/factory.go index 5c4d5fdcc..bf5d18647 100644 --- a/router/xlink_transport/factory.go +++ b/router/xlink_transport/factory.go @@ -18,8 +18,8 @@ package xlink_transport import ( "fmt" - "github.com/netfoundry/ziti-fabric/router/xlink" - "github.com/netfoundry/ziti-foundation/identity/identity" + "github.com/openziti/fabric/router/xlink" + "github.com/openziti/foundation/identity/identity" ) func NewFactory(accepter xlink.Accepter, chAccepter ChannelAccepter) xlink.Factory { diff --git a/router/xlink_transport/listener.go b/router/xlink_transport/listener.go index 0f4f2e0b5..619694a5d 100644 --- a/router/xlink_transport/listener.go +++ b/router/xlink_transport/listener.go @@ -19,9 +19,9 @@ package xlink_transport import ( "errors" "fmt" - "github.com/netfoundry/ziti-fabric/router/xlink" - "github.com/netfoundry/ziti-foundation/channel2" - "github.com/netfoundry/ziti-foundation/identity/identity" + "github.com/openziti/fabric/router/xlink" + "github.com/openziti/foundation/channel2" + "github.com/openziti/foundation/identity/identity" "github.com/sirupsen/logrus" ) diff --git a/router/xlink_transport/xlink.go b/router/xlink_transport/xlink.go index 95da55284..864ccf852 100644 --- a/router/xlink_transport/xlink.go +++ b/router/xlink_transport/xlink.go @@ -17,9 +17,9 @@ package xlink_transport import ( - "github.com/netfoundry/ziti-fabric/router/xgress" - "github.com/netfoundry/ziti-foundation/channel2" - "github.com/netfoundry/ziti-foundation/identity/identity" + "github.com/openziti/fabric/router/xgress" + "github.com/openziti/foundation/channel2" + "github.com/openziti/foundation/identity/identity" ) func (self *impl) Id() *identity.TokenId { diff --git a/router/xlink_transwarp/dialer.go b/router/xlink_transwarp/dialer.go index fea11a70b..09a7b2f4a 100644 --- a/router/xlink_transwarp/dialer.go +++ b/router/xlink_transwarp/dialer.go @@ -18,8 +18,8 @@ package xlink_transwarp import ( "fmt" - "github.com/netfoundry/ziti-fabric/router/xlink" - "github.com/netfoundry/ziti-foundation/identity/identity" + "github.com/openziti/fabric/router/xlink" + "github.com/openziti/foundation/identity/identity" "github.com/sirupsen/logrus" "net" "time" diff --git a/router/xlink_transwarp/factory.go b/router/xlink_transwarp/factory.go index 81c09ab16..4f9affced 100644 --- a/router/xlink_transwarp/factory.go +++ b/router/xlink_transwarp/factory.go @@ -18,8 +18,8 @@ package xlink_transwarp import ( "fmt" - "github.com/netfoundry/ziti-fabric/router/xlink" - "github.com/netfoundry/ziti-foundation/identity/identity" + "github.com/openziti/fabric/router/xlink" + "github.com/openziti/foundation/identity/identity" ) func NewFactory(accepter xlink.Accepter) xlink.Factory { diff --git a/router/xlink_transwarp/listener.go b/router/xlink_transwarp/listener.go index c4377eca3..794fcb96e 100644 --- a/router/xlink_transwarp/listener.go +++ b/router/xlink_transwarp/listener.go @@ -18,9 +18,9 @@ package xlink_transwarp import ( "fmt" - "github.com/netfoundry/ziti-fabric/router/xlink" - "github.com/netfoundry/ziti-foundation/identity/identity" - "github.com/netfoundry/ziti-foundation/util/concurrenz" + "github.com/openziti/fabric/router/xlink" + "github.com/openziti/foundation/identity/identity" + "github.com/openziti/foundation/util/concurrenz" "github.com/sirupsen/logrus" "net" ) diff --git a/router/xlink_transwarp/message.go b/router/xlink_transwarp/message.go index 587399424..48a8e96bc 100644 --- a/router/xlink_transwarp/message.go +++ b/router/xlink_transwarp/message.go @@ -20,9 +20,9 @@ import ( "bytes" "encoding/binary" "fmt" - "github.com/netfoundry/ziti-fabric/router/xgress" - "github.com/netfoundry/ziti-foundation/identity/identity" - "github.com/netfoundry/ziti-foundation/transport/udp" + "github.com/openziti/fabric/router/xgress" + "github.com/openziti/foundation/identity/identity" + "github.com/openziti/foundation/transport/udp" "net" "time" ) diff --git a/router/xlink_transwarp/message_acknowledgement.go b/router/xlink_transwarp/message_acknowledgement.go index 7cba57301..82f7f68c4 100644 --- a/router/xlink_transwarp/message_acknowledgement.go +++ b/router/xlink_transwarp/message_acknowledgement.go @@ -19,7 +19,7 @@ package xlink_transwarp import ( "bytes" "encoding/binary" - "github.com/netfoundry/ziti-fabric/router/xgress" + "github.com/openziti/fabric/router/xgress" ) /* diff --git a/router/xlink_transwarp/message_payload.go b/router/xlink_transwarp/message_payload.go index 20e71ee2a..5351cc121 100644 --- a/router/xlink_transwarp/message_payload.go +++ b/router/xlink_transwarp/message_payload.go @@ -19,7 +19,7 @@ package xlink_transwarp import ( "bytes" "encoding/binary" - "github.com/netfoundry/ziti-fabric/router/xgress" + "github.com/openziti/fabric/router/xgress" ) /* diff --git a/router/xlink_transwarp/xlink.go b/router/xlink_transwarp/xlink.go index 48f7434b4..51adaa9d9 100644 --- a/router/xlink_transwarp/xlink.go +++ b/router/xlink_transwarp/xlink.go @@ -18,9 +18,9 @@ package xlink_transwarp import ( "fmt" - "github.com/netfoundry/ziti-fabric/router/xgress" - "github.com/netfoundry/ziti-fabric/router/xlink" - "github.com/netfoundry/ziti-foundation/identity/identity" + "github.com/openziti/fabric/router/xgress" + "github.com/openziti/fabric/router/xlink" + "github.com/openziti/foundation/identity/identity" "github.com/sirupsen/logrus" "net" "sync" diff --git a/trace/channel_peekhandler.go b/trace/channel_peekhandler.go index a72999095..0d76f9ceb 100644 --- a/trace/channel_peekhandler.go +++ b/trace/channel_peekhandler.go @@ -20,12 +20,12 @@ import ( "fmt" "github.com/golang/protobuf/proto" "github.com/michaelquigley/pfxlog" - "github.com/netfoundry/ziti-fabric/pb/ctrl_pb" - "github.com/netfoundry/ziti-fabric/pb/mgmt_pb" - "github.com/netfoundry/ziti-fabric/router/xgress" - "github.com/netfoundry/ziti-foundation/channel2" - "github.com/netfoundry/ziti-foundation/identity/identity" - trace_pb "github.com/netfoundry/ziti-foundation/trace/pb" + "github.com/openziti/fabric/pb/ctrl_pb" + "github.com/openziti/fabric/pb/mgmt_pb" + "github.com/openziti/fabric/router/xgress" + "github.com/openziti/foundation/channel2" + "github.com/openziti/foundation/identity/identity" + trace_pb "github.com/openziti/foundation/trace/pb" "sync/atomic" "time" ) diff --git a/trace/controller.go b/trace/controller.go index 38aee6f55..831e65a00 100644 --- a/trace/controller.go +++ b/trace/controller.go @@ -18,7 +18,7 @@ package trace import ( "fmt" - "github.com/netfoundry/ziti-foundation/trace/pb" + "github.com/openziti/foundation/trace/pb" "regexp" "strings" ) diff --git a/trace/event_controller.go b/trace/event_controller.go index f428719cb..a68efffb5 100644 --- a/trace/event_controller.go +++ b/trace/event_controller.go @@ -19,9 +19,9 @@ package trace import ( "github.com/golang/protobuf/proto" "github.com/michaelquigley/pfxlog" - "github.com/netfoundry/ziti-fabric/pb/ctrl_pb" - "github.com/netfoundry/ziti-foundation/channel2" - "github.com/netfoundry/ziti-foundation/trace/pb" + "github.com/openziti/fabric/pb/ctrl_pb" + "github.com/openziti/foundation/channel2" + "github.com/openziti/foundation/trace/pb" ) // EventHandler is for types wishing to receive trace messages diff --git a/trace/filter.go b/trace/filter.go index 3d345512c..37969c2ca 100644 --- a/trace/filter.go +++ b/trace/filter.go @@ -16,7 +16,7 @@ package trace -import tracepb "github.com/netfoundry/ziti-foundation/trace/pb" +import tracepb "github.com/openziti/foundation/trace/pb" type Filter interface { Accept(event *tracepb.ChannelMessage) bool diff --git a/trace/xgress_peekhandler.go b/trace/xgress_peekhandler.go index ab2999b2b..452b0ce83 100644 --- a/trace/xgress_peekhandler.go +++ b/trace/xgress_peekhandler.go @@ -18,10 +18,10 @@ package trace import ( "fmt" - "github.com/netfoundry/ziti-fabric/router/xgress" - "github.com/netfoundry/ziti-foundation/channel2" - "github.com/netfoundry/ziti-foundation/identity/identity" - trace_pb "github.com/netfoundry/ziti-foundation/trace/pb" + "github.com/openziti/fabric/router/xgress" + "github.com/openziti/foundation/channel2" + "github.com/openziti/foundation/identity/identity" + trace_pb "github.com/openziti/foundation/trace/pb" "sync/atomic" "time" )