Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-12-22 08:38:03 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #9529 from wy65701436/fix-repo-delete

Browse Source 
update query in the immutable delete manifest middleware
This commit is contained in:
Wang Yan 2019-10-22 22:10:42 +08:00 committed by GitHub
commit 70bca1251d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/middlewares/interceptor/immutable/deletemf.go
View File

@ -29,6 +29,8 @@ func (dmf *delmfInterceptor) HandleRequest(req *http.Request) (err error) {
artifactQuery := &models.ArtifactQuery{ artifactQuery := &models.ArtifactQuery{
Digest: dmf.mf.Digest, Digest: dmf.mf.Digest,
Repo: dmf.mf.Repository,
PID: dmf.mf.ProjectID,
} }
var afs []*models.Artifact var afs []*models.Artifact
afs, err = dao.ListArtifacts(artifactQuery) afs, err = dao.ListArtifacts(artifactQuery)

2
tests/apitests/python/test_project_quota.py
View File

@ -73,7 +73,7 @@ class TestProjects(unittest.TestCase):
#5. Get project quota #5. Get project quota
quota = self.system.get_project_quota("project", TestProjects.project_test_quota_id, **ADMIN_CLIENT) quota = self.system.get_project_quota("project", TestProjects.project_test_quota_id, **ADMIN_CLIENT)
self.assertEqual(quota[0].used["count"], 1) self.assertEqual(quota[0].used["count"], 1)
self.assertEqual(quota[0].used["storage"], 2791709) self.assertEqual(quota[0].used["storage"], 2789174)
#6. Delete repository(RA) by user(UA); #6. Delete repository(RA) by user(UA);
self.repo.delete_repoitory(TestProjects.repo_name, **ADMIN_CLIENT) self.repo.delete_repoitory(TestProjects.repo_name, **ADMIN_CLIENT)