feat: 容器执行支持灰度 TencentBlueKing#2903

src/backend/commons/common-service/src/main/java/com/tencent/bk/job/common/service/feature/strategy/AbstractResourceScopeToggleStrategy.java

@@ -108,4 +108,18 @@ private boolean isValidScopeId(String scopeId) {
 
         return true;
     }
+
+    /**
+     * 判断是否命中配置的管理空间列表
+     *
+     * @param scope 管理空间
+     */
+    protected boolean hitResourceScopeRange(ResourceScope scope) {
+        ResourceScope checkScope = scope;
+        if (!scope.getClass().equals(ResourceScope.class)) {
+            // 需要转换为 ResourceScope 类型，避免后面 contains() 判断因为 class 不同出现预期之外的结果
+            checkScope = new ResourceScope(scope.getType(), scope.getId());
+        }
+        return this.resourceScopes.contains(checkScope);
+    }
 }

src/backend/commons/common-service/src/main/java/com/tencent/bk/job/common/service/feature/strategy/ResourceScopeBlackListToggleStrategy.java

@@ -47,7 +47,7 @@ public ResourceScopeBlackListToggleStrategy(Map<String, String> initParams) {
     @Override
     public boolean evaluate(String featureId, FeatureExecutionContext ctx) {
         ResourceScope scope = (ResourceScope) ctx.getParam(ToggleStrategyContextParams.CTX_PARAM_RESOURCE_SCOPE);
-        return !this.resourceScopes.contains(scope);
+        return !hitResourceScopeRange(scope);
     }
 
     @Override

src/backend/commons/common-service/src/main/java/com/tencent/bk/job/common/service/feature/strategy/ResourceScopeWhiteListToggleStrategy.java

@@ -47,7 +47,7 @@ public ResourceScopeWhiteListToggleStrategy(Map<String, String> initParams) {
     @Override
     public boolean evaluate(String featureId, FeatureExecutionContext ctx) {
         ResourceScope scope = (ResourceScope) ctx.getParam(ToggleStrategyContextParams.CTX_PARAM_RESOURCE_SCOPE);
-        return this.resourceScopes.contains(scope);
+        return hitResourceScopeRange(scope);
     }
 
     @Override