Feat/sync spec (#153)

* feat：协议同步

* feat：协议同步，提交go编译后的文件

Author: ChaoyongLiang

api/v1/config_manage/config_file.proto

@@ -128,6 +128,8 @@ message ConfigFileReleaseHistory {
   // 配置发布失败的原因
   google.protobuf.StringValue reason = 17;
   google.protobuf.StringValue release_description = 18;
+  ConfigFileSupportedClient supported_client = 19 [ json_name = "supported_client" ];
+  ConfigFilePersistent persistent = 20  [ json_name = "persistent" ];
 }
 
 message ConfigFileTemplate {
@@ -159,6 +161,7 @@ message ClientConfigFileInfo {
   // 配置文件的发布时间
   google.protobuf.StringValue release_time = 11 [ json_name = "release_time" ];
   ConfigClientType client_type = 12 [ json_name = "client_type" ];
+  ConfigFileSupportedClient supported_client = 13 [ json_name = "supported_client" ];
   ConfigFilePersistent persistent = 14  [ json_name = "persistent" ];
 }
 
@@ -182,6 +185,17 @@ message ConfigFileExportRequest {
   repeated google.protobuf.UInt64Value ids = 4;
 }
 
+message ConfigFileImportRequest {
+  google.protobuf.StringValue namespace = 1;
+  google.protobuf.StringValue base64Content = 2 [json_name = "base64_content"];
+  ConflictHandling conflict_handling = 3 [json_name = "conflict_handling"];
+}
+
+enum ConflictHandling {
+  CONFLICT_HANDLING_SKIP = 0;
+  CONFLICT_HANDLING_OVERWRITE = 1;
+}
+
 message ConfigFilePublishInfo {
   google.protobuf.StringValue release_name = 1 [ json_name = "release_name" ];
   google.protobuf.StringValue namespace = 2;
@@ -199,6 +213,7 @@ message ConfigFilePublishInfo {
   google.protobuf.BoolValue encrypted = 16;
   // 加密算法
   google.protobuf.StringValue encrypt_algo = 17;
+  ConfigFileSupportedClient supported_client = 18 [ json_name = "supported_client" ];
   ConfigFilePersistent persistent = 19 [ json_name = "persistent" ];
 }
 

api/v1/config_manage/config_file_response.proto

@@ -23,6 +23,8 @@ message ConfigResponse {
   ConfigFileRelease configFileRelease = 5;
   ConfigFileReleaseHistory configFileReleaseHistory = 6;
   ConfigFileTemplate configFileTemplate = 7;
+
+  repeated ConfigFile configFiles = 8;
 }
 
 message ConfigBatchWriteResponse {
@@ -57,12 +59,14 @@ message ConfigImportResponse {
   repeated ConfigFile createConfigFiles = 3;
   repeated ConfigFile skipConfigFiles = 4;
   repeated ConfigFile overwriteConfigFiles = 5;
+  repeated ConfigFile failedConfigFiles = 6;
 }
 
 message ConfigExportResponse {
   google.protobuf.UInt32Value code = 1;
   google.protobuf.StringValue info = 2;
   google.protobuf.BytesValue data = 3;
+  google.protobuf.StringValue base64Content = 4 [json_name = "base64_content"];
 }
 
 message ConfigEncryptAlgorithmResponse {

api/v1/model/code.proto

@@ -162,6 +162,10 @@ enum Code {
     EncryptConfigFileException      = 400809;
     GroupExistActiveRelease        = 400810;
     DecryptConfigFileException      = 400811;
+    InvalidConfigId                 = 400815;
+    InvalidConfigReleaseId          = 400812;
+    NotMatchContentToFormat         = 400813;
+    InvalidConfigContent            = 400814;
 
     // auth codes
     InvalidUserOwners          = 400410;

api/v1/model/namespace.proto

@@ -34,5 +34,8 @@ message Namespace {
   repeated google.protobuf.StringValue service_export_to = 16 [ json_name = "service_export_to" ];
 
   map<string, string> metadata = 17;
-  google.protobuf.BoolValue deleteable = 18;
+
+  bool sync_to_global_registry = 18 [ json_name = "sync_to_global_registry" ];
+
+  google.protobuf.BoolValue deleteable = 100;
 }

api/v1/security/block_allow_list.proto

@@ -2,7 +2,6 @@ syntax = "proto3";
 
 package v1;
 
-import "google/protobuf/wrappers.proto";
 import "model.proto";
 
 option go_package = "github.com/polarismesh/specification/source/go/api/v1/security";
@@ -47,6 +46,9 @@ message BlockAllowListRule {
   // block or allow configuration
   repeated BlockAllowConfig blockAllowConfig = 12 [ json_name = "block_allow_config" ];
 
+  //revision
+  string revision = 13 [json_name = "revision" ];
+
 }
 
 message BlockAllowConfig {

api/v1/service_manage/heartbeat.proto

@@ -12,6 +12,7 @@ message HeartbeatRecord {
   reserved 2 to 5;
   int64 lastHeartbeatSec = 6 [ json_name = "last_heartbeat_sec" ];
   bool exist = 7 [ json_name = "exist" ];
+  int64 count = 8 [ json_name = "count" ];
 }
 
 message InstanceHeartbeat {

api/v1/service_manage/response.proto

@@ -141,7 +141,7 @@ message DiscoverResponse {
   // 就近路由规则内容
   repeated RouteRule nearbyRouteRules = 24;
   // 无损上下线规则内容(兼容老版本)
-  repeated LosslessRule losslessRules = 25;
+  LosslessRule lossless = 25;
   // 服务黑白名单鉴权规则
   repeated BlockAllowListRule blockAllowListRule = 26;
   // 流量镜像规则内容

api/v1/service_manage/service.proto

@@ -42,7 +42,19 @@ message Service {
   google.protobuf.StringValue id = 21;
   google.protobuf.BoolValue editable = 24;
   repeated google.protobuf.StringValue export_to = 25 [ json_name = "export_to" ];
-  google.protobuf.BoolValue deleteable = 26;
+
+  bool sync_to_global_registry = 26 [ json_name = "sync_to_global_registry" ];
+
+  google.protobuf.UInt32Value isolate_instance_count = 27 [json_name = "isolate_instance_count"];
+  ServiceStatus service_status = 28 [json_name = "service_status"];
+
+  google.protobuf.BoolValue deleteable = 100;
+}
+
+enum ServiceStatus {
+  NORMAL = 0;    //服务状态正常
+  ABNORMAL = 1;  //服务状态异常
+  OFFLINE = 2;   //服务离线
 }
 
 enum AliasType {
@@ -66,6 +78,8 @@ message ServiceAlias {
   google.protobuf.StringValue id = 11;
   google.protobuf.BoolValue editable = 12;
   google.protobuf.BoolValue deleteable = 13;
+  repeated google.protobuf.StringValue export_to = 25 [ json_name = "export_to" ];
+  map<string, string> metadata = 26;
 }
 
 message Instance {

api/v1/traffic_manage/lane.proto

@@ -13,13 +13,20 @@ option java_outer_classname = "LaneProto";
 // 流量入口
 message TrafficEntry {
   // 标记流量入口类型
-  // type == "polarismesh.cn/gateway/spring-cloud-gateway", 则 selector 为
-  // ServiceGatewaySelector type == "polarismesh.cn/service, 则 selector 为
-  // ServiceSelector
+  // type == "polarismesh.cn/gateway/tse-gateway, 则 selector 为
+  // TSEGatewaySelector type == "polarismesh.cn/gateway/spring-cloud-gateway",
+  // 则 selector 为 ServiceGatewaySelector type == "polarismesh.cn/service, 则
+  // selector 为 ServiceSelector
   string type = 1;
   google.protobuf.Any selector = 2;
 }
 
+// 网关入口定义
+message TSEGatewaySelector {
+  string instance_id = 1 [ json_name = "instance_id" ];
+  repeated string services = 2;
+}
+
 // 微服务网关入口定义
 message ServiceGatewaySelector {
   string namespace = 1;
@@ -74,7 +81,7 @@ message TrafficMatchRule {
     // 或模式
     OR = 1;
   }
-  TrafficMatchMode matchMode = 14;
+  TrafficMatchMode matchMode = 14 [ json_name = "match_mode" ];
 }
 
 // TrafficGray 流量灰度配置
@@ -109,9 +116,9 @@ message LaneRule {
   // 所属泳道组的名称
   string group_name = 3 [ json_name = "group_name" ];
   // 流量匹配规则
-  TrafficMatchRule traffic_match_rule = 4;
+  TrafficMatchRule traffic_match_rule = 4 [ json_name = "traffic_match_rule" ];
   // 保存这个泳道的默认实例标签
-  string default_label_value = 5;
+  string default_label_value = 5 [ json_name = "default_label_value" ];
   // 泳道规则是否启用
   bool enable = 6;
   enum LaneMatchMode {
@@ -120,7 +127,7 @@ message LaneRule {
     // 宽松匹配模式
     PERMISSIVE = 1;
   }
-  LaneMatchMode match_mode = 7;
+  LaneMatchMode match_mode = 7 [ json_name = "match_mode" ];
   // 流量灰度配置
   TrafficGray traffic_gray = 15 [ json_name = "traffic_gray" ];
   // revision routing version

api/v1/traffic_manage/ratelimit.proto

@@ -132,7 +132,7 @@ message MatchArgument {
 
 // concurrency rate-limit amount config
 message ConcurrencyAmount {
-  uint32 maxAmount = 1 [ json_name = "max_amount" ];
+  uint32 maxAmount = 1 [ json_name = "maxAmount" ];
 }
 
 // custom response text when limited