fix:修复pb定义问题 (#119)

polarismesh · Aug 15, 2024 · 3c8c88a · 3c8c88a
1 parent 41a082c
commit 3c8c88a
Show file tree

Hide file tree

Showing 65 changed files with 25,976 additions and 13,163 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/api/v1/fault_tolerance/circuitbreaker.proto b/api/v1/fault_tolerance/circuitbreaker.proto
@@ -286,7 +286,7 @@ message CircuitBreakerRule {
   // priority rules priority
   uint32 priority = 30 [ json_name = "priority" ];
   // 熔断规则标签数据
-  map<string, string> metadata = 50;
+  map<string, string> metadata = 31;
 }
 
 // the condition to judge an input invocation as an error

diff --git a/api/v1/fault_tolerance/fault_detector.proto b/api/v1/fault_tolerance/fault_detector.proto
@@ -65,7 +65,7 @@ message FaultDetectRule {
   // priority rules priority
   uint32 priority = 29 [ json_name = "priority" ];
   // 探测规则标签数据
-  map<string, string> metadata = 50;
+  map<string, string> metadata = 30;
 }
 
 message HttpProtocolConfig {

diff --git a/api/v1/model/code.proto b/api/v1/model/code.proto
@@ -159,7 +159,8 @@ enum Code {
     NotFoundResourceConfigFile      = 400807;
     InvalidConfigFileTemplateName   = 400808;
     EncryptConfigFileException      = 400809;
-    DecryptConfigFileException      = 400810;
+    GroupExistActiveRelease        = 400810;
+    DecryptConfigFileException      = 400811;
 
     // auth codes
     InvalidUserOwners          = 400410;

diff --git a/api/v1/service_manage/contract.proto b/api/v1/service_manage/contract.proto
@@ -34,6 +34,8 @@ message ServiceContract {
   string status = 12;
   // 类型
   string type = 14;
+  // 标签
+  map<string, string> metadata = 15;
 }
 
 message InterfaceDescriptor {

diff --git a/api/v1/service_manage/response.proto b/api/v1/service_manage/response.proto
@@ -128,4 +128,9 @@ message DiscoverResponse {
 
 message OptionSwitch { map<string, string> options = 1; }
 
-message InstanceLabels { map<string, StringList> labels = 1; }
+message InstanceLabels { 
+  map<string, StringList> labels = 1;
+  string namespace = 2;
+  string service = 3;
+  string service_id = 4;
+}
diff --git a/api/v1/traffic_manage/lane.proto b/api/v1/traffic_manage/lane.proto
@@ -57,7 +57,7 @@ message LaneGroup {
   // 泳道组内的流量入口信息
   repeated LaneRule rules = 11;
   // 泳道组标签信息
-  map<string, string> metadata = 20;
+  map<string, string> metadata = 12;
 }
 
 // TrafficMatchRule 流量匹配规则

diff --git a/api/v1/traffic_manage/lossless.proto b/api/v1/traffic_manage/lossless.proto
@@ -30,6 +30,8 @@ message LosslessRule {
   LosslessOnline losslessOnline = 8 [ json_name = "lossless_online" ];
   // configuration for lossless offline
   LosslessOffline losslessOffline = 9 [ json_name = "lossless_offline" ];
+  // rule labels
+  map<string, string> metadata = 10;
 }
 
 message LosslessOnline {

diff --git a/api/v1/traffic_manage/ratelimit.proto b/api/v1/traffic_manage/ratelimit.proto
@@ -94,12 +94,12 @@ message Rule {
   google.protobuf.StringValue etime = 25;
   // 最大排队时长，单位秒
   google.protobuf.UInt32Value max_queue_delay = 26 [json_name = "max_queue_delay"];
-  // 限流规则标签数据
-  map<string, string> metadata = 50;
   // amount for concurrency rate-limit
   ConcurrencyAmount concurrencyAmount = 27 [ json_name = "concurrency_amount" ];
   // fallback configuration
   FallbackConfig fallbackConfig = 28 [ json_name = "fallback_config" ];
+  // 限流规则标签数据
+  map<string, string> metadata = 29;
 }
 
 message MatchArgument {

diff --git a/api/v1/traffic_manage/routing.proto b/api/v1/traffic_manage/routing.proto
@@ -127,7 +127,7 @@ message RouteRule {
   // deprecated_filed only for compatible to the old version server
   map<string, string> extendInfo = 20;
   // 路由规则标签数据
-  map<string, string> metadata = 50;
+  map<string, string> metadata = 21;
 }
 
 message MetadataFailover {