From 7d6f4ef7002b09e220cd5fd17c54f8623cca2330 Mon Sep 17 00:00:00 2001 From: Paul Lorenz Date: Fri, 4 Aug 2023 09:48:06 -0400 Subject: [PATCH] Reorganize code in preparation for merging to ziti repo, first pass. --- {edge_common => common}/binding.go | 2 +- {runner => common/runner}/operation.go | 0 {runner => common/runner}/runner.go | 0 controller/env/appenv.go | 2 +- {events => controller/events}/api_session.go | 0 {events => controller/events}/dispatcher.go | 0 .../events}/dispatcher_api_session.go | 0 .../events}/dispatcher_entity_counts.go | 0 .../events}/dispatcher_session.go | 0 .../events}/entity_counts.go | 0 {events => controller/events}/formatter.go | 0 {events => controller/events}/session.go | 0 .../handler_edge_ctrl/create_terminator.go | 4 +- .../create_tunnel_terminator.go | 4 +- .../handler_edge_ctrl/remove_terminator.go | 4 +- .../remove_tunnel_terminator.go | 4 +- .../handler_edge_ctrl/tunnel_health_event.go | 4 +- .../handler_edge_ctrl/update_terminator.go | 4 +- .../update_tunnel_terminator.go | 4 +- .../internal/policy/api_session_enforcer.go | 2 +- .../policy/service_policy_enforcer.go | 2 +- controller/model/authenticator_manager.go | 11 ++- controller/model/create_terminator_cmd.go | 4 +- controller/model/enrollment_mod_updb.go | 3 +- {crypto => controller/model}/hash.go | 2 +- controller/server/controller.go | 6 +- logconf/logconf.go | 84 ------------------- router/fabric/heartbeat.go | 2 +- router/fabric/manager.go | 6 +- router/internal/edgerouter/config.go | 4 +- router/xgress_edge/factory_test.go | 6 +- tests/context.go | 6 +- tests/events_test.go | 2 +- tunnel/entities/service.go | 2 +- {health => tunnel/health}/checks.go | 0 {health => tunnel/health}/checks_test.go | 0 {health => tunnel/health}/health.go | 0 {health => tunnel/health}/health_test.go | 0 {health => tunnel/health}/round_test.go | 0 tunnel/intercept/hosting.go | 2 +- tunnel/intercept/svcpoll.go | 2 +- tunnel/provider.go | 2 +- 42 files changed, 47 insertions(+), 133 deletions(-) rename {edge_common => common}/binding.go (96%) rename {runner => common/runner}/operation.go (100%) rename {runner => common/runner}/runner.go (100%) rename {events => controller/events}/api_session.go (100%) rename {events => controller/events}/dispatcher.go (100%) rename {events => controller/events}/dispatcher_api_session.go (100%) rename {events => controller/events}/dispatcher_entity_counts.go (100%) rename {events => controller/events}/dispatcher_session.go (100%) rename {events => controller/events}/entity_counts.go (100%) rename {events => controller/events}/formatter.go (100%) rename {events => controller/events}/session.go (100%) rename {crypto => controller/model}/hash.go (98%) delete mode 100644 logconf/logconf.go rename {health => tunnel/health}/checks.go (100%) rename {health => tunnel/health}/checks_test.go (100%) rename {health => tunnel/health}/health.go (100%) rename {health => tunnel/health}/health_test.go (100%) rename {health => tunnel/health}/round_test.go (100%) diff --git a/edge_common/binding.go b/common/binding.go similarity index 96% rename from edge_common/binding.go rename to common/binding.go index 45d9f5698..cc412a835 100644 --- a/edge_common/binding.go +++ b/common/binding.go @@ -14,7 +14,7 @@ limitations under the License. */ -package edge_common +package common const ( EdgeBinding = "edge" diff --git a/runner/operation.go b/common/runner/operation.go similarity index 100% rename from runner/operation.go rename to common/runner/operation.go diff --git a/runner/runner.go b/common/runner/runner.go similarity index 100% rename from runner/runner.go rename to common/runner/runner.go diff --git a/controller/env/appenv.go b/controller/env/appenv.go index 68812ec7f..c49dedc10 100644 --- a/controller/env/appenv.go +++ b/controller/env/appenv.go @@ -36,12 +36,12 @@ import ( managementOperations "github.com/openziti/edge-api/rest_management_api_server/operations" "github.com/openziti/edge-api/rest_model" edgeConfig "github.com/openziti/edge/controller/config" + "github.com/openziti/edge/controller/events" "github.com/openziti/edge/controller/internal/permissions" "github.com/openziti/edge/controller/model" "github.com/openziti/edge/controller/persistence" "github.com/openziti/edge/controller/response" "github.com/openziti/edge/eid" - "github.com/openziti/edge/events" "github.com/openziti/edge/internal/cert" "github.com/openziti/edge/internal/jwtsigner" "github.com/openziti/fabric/controller/api" diff --git a/events/api_session.go b/controller/events/api_session.go similarity index 100% rename from events/api_session.go rename to controller/events/api_session.go diff --git a/events/dispatcher.go b/controller/events/dispatcher.go similarity index 100% rename from events/dispatcher.go rename to controller/events/dispatcher.go diff --git a/events/dispatcher_api_session.go b/controller/events/dispatcher_api_session.go similarity index 100% rename from events/dispatcher_api_session.go rename to controller/events/dispatcher_api_session.go diff --git a/events/dispatcher_entity_counts.go b/controller/events/dispatcher_entity_counts.go similarity index 100% rename from events/dispatcher_entity_counts.go rename to controller/events/dispatcher_entity_counts.go diff --git a/events/dispatcher_session.go b/controller/events/dispatcher_session.go similarity index 100% rename from events/dispatcher_session.go rename to controller/events/dispatcher_session.go diff --git a/events/entity_counts.go b/controller/events/entity_counts.go similarity index 100% rename from events/entity_counts.go rename to controller/events/entity_counts.go diff --git a/events/formatter.go b/controller/events/formatter.go similarity index 100% rename from events/formatter.go rename to controller/events/formatter.go diff --git a/events/session.go b/controller/events/session.go similarity index 100% rename from events/session.go rename to controller/events/session.go diff --git a/controller/handler_edge_ctrl/create_terminator.go b/controller/handler_edge_ctrl/create_terminator.go index 0e9ec3220..6b1b03351 100644 --- a/controller/handler_edge_ctrl/create_terminator.go +++ b/controller/handler_edge_ctrl/create_terminator.go @@ -20,10 +20,10 @@ import ( "fmt" "github.com/michaelquigley/pfxlog" "github.com/openziti/channel/v2" + "github.com/openziti/edge/common" "github.com/openziti/edge/controller/env" "github.com/openziti/edge/controller/model" "github.com/openziti/edge/controller/persistence" - "github.com/openziti/edge/edge_common" "github.com/openziti/edge/pb/edge_ctrl_pb" "github.com/openziti/fabric/controller/idgen" "github.com/openziti/fabric/controller/models" @@ -105,7 +105,7 @@ func (self *createTerminatorHandler) CreateTerminator(ctx *CreateTerminatorReque }, Service: ctx.session.ServiceId, Router: ctx.sourceRouter.Id, - Binding: edge_common.EdgeBinding, + Binding: common.EdgeBinding, Address: "hosted:" + ctx.session.Token, InstanceId: ctx.req.InstanceId, InstanceSecret: ctx.req.InstanceSecret, diff --git a/controller/handler_edge_ctrl/create_tunnel_terminator.go b/controller/handler_edge_ctrl/create_tunnel_terminator.go index d68cfc8ac..596c81769 100644 --- a/controller/handler_edge_ctrl/create_tunnel_terminator.go +++ b/controller/handler_edge_ctrl/create_tunnel_terminator.go @@ -20,9 +20,9 @@ import ( "fmt" "github.com/michaelquigley/pfxlog" "github.com/openziti/channel/v2" + "github.com/openziti/edge/common" "github.com/openziti/edge/controller/env" "github.com/openziti/edge/controller/persistence" - "github.com/openziti/edge/edge_common" "github.com/openziti/edge/pb/edge_ctrl_pb" "github.com/openziti/fabric/controller/models" "github.com/openziti/fabric/controller/network" @@ -114,7 +114,7 @@ func (self *createTunnelTerminatorHandler) CreateTerminator(ctx *CreateTunnelTer }, Service: ctx.session.ServiceId, Router: ctx.sourceRouter.Id, - Binding: edge_common.TunnelBinding, + Binding: common.TunnelBinding, Address: ctx.req.Address, InstanceId: ctx.req.InstanceId, InstanceSecret: ctx.req.InstanceSecret, diff --git a/controller/handler_edge_ctrl/remove_terminator.go b/controller/handler_edge_ctrl/remove_terminator.go index 31d182424..ff0c010ae 100644 --- a/controller/handler_edge_ctrl/remove_terminator.go +++ b/controller/handler_edge_ctrl/remove_terminator.go @@ -19,9 +19,9 @@ package handler_edge_ctrl import ( "github.com/michaelquigley/pfxlog" "github.com/openziti/channel/v2" + "github.com/openziti/edge/common" "github.com/openziti/edge/controller/env" "github.com/openziti/edge/controller/persistence" - "github.com/openziti/edge/edge_common" "github.com/openziti/edge/pb/edge_ctrl_pb" "github.com/sirupsen/logrus" "google.golang.org/protobuf/proto" @@ -78,7 +78,7 @@ func (self *removeTerminatorHandler) RemoveTerminator(ctx *RemoveTerminatorReque return } - terminator := ctx.verifyTerminator(ctx.req.TerminatorId, edge_common.EdgeBinding) + terminator := ctx.verifyTerminator(ctx.req.TerminatorId, common.EdgeBinding) if ctx.err != nil { self.returnError(ctx, ctx.err) return diff --git a/controller/handler_edge_ctrl/remove_tunnel_terminator.go b/controller/handler_edge_ctrl/remove_tunnel_terminator.go index 5dff69ae7..88d6596a9 100644 --- a/controller/handler_edge_ctrl/remove_tunnel_terminator.go +++ b/controller/handler_edge_ctrl/remove_tunnel_terminator.go @@ -18,8 +18,8 @@ package handler_edge_ctrl import ( "github.com/openziti/channel/v2" + "github.com/openziti/edge/common" "github.com/openziti/edge/controller/env" - "github.com/openziti/edge/edge_common" "github.com/openziti/edge/pb/edge_ctrl_pb" "github.com/sirupsen/logrus" ) @@ -61,7 +61,7 @@ func (self *removeTunnelTerminatorHandler) RemoveTerminator(ctx *RemoveTunnelTer return } - t := ctx.verifyTerminator(ctx.terminatorId, edge_common.TunnelBinding) + t := ctx.verifyTerminator(ctx.terminatorId, common.TunnelBinding) if ctx.err != nil { self.returnError(ctx, ctx.err) return diff --git a/controller/handler_edge_ctrl/tunnel_health_event.go b/controller/handler_edge_ctrl/tunnel_health_event.go index 54b0b48b6..c31457e44 100644 --- a/controller/handler_edge_ctrl/tunnel_health_event.go +++ b/controller/handler_edge_ctrl/tunnel_health_event.go @@ -18,8 +18,8 @@ package handler_edge_ctrl import ( "github.com/openziti/channel/v2" + "github.com/openziti/edge/common" "github.com/openziti/edge/controller/env" - "github.com/openziti/edge/edge_common" "github.com/openziti/edge/pb/edge_ctrl_pb" "github.com/openziti/metrics" "time" @@ -69,7 +69,7 @@ func (self *tunnelHealthEventHandler) handleHealthEvent(ctx *TunnelHealthEventRe return } - terminator := ctx.verifyTerminator(ctx.terminatorId, edge_common.TunnelBinding) + terminator := ctx.verifyTerminator(ctx.terminatorId, common.TunnelBinding) if terminator != nil && ctx.err == nil { if ctx.checkPassed { self.serviceHealthCheckPassedCounter.Update(terminator.Service, time.Now(), 1) diff --git a/controller/handler_edge_ctrl/update_terminator.go b/controller/handler_edge_ctrl/update_terminator.go index a7cd93238..534a21bd8 100644 --- a/controller/handler_edge_ctrl/update_terminator.go +++ b/controller/handler_edge_ctrl/update_terminator.go @@ -19,9 +19,9 @@ package handler_edge_ctrl import ( "github.com/michaelquigley/pfxlog" "github.com/openziti/channel/v2" + "github.com/openziti/edge/common" "github.com/openziti/edge/controller/env" "github.com/openziti/edge/controller/persistence" - "github.com/openziti/edge/edge_common" "github.com/openziti/edge/pb/edge_ctrl_pb" "github.com/sirupsen/logrus" "google.golang.org/protobuf/proto" @@ -82,7 +82,7 @@ func (self *updateTerminatorHandler) UpdateTerminator(ctx *UpdateTerminatorReque ctx.loadSession(ctx.req.SessionToken) ctx.checkSessionType(persistence.SessionTypeBind) ctx.checkSessionFingerprints(ctx.req.Fingerprints) - terminator := ctx.verifyTerminator(ctx.req.TerminatorId, edge_common.EdgeBinding) + terminator := ctx.verifyTerminator(ctx.req.TerminatorId, common.EdgeBinding) ctx.updateTerminator(terminator, ctx.req, ctx.newChangeContext()) diff --git a/controller/handler_edge_ctrl/update_tunnel_terminator.go b/controller/handler_edge_ctrl/update_tunnel_terminator.go index b8e4e4a02..21eaa041c 100644 --- a/controller/handler_edge_ctrl/update_tunnel_terminator.go +++ b/controller/handler_edge_ctrl/update_tunnel_terminator.go @@ -19,8 +19,8 @@ package handler_edge_ctrl import ( "github.com/michaelquigley/pfxlog" "github.com/openziti/channel/v2" + "github.com/openziti/edge/common" "github.com/openziti/edge/controller/env" - "github.com/openziti/edge/edge_common" "github.com/openziti/edge/pb/edge_ctrl_pb" "github.com/sirupsen/logrus" "google.golang.org/protobuf/proto" @@ -76,7 +76,7 @@ func (self *updateTunnelTerminatorHandler) UpdateTerminator(ctx *UpdateTunnelTer logrus.Debug("update request received") - terminator := ctx.verifyTerminator(ctx.req.TerminatorId, edge_common.TunnelBinding) + terminator := ctx.verifyTerminator(ctx.req.TerminatorId, common.TunnelBinding) ctx.updateTerminator(terminator, ctx.req, ctx.newTunnelChangeContext()) if ctx.err != nil { self.returnError(ctx, ctx.err) diff --git a/controller/internal/policy/api_session_enforcer.go b/controller/internal/policy/api_session_enforcer.go index 470b6cefb..0ab279f93 100644 --- a/controller/internal/policy/api_session_enforcer.go +++ b/controller/internal/policy/api_session_enforcer.go @@ -19,9 +19,9 @@ package policy import ( "fmt" "github.com/michaelquigley/pfxlog" + "github.com/openziti/edge/common/runner" "github.com/openziti/edge/controller/env" "github.com/openziti/edge/controller/model" - "github.com/openziti/edge/runner" "github.com/openziti/fabric/controller/change" "github.com/sirupsen/logrus" "time" diff --git a/controller/internal/policy/service_policy_enforcer.go b/controller/internal/policy/service_policy_enforcer.go index a2a2fd730..3276a4d41 100644 --- a/controller/internal/policy/service_policy_enforcer.go +++ b/controller/internal/policy/service_policy_enforcer.go @@ -19,12 +19,12 @@ package policy import ( "fmt" "github.com/michaelquigley/pfxlog" + "github.com/openziti/edge/common/runner" "github.com/openziti/fabric/controller/change" "time" "github.com/openziti/edge/controller/env" "github.com/openziti/edge/controller/persistence" - "github.com/openziti/edge/runner" "go.etcd.io/bbolt" ) diff --git a/controller/model/authenticator_manager.go b/controller/model/authenticator_manager.go index c46b280f2..6b806bc26 100644 --- a/controller/model/authenticator_manager.go +++ b/controller/model/authenticator_manager.go @@ -24,7 +24,6 @@ import ( "github.com/michaelquigley/pfxlog" "github.com/openziti/edge/controller/apierror" "github.com/openziti/edge/controller/persistence" - "github.com/openziti/edge/crypto" "github.com/openziti/edge/eid" edgeCert "github.com/openziti/edge/internal/cert" "github.com/openziti/edge/pb/edge_cmd_pb" @@ -361,7 +360,7 @@ func (self *AuthenticatorManager) PatchSelf(authenticatorSelf *AuthenticatorSelf } func (self *AuthenticatorManager) HashPassword(password string) *HashedPassword { - newResult := crypto.Hash(password) + newResult := Hash(password) b64Password := base64.StdEncoding.EncodeToString(newResult.Hash) b64Salt := base64.StdEncoding.EncodeToString(newResult.Salt) @@ -373,7 +372,7 @@ func (self *AuthenticatorManager) HashPassword(password string) *HashedPassword } func (self *AuthenticatorManager) ReHashPassword(password string, salt []byte) *HashedPassword { - newResult := crypto.ReHash(password, salt) + newResult := ReHash(password, salt) b64Password := base64.StdEncoding.EncodeToString(newResult.Hash) b64Salt := base64.StdEncoding.EncodeToString(newResult.Salt) @@ -791,9 +790,9 @@ func (self *AuthenticatorManager) ProtobufToAuthenticator(msg *edge_cmd_pb.Authe } type HashedPassword struct { - RawResult *crypto.HashResult //raw byte hash results - Salt string //base64 encoded hash - Password string //base64 encoded hash + RawResult *HashResult //raw byte hash results + Salt string //base64 encoded hash + Password string //base64 encoded hash } type AuthenticatorListQueryResult struct { diff --git a/controller/model/create_terminator_cmd.go b/controller/model/create_terminator_cmd.go index 817c2d9f2..5b7802c8e 100644 --- a/controller/model/create_terminator_cmd.go +++ b/controller/model/create_terminator_cmd.go @@ -2,8 +2,8 @@ package model import ( "github.com/michaelquigley/pfxlog" + "github.com/openziti/edge/common" "github.com/openziti/edge/controller/persistence" - "github.com/openziti/edge/edge_common" "github.com/openziti/edge/pb/edge_cmd_pb" "github.com/openziti/fabric/controller/change" "github.com/openziti/fabric/controller/command" @@ -74,7 +74,7 @@ type terminator interface { } func (self *CreateEdgeTerminatorCmd) getTerminatorSession(tx *bbolt.Tx, terminator terminator, context string) (*persistence.Session, error) { - if terminator.GetBinding() != edge_common.EdgeBinding { + if terminator.GetBinding() != common.EdgeBinding { return nil, errors.Errorf("%vterminator %v with identity %v is not edge terminator. Can't share identity", context, terminator.GetId(), terminator.GetInstanceId()) } diff --git a/controller/model/enrollment_mod_updb.go b/controller/model/enrollment_mod_updb.go index 70344cadc..1e32e3db7 100644 --- a/controller/model/enrollment_mod_updb.go +++ b/controller/model/enrollment_mod_updb.go @@ -21,7 +21,6 @@ import ( "errors" "github.com/openziti/edge/controller/apierror" "github.com/openziti/edge/controller/persistence" - "github.com/openziti/edge/crypto" "github.com/openziti/edge/eid" "github.com/openziti/edge/internal/cert" "github.com/openziti/fabric/controller/change" @@ -82,7 +81,7 @@ func (module *EnrollModuleUpdb) Process(ctx EnrollmentContext) (*EnrollmentResul } password = val.(string) - hash := crypto.Hash(password) + hash := Hash(password) encodedPassword := base64.StdEncoding.EncodeToString(hash.Hash) encodedSalt := base64.StdEncoding.EncodeToString(hash.Salt) diff --git a/crypto/hash.go b/controller/model/hash.go similarity index 98% rename from crypto/hash.go rename to controller/model/hash.go index a7f882328..5494be778 100644 --- a/crypto/hash.go +++ b/controller/model/hash.go @@ -14,7 +14,7 @@ limitations under the License. */ -package crypto +package model import ( "crypto/rand" diff --git a/controller/server/controller.go b/controller/server/controller.go index a2a99d95e..193ccd4b8 100644 --- a/controller/server/controller.go +++ b/controller/server/controller.go @@ -19,6 +19,7 @@ package server import ( "fmt" "github.com/openziti/channel/v2" + runner2 "github.com/openziti/edge/common/runner" "github.com/openziti/edge/controller/handler_edge_mgmt" sync2 "github.com/openziti/edge/controller/sync_strats" "github.com/openziti/edge/pb/edge_ctrl_pb" @@ -35,7 +36,6 @@ import ( "github.com/openziti/edge/controller/handler_edge_ctrl" _ "github.com/openziti/edge/controller/internal/routes" "github.com/openziti/edge/controller/model" - "github.com/openziti/edge/runner" "github.com/openziti/fabric/config" "github.com/openziti/storage/boltz" ) @@ -45,7 +45,7 @@ type Controller struct { AppEnv *env.AppEnv xmgmt *submgmt xctrl *subctrl - policyEngine runner.Runner + policyEngine runner2.Runner isLoaded bool initModulesOnce sync.Once initialized bool @@ -78,7 +78,7 @@ func NewController(cfg config.Configurable, host env.HostController) (*Controlle pfxlog.Logger().Infof("edge controller instance id: %s", c.AppEnv.InstanceId) - pe, err := runner.NewRunner(policyMinFreq, policyMaxFreq, func(e error, enforcer runner.Operation) { + pe, err := runner2.NewRunner(policyMinFreq, policyMaxFreq, func(e error, enforcer runner2.Operation) { pfxlog.Logger(). WithField("cause", e). WithField("enforcerName", enforcer.GetName()). diff --git a/logconf/logconf.go b/logconf/logconf.go deleted file mode 100644 index a918d9516..000000000 --- a/logconf/logconf.go +++ /dev/null @@ -1,84 +0,0 @@ -/* - Copyright NetFoundry Inc. - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - https://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. -*/ - -package logconf - -import ( - "fmt" - "github.com/sirupsen/logrus" - "strings" -) - -type Logging struct { - Level string `yaml:"level"` - Format string `yaml:"format"` -} - -func (l *Logging) SetLoggingOptions() error { - - fl := strings.TrimSpace(l.Level) - - if fl == "" { - fl = "info" - } - - lvl, err := logrus.ParseLevel(fl) - - if err != nil { - return fmt.Errorf("invalid logging level [%s] specified", l.Level) - } - - if logrus.GetLevel() != lvl && (logrus.GetLevel() == logrus.InfoLevel || logrus.GetLevel() < lvl) { - fmt.Printf("Changing log level from %v to %v\n", logrus.GetLevel(), lvl) - logrus.SetLevel(lvl) - } - - fmt, err := parseFormat(l.Format) - - if err != nil { - return err - } - - if fmt != nil { - logrus.SetFormatter(fmt) - } - - return nil -} - -func parseFormat(f string) (logrus.Formatter, error) { - mf := strings.ToLower(strings.TrimSpace(f)) - switch strings.ToLower(mf) { - case "": - return nil, nil - case "default": - return nil, nil - case "text": - return &logrus.TextFormatter{ - DisableColors: true, - FullTimestamp: true, - }, nil - case "json": - return &logrus.JSONFormatter{}, nil - case "console": - return &logrus.TextFormatter{ - ForceColors: true, - }, nil - } - - return nil, fmt.Errorf("invalid log formatter [%s]", f) - -} diff --git a/router/fabric/heartbeat.go b/router/fabric/heartbeat.go index 765b2d207..301fdfd47 100644 --- a/router/fabric/heartbeat.go +++ b/router/fabric/heartbeat.go @@ -19,9 +19,9 @@ package fabric import ( "github.com/michaelquigley/pfxlog" "github.com/openziti/channel/v2" + "github.com/openziti/edge/common/runner" "github.com/openziti/edge/controller/env" "github.com/openziti/edge/pb/edge_ctrl_pb" - "github.com/openziti/edge/runner" routerEnv "github.com/openziti/fabric/router/env" "google.golang.org/protobuf/proto" "time" diff --git a/router/fabric/manager.go b/router/fabric/manager.go index 7745207b0..25a8cbcb7 100644 --- a/router/fabric/manager.go +++ b/router/fabric/manager.go @@ -22,8 +22,8 @@ import ( "github.com/kataras/go-events" "github.com/michaelquigley/pfxlog" "github.com/openziti/channel/v2" + runner2 "github.com/openziti/edge/common/runner" "github.com/openziti/edge/pb/edge_ctrl_pb" - "github.com/openziti/edge/runner" "github.com/openziti/fabric/router/env" cmap "github.com/orcaman/concurrent-map/v2" "github.com/sirupsen/logrus" @@ -83,7 +83,7 @@ type StateManagerImpl struct { ClusterId string NodeId string events.EventEmmiter - heartbeatRunner runner.Runner + heartbeatRunner runner2.Runner heartbeatOperation *heartbeatOperation currentSync string syncLock sync.Mutex @@ -293,7 +293,7 @@ func (sm *StateManagerImpl) StartHeartbeat(env env.RouterEnv, intervalSeconds in sm.heartbeatOperation = newHeartbeatOperation(env, time.Duration(intervalSeconds)*time.Second, sm) var err error - sm.heartbeatRunner, err = runner.NewRunner(1*time.Second, 24*time.Hour, func(e error, operation runner.Operation) { + sm.heartbeatRunner, err = runner2.NewRunner(1*time.Second, 24*time.Hour, func(e error, operation runner2.Operation) { pfxlog.Logger().WithError(err).Error("error during heartbeat runner") }) diff --git a/router/internal/edgerouter/config.go b/router/internal/edgerouter/config.go index bbf2339af..1af7e8f4b 100644 --- a/router/internal/edgerouter/config.go +++ b/router/internal/edgerouter/config.go @@ -20,7 +20,7 @@ import ( "fmt" "github.com/michaelquigley/pfxlog" "github.com/mitchellh/mapstructure" - "github.com/openziti/edge/edge_common" + "github.com/openziti/edge/common" "github.com/openziti/edge/pb/edge_ctrl_pb" "github.com/openziti/fabric/router" "github.com/openziti/identity" @@ -241,7 +241,7 @@ func (config *Config) loadListener(rootConfigMap map[interface{}]interface{}) er if value, found := submap["binding"]; found { binding := value.(string) - if binding == edge_common.EdgeBinding { + if binding == common.EdgeBinding { if value, found := submap["address"]; found { address := value.(string) diff --git a/router/xgress_edge/factory_test.go b/router/xgress_edge/factory_test.go index 8d5bc4c8f..5ad5d7553 100644 --- a/router/xgress_edge/factory_test.go +++ b/router/xgress_edge/factory_test.go @@ -2,7 +2,7 @@ package xgress_edge import ( "github.com/openziti/channel/v2" - "github.com/openziti/edge/edge_common" + "github.com/openziti/edge/common" "github.com/openziti/fabric/router/xgress" "github.com/stretchr/testify/require" "testing" @@ -113,7 +113,7 @@ const ( func newTestConfigWithConnectOptions() xgress.OptionsData { return xgress.OptionsData{ - "binding": edge_common.EdgeBinding, + "binding": common.EdgeBinding, "address": "tls:0.0.0.0:3022", "options": map[interface{}]interface{}{ "advertise": "127.0.0.1:3022", @@ -126,7 +126,7 @@ func newTestConfigWithConnectOptions() xgress.OptionsData { func newTestConfigWithoutConnectOptions() xgress.OptionsData { return xgress.OptionsData{ - "binding": edge_common.EdgeBinding, + "binding": common.EdgeBinding, "address": "tls:0.0.0.0:3022", "options": map[interface{}]interface{}{ "advertise": "127.0.0.1:3022", diff --git a/tests/context.go b/tests/context.go index 2081e5652..08615b227 100644 --- a/tests/context.go +++ b/tests/context.go @@ -29,7 +29,7 @@ import ( "github.com/go-openapi/strfmt" "github.com/google/uuid" "github.com/openziti/edge-api/rest_model" - "github.com/openziti/edge/edge_common" + "github.com/openziti/edge/common" "github.com/openziti/edge/eid" "github.com/openziti/edge/router/enroll" "github.com/openziti/edge/router/fabric" @@ -458,10 +458,10 @@ func (ctx *TestContext) startEdgeRouter() { stateManager := fabric.NewStateManager() xgressEdgeFactory := xgress_edge.NewFactory(config, NewVersionProviderTest(), stateManager, ctx.router.GetMetricsRegistry()) - xgress.GlobalRegistry().Register(edge_common.EdgeBinding, xgressEdgeFactory) + xgress.GlobalRegistry().Register(common.EdgeBinding, xgressEdgeFactory) xgressEdgeTunnelFactory := xgress_edge_tunnel.NewFactory(ctx.router, config, stateManager) - xgress.GlobalRegistry().Register(edge_common.TunnelBinding, xgressEdgeTunnelFactory) + xgress.GlobalRegistry().Register(common.TunnelBinding, xgressEdgeTunnelFactory) ctx.Req.NoError(ctx.router.RegisterXrctrl(xgressEdgeFactory)) ctx.Req.NoError(ctx.router.RegisterXrctrl(xgressEdgeTunnelFactory)) diff --git a/tests/events_test.go b/tests/events_test.go index fc11a8dcd..ffceb286a 100644 --- a/tests/events_test.go +++ b/tests/events_test.go @@ -20,7 +20,7 @@ package tests import ( "fmt" - events2 "github.com/openziti/edge/events" + events2 "github.com/openziti/edge/controller/events" "github.com/openziti/fabric/controller/xt_smartrouting" "github.com/openziti/fabric/event" "github.com/openziti/foundation/v2/stringz" diff --git a/tunnel/entities/service.go b/tunnel/entities/service.go index a96db3107..c990b4d61 100644 --- a/tunnel/entities/service.go +++ b/tunnel/entities/service.go @@ -5,8 +5,8 @@ import ( "github.com/michaelquigley/pfxlog" "github.com/mitchellh/mapstructure" "github.com/openziti/edge-api/rest_model" - "github.com/openziti/edge/health" "github.com/openziti/edge/tunnel" + "github.com/openziti/edge/tunnel/health" "github.com/openziti/edge/tunnel/utils" "github.com/openziti/foundation/v2/genext" "github.com/openziti/foundation/v2/stringz" diff --git a/health/checks.go b/tunnel/health/checks.go similarity index 100% rename from health/checks.go rename to tunnel/health/checks.go diff --git a/health/checks_test.go b/tunnel/health/checks_test.go similarity index 100% rename from health/checks_test.go rename to tunnel/health/checks_test.go diff --git a/health/health.go b/tunnel/health/health.go similarity index 100% rename from health/health.go rename to tunnel/health/health.go diff --git a/health/health_test.go b/tunnel/health/health_test.go similarity index 100% rename from health/health_test.go rename to tunnel/health/health_test.go diff --git a/health/round_test.go b/tunnel/health/round_test.go similarity index 100% rename from health/round_test.go rename to tunnel/health/round_test.go diff --git a/tunnel/intercept/hosting.go b/tunnel/intercept/hosting.go index 533d19aa5..28eb63c40 100644 --- a/tunnel/intercept/hosting.go +++ b/tunnel/intercept/hosting.go @@ -19,9 +19,9 @@ package intercept import ( "github.com/michaelquigley/pfxlog" "github.com/openziti/edge-api/rest_model" - "github.com/openziti/edge/health" "github.com/openziti/edge/tunnel" "github.com/openziti/edge/tunnel/entities" + "github.com/openziti/edge/tunnel/health" "github.com/openziti/edge/tunnel/router" "github.com/openziti/edge/tunnel/utils" "github.com/openziti/sdk-golang/ziti" diff --git a/tunnel/intercept/svcpoll.go b/tunnel/intercept/svcpoll.go index ac524cd1c..4f28a4cca 100644 --- a/tunnel/intercept/svcpoll.go +++ b/tunnel/intercept/svcpoll.go @@ -20,10 +20,10 @@ import ( "fmt" "github.com/michaelquigley/pfxlog" "github.com/openziti/edge-api/rest_model" - "github.com/openziti/edge/health" "github.com/openziti/edge/tunnel" "github.com/openziti/edge/tunnel/dns" "github.com/openziti/edge/tunnel/entities" + "github.com/openziti/edge/tunnel/health" "github.com/openziti/foundation/v2/stringz" "github.com/openziti/sdk-golang/ziti" "github.com/pkg/errors" diff --git a/tunnel/provider.go b/tunnel/provider.go index ba4cd0f99..05a1d725a 100644 --- a/tunnel/provider.go +++ b/tunnel/provider.go @@ -3,7 +3,7 @@ package tunnel import ( "encoding/json" "github.com/openziti/edge-api/rest_model" - "github.com/openziti/edge/health" + "github.com/openziti/edge/tunnel/health" "github.com/openziti/sdk-golang/ziti" "github.com/openziti/sdk-golang/ziti/edge" "github.com/sirupsen/logrus"