Skip to content

Commit

Permalink
optimize code
Browse files Browse the repository at this point in the history
  • Loading branch information
lbemi committed Dec 18, 2024
1 parent 0f31a2d commit 7c614d7
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ func (cr *clusterRouter) createRepository(c *gin.Context) {
return
}

if err = cr.c.Cluster().Helm(pixiuMeta.Cluster).Repositories().Create(c, &formData); err != nil {
if err = cr.c.Cluster().Helm(pixiuMeta.Cluster).Repository().Create(c, &formData); err != nil {
httputils.SetFailed(c, r, err)
return
}
Expand Down Expand Up @@ -82,7 +82,7 @@ func (cr *clusterRouter) deleteRepository(c *gin.Context) {
httputils.SetFailed(c, r, err)
return
}
if err = cr.c.Cluster().Helm(repoMeta.Cluster).Repositories().Delete(c, repoMeta.Id); err != nil {
if err = cr.c.Cluster().Helm(repoMeta.Cluster).Repository().Delete(c, repoMeta.Id); err != nil {
httputils.SetFailed(c, r, err)
return
}
Expand Down Expand Up @@ -117,7 +117,7 @@ func (cr *clusterRouter) updateRepository(c *gin.Context) {
httputils.SetFailed(c, r, err)
return
}
if err = cr.c.Cluster().Helm(repoMeta.Cluster).Repositories().Update(c, repoMeta.Id, &formData); err != nil {
if err = cr.c.Cluster().Helm(repoMeta.Cluster).Repository().Update(c, repoMeta.Id, &formData); err != nil {
httputils.SetFailed(c, r, err)
return
}
Expand Down Expand Up @@ -149,7 +149,7 @@ func (cr *clusterRouter) getRepository(c *gin.Context) {
httputils.SetFailed(c, r, err)
return
}
if r.Result, err = cr.c.Cluster().Helm(repoMeta.Cluster).Repositories().Get(c, repoMeta.Id); err != nil {
if r.Result, err = cr.c.Cluster().Helm(repoMeta.Cluster).Repository().Get(c, repoMeta.Id); err != nil {
httputils.SetFailed(c, r, err)
return
}
Expand Down Expand Up @@ -181,7 +181,7 @@ func (cr *clusterRouter) listRepositories(c *gin.Context) {
return
}

if r.Result, err = cr.c.Cluster().Helm(pixiuMeta.Cluster).Repositories().List(c); err != nil {
if r.Result, err = cr.c.Cluster().Helm(pixiuMeta.Cluster).Repository().List(c); err != nil {
httputils.SetFailed(c, r, err)
return
}
Expand Down Expand Up @@ -213,7 +213,7 @@ func (cr *clusterRouter) getRepoCharts(c *gin.Context) {
httputils.SetFailed(c, r, err)
return
}
if r.Result, err = cr.c.Cluster().Helm(repoMeta.Cluster).Repositories().GetRepoChartsById(c, repoMeta.Id); err != nil {
if r.Result, err = cr.c.Cluster().Helm(repoMeta.Cluster).Repository().GetRepoChartsById(c, repoMeta.Id); err != nil {
httputils.SetFailed(c, r, err)
return
}
Expand Down Expand Up @@ -247,7 +247,7 @@ func (cr *clusterRouter) getRepoChartsByURL(c *gin.Context) {
httputils.SetFailed(c, r, err)
return
}
if r.Result, err = cr.c.Cluster().Helm(pixiuMeta.Cluster).Repositories().GetRepoChartsByURL(c, repoMeta.Url); err != nil {
if r.Result, err = cr.c.Cluster().Helm(pixiuMeta.Cluster).Repository().GetRepoChartsByURL(c, repoMeta.Url); err != nil {
httputils.SetFailed(c, r, err)
return
}
Expand Down Expand Up @@ -283,7 +283,7 @@ func (cr *clusterRouter) getChartValues(c *gin.Context) {
httputils.SetFailed(c, r, err)
return
}
if r.Result, err = cr.c.Cluster().Helm(pixiuMeta.Cluster).Repositories().GetRepoChartValues(c, repoMeta.Chart, repoMeta.Version); err != nil {
if r.Result, err = cr.c.Cluster().Helm(pixiuMeta.Cluster).Repository().GetRepoChartValues(c, repoMeta.Chart, repoMeta.Version); err != nil {
httputils.SetFailed(c, r, err)
return
}
Expand Down
4 changes: 2 additions & 2 deletions pkg/controller/cluster/helm.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import (

type HelmInterface interface {
Releases(namespace string) ReleaseInterface
Repositories() RepositoryInterface
Repository() RepositoryInterface
}

type Helm struct {
Expand All @@ -55,7 +55,7 @@ func (h *Helm) Releases(namespace string) ReleaseInterface {
return newReleases(h.actionConfig, h.settings)
}

func (h *Helm) Repositories() RepositoryInterface {
func (h *Helm) Repository() RepositoryInterface {
if err := h.actionConfig.Init(
h.resetClientGetter,
h.settings.Namespace(),
Expand Down
File renamed without changes.

0 comments on commit 7c614d7

Please sign in to comment.