Skip to content
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

fix(kubeserver): list container registries #371

Merged
merged 1 commit into from
Sep 13, 2024
Merged

fix(kubeserver): list container registries #371

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
4 changes: 2 additions & 2 deletions pkg/kubeserver/api/container_registry.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const (
)

type ContainerRegistryListInput struct {
apis.VirtualResourceListInput
apis.SharableVirtualResourceListInput

Type string `json:"type"`
Url string `json:"url"`
Expand All @@ -33,7 +33,7 @@ type ContainerRegistryConfig struct {
}

type ContainerRegistryCreateInput struct {
apis.VirtualResourceCreateInput
apis.SharableVirtualResourceCreateInput

// Repo type
// required: true
Expand Down
58 changes: 45 additions & 13 deletions pkg/kubeserver/drivers/container_registries/client/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"net/url"
"os"
"path"
"regexp"
"strings"

"github.com/regclient/regclient"
Expand Down Expand Up @@ -106,21 +107,20 @@ func (c client) getHeader(header http.Header) http.Header {
return header
}

func (c client) Request(ctx context.Context, method httputils.THttpMethod, urlPath string, header http.Header, body jsonutils.JSONObject) (jsonutils.JSONObject, error) {
func (c client) Request(ctx context.Context, method httputils.THttpMethod, urlPath string, header http.Header, body jsonutils.JSONObject) (http.Header, jsonutils.JSONObject, error) {
cli := httputils.GetDefaultClient()
regUrl := strings.TrimSuffix(c.regUrl, c.pathPrefix)
_, ret, err := httputils.JSONRequest(cli, ctx, method, request.JoinUrl(regUrl, urlPath), c.getHeader(header), body, true)
return ret, err
return httputils.JSONRequest(cli, ctx, method, request.JoinUrl(regUrl, urlPath), c.getHeader(header), body, true)
}

func (c client) Get(ctx context.Context, urlPath string, header http.Header, body jsonutils.JSONObject) (jsonutils.JSONObject, error) {
func (c client) Get(ctx context.Context, urlPath string, header http.Header, body jsonutils.JSONObject) (http.Header, jsonutils.JSONObject, error) {
return c.Request(ctx, httputils.GET, urlPath, header, body)
}

func (c client) Ping(ctx context.Context) error {
//TODO implement me
pingUrl := "/v2/"
_, err := c.Get(ctx, pingUrl, nil, nil)
_, _, err := c.Get(ctx, pingUrl, nil, nil)
return err
}

Expand All @@ -129,15 +129,47 @@ type CatalogResult struct {
Details []*ImageTagResult `json:"details"`
}

var (
catalogLinkRegexp = regexp.MustCompile(`<(.*)>;`)
)

func parseCatalogLink(respHeader http.Header) string {
if respHeader == nil {
return ""
}
key := "Link"
val := respHeader.Get(key)
if val == "" {
return ""
}
// val: '</v2/_catalog?last=yunionio%2Fcloudpods-ee&n=100>; rel="next"'
matches := catalogLinkRegexp.FindStringSubmatch(val)
if len(matches) < 1 {
return ""
}
return matches[1]
}

func (c client) ListImages(ctx context.Context, input *api.ContainerRegistryListImagesInput) (jsonutils.JSONObject, error) {
catalogUrl := "/v2/_catalog"
resp, err := c.Get(ctx, catalogUrl, nil, nil)
if err != nil {
return nil, err
result := &CatalogResult{
Repositories: make([]string, 0),
Details: make([]*ImageTagResult, 0),
}
result := new(CatalogResult)
if err := resp.Unmarshal(result); err != nil {
return nil, err
for {
header, resp, err := c.Get(ctx, catalogUrl, nil, nil)
if err != nil {
return nil, err
}
tmpResult := new(CatalogResult)
if err := resp.Unmarshal(tmpResult); err != nil {
return nil, err
}
catalogUrl = parseCatalogLink(header)
result.Repositories = append(result.Repositories, tmpResult.Repositories...)
if catalogUrl == "" {
break
}
}
newRepos := []string{}
if c.pathPrefix != "" {
Expand Down Expand Up @@ -187,7 +219,7 @@ func (c client) ListImages(ctx context.Context, input *api.ContainerRegistryList
return nil, err
}
}
resp = jsonutils.Marshal(result)
resp := jsonutils.Marshal(result)
return resp, nil
}

Expand All @@ -206,7 +238,7 @@ func (c client) ListImageTags(ctx context.Context, image string) (jsonutils.JSON
}
image = url.QueryEscape(image)
tagsUrl = fmt.Sprintf(tagsUrl, image)
resp, err := c.Get(ctx, tagsUrl, nil, nil)
_, resp, err := c.Get(ctx, tagsUrl, nil, nil)
if err != nil {
return nil, err
}
Expand Down
32 changes: 32 additions & 0 deletions pkg/kubeserver/drivers/container_registries/client/client_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
package client

import (
"fmt"
"net/http"
"testing"
)

func Test_parseCatalogLink(t *testing.T) {
tests := []struct {
header http.Header
want string
}{
{
header: http.Header{
"Link": []string{"</v2/_catalog?last=yunionio%2Fcloudpods-ee&n=100>; rel=\"next\""},
},
want: "/v2/_catalog?last=yunionio%2Fcloudpods-ee&n=100",
},
{
header: http.Header{},
want: "",
},
}
for _, tt := range tests {
t.Run(fmt.Sprintf("%#v", tt.header), func(t *testing.T) {
if got := parseCatalogLink(tt.header); got != tt.want {
t.Errorf("parseCatalogLink() = %v, want %v", got, tt.want)
}
})
}
}
14 changes: 7 additions & 7 deletions pkg/kubeserver/models/container_registries.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import (
)

type SContainerRegistryManager struct {
db.SVirtualResourceBaseManager
db.SSharableVirtualResourceBaseManager
}

var (
Expand All @@ -42,7 +42,7 @@ var (
func GetContainerRegistryManager() *SContainerRegistryManager {
if containerRegistryManager == nil {
containerRegistryManager = &SContainerRegistryManager{
SVirtualResourceBaseManager: db.NewVirtualResourceBaseManager(SContainerRegistry{}, "container_registries_tbl", "container_registry", "container_registries"),
SSharableVirtualResourceBaseManager: db.NewSharableVirtualResourceBaseManager(SContainerRegistry{}, "container_registries_tbl", "container_registry", "container_registries"),
}
containerRegistryManager.SetVirtualObject(containerRegistryManager)
}
Expand All @@ -54,7 +54,7 @@ func init() {
}

type SContainerRegistry struct {
db.SVirtualResourceBase
db.SSharableVirtualResourceBase

Url string `width:"256" charset:"ascii" nullable:"false" create:"required" update:"user" list:"user"`
Type string `charset:"ascii" width:"128" create:"required" nullable:"true" list:"user"`
Expand All @@ -68,7 +68,7 @@ func (man *SContainerRegistryManager) AddDispatcher(prefix string, app *appsrv.A
}

func (man *SContainerRegistryManager) ListItemFilter(ctx context.Context, q *sqlchemy.SQuery, userCred mcclient.TokenCredential, input *api.ContainerRegistryListInput) (*sqlchemy.SQuery, error) {
q, err := man.SVirtualResourceBaseManager.ListItemFilter(ctx, q, userCred, input.VirtualResourceListInput)
q, err := man.SSharableVirtualResourceBaseManager.ListItemFilter(ctx, q, userCred, input.SharableVirtualResourceListInput)
if err != nil {
return nil, err
}
Expand All @@ -86,11 +86,11 @@ func (man *SContainerRegistryManager) GetDriver(rType api.ContainerRegistryType)
}

func (man *SContainerRegistryManager) ValidateCreateData(ctx context.Context, userCred mcclient.TokenCredential, ownerId mcclient.IIdentityProvider, query jsonutils.JSONObject, data *api.ContainerRegistryCreateInput) (*api.ContainerRegistryCreateInput, error) {
shareInput, err := man.SVirtualResourceBaseManager.ValidateCreateData(ctx, userCred, ownerId, query, data.VirtualResourceCreateInput)
shareInput, err := man.SSharableVirtualResourceBaseManager.ValidateCreateData(ctx, userCred, ownerId, query, data.SharableVirtualResourceCreateInput)
if err != nil {
return nil, err
}
data.VirtualResourceCreateInput = shareInput
data.SharableVirtualResourceCreateInput = shareInput
if data.Url == "" {
return nil, httperrors.NewInputParameterError("Missing repo url")
}
Expand Down Expand Up @@ -186,7 +186,7 @@ func (r *SContainerRegistry) GetDetailsImageTags(ctx context.Context, userCred m
}

func (m *SContainerRegistryManager) CustomizeHandlerInfo(info *appsrv.SHandlerInfo) {
m.SVirtualResourceBaseManager.CustomizeHandlerInfo(info)
m.SSharableVirtualResourceBaseManager.CustomizeHandlerInfo(info)

switch info.GetName(nil) {
case "perform_action", "get_specific", "get_property", "get_details":
Expand Down
Loading