From 67b4f952eb5b91016d85968790cdce4b2259819e Mon Sep 17 00:00:00 2001 From: andrew shan <45474304+andrewshan@users.noreply.github.com> Date: Wed, 9 Oct 2024 10:35:16 +0800 Subject: [PATCH 1/3] feat: support customize label key (#128) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: add ratelimit spec & remove temporary proto files * Update version to 1.5.3-SNAPSHOT * fix: change maxAmount to max_amount * feat: add lossless rule specification * feat: lossless支持lables过滤 * feat: restore circuitbreaker fallback & ratelimit add custom response * fix: add json_name * fix: customResponse to custom_response * feat: add go compile sources * feat: add extendInfo to FaultDetector * feat: add json name * feat: add blockallowlist rules & remove unused imports * feat: enhance lane route rule to support more reflexible functions * fix: 枚举类型不能以VALUE结尾 * feat: 支持指定label_key --- api/v1/traffic_manage/lane.proto | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/api/v1/traffic_manage/lane.proto b/api/v1/traffic_manage/lane.proto index 842c30f1..d39ff90c 100644 --- a/api/v1/traffic_manage/lane.proto +++ b/api/v1/traffic_manage/lane.proto @@ -58,15 +58,6 @@ message LaneGroup { repeated LaneRule rules = 11; // 泳道组标签信息 map metadata = 12; - // 基线实例的过滤策略,默认为不带有标签KEY的实例属于该泳道 - enum BaselineFilterStrategy { - // 带有标签KEY的实例属于该泳道 - NOT_MATCH_KEY = 0; - // 匹配上KEY和VALUE的实例才属于该泳道 - NOT_MATCH_KEY_VALUES = 1; - } - BaselineFilterStrategy baselineFilterStrategy = 13 [ json_name = "baseline_filter_strategy" ]; - // 操作标志位 bool editable = 20 [ json_name = "editable" ]; bool deleteable = 21 [ json_name = "deleteable" ]; @@ -117,9 +108,6 @@ message LaneRule { uint32 priority = 12; // description simple description rules string description = 13; - // 属于该泳道的实例标签值,只要匹配上其中一个标签,就代表这个实例属于这个泳道 - // 如果为空,则使用default_label_value - repeated string label_values = 14; - // 属于该泳道的实例标签KEY,默认为lane - string label_key = 15; + // 属于该泳道的实例标签KEY,不填默认为lane + string label_key = 14; } \ No newline at end of file From 31cb97c5123aaedb4ecb8c9673f22c17bb9674c4 Mon Sep 17 00:00:00 2001 From: Haotian Zhang <928016560@qq.com> Date: Wed, 9 Oct 2024 10:57:34 +0800 Subject: [PATCH 2/3] begin 1.5.4. --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 8af85beb..80e940f2 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.5.3 +1.5.4-SNAPSHOT From b8eb21fdc29c32acd4dac298a6dc5b51d63ccfc3 Mon Sep 17 00:00:00 2001 From: shedfreewu <49236872+shedfreewu@users.noreply.github.com> Date: Tue, 26 Nov 2024 15:27:47 +0800 Subject: [PATCH 3/3] release 1.5.4. (#130) --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 80e940f2..94fe62c2 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.5.4-SNAPSHOT +1.5.4