Set the "Link" and "location" header

Set the "Link" and "location" header

Signed-off-by: Wenkai Yin <yinw@vmware.com>
This commit is contained in:
Wenkai Yin 2020-02-27 15:04:43 +08:00
parent e3f73a3efd
commit e3bbcb66d1
5 changed files with 110 additions and 10 deletions

View File

@ -560,6 +560,9 @@ responses:
X-Request-Id: X-Request-Id:
description: The ID of the corresponding request for the response description: The ID of the corresponding request for the response
type: string type: string
Location:
description: The location of the resource
type: string
'202': '202':
description: Accepted description: Accepted
headers: headers:

View File

@ -107,8 +107,10 @@ func (a *artifactAPI) ListArtifacts(ctx context.Context, params operation.ListAr
assembler.NewVulAssembler(boolValue(params.WithScanOverview)).WithArtifacts(artifacts...).Assemble(ctx) assembler.NewVulAssembler(boolValue(params.WithScanOverview)).WithArtifacts(artifacts...).Assemble(ctx)
// TODO add link header return operation.NewListArtifactsOK().
return operation.NewListArtifactsOK().WithXTotalCount(total).WithLink("").WithPayload(artifacts) WithXTotalCount(total).
WithLink(a.Links(ctx, params.HTTPRequest.URL, total, query.PageNumber, query.PageSize).String()).
WithPayload(artifacts)
} }
func (a *artifactAPI) GetArtifact(ctx context.Context, params operation.GetArtifactParams) middleware.Responder { func (a *artifactAPI) GetArtifact(ctx context.Context, params operation.GetArtifactParams) middleware.Responder {
@ -163,18 +165,17 @@ func (a *artifactAPI) CopyArtifact(ctx context.Context, params operation.CopyArt
} }
dstRepo := fmt.Sprintf("%s/%s", params.ProjectName, params.RepositoryName) dstRepo := fmt.Sprintf("%s/%s", params.ProjectName, params.RepositoryName)
_, id, err := a.repoCtl.Ensure(ctx, dstRepo) _, _, err = a.repoCtl.Ensure(ctx, dstRepo)
if err != nil { if err != nil {
return a.SendError(ctx, err) return a.SendError(ctx, err)
} }
id, err = a.artCtl.Copy(ctx, srcRepo, ref, dstRepo) _, err = a.artCtl.Copy(ctx, srcRepo, ref, dstRepo)
if err != nil { if err != nil {
return a.SendError(ctx, err) return a.SendError(ctx, err)
} }
// TODO set location header location := strings.TrimSuffix(params.HTTPRequest.URL.Path, "/") + "/" + ref
_ = id return operation.NewCopyArtifactCreated().WithLocation(location)
return operation.NewCopyArtifactCreated()
} }
func (a *artifactAPI) ScanArtifact(ctx context.Context, params operation.ScanArtifactParams) middleware.Responder { func (a *artifactAPI) ScanArtifact(ctx context.Context, params operation.ScanArtifactParams) middleware.Responder {
@ -240,7 +241,7 @@ func (a *artifactAPI) CreateTag(ctx context.Context, params operation.CreateTagP
if _, err = a.artCtl.CreateTag(ctx, tag); err != nil { if _, err = a.artCtl.CreateTag(ctx, tag); err != nil {
return a.SendError(ctx, err) return a.SendError(ctx, err)
} }
// TODO set location header? // TODO as we provide no API for get the single tag, ignore setting the location header here
return operation.NewCreateTagCreated() return operation.NewCreateTagCreated()
} }

View File

@ -19,7 +19,10 @@ package handler
import ( import (
"context" "context"
"errors" "errors"
"github.com/goharbor/harbor/src/internal"
ierror "github.com/goharbor/harbor/src/internal/error" ierror "github.com/goharbor/harbor/src/internal/error"
"net/url"
"strconv"
"github.com/go-openapi/runtime/middleware" "github.com/go-openapi/runtime/middleware"
"github.com/goharbor/harbor/src/common/rbac" "github.com/goharbor/harbor/src/common/rbac"
@ -95,3 +98,32 @@ func (b *BaseAPI) RequireProjectAccess(ctx context.Context, projectIDOrName inte
} }
return ierror.ForbiddenError(nil) return ierror.ForbiddenError(nil)
} }
// Links return Links based on the provided pagination information
func (b *BaseAPI) Links(ctx context.Context, u *url.URL, total, pageNumber, pageSize int64) internal.Links {
url := *u
var links internal.Links
// prev
if pageNumber > 1 && (pageNumber-1)*pageSize < total {
q := url.Query()
q.Set("page", strconv.FormatInt(pageNumber-1, 10))
url.RawQuery = q.Encode()
link := &internal.Link{
URL: url.String(),
Rel: "prev",
}
links = append(links, link)
}
// next
if pageSize*pageNumber < total {
q := url.Query()
q.Set("page", strconv.FormatInt(pageNumber+1, 10))
url.RawQuery = q.Encode()
link := &internal.Link{
URL: url.String(),
Rel: "next",
}
links = append(links, link)
}
return links
}

View File

@ -0,0 +1,62 @@
// Copyright Project Harbor Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package handler
import (
"github.com/stretchr/testify/suite"
"net/url"
"testing"
)
type baseHandlerTestSuite struct {
suite.Suite
base *BaseAPI
}
func (b *baseHandlerTestSuite) SetupSuite() {
b.base = &BaseAPI{}
}
func (b *baseHandlerTestSuite) TestLinks() {
// request first page, response contains only "next" link
url, err := url.Parse("http://localhost/api/artifacts?page=1&page_size=1")
b.Require().Nil(err)
links := b.base.Links(nil, url, 3, 1, 1)
b.Require().Len(links, 1)
b.Equal("next", links[0].Rel)
b.Equal("http://localhost/api/artifacts?page=2&page_size=1", links[0].URL)
// request last page, response contains only "prev" link
url, err = url.Parse("http://localhost/api/artifacts?page=3&page_size=1")
b.Require().Nil(err)
links = b.base.Links(nil, url, 3, 3, 1)
b.Require().Len(links, 1)
b.Equal("prev", links[0].Rel)
b.Equal("http://localhost/api/artifacts?page=2&page_size=1", links[0].URL)
// request the second page, response contains both "prev" and "next" links
url, err = url.Parse("http://localhost/api/artifacts?page=2&page_size=1")
b.Require().Nil(err)
links = b.base.Links(nil, url, 3, 2, 1)
b.Require().Len(links, 2)
b.Equal("prev", links[0].Rel)
b.Equal("http://localhost/api/artifacts?page=1&page_size=1", links[0].URL)
b.Equal("next", links[1].Rel)
b.Equal("http://localhost/api/artifacts?page=3&page_size=1", links[1].URL)
}
func TestBaseHandler(t *testing.T) {
suite.Run(t, &baseHandlerTestSuite{})
}

View File

@ -81,8 +81,10 @@ func (r *repositoryAPI) ListRepositories(ctx context.Context, params operation.L
for _, repository := range repositories { for _, repository := range repositories {
repos = append(repos, r.assembleRepository(ctx, repository)) repos = append(repos, r.assembleRepository(ctx, repository))
} }
// TODO add link header return operation.NewListRepositoriesOK().
return operation.NewListRepositoriesOK().WithXTotalCount(total).WithLink("").WithPayload(repos) WithXTotalCount(total).
WithLink(r.Links(ctx, params.HTTPRequest.URL, total, query.PageNumber, query.PageSize).String()).
WithPayload(repos)
} }
func (r *repositoryAPI) GetRepository(ctx context.Context, params operation.GetRepositoryParams) middleware.Responder { func (r *repositoryAPI) GetRepository(ctx context.Context, params operation.GetRepositoryParams) middleware.Responder {