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

Merge pull request #11318 from ywk253100/200326_remove_pagination_default

Browse Source 
Iterate the link header when listing artifact
This commit is contained in:
Steven Zou 2020-03-27 18:07:03 +08:00 committed by GitHub
commit 36552ba18b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/replication/adapter/harbor/image_registry.go
View File

@ -149,7 +149,7 @@ func (a *adapter) listArtifacts(repository string, filters []*model.Filter) ([]*
url := fmt.Sprintf("%s/api/%s/projects/%s/repositories/%s/artifacts?with_label=true", url := fmt.Sprintf("%s/api/%s/projects/%s/repositories/%s/artifacts?with_label=true",
a.getURL(), api.APIVersion, project, repository) a.getURL(), api.APIVersion, project, repository)
artifacts := []*artifact.Artifact{} artifacts := []*artifact.Artifact{}
if err := a.client.Get(url, &artifacts); err != nil { if err := a.client.GetAndIteratePagination(url, &artifacts); err != nil {
return nil, err return nil, err
} }
var arts []*model.Artifact var arts []*model.Artifact

9
src/server/v2.0/handler/base.go
View File

@ -135,6 +135,10 @@ func (b *BaseAPI) BuildQuery(ctx context.Context, query *string, pageNumber, pag
// Links return Links based on the provided pagination information // Links return Links based on the provided pagination information
func (b *BaseAPI) Links(ctx context.Context, u *url.URL, total, pageNumber, pageSize int64) lib.Links { func (b *BaseAPI) Links(ctx context.Context, u *url.URL, total, pageNumber, pageSize int64) lib.Links {
var links lib.Links
if pageSize == 0 {
return links
}
ul := *u ul := *u
// try to unescape the repository name which contains escaped slashes // try to unescape the repository name which contains escaped slashes
if escapedPath, err := url.PathUnescape(ul.Path); err == nil { if escapedPath, err := url.PathUnescape(ul.Path); err == nil {
@ -142,11 +146,13 @@ func (b *BaseAPI) Links(ctx context.Context, u *url.URL, total, pageNumber, page
} else { } else {
log.Errorf("failed to unescape the path %s: %v", ul.Path, err) log.Errorf("failed to unescape the path %s: %v", ul.Path, err)
} }
var links lib.Links
// prev // prev
if pageNumber > 1 && (pageNumber-1)*pageSize < total { if pageNumber > 1 && (pageNumber-1)*pageSize < total {
q := ul.Query() q := ul.Query()
q.Set("page", strconv.FormatInt(pageNumber-1, 10)) q.Set("page", strconv.FormatInt(pageNumber-1, 10))
// the URL may contain no "page_size", in this case the pageSize in the query is set by
// the go-swagger automatically
q.Set("page_size", strconv.FormatInt(pageSize, 10))
ul.RawQuery = q.Encode() ul.RawQuery = q.Encode()
// try to unescape the query // try to unescape the query
if escapedQuery, err := url.QueryUnescape(ul.RawQuery); err == nil { if escapedQuery, err := url.QueryUnescape(ul.RawQuery); err == nil {
@ -164,6 +170,7 @@ func (b *BaseAPI) Links(ctx context.Context, u *url.URL, total, pageNumber, page
if pageSize*pageNumber < total { if pageSize*pageNumber < total {
q := ul.Query() q := ul.Query()
q.Set("page", strconv.FormatInt(pageNumber+1, 10)) q.Set("page", strconv.FormatInt(pageNumber+1, 10))
q.Set("page_size", strconv.FormatInt(pageSize, 10))
ul.RawQuery = q.Encode() ul.RawQuery = q.Encode()
// try to unescape the query // try to unescape the query
if escapedQuery, err := url.QueryUnescape(ul.RawQuery); err == nil { if escapedQuery, err := url.QueryUnescape(ul.RawQuery); err == nil {