gsadmin/ziti
1
0
Fork 0
mirror of https://github.com/openziti/ziti.git synced 2026-09-11 13:29:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Implement entity change events. Fixes openziti/fabric#562

Browse Source
This commit is contained in:
Paul Lorenz
2023-04-06 23:43:33 -04:00
parent 9beb13c0e0
commit 23110fccb2
21 changed files with 637 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controller/handler_ctrl/base.go
+6 -4
View File
@@ -17,7 +17,6 @@
package handler_ctrl
import (
"fmt"
"github.com/openziti/channel/v2"
"github.com/openziti/fabric/controller/change"
"github.com/openziti/fabric/controller/network"
@@ -28,10 +27,13 @@ type baseHandler struct {
network *network.Network
}
func (self *baseHandler) newChangeContext(ch channel.Channel) *change.Context {
func (self *baseHandler) newChangeContext(ch channel.Channel, method string) *change.Context {
return change.New().
SetChangeAuthorId(self.router.Id).
SetChangeAuthorName(self.router.Name).
SetChangeAuthorType("router").
SetSource(fmt.Sprintf("ctrl[%v]", ch.Underlay().GetRemoteAddr().String()))
SetChangeAuthorType(change.AuthorTypeRouter).
SetSourceType(change.SourceTypeControlChannel).
SetSourceMethod(method).
SetSourceLocal(ch.Underlay().GetLocalAddr().String()).
SetSourceRemote(ch.Underlay().GetRemoteAddr().String())
}
controller/handler_ctrl/create_terminator.go
+1 -1
View File
@@ -72,7 +72,7 @@ func (self *createTerminatorHandler) handleCreateTerminator(msg *channel.Message
Cost: uint16(request.Cost),
}
if err := self.network.Terminators.Create(terminator, self.newChangeContext(ch)); err == nil {
if err := self.network.Terminators.Create(terminator, self.newChangeContext(ch, "fabric.create.terminator")); err == nil {
pfxlog.Logger().Infof("created terminator [t/%s]", terminator.Id)
handler_common.SendSuccess(msg, ch, terminator.Id)
} else {
controller/handler_ctrl/remove_terminator.go
+1 -1
View File
@@ -63,7 +63,7 @@ func (self *removeTerminatorHandler) handleRemoveTerminator(msg *channel.Message
return
}
if err := self.network.Terminators.Delete(request.TerminatorId, self.newChangeContext(ch)); err == nil {
if err := self.network.Terminators.Delete(request.TerminatorId, self.newChangeContext(ch, "fabric.remove.terminator")); err == nil {
log.
WithField("routerId", ch.Id()).
WithField("serviceId", terminator.Service).
controller/handler_ctrl/remove_terminators.go
+1 -1
View File
@@ -57,7 +57,7 @@ func (self *removeTerminatorsHandler) HandleReceive(msg *channel.Message, ch cha
func (self *removeTerminatorsHandler) handleRemoveTerminators(msg *channel.Message, ch channel.Channel, request *ctrl_pb.RemoveTerminatorsRequest) {
log := pfxlog.ContextLogger(ch.Label())
if err := self.network.Terminators.DeleteBatch(request.TerminatorIds, self.newChangeContext(ch)); err == nil {
if err := self.network.Terminators.DeleteBatch(request.TerminatorIds, self.newChangeContext(ch, "fabric.remove.terminators.batch")); err == nil {
log.
WithField("routerId", ch.Id()).
WithField("terminatorIds", request.TerminatorIds).
controller/handler_ctrl/update_terminator.go
+1 -1
View File
@@ -97,7 +97,7 @@ func (self *updateTerminatorHandler) handleUpdateTerminator(msg *channel.Message
checker[db.FieldTerminatorPrecedence] = struct{}{}
}
if err := self.network.Terminators.Update(terminator, checker, self.newChangeContext(ch)); err != nil {
if err := self.network.Terminators.Update(terminator, checker, self.newChangeContext(ch, "fabric.update.terminator")); err != nil {
handler_common.SendFailure(msg, ch, err.Error())
return
}