github/kubevela
1
0
Fork 0
mirror of https://github.com/kubevela/kubevela.git synced 2026-05-03 16:07:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Feat: add path argument to addon oss source (#2907)

Browse Source 
* add path

Signed-off-by: qiaozp <chivalry.pp@gmail.com>

* pending test

Signed-off-by: qiaozp <chivalry.pp@gmail.com>

* reviewable

Signed-off-by: qiaozp <chivalry.pp@gmail.com>

* reviewable

Signed-off-by: qiaozp <chivalry.pp@gmail.com>

* license

Signed-off-by: qiaozp <chivalry.pp@gmail.com>

* keep compatible

Signed-off-by: qiaozp <chivalry.pp@gmail.com>
This commit is contained in:
qiaozp
2021-12-13 19:43:15 +08:00
committed by GitHub
parent a89bb69a62
commit a67b7e90d0
4 changed files with 75 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/addon/addon_test.go
View File

@@ -88,7 +88,7 @@ func TestGetAddon(t *testing.T) {
server := httptest.NewServer(ossHandler)
defer server.Close()
reader, err := NewAsyncReader(server.URL, "", "", ossType)
reader, err := NewAsyncReader(server.URL, "", "", "", ossType)
assert.NilError(t, err)

39
pkg/addon/source.go
View File

@@ -61,11 +61,12 @@ type GitAddonSource struct {
type OSSAddonSource struct {
EndPoint string `json:"end_point" validate:"required"`
Bucket string `json:"bucket"`
Path string `json:"path"`
}
// GetAddon from OSSAddonSource
func (o *OSSAddonSource) GetAddon(name string, opt ListOptions) (*Addon, error) {
reader, err := NewAsyncReader(o.EndPoint, o.Bucket, "", ossType)
reader, err := NewAsyncReader(o.EndPoint, o.Bucket, o.Path, "", ossType)
if err != nil {
return nil, err
}
@@ -78,7 +79,7 @@ func (o *OSSAddonSource) GetAddon(name string, opt ListOptions) (*Addon, error)
// ListAddons from OSSAddonSource
func (o *OSSAddonSource) ListAddons(opt ListOptions) ([]*Addon, error) {
reader, err := NewAsyncReader(o.EndPoint, o.Bucket, "", ossType)
reader, err := NewAsyncReader(o.EndPoint, o.Bucket, o.Path, "", ossType)
if err != nil {
return nil, err
}
@@ -91,7 +92,7 @@ func (o *OSSAddonSource) ListAddons(opt ListOptions) ([]*Addon, error) {
// GetAddon get an addon info from GitAddonSource, can be used for get or enable
func (git *GitAddonSource) GetAddon(name string, opt ListOptions) (*Addon, error) {
reader, err := NewAsyncReader(git.URL, git.Path, git.Token, gitType)
reader, err := NewAsyncReader(git.URL, "", git.Path, git.Token, gitType)
if err != nil {
return nil, err
}
@@ -104,7 +105,7 @@ func (git *GitAddonSource) GetAddon(name string, opt ListOptions) (*Addon, error
// ListAddons list addons' info from GitAddonSource
func (git *GitAddonSource) ListAddons(opt ListOptions) ([]*Addon, error) {
r, err := NewAsyncReader(git.URL, git.Path, git.Token, "git")
r, err := NewAsyncReader(git.URL, "", git.Path, git.Token, "git")
if err != nil {
return nil, err
}
@@ -218,6 +219,7 @@ func (g *gitReader) RelativePath(item Item) string {
type ossReader struct {
baseReader
bucketEndPoint string
path string
client *resty.Client
}
@@ -243,15 +245,25 @@ func (i OssItem) GetName() string {
return i.name
}
// pathWithParent joins path with its parent directory, suffix slash is reserved
func pathWithParent(subPath, parent string) string {
actualPath := path.Join(parent, subPath)
if strings.HasSuffix(subPath, "/") {
actualPath += "/"
}
return actualPath
}
// Read from oss
func (o *ossReader) Read(readPath string) (content string, subItem []Item, err error) {
if readPath == "." {
readPath = ""
}
resp, err := o.client.R().Get(fmt.Sprintf(listOssFileTmpl, o.bucketEndPoint, readPath))
actualPath := pathWithParent(readPath, o.path)
resp, err := o.client.R().Get(fmt.Sprintf(listOssFileTmpl, o.bucketEndPoint, actualPath))
if err != nil {
return "", nil, errors.Wrapf(err, "read path %s fail", readPath)
return "", nil, errors.Wrapf(err, "read path %s fail", actualPath)
}
list := ListBucketResult{}
err = xml.Unmarshal(resp.Body(), &list)
@@ -266,8 +278,8 @@ func (o *ossReader) Read(readPath string) (content string, subItem []Item, err e
}
list.Files = actualFiles
list.Count = len(actualFiles)
if len(list.Files) == 1 && list.Files[0].Name == readPath {
resp, err = o.client.R().Get(fmt.Sprintf(singleOssFileTmpl, o.bucketEndPoint, readPath))
if len(list.Files) == 1 && list.Files[0].Name == actualPath {
resp, err = o.client.R().Get(fmt.Sprintf(singleOssFileTmpl, o.bucketEndPoint, actualPath))
if err != nil {
return "", nil, err
}
@@ -279,7 +291,7 @@ func (o *ossReader) Read(readPath string) (content string, subItem []Item, err e
if !strings.HasSuffix(readPath, "/") && readPath != "" {
return o.Read(readPath + "/")
}
items := convert2OssItem(list.Files, readPath)
items := convert2OssItem(list.Files, actualPath)
return "", items, nil
}
@@ -342,7 +354,7 @@ const (
// NewAsyncReader create AsyncReader from
// 1. GitHub url and directory
// 2. OSS endpoint and bucket
func NewAsyncReader(baseURL, dirOrBucket, token string, rdType ReaderType) (AsyncReader, error) {
func NewAsyncReader(baseURL, bucket, subPath, token string, rdType ReaderType) (AsyncReader, error) {
bReader := baseReader{
a: &Addon{},
errChan: make(chan error),
@@ -355,7 +367,7 @@ func NewAsyncReader(baseURL, dirOrBucket, token string, rdType ReaderType) (Asyn
if err != nil {
return nil, errors.New("addon registry invalid")
}
u.Path = path.Join(u.Path, dirOrBucket)
u.Path = path.Join(u.Path, subPath)
tp, content, err := utils.Parse(u.String())
if err != nil || tp != utils.TypeGithub {
return nil, err
@@ -371,17 +383,18 @@ func NewAsyncReader(baseURL, dirOrBucket, token string, rdType ReaderType) (Asyn
return nil, err
}
var bucketEndPoint string
if dirOrBucket == "" {
if bucket == "" {
bucketEndPoint = ossURL.String()
} else {
if ossURL.Scheme == "" {
ossURL.Scheme = "https"
}
bucketEndPoint = fmt.Sprintf(bucketTmpl, ossURL.Scheme, dirOrBucket, ossURL.Host)
bucketEndPoint = fmt.Sprintf(bucketTmpl, ossURL.Scheme, bucket, ossURL.Host)
}
return &ossReader{
baseReader: bReader,
bucketEndPoint: bucketEndPoint,
path: subPath,
client: resty.New(),
}, nil
}

46
pkg/addon/source_test.go Normal file
View File

@@ -0,0 +1,46 @@
/*
Copyright 2021 The KubeVela 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 addon
import (
"testing"
"gotest.tools/assert"
)
func TestPathWithParent(t *testing.T) {
testCases := []struct {
readPath string
parentPath string
actualReadPath string
}{
{
readPath: "example",
parentPath: "experimental",
actualReadPath: "experimental/example",
},
{
readPath: "example/",
parentPath: "experimental",
actualReadPath: "experimental/example/",
},
}
for _, tc := range testCases {
res := pathWithParent(tc.readPath, tc.parentPath)
assert.Equal(t, res, tc.actualReadPath)
}
}