Skip to content

fix: use LEFT JOIN in projectBasicSQL to include projects without quota records #23520

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

Open
cdarninsuang-bamfunds wants to merge 1 commit into
base: main
Choose a base branch
from
+29 −13
Open

fix: use LEFT JOIN in projectBasicSQL to include projects without quota records #23520

Show file tree
Hide file tree
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: 5 additions & 5 deletions src/pkg/exporter/project_collector.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@ var (
FROM project INNER JOIN project_metadata ON project.project_id=project_metadata.project_id
WHERE project.deleted=FALSE AND project_metadata.name='public'
GROUP BY project_metadata.value;`
projectBasicSQL = `SELECT project.project_id, project.name, project_metadata.value AS public, quota.hard AS quota, quota_usage.used AS usage FROM project
INNER JOIN project_metadata ON (project.project_id = project_metadata.project_id)
INNER JOIN quota ON project.project_id = CAST(quota.reference_id AS Integer)
INNER JOIN quota_usage ON project.project_id = CAST(quota_usage.reference_id AS Integer)
WHERE quota.reference='project' AND quota_usage.reference='project' AND project.deleted=FALSE AND project_metadata.name='public';`
projectBasicSQL = `SELECT project.project_id, project.name, COALESCE(project_metadata.value, 'false') AS public, COALESCE(quota.hard, '{}') AS quota, COALESCE(quota_usage.used, '{}') AS usage FROM project
LEFT JOIN project_metadata ON (project.project_id = project_metadata.project_id AND project_metadata.name='public')
LEFT JOIN quota ON (project.project_id::text = quota.reference_id AND quota.reference='project')
LEFT JOIN quota_usage ON (project.project_id::text = quota_usage.reference_id AND quota_usage.reference='project')
WHERE project.deleted=FALSE;`
projectMemberSQL = `SELECT project.project_id, COUNT(project.project_id) AS member_total
FROM project INNER JOIN project_member ON project.project_id=project_member.project_id
WHERE project.deleted=FALSE AND project_member.entity_type='u'
Expand Down
32 changes: 24 additions & 8 deletions src/pkg/exporter/project_collector_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ var (
eve = models.User{Username: "eve", Password: "password", Email: "eve@test.com"}
testPro1 = proModels.Project{OwnerID: 1, Name: "test1", Metadata: map[string]string{"public": "true"}}
testPro2 = proModels.Project{OwnerID: 1, Name: "test2", Metadata: map[string]string{"public": "false"}}
testPro3 = proModels.Project{OwnerID: 1, Name: "test3", Metadata: map[string]string{"public": "false"}}
rs1 = qtypes.ResourceList{qtypes.ResourceStorage: 100}
rs2 = qtypes.ResourceList{qtypes.ResourceStorage: 200}
repo1 = model.RepoRecord{Name: "repo1"}
Expand Down Expand Up @@ -65,8 +66,14 @@ func setupTest(t *testing.T) {
if err != nil {
t.Errorf("project creating %v", err)
}
// testPro3 has no quota records — simulates quota_per_project_enable=false
proID3, err := proctl.Ctl.Create(ctx, &testPro3)
if err != nil {
t.Errorf("project creating %v", err)
}
testPro1.ProjectID = proID1
testPro2.ProjectID = proID2
testPro3.ProjectID = proID3

// Create quota for project
quotactl.Ctl.Create(ctx, "project", strconv.Itoa(int(testPro1.ProjectID)), rs1)
Expand Down Expand Up @@ -125,14 +132,14 @@ func setupTest(t *testing.T) {
}

func tearDownTest(t *testing.T) {
dao.GetOrmer().Raw("delete from project_member where project_id in (?, ?)", []int64{testPro1.ProjectID, testPro2.ProjectID}).Exec()
dao.GetOrmer().Raw("delete from project_metadata where project_id in (?, ?)", []int64{testPro1.ProjectID, testPro2.ProjectID}).Exec()
dao.GetOrmer().Raw("delete from quota where reference=\"project\" and reference_id in (?, ?)", []int64{testPro1.ProjectID, testPro2.ProjectID}).Exec()
dao.GetOrmer().Raw("delete from quota_usage where reference=\"project\" and reference_id in (?, ?)", []int64{testPro1.ProjectID, testPro2.ProjectID}).Exec()
dao.GetOrmer().Raw("delete from project where project_id in (?, ?)", []int64{testPro1.ProjectID, testPro2.ProjectID}).Exec()
dao.GetOrmer().Raw("delete from artifact where project_id in (?, ?)", []int64{testPro1.ProjectID, testPro2.ProjectID}).Exec()
dao.GetOrmer().Raw("delete from repository where project_id in (?, ?)", []int64{testPro1.ProjectID, testPro2.ProjectID}).Exec()
dao.GetOrmer().Raw("delete from cve_allowlist where project_id in (?, ?)", []int64{testPro1.ProjectID, testPro2.ProjectID}).Exec()
dao.GetOrmer().Raw("delete from project_member where project_id in (?, ?, ?)", []int64{testPro1.ProjectID, testPro2.ProjectID, testPro3.ProjectID}).Exec()
dao.GetOrmer().Raw("delete from project_metadata where project_id in (?, ?, ?)", []int64{testPro1.ProjectID, testPro2.ProjectID, testPro3.ProjectID}).Exec()
dao.GetOrmer().Raw("delete from quota where reference=\"project\" and reference_id in (?, ?, ?)", []int64{testPro1.ProjectID, testPro2.ProjectID, testPro3.ProjectID}).Exec()
dao.GetOrmer().Raw("delete from quota_usage where reference=\"project\" and reference_id in (?, ?, ?)", []int64{testPro1.ProjectID, testPro2.ProjectID, testPro3.ProjectID}).Exec()
dao.GetOrmer().Raw("delete from project where project_id in (?, ?, ?)", []int64{testPro1.ProjectID, testPro2.ProjectID, testPro3.ProjectID}).Exec()
dao.GetOrmer().Raw("delete from artifact where project_id in (?, ?, ?)", []int64{testPro1.ProjectID, testPro2.ProjectID, testPro3.ProjectID}).Exec()
dao.GetOrmer().Raw("delete from repository where project_id in (?, ?, ?)", []int64{testPro1.ProjectID, testPro2.ProjectID, testPro3.ProjectID}).Exec()
dao.GetOrmer().Raw("delete from cve_allowlist where project_id in (?, ?, ?)", []int64{testPro1.ProjectID, testPro2.ProjectID, testPro3.ProjectID}).Exec()
dao.GetOrmer().Raw("delete from harbor_user where user_id in (?, ?, ?)", []int{alice.UserID, bob.UserID, eve.UserID}).Exec()
}

Expand Down Expand Up @@ -167,4 +174,13 @@ func (c *ProjectCollectorTestSuite) TestProjectCollector() {
c.Equalf(pMap[testPro2.ProjectID].PullTotal, float64(0), "pMap %v", pMap)
c.Equalf(pMap[testPro2.ProjectID].Artifact["IMAGE"].ArtifactTotal, float64(1), "pMap %v", pMap)

// testPro3 has no quota records (simulates quota_per_project_enable=false).
// Verify it is still included in the map with zero quota/usage rather than
// being silently dropped and logged as "project not found".
c.Containsf(pMap, testPro3.ProjectID, "project without quota records should appear in pMap")
c.Equalf(pMap[testPro3.ProjectID].Name, testPro3.Name, "pMap %v", pMap)
c.Equalf(strconv.FormatBool(pMap[testPro3.ProjectID].Public), testPro3.Metadata["public"], "pMap %v", pMap)
c.Equalf(pMap[testPro3.ProjectID].Quota, "{}", "project without quota record should have empty quota")
c.Equalf(pMap[testPro3.ProjectID].Usage, "{}", "project without quota record should have empty usage")

}