Thanks to visit codestin.com
Credit goes to github.com

Skip to content

fix(api): getWorkflowJobQueueHandler filter by group for all hatcheries #5079

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 25, 2020
Merged

fix(api): getWorkflowJobQueueHandler filter by group for all hatcheries #5079

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions engine/api/workflow_queue.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -741,12 +741,12 @@ func (api *API) getWorkflowJobQueueHandler() service.Handler {
return errM
}

permissions := sdk.PermissionReadExecute
permissions := sdk.PermissionRead

isW := isWorker(ctx)
isS := isService(ctx)
if !isW && !isS {
permissions = sdk.PermissionRead
if isW || isS {
permissions = sdk.PermissionReadExecute
}

filter := workflow.NewQueueFilter()
Expand All @@ -759,8 +759,10 @@ func (api *API) getWorkflowJobQueueHandler() service.Handler {
if modelType != "" {
filter.ModelType = []string{modelType}
}

var jobs []sdk.WorkflowNodeJobRun
if !isMaintainer(ctx) && !isAdmin(ctx) {
// If the consumer is a worker, a hatchery or a non maintainer user, filter the job by its groups
if isW || isS || !isMaintainer(ctx) {
jobs, err = workflow.LoadNodeJobRunQueueByGroupIDs(ctx, api.mustDB(), api.Cache, filter, getAPIConsumer(ctx).GetGroupIDs())
} else {
jobs, err = workflow.LoadNodeJobRunQueue(ctx, api.mustDB(), api.Cache, filter)
Expand Down