mirror of
https://github.com/openziti/ziti.git
synced 2026-09-10 08:45:41 +00:00
Paul Lorenz
86092a8640
Bumps the sdk-golang dependency from v1 to the v2 module (`github.com/openziti/sdk-golang/v2` at v2.0.0-pre1) and updates all import paths. This is a no-behavior-change precursor that isolates the dependency migration from the Connect-V2 feature work in #3884. - Rewrites `github.com/openziti/sdk-golang/...` imports to `github.com/openziti/sdk-golang/v2/...` across the main and zititest modules. - Pins both modules to `github.com/openziti/sdk-golang/v2 v2.0.0-pre1`. - Adapts `edgeXgressConn.AcceptMessage` to the v2 `MsgSink` signature, which now takes an `edge.SdkChannel` argument. - Replaces the removed `edge.Conn.GetRouterId()` with `RemoteAddr().String()` in the loop4 traffic-test logging. For openziti/sdk-golang#936.
102 lines
3.0 KiB
Go
102 lines
3.0 KiB
Go
package model
|
|
|
|
import (
|
|
"fmt"
|
|
|
|
"github.com/michaelquigley/pfxlog"
|
|
"github.com/openziti/sdk-golang/v2/ziti/edge"
|
|
"github.com/openziti/ziti/v2/controller/storage/boltz"
|
|
"github.com/openziti/ziti/v2/common/pb/cmd_pb"
|
|
"github.com/openziti/ziti/v2/common/pb/edge_cmd_pb"
|
|
"github.com/openziti/ziti/v2/controller/change"
|
|
"github.com/openziti/ziti/v2/controller/command"
|
|
"github.com/sirupsen/logrus"
|
|
)
|
|
|
|
// InvalidTerminatorInstanceIdError indicates a non-retriable terminator validation failure
|
|
type InvalidTerminatorInstanceIdError struct {
|
|
msg string
|
|
}
|
|
|
|
func (e InvalidTerminatorInstanceIdError) ErrorCode() uint32 {
|
|
return edge.ErrorCodeInvalidInstanceId
|
|
}
|
|
|
|
func (e InvalidTerminatorInstanceIdError) GetRetryHint() edge.RetryHint {
|
|
return edge.RetryNotRetriable
|
|
}
|
|
|
|
func (e InvalidTerminatorInstanceIdError) Error() string {
|
|
return e.msg
|
|
}
|
|
|
|
type CreateEdgeTerminatorCmd struct {
|
|
Env Env
|
|
Entity *Terminator
|
|
Context *change.Context
|
|
}
|
|
|
|
func (self *CreateEdgeTerminatorCmd) Apply(ctx boltz.MutateContext) error {
|
|
createCmd := &command.CreateEntityCommand[*Terminator]{
|
|
Creator: self.Env.GetManagers().Terminator,
|
|
Entity: self.Entity,
|
|
PostCreateHook: self.validateTerminatorIdentity,
|
|
Context: self.Context,
|
|
}
|
|
return self.Env.GetManagers().Terminator.ApplyCreate(createCmd, ctx)
|
|
}
|
|
|
|
func (self *CreateEdgeTerminatorCmd) validateTerminatorIdentity(ctx boltz.MutateContext, terminator *Terminator) error {
|
|
tx := ctx.Tx()
|
|
|
|
if terminator.GetInstanceId() == "" {
|
|
return nil
|
|
}
|
|
|
|
identityTerminators, err := self.Env.GetStores().Terminator.GetTerminatorsInIdentityGroup(tx, terminator.GetId())
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
for _, otherTerminator := range identityTerminators {
|
|
if otherTerminator.HostId != terminator.HostId {
|
|
pfxlog.Logger().WithFields(logrus.Fields{
|
|
"terminatorId": terminator.GetId(),
|
|
"siblingId": otherTerminator.GetId(),
|
|
"instanceId": terminator.InstanceId,
|
|
"terminatorIdentity": terminator.HostId,
|
|
"existingIdentity": otherTerminator.HostId,
|
|
}).Warn("validation of terminator failed, shared identity belongs to different identity")
|
|
return InvalidTerminatorInstanceIdError{
|
|
msg: fmt.Sprintf("sibling terminator %v with shared identity %v belongs to different identity", otherTerminator.GetId(), terminator.GetInstanceId()),
|
|
}
|
|
}
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
func (self *CreateEdgeTerminatorCmd) GetChangeContext() *change.Context {
|
|
return self.Context
|
|
}
|
|
|
|
func (self *CreateEdgeTerminatorCmd) Encode() ([]byte, error) {
|
|
terminatorData, err := self.Env.GetManagers().Terminator.Marshall(self.Entity)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
cmd := &edge_cmd_pb.CreateEdgeTerminatorCommand{
|
|
TerminatorData: terminatorData,
|
|
Ctx: ContextToProtobuf(self.Context),
|
|
}
|
|
return cmd_pb.EncodeProtobuf(cmd)
|
|
}
|
|
|
|
func (self *CreateEdgeTerminatorCmd) Decode(env Env, msg *edge_cmd_pb.CreateEdgeTerminatorCommand) error {
|
|
var err error
|
|
self.Env = env
|
|
self.Entity, err = env.GetManagers().Terminator.Unmarshall(msg.TerminatorData)
|
|
self.Context = ProtobufToContext(msg.Ctx)
|
|
return err
|
|
}
|