Merge branch 'polarismesh:main' into feat.cpu_limiter

VERSION

@@ -1 +1 @@
-1.4.0-SNAPSHOT
+1.4.0

api/v1/config_manage/config_file.proto

@@ -3,6 +3,7 @@ syntax = "proto3";
 package v1;
 
 import "google/protobuf/wrappers.proto";
+import "model.proto";
 option go_package = "github.com/polarismesh/specification/source/go/api/v1/config_manage";
 option java_package = "com.tencent.polaris.specification.api.v1.config.manage";
 option java_outer_classname = "ConfigFileProto";
@@ -63,6 +64,7 @@ message ConfigFileTag {
   google.protobuf.StringValue value = 2;
 }
 
+
 message ConfigFileRelease {
   google.protobuf.UInt64Value id = 1;
   google.protobuf.StringValue name = 2;
@@ -82,6 +84,9 @@ message ConfigFileRelease {
   google.protobuf.BoolValue active = 15;
   google.protobuf.StringValue format = 16;
   google.protobuf.StringValue release_description = 17;
+  google.protobuf.UInt32Value type = 18;
+  // 配置灰度发布时需要匹配的客户端标签信息
+  repeated ClientLabel beta_labels = 19;
 }
 
 message ConfigFileReleaseHistory {
@@ -165,4 +170,4 @@ message ConfigFilePublishInfo {
 message ConfigFileGroupRequest {
   google.protobuf.StringValue revision = 1;
   ConfigFileGroup config_file_group = 2;
-}
+}

api/v1/model/code.proto

@@ -74,6 +74,7 @@ enum Code {
     InvalidFaultDetectName           = 400901;
     InvalidFaultDetectNamespace      = 400902;
     FaultDetectRuleExisted           = 400903;
+    InvalidMatchRule                 = 400904;
 
     // network relative codes
     ServicesExistedMesh   = 400170;
@@ -190,4 +191,4 @@ enum Code {
 
     AuthTokenForbidden        = 403001;
     OperationRoleForbidden    = 403002;
-}
+}

api/v1/model/model.proto

@@ -39,20 +39,23 @@ message MatchString {
 
   MatchStringType type = 1;
   google.protobuf.StringValue value = 2;
-  ValueType value_type = 3  [json_name = "value_type"];
+  ValueType value_type = 3 [ json_name = "value_type" ];
 }
 
-
-message StringList {
-  repeated string values = 1;
-}
+message StringList { repeated string values = 1; }
 
 // 汇总查询数据
 message Summary {
   // 服务总数
-  uint32 total_service_count = 1 [json_name = "total_service_count"];
+  uint32 total_service_count = 1 [ json_name = "total_service_count" ];
   // 健康实例总数
-  uint32 total_health_instance_count = 2 [json_name = "total_health_instance_count"];
+  uint32 total_health_instance_count = 2
+      [ json_name = "total_health_instance_count" ];
   // 实例总数
-  uint32 total_instance_count = 3 [json_name = "total_instance_count"];
+  uint32 total_instance_count = 3 [ json_name = "total_instance_count" ];
+}
+
+message ClientLabel {
+  string key = 1;
+  MatchString value = 2;
 }

api/v1/service_manage/contract.proto

@@ -29,6 +29,8 @@ message ServiceContract {
   string ctime = 10;
   // 更新时间
   string mtime = 11;
+  // 接口状态，Offline/Online
+  string status = 12;
 }
 
 message InterfaceDescriptor {
@@ -54,6 +56,4 @@ message InterfaceDescriptor {
   string ctime = 7;
   // 更新时间
   string mtime = 8;
-  // 接口状态，Offline/Online
-  string status = 9;
 }