Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 7 additions & 1 deletion cyclops-ctrl/internal/controller/templates.go
Original file line number Diff line number Diff line change
Expand Up @@ -212,17 +212,23 @@ func (c *Templates) GetTemplateRevisions(ctx *gin.Context) {
ctx.Header("Access-Control-Allow-Origin", "*")

repo := ctx.Query("repo")
path := ctx.Query("path")

if repo == "" {
ctx.JSON(http.StatusOK, []string{})
return
}

revisions, err := c.templatesRepo.GetTemplateRevisions(repo)
revisions, err := c.templatesRepo.GetTemplateRevisions(repo, path)
if err != nil {
ctx.JSON(http.StatusBadRequest, dto.NewError("Error loading template", err.Error()))
return
}

if revisions == nil {
ctx.JSON(http.StatusOK, []string{})
return
}

ctx.JSON(http.StatusOK, revisions)
}
29 changes: 15 additions & 14 deletions cyclops-ctrl/mocks/ITemplateRepo.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

27 changes: 18 additions & 9 deletions cyclops-ctrl/pkg/template/oci.go
Original file line number Diff line number Diff line change
Expand Up @@ -226,22 +226,31 @@ func fetchDigest(repo, chart, version, token string) (string, error) {
}

func getOCIStrictVersion(repo, chart, version string) (string, error) {
token, err := authorizeOCITags(repo, chart)
allTags, err := GetOCIChartTags(repo, chart)
if err != nil {
return "", err
}

return resolveSemver(version, allTags)
}

func GetOCIChartTags(repo, chart string) ([]string, error) {
token, err := authorizeOCITags(repo, chart)
if err != nil {
return nil, err
}

tURL, err := tagsURL(repo, chart)
if err != nil {
return "", err
return nil, err
}

client := &http.Client{}
var allTags []string
for {
req, err := http.NewRequest(http.MethodGet, tURL.String(), nil)
if err != nil {
return "", err
return nil, err
}

req.Header.Set("User-Agent", "Helm/3.13.3")
Expand All @@ -251,21 +260,21 @@ func getOCIStrictVersion(repo, chart, version string) (string, error) {

resp, err := client.Do(req)
if err != nil {
return "", err
return nil, err
}
defer resp.Body.Close()

responseBody, err := ioutil.ReadAll(resp.Body)
if err != nil {
return "", err
return nil, err
}

var tagsResp struct {
Tags []string `json:"tags"`
}

if err := json.Unmarshal(responseBody, &tagsResp); err != nil {
return "", err
return nil, err
}

allTags = append(allTags, tagsResp.Tags...)
Expand All @@ -278,7 +287,7 @@ func getOCIStrictVersion(repo, chart, version string) (string, error) {

nextURL, err := parseNextLink(linkHeader)
if err != nil {
return "", err
return nil, err
}

if nextURL == "" {
Expand All @@ -287,11 +296,11 @@ func getOCIStrictVersion(repo, chart, version string) (string, error) {

tURL, err = resolveRelativeURL(tURL, nextURL)
if err != nil {
return "", err
return nil, err
}
}

return resolveSemver(version, allTags)
return allTags, err
}

func authorizeOCI(repo, chart, version string) (string, error) {
Expand Down
8 changes: 6 additions & 2 deletions cyclops-ctrl/pkg/template/template.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ type ITemplateRepo interface {
version string,
source cyclopsv1alpha1.TemplateSourceType,
) (map[string]interface{}, error)
GetTemplateRevisions(repo string) ([]string, error)
GetTemplateRevisions(repo, path string) ([]string, error)
ReturnCache() *ristretto.Cache
}

Expand Down Expand Up @@ -181,7 +181,11 @@ func (r Repo) assumeTemplateSourceType(repo string) (cyclopsv1alpha1.TemplateSou
return cyclopsv1alpha1.TemplateSourceTypeGit, nil
}

func (r Repo) GetTemplateRevisions(repo string) ([]string, error) {
func (r Repo) GetTemplateRevisions(repo, path string) ([]string, error) {
if registry.IsOCI(repo) {
return GetOCIChartTags(repo, path)
}

if !gitproviders2.IsGitHubSource(repo) {
return nil, nil
}
Expand Down
18 changes: 13 additions & 5 deletions cyclops-ui/src/components/pages/TemplateStore/TemplateStore.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -350,21 +350,29 @@ const TemplateStore = () => {
);
};

const fetchRepoRevisions = (e) => {
const fetchRepoRevisions = () => {
const repo = addForm.getFieldValue(["ref", "repo"]);
const path = addForm.getFieldValue(["ref", "path"]);

axios
.get(`/api/templates/revisions?repo=` + e.target.value)
.get(`/api/templates/revisions?repo=${repo}&path=${path}`)
.then((res) => {
setRepoRevisions(res.data);

const filtered = res.data.map((item) => ({ value: item }));
setRepoRevisionOptions(filtered);
})
.catch(() => {});
};

const handleRepoInput = (value) => {
const handleVersionInput = (value) => {
if (repoRevisions.length === 0) {
setRepoRevisionOptions([]);
return;
}

console.log(value);

const filtered = repoRevisions
.filter((item) => item.toLowerCase().includes(value.toLowerCase()))
.map((item) => ({ value: item }));
Expand Down Expand Up @@ -670,7 +678,7 @@ const TemplateStore = () => {
rules={[{ required: true, message: "Path is required" }]}
style={{ marginBottom: "12px" }}
>
<Input />
<Input onBlur={fetchRepoRevisions} />
</Form.Item>

<Form.Item
Expand All @@ -680,7 +688,7 @@ const TemplateStore = () => {
>
<AutoComplete
options={repoRevisionOptions}
onSearch={handleRepoInput}
onSearch={handleVersionInput}
allowClear
>
<Input />
Expand Down