zishuo/onepanel
1
0
Fork 0
mirror of https://github.com/onepanelio/onepanel.git synced 2025-10-28 07:41:27 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat: added support for filtering workflow templates by a single label.

Browse Source 
When a workflow template is created, or a new version is created, we now stores the labels for it as the latest labels. This makes it easier to filter based on labels.
This commit is contained in:
Andrey Melnikov
2020-07-28 16:57:43 -07:00
parent 5009a2643f
commit da8cb2859a
3 changed files with 43 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/labels.go
View File

@@ -163,7 +163,8 @@ func (c *Client) ReplaceLabelsUsingKnownID(namespace, resource string, resourceI
Where(sq.Eq{
"resource": resource,
"resource_id": resourceID,
}).RunWith(tx).
}).
RunWith(tx).
Exec()
if err != nil {
return err

42
pkg/workflow_template.go
View File

@@ -108,6 +108,10 @@ func (c *Client) createWorkflowTemplate(namespace string, workflowTemplate *Work
return nil, nil, err
}
if err := c.ReplaceLabelsUsingKnownID(namespace, TypeWorkflowTemplate, workflowTemplate.ID, workflowTemplate.UID, workflowTemplate.Labels); err != nil {
return nil, nil, err
}
argoWft, err := createArgoWorkflowTemplate(workflowTemplate, workflowTemplateVersion.Version)
if err != nil {
return nil, nil, err
@@ -340,7 +344,7 @@ func (c *Client) listWorkflowTemplateVersions(namespace, uid string) (workflowTe
// selectWorkflowTemplatesDB loads workflow templates from the database for the input namespace
// it also selects the total number of versions and latest version id
func (c *Client) selectWorkflowTemplatesDB(namespace string, paginator *pagination.PaginationRequest) (workflowTemplates []*WorkflowTemplate, err error) {
func (c *Client) selectWorkflowTemplatesDB(namespace string, paginator *pagination.PaginationRequest, filter *WorkflowTemplateFilter) (workflowTemplates []*WorkflowTemplate, err error) {
workflowTemplates = make([]*WorkflowTemplate, 0)
sb := c.workflowTemplatesSelectBuilder(namespace).
@@ -352,6 +356,18 @@ func (c *Client) selectWorkflowTemplatesDB(namespace string, paginator *paginati
"wt.is_system": false,
}).
OrderBy("wt.created_at DESC")
if len(filter.Labels) > 0 {
sb = sb.Join("labels l ON wt.id = l.resource_id AND l.resource = 'workflow_template'")
// Note: multiple labels are not yet supported. The below will not correctly AND label selection.
for _, lbl := range filter.Labels {
sb = sb.Where(sq.Eq{
"l.key": lbl.Key,
"l.value": lbl.Value,
})
}
}
sb = *paginator.ApplyToSelect(&sb)
err = c.DB.Selectx(&workflowTemplates, sb)
@@ -361,15 +377,28 @@ func (c *Client) selectWorkflowTemplatesDB(namespace string, paginator *paginati
// CountWorkflowTemplates counts the total number of workflow templates for the given namespace
// archived, and system templates are ignored.
func (c *Client) CountWorkflowTemplates(namespace string) (count int, err error) {
err = sb.Select("COUNT(*)").
func (c *Client) CountWorkflowTemplates(namespace string, filter *WorkflowTemplateFilter) (count int, err error) {
sb := sb.Select("COUNT(*)").
From("workflow_templates wt").
Where(sq.Eq{
"wt.namespace": namespace,
"wt.is_archived": false,
"wt.is_system": false,
}).
RunWith(c.DB).
})
if len(filter.Labels) > 0 {
sb = sb.Join("labels l ON wt.id = l.resource_id AND l.resource = 'workflow_template'")
// Note: multiple labels are not yet supported. The below will not correctly AND label selection.
for _, lbl := range filter.Labels {
sb = sb.Where(sq.Eq{
"l.key": lbl.Key,
"l.value": lbl.Value,
})
}
}
err = sb.RunWith(c.DB).
QueryRow().
Scan(&count)
@@ -497,6 +526,7 @@ func (c *Client) CreateWorkflowTemplateVersion(namespace string, workflowTemplat
return nil, err
}
workflowTemplate.ID = workflowTemplateDB.ID
workflowTemplate.Version = workflowTemplateVersion.Version
return workflowTemplate, nil
@@ -580,7 +610,7 @@ func (c *Client) ListWorkflowTemplateVersions(namespace, uid string) (workflowTe
}
func (c *Client) ListWorkflowTemplates(namespace string, paginator *pagination.PaginationRequest, filter *WorkflowTemplateFilter) (workflowTemplateVersions []*WorkflowTemplate, err error) {
workflowTemplateVersions, err = c.selectWorkflowTemplatesDB(namespace, paginator)
workflowTemplateVersions, err = c.selectWorkflowTemplatesDB(namespace, paginator, filter)
if err != nil {
log.WithFields(log.Fields{
"Namespace": namespace,

6
server/workflow_template_server.go
View File

@@ -98,6 +98,10 @@ func (s *WorkflowTemplateServer) CreateWorkflowTemplateVersion(ctx context.Conte
return nil, err
}
if err := client.ReplaceLabelsUsingKnownID(req.Namespace, v1.TypeWorkflowTemplate, workflowTemplate.ID, workflowTemplate.UID, workflowTemplate.Labels); err != nil {
return nil, err
}
req.WorkflowTemplate.Uid = workflowTemplate.UID
req.WorkflowTemplate.Name = workflowTemplate.Name
req.WorkflowTemplate.Version = workflowTemplate.Version
@@ -213,7 +217,7 @@ func (s *WorkflowTemplateServer) ListWorkflowTemplates(ctx context.Context, req
apiWorkflowTemplates = append(apiWorkflowTemplates, apiWorkflowTemplate(wtv))
}
count, err := client.CountWorkflowTemplates(req.Namespace)
count, err := client.CountWorkflowTemplates(req.Namespace, &filter)
if err != nil {
return nil, err
}