Merge pull request #2542 from openziti/add-cluster-id

Add cluster id, to prevent merging disparate clusters. Fixes #2541

common/pb/cmd_pb/cmd.proto

@@ -25,6 +25,7 @@ enum CommandType {
   DeleteTerminatorsBatchType = 4;
 
   SyncSnapshot = 10;
+  InitClusterId = 11;
 }
 
 message ChangeContext {
@@ -76,6 +77,10 @@ message SyncSnapshotCommand {
   bytes snapshot = 2;
 }
 
+message InitClusterIdCommand {
+  string clusterId = 1;
+}
+
 message DeleteTerminatorsBatchCommand {
   repeated string entityIds = 1;
   ChangeContext ctx = 2;

common/pb/cmd_pb/impl.go

@@ -55,6 +55,10 @@ func (x *SyncSnapshotCommand) GetCommandType() int32 {
 	return int32(CommandType_SyncSnapshot)
 }
 
+func (x *InitClusterIdCommand) GetCommandType() int32 {
+	return int32(CommandType_InitClusterId)
+}
+
 func EncodeTags(tags map[string]interface{}) (map[string]*TagValue, error) {
 	if len(tags) == 0 {
 		return nil, nil

common/pb/ctrl_pb/impl.go

@@ -17,7 +17,6 @@
 package ctrl_pb
 
 import (
-	"github.com/openziti/channel/v3/protobufs"
 	"github.com/openziti/ziti/controller/xt"
 )
 
@@ -110,29 +109,3 @@ func (request *UpdateCtrlAddresses) GetContentType() int32 {
 func (request *PeerStateChanges) GetContentType() int32 {
 	return int32(ContentType_PeerStateChangeRequestType)
 }
-
-type FilterableValidateTerminatorsRequest interface {
-	protobufs.TypedMessage
-	FilterTerminators(f func(terminator *Terminator) bool)
-	GetTerminators() []*Terminator
-}
-
-func (request *ValidateTerminatorsRequest) FilterTerminators(f func(terminator *Terminator) bool) {
-	var terminators []*Terminator
-	for _, terminator := range request.Terminators {
-		if f(terminator) {
-			terminators = append(terminators, terminator)
-		}
-	}
-	request.Terminators = terminators
-}
-
-func (request *ValidateTerminatorsV2Request) FilterTerminators(f func(terminator *Terminator) bool) {
-	var terminators []*Terminator
-	for _, terminator := range request.Terminators {
-		if f(terminator) {
-			terminators = append(terminators, terminator)
-		}
-	}
-	request.Terminators = terminators
-}

common/pb/mgmt_pb/impl.go

@@ -71,3 +71,7 @@ func (request *ValidateIdentityConnectionStatusesResponse) GetContentType() int3
 func (request *RouterIdentityConnectionStatusesDetails) GetContentType() int32 {
 	return int32(ContentType_ValidateIdentityConnectionStatusesResultType)
 }
+
+func (x *InitRequest) GetContentType() int32 {
+	return int32(ContentType_RaftInit)
+}