From 7c614d74a8405cb655c0466bf90bec2b1c1aa782 Mon Sep 17 00:00:00 2001 From: lei <934366858@qq.com> Date: Wed, 18 Dec 2024 17:59:56 +0800 Subject: [PATCH] optimize code --- ...ositories_routes.go => respository_routes.go} | 16 ++++++++-------- pkg/controller/cluster/helm.go | 4 ++-- .../cluster/{repositories.go => repository.go} | 0 3 files changed, 10 insertions(+), 10 deletions(-) rename api/server/router/cluster/{respositories_routes.go => respository_routes.go} (93%) rename pkg/controller/cluster/{repositories.go => repository.go} (100%) diff --git a/api/server/router/cluster/respositories_routes.go b/api/server/router/cluster/respository_routes.go similarity index 93% rename from api/server/router/cluster/respositories_routes.go rename to api/server/router/cluster/respository_routes.go index 4eaa0dae..24f7b9eb 100644 --- a/api/server/router/cluster/respositories_routes.go +++ b/api/server/router/cluster/respository_routes.go @@ -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 } @@ -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 } @@ -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 } @@ -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 } @@ -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 } @@ -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 } @@ -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 } @@ -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 } diff --git a/pkg/controller/cluster/helm.go b/pkg/controller/cluster/helm.go index 931e4d9f..6b2fc350 100644 --- a/pkg/controller/cluster/helm.go +++ b/pkg/controller/cluster/helm.go @@ -30,7 +30,7 @@ import ( type HelmInterface interface { Releases(namespace string) ReleaseInterface - Repositories() RepositoryInterface + Repository() RepositoryInterface } type Helm struct { @@ -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(), diff --git a/pkg/controller/cluster/repositories.go b/pkg/controller/cluster/repository.go similarity index 100% rename from pkg/controller/cluster/repositories.go rename to pkg/controller/cluster/repository.go