Merge pull request #743 from openziti/inspect-support

Add CtrlId and GetDestinationType for inspect support. Fixes #742

Author: plorenz

CHANGELOG.md

@@ -3,6 +3,7 @@
 ## Issues Fixed and Dependency Updates
 
 * github.com/openziti/sdk-golang: [v1.1.1 -> v1.1.2](https://github.com/openziti/sdk-golang/compare/v1.1.1...v1.1.2)
+    * [Issue #742](https://github.com/openziti/sdk-golang/issues/742) - Additional CtrlId and GetDestinationType for inspect support
     * [Issue #739](https://github.com/openziti/sdk-golang/issues/739) - go-jose v2.6.3 CVE-2025-27144 resolution
 
 * github.com/zitadel/oidc/v3: v2.12.2 -> v3.39.0

xgress/circuit_inspections.go

@@ -102,4 +102,5 @@ type CircuitDetail struct {
 	Address    string `json:"address"`
 	Originator string `json:"originator"`
 	IsXgress   bool   `json:"isXgress"`
+	CtrlId     string `json:"ctrlId"`
 }

xgress/xgress.go

@@ -138,6 +138,10 @@ type Xgress struct {
 	tags                 map[string]string
 }
 
+func (self *Xgress) GetDestinationType() string {
+	return "xgress"
+}
+
 func (self *Xgress) GetIntervalId() string {
 	return self.circuitId
 }

ziti/edge/conn.go

@@ -102,6 +102,7 @@ type ServiceConn interface {
 type Conn interface {
 	ServiceConn
 	Identifiable
+	GetRouterId() string
 	CompleteAcceptSuccess() error
 	CompleteAcceptFailed(err error)
 }
@@ -139,6 +140,10 @@ func NewEdgeMsgChannel(ch SdkChannel, connId uint32) *MsgChannel {
 	}
 }
 
+func (ec *MsgChannel) GetRouterId() string {
+	return ec.GetChannel().Id()
+}
+
 func (ec *MsgChannel) Id() uint32 {
 	return ec.id
 }

ziti/edge/network/conn.go

@@ -324,6 +324,7 @@ func (conn *edgeConn) GetCircuitDetail() *xgress.CircuitDetail {
 			detail.IsXgress = true
 			detail.Originator = conn.xgCircuit.xg.Originator().String()
 			detail.Address = string(conn.xgCircuit.xg.Address())
+			detail.CtrlId = conn.xgCircuit.xg.CtrlId()
 		}
 
 		return detail