[Improvement-18286][ApiServer] Remove the default workerGroup from the frontend and add backend validation for workerGroup#18293
Open
njnu-seafish wants to merge 4 commits into
Open
Conversation
…dation for workerGroup
ruanwenjun
reviewed
May 26, 2026
| * @param workerGroups worker group names to validate | ||
| * @throws ServiceException if any worker group is not assigned | ||
| */ | ||
| void validateWorkerGroupsAssignedToProject(Long projectCode, List<String> workerGroups); |
Member
There was a problem hiding this comment.
duplicated with WorkerGroupValidator
Contributor
Author
There was a problem hiding this comment.
duplicated with
WorkerGroupValidator
Okay, I will unify the logic.
Comment on lines
+395
to
+407
| private void validateTaskWorkerGroups(long projectCode, List<TaskDefinitionLog> taskDefinitionLogs) { | ||
| if (CollectionUtils.isEmpty(taskDefinitionLogs)) { | ||
| return; | ||
| } | ||
|
|
||
| List<String> workerGroups = taskDefinitionLogs.stream() | ||
| .map(TaskDefinitionLog::getWorkerGroup) | ||
| .filter(StringUtils::isNotEmpty) | ||
| .distinct() | ||
| .collect(Collectors.toList()); | ||
|
|
||
| projectWorkerGroupRelationService.validateWorkerGroupsAssignedToProject(projectCode, workerGroups); | ||
| } |
Member
There was a problem hiding this comment.
This kind of code should put into WorkerGroupValidator
Contributor
Author
There was a problem hiding this comment.
This kind of code should put into
WorkerGroupValidator
Okay, I will unify the logic.
SbloodyS
changed the title
SbloodyS
requested changes
May 26, 2026
| .selectOne(new QueryWrapper<ProjectPreference>().lambda().eq(ProjectPreference::getProjectCode, | ||
| projectCode)); | ||
|
|
||
| // Validate workerGroup is assigned to project |
Member
There was a problem hiding this comment.
Suggested change
| // Validate workerGroup is assigned to project |
| JSONUtils.parseObject(preferences, new TypeReference<Map<String, Object>>() { | ||
| }); | ||
| if (preferenceMap != null) { | ||
| Object workerGroupObj = preferenceMap.get("workerGroup"); |
Member
There was a problem hiding this comment.
Using entity instead of hard coding.
Contributor
Author
There was a problem hiding this comment.
Using entity instead of hard coding.
good idea
| } | ||
| } | ||
| } catch (Exception e) { | ||
| log.warn("Failed to parse preferences JSON: {}", preferences, e); |
Contributor
Author
There was a problem hiding this comment.
throw
ServiceExceptionhere.
ok
| scheduleObj.setReleaseState(ReleaseState.OFFLINE); | ||
| scheduleObj.setWorkflowInstancePriority(workflowInstancePriority); | ||
|
|
||
| // Validate workerGroup |
Member
There was a problem hiding this comment.
Suggested change
| // Validate workerGroup |
| schedule.setFailureStrategy(failureStrategy); | ||
| } | ||
|
|
||
| // Validate workerGroup |
Member
There was a problem hiding this comment.
Suggested change
| // Validate workerGroup |
|
|
||
| startParamListValidator.validate(triggerWorkflowDTO.getStartParamList()); | ||
|
|
||
| // Validate workerGroup using WorkerGroupValidator |
Member
There was a problem hiding this comment.
Suggested change
| // Validate workerGroup using WorkerGroupValidator |
Comment on lines
+25
to
+42
| /** | ||
| * Validation context for workerGroup validation | ||
| */ | ||
| @Data | ||
| @Builder | ||
| @NoArgsConstructor | ||
| @AllArgsConstructor | ||
| public class WorkerGroupValidationContext { | ||
|
|
||
| /** | ||
| * The workerGroup to validate | ||
| */ | ||
| private String workerGroup; | ||
|
|
||
| /** | ||
| * The project code to check against | ||
| */ | ||
| private long projectCode; |
Member
There was a problem hiding this comment.
Remove all unnessnary comment.
Contributor
Author
There was a problem hiding this comment.
Remove all unnessnary comment.
ok
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Was this PR generated or assisted by AI?
Yes, Modify the frontend code using AI, then test and verify locally.
Purpose of the pull request
close #18286
Brief change log
Remove the default workerGroup from the frontend and add backend validation for workerGroup
Verify this pull request
This pull request is code cleanup without any test coverage.
(or)
This pull request is already covered by existing tests, such as (please describe tests).
(or)
This change added tests and can be verified as follows:
(or)
Pull Request Notice
Pull Request Notice
If your pull request contains incompatible change, you should also add it to
docs/docs/en/guide/upgrade/incompatible.md