Enhance the router data model with config information. Fixes #2010

openziti · May 23, 2024 · 8fa92aa · 8fa92aa
1 parent f271825
commit 8fa92aa
Show file tree

Hide file tree

Showing 25 changed files with 3,697 additions and 2,227 deletions.
diff --git a/common/event_cache.go b/common/event_cache.go
@@ -1,3 +1,19 @@
+/*
+	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 common
 
 import (

diff --git a/common/oidc_tokens.go b/common/oidc_tokens.go
@@ -1,3 +1,19 @@
+/*
+	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 common
 
 import (

diff --git a/common/pb/edge_cmd_pb/edge_cmd.pb.go b/common/pb/edge_cmd_pb/edge_cmd.pb.go
diff --git a/common/pb/edge_cmd_pb/edge_cmd.proto b/common/pb/edge_cmd_pb/edge_cmd.proto
@@ -175,7 +175,7 @@ message Controller {
   bool isOnline = 6;
   google.protobuf.Timestamp lastJoinedAt = 7;
   map<string, TagValue> tags = 8;
-  map<string,ApiAddressList> apiAddresses = 9;
+  map<string, ApiAddressList> apiAddresses = 9;
 }
 
 message ApiAddressList {
@@ -291,6 +291,12 @@ message Identity {
     string Version = 6;
   }
 
+  message ServiceConfig {
+    string serviceId = 1;
+    string configTypeId = 2;
+    string configId = 3;
+  }
+
   string id = 1;
   string name = 2;
   map<string, TagValue> tags = 3;
@@ -310,6 +316,7 @@ message Identity {
   bool disabled = 17;
   optional google.protobuf.Timestamp disabledAt = 18;
   optional google.protobuf.Timestamp disabledUntil = 19;
+  repeated ServiceConfig serviceConfigs = 20;
 }
 
 message CreateIdentityWithEnrollmentsCmd {