Adjust the query by UUID sql so that it can use the idx_task_extra_at…

…trs_report_uuids fixes goharbor#20505 Signed-off-by: stonezdj <stone.zhang@broadcom.com>
stonezdj · Jun 5, 2024 · 134c68e · 134c68e
1 parent 6c984d8
commit 134c68e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/src/common/rbac/project/rbac_role.go b/src/common/rbac/project/rbac_role.go
@@ -122,10 +122,7 @@ var (
 			{Resource: rbac.ResourceMember, Action: rbac.ActionRead},
 			{Resource: rbac.ResourceMember, Action: rbac.ActionList},
 
-			{Resource: rbac.ResourceMetadata, Action: rbac.ActionCreate},
 			{Resource: rbac.ResourceMetadata, Action: rbac.ActionRead},
-			{Resource: rbac.ResourceMetadata, Action: rbac.ActionUpdate},
-			{Resource: rbac.ResourceMetadata, Action: rbac.ActionDelete},
 
 			{Resource: rbac.ResourceLog, Action: rbac.ActionList},
 

diff --git a/src/pkg/task/dao/task.go b/src/pkg/task/dao/task.go
@@ -114,8 +114,8 @@ func (t *taskDAO) ListScanTasksByReportUUID(ctx context.Context, uuid string) ([
 	}
 
 	var tasks []*Task
-	param := fmt.Sprintf(`{"report_uuids":["%s"]}`, uuid)
-	sql := `SELECT * FROM task WHERE extra_attrs::jsonb @> cast( ? as jsonb )`
+	param := fmt.Sprintf(`"%s"`, uuid)
+	sql := `SELECT * FROM task WHERE extra_attrs::jsonb -> 'report_uuids' @> ?`
 	_, err = ormer.Raw(sql, param).QueryRows(&tasks)
 	if err != nil {
 		return nil, err