Skip to content

Commit ecd7cc0

Browse files
Ash-expAsh-exp
authored
chore: App store services refactoring (#4596)
* chore: fixed test file * chore: app store deployment services refactoring * updated todo
1 parent d2aca5c commit ecd7cc0

File tree

50 files changed

+1820
-1793
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+1820
-1793
lines changed

‎Wire.go‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,9 @@ import (
8989
"github.com/devtron-labs/devtron/pkg/appStatus"
9090
"github.com/devtron-labs/devtron/pkg/appStore/chartGroup"
9191
repository4 "github.com/devtron-labs/devtron/pkg/appStore/chartGroup/repository"
92-
"github.com/devtron-labs/devtron/pkg/appStore/deployment/service"
93-
appStoreDeploymentGitopsTool "github.com/devtron-labs/devtron/pkg/appStore/deployment/tool"
92+
"github.com/devtron-labs/devtron/pkg/appStore/installedApp/service/FullMode"
93+
deployment3 "github.com/devtron-labs/devtron/pkg/appStore/installedApp/service/FullMode/deployment"
94+
"github.com/devtron-labs/devtron/pkg/appStore/installedApp/service/FullMode/resource"
9495
"github.com/devtron-labs/devtron/pkg/appWorkflow"
9596
"github.com/devtron-labs/devtron/pkg/attributes"
9697
"github.com/devtron-labs/devtron/pkg/bulkAction"
@@ -504,8 +505,10 @@ func InitializeApp() (*App, error) {
504505
wire.Bind(new(appStoreRestHandler.AppStoreStatusTimelineRestHandler), new(*appStoreRestHandler.AppStoreStatusTimelineRestHandlerImpl)),
505506
appStoreRestHandler.NewInstalledAppRestHandlerImpl,
506507
wire.Bind(new(appStoreRestHandler.InstalledAppRestHandler), new(*appStoreRestHandler.InstalledAppRestHandlerImpl)),
507-
service.NewInstalledAppServiceImpl,
508-
wire.Bind(new(service.InstalledAppService), new(*service.InstalledAppServiceImpl)),
508+
FullMode.NewInstalledAppDBExtendedServiceImpl,
509+
wire.Bind(new(FullMode.InstalledAppDBExtendedService), new(*FullMode.InstalledAppDBExtendedServiceImpl)),
510+
resource.NewInstalledAppResourceServiceImpl,
511+
wire.Bind(new(resource.InstalledAppResourceService), new(*resource.InstalledAppResourceServiceImpl)),
509512

510513
appStoreRestHandler.NewAppStoreRouterImpl,
511514
wire.Bind(new(appStoreRestHandler.AppStoreRouter), new(*appStoreRestHandler.AppStoreRouterImpl)),
@@ -719,8 +722,8 @@ func InitializeApp() (*App, error) {
719722
delete2.NewDeleteServiceFullModeImpl,
720723
wire.Bind(new(delete2.DeleteServiceFullMode), new(*delete2.DeleteServiceFullModeImpl)),
721724

722-
appStoreDeploymentGitopsTool.NewAppStoreDeploymentArgoCdServiceImpl,
723-
wire.Bind(new(appStoreDeploymentGitopsTool.AppStoreDeploymentArgoCdService), new(*appStoreDeploymentGitopsTool.AppStoreDeploymentArgoCdServiceImpl)),
725+
deployment3.NewFullModeDeploymentServiceImpl,
726+
wire.Bind(new(deployment3.FullModeDeploymentService), new(*deployment3.FullModeDeploymentServiceImpl)),
724727
// util2.NewGoJsonSchemaCustomFormatChecker,
725728

726729
//history starts

‎api/appStore/InstalledAppRestHandler.go‎

Lines changed: 23 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ import (
2323
"errors"
2424
"fmt"
2525
client "github.com/devtron-labs/devtron/api/helm-app/gRPC"
26+
"github.com/devtron-labs/devtron/pkg/appStore/installedApp/service/FullMode"
27+
"github.com/devtron-labs/devtron/pkg/appStore/installedApp/service/FullMode/resource"
2628
"net/http"
2729
"strconv"
2830
"strings"
@@ -39,8 +41,8 @@ import (
3941
app2 "github.com/devtron-labs/devtron/pkg/app"
4042
appStoreBean "github.com/devtron-labs/devtron/pkg/appStore/bean"
4143
"github.com/devtron-labs/devtron/pkg/appStore/chartGroup"
42-
"github.com/devtron-labs/devtron/pkg/appStore/deployment/repository"
43-
"github.com/devtron-labs/devtron/pkg/appStore/deployment/service"
44+
"github.com/devtron-labs/devtron/pkg/appStore/installedApp/repository"
45+
"github.com/devtron-labs/devtron/pkg/appStore/installedApp/service"
4446
"github.com/devtron-labs/devtron/pkg/auth/authorisation/casbin"
4547
"github.com/devtron-labs/devtron/pkg/auth/user"
4648
"github.com/devtron-labs/devtron/pkg/cluster"
@@ -75,7 +77,9 @@ type InstalledAppRestHandlerImpl struct {
7577
enforcer casbin.Enforcer
7678
enforcerUtil rbac.EnforcerUtil
7779
enforcerUtilHelm rbac.EnforcerUtilHelm
78-
installedAppService service.InstalledAppService
80+
installedAppService FullMode.InstalledAppDBExtendedService
81+
installedAppResourceService resource.InstalledAppResourceService
82+
chartGroupService chartGroup.ChartGroupService
7983
validator *validator.Validate
8084
clusterService cluster.ClusterService
8185
acdServiceClient application.ServiceClient
@@ -89,10 +93,11 @@ type InstalledAppRestHandlerImpl struct {
8993
}
9094

9195
func NewInstalledAppRestHandlerImpl(Logger *zap.SugaredLogger, userAuthService user.UserService,
92-
enforcer casbin.Enforcer, enforcerUtil rbac.EnforcerUtil, enforcerUtilHelm rbac.EnforcerUtilHelm, installedAppService service.InstalledAppService,
93-
validator *validator.Validate, clusterService cluster.ClusterService, acdServiceClient application.ServiceClient,
94-
appStoreDeploymentService service.AppStoreDeploymentService, helmAppClient client.HelmAppClient,
95-
argoUserService argo.ArgoUserService,
96+
enforcer casbin.Enforcer, enforcerUtil rbac.EnforcerUtil, enforcerUtilHelm rbac.EnforcerUtilHelm,
97+
installedAppService FullMode.InstalledAppDBExtendedService, installedAppResourceService resource.InstalledAppResourceService,
98+
chartGroupService chartGroup.ChartGroupService, validator *validator.Validate, clusterService cluster.ClusterService,
99+
acdServiceClient application.ServiceClient, appStoreDeploymentService service.AppStoreDeploymentService,
100+
helmAppClient client.HelmAppClient, argoUserService argo.ArgoUserService,
96101
cdApplicationStatusUpdateHandler cron.CdApplicationStatusUpdateHandler,
97102
installedAppRepository repository.InstalledAppRepository,
98103
appCrudOperationService app2.AppCrudOperationService) *InstalledAppRestHandlerImpl {
@@ -103,6 +108,8 @@ func NewInstalledAppRestHandlerImpl(Logger *zap.SugaredLogger, userAuthService u
103108
enforcerUtil: enforcerUtil,
104109
enforcerUtilHelm: enforcerUtilHelm,
105110
installedAppService: installedAppService,
111+
installedAppResourceService: installedAppResourceService,
112+
chartGroupService: chartGroupService,
106113
validator: validator,
107114
clusterService: clusterService,
108115
acdServiceClient: acdServiceClient,
@@ -371,7 +378,7 @@ func (handler *InstalledAppRestHandlerImpl) DeployBulk(w http.ResponseWriter, r
371378
return
372379
}
373380
}
374-
res, err := handler.installedAppService.DeployBulk(&request)
381+
res, err := handler.chartGroupService.DeployBulk(&request)
375382
if err != nil {
376383
handler.Logger.Errorw("service err, DeployBulk", "err", err, "payload", request)
377384
common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
@@ -433,7 +440,7 @@ func (impl *InstalledAppRestHandlerImpl) DefaultComponentInstallation(w http.Res
433440
return
434441
}
435442
// RBAC enforcer ends
436-
isTriggered, err := impl.installedAppService.DeployDefaultChartOnCluster(cluster, userId)
443+
isTriggered, err := impl.chartGroupService.DeployDefaultChartOnCluster(cluster, userId)
437444
if err != nil {
438445
impl.Logger.Errorw("service err, DefaultComponentInstallation", "error", err, "cluster", cluster)
439446
common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
@@ -462,7 +469,7 @@ func (handler *InstalledAppRestHandlerImpl) FetchNotesForArgoInstalledApp(w http
462469
return
463470
}
464471
handler.Logger.Infow("request payload, FetchNotesForArgoInstalledApp, app store", "installedAppId", installedAppId, "envId", envId)
465-
notes, err := handler.installedAppService.FetchChartNotes(installedAppId, envId, token, handler.checkNotesAuth)
472+
notes, err := handler.installedAppResourceService.FetchChartNotes(installedAppId, envId, token, handler.checkNotesAuth)
466473
if err != nil {
467474
handler.Logger.Errorw("service err, FetchNotesFromdb, app store", "err", err, "installedAppId", installedAppId, "envId", envId)
468475
common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
@@ -621,7 +628,8 @@ func (handler *InstalledAppRestHandlerImpl) FetchAppDetailsForInstalledApp(w htt
621628
apiError, ok := err.(*util2.ApiError)
622629
if ok && apiError != nil {
623630
if apiError.Code == constants.AppDetailResourceTreeNotFound && installedApp.DeploymentAppDeleteRequest == true {
624-
err = handler.installedAppService.MarkGitOpsInstalledAppsDeletedIfArgoAppIsDeleted(installedAppId, envId)
631+
// TODO refactoring: should be performed through nats
632+
err = handler.appStoreDeploymentService.MarkGitOpsInstalledAppsDeletedIfArgoAppIsDeleted(installedAppId, envId)
625633
appDeleteErr, appDeleteErrOk := err.(*util2.ApiError)
626634
if appDeleteErrOk && appDeleteErr != nil {
627635
handler.Logger.Errorw(appDeleteErr.InternalMessage)
@@ -738,7 +746,8 @@ func (handler *InstalledAppRestHandlerImpl) FetchResourceTree(w http.ResponseWri
738746
apiError, ok := err.(*util2.ApiError)
739747
if ok && apiError != nil {
740748
if apiError.Code == constants.AppDetailResourceTreeNotFound && installedApp.DeploymentAppDeleteRequest == true {
741-
err = handler.installedAppService.MarkGitOpsInstalledAppsDeletedIfArgoAppIsDeleted(installedAppId, envId)
749+
// TODO refactoring: should be performed in go routine
750+
err = handler.appStoreDeploymentService.MarkGitOpsInstalledAppsDeletedIfArgoAppIsDeleted(installedAppId, envId)
742751
appDeleteErr, appDeleteErrOk := err.(*util2.ApiError)
743752
if appDeleteErrOk && appDeleteErr != nil {
744753
handler.Logger.Errorw(appDeleteErr.InternalMessage)
@@ -825,12 +834,12 @@ func (handler *InstalledAppRestHandlerImpl) FetchResourceTreeForACDApp(w http.Re
825834
func (handler *InstalledAppRestHandlerImpl) fetchResourceTree(w http.ResponseWriter, r *http.Request, resourceTreeAndNotesContainer *bean2.AppDetailsContainer, installedApp repository.InstalledApps, helmReleaseInstallStatus string, status string) error {
826835
ctx := r.Context()
827836
cn, _ := w.(http.CloseNotifier)
828-
err := handler.installedAppService.FetchResourceTree(ctx, cn, resourceTreeAndNotesContainer, installedApp, helmReleaseInstallStatus, status)
837+
err := handler.installedAppResourceService.FetchResourceTree(ctx, cn, resourceTreeAndNotesContainer, installedApp, helmReleaseInstallStatus, status)
829838
return err
830839
}
831840

832841
func (handler *InstalledAppRestHandlerImpl) fetchResourceTreeWithHibernateForACD(w http.ResponseWriter, r *http.Request, appDetail *bean2.AppDetailContainer) {
833842
ctx := r.Context()
834843
cn, _ := w.(http.CloseNotifier)
835-
handler.installedAppService.FetchResourceTreeWithHibernateForACD(ctx, cn, appDetail)
844+
handler.installedAppResourceService.FetchResourceTreeWithHibernateForACD(ctx, cn, appDetail)
836845
}

‎api/appStore/deployment/AppStoreDeploymentRestHandler.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import (
2323
"errors"
2424
"fmt"
2525
service2 "github.com/devtron-labs/devtron/api/helm-app/service"
26+
"github.com/devtron-labs/devtron/pkg/appStore/installedApp/service/common"
2627
"net/http"
2728
"strconv"
2829
"strings"
@@ -33,8 +34,7 @@ import (
3334
"github.com/devtron-labs/devtron/api/restHandler/common"
3435
"github.com/devtron-labs/devtron/internal/util"
3536
appStoreBean "github.com/devtron-labs/devtron/pkg/appStore/bean"
36-
appStoreDeploymentCommon "github.com/devtron-labs/devtron/pkg/appStore/deployment/common"
37-
"github.com/devtron-labs/devtron/pkg/appStore/deployment/service"
37+
"github.com/devtron-labs/devtron/pkg/appStore/installedApp/service"
3838
"github.com/devtron-labs/devtron/pkg/attributes"
3939
"github.com/devtron-labs/devtron/pkg/auth/authorisation/casbin"
4040
"github.com/devtron-labs/devtron/pkg/auth/user"

‎api/appStore/deployment/CommonDeploymentRestHandler.go‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import (
2222
"encoding/json"
2323
"fmt"
2424
service2 "github.com/devtron-labs/devtron/api/helm-app/service"
25+
"github.com/devtron-labs/devtron/pkg/appStore/installedApp/service/EAMode"
2526
"net/http"
2627
"strconv"
2728
"time"
@@ -32,7 +33,7 @@ import (
3233
"github.com/devtron-labs/devtron/api/restHandler/common"
3334
"github.com/devtron-labs/devtron/internal/util"
3435
appStoreBean "github.com/devtron-labs/devtron/pkg/appStore/bean"
35-
"github.com/devtron-labs/devtron/pkg/appStore/deployment/service"
36+
"github.com/devtron-labs/devtron/pkg/appStore/installedApp/service"
3637
"github.com/devtron-labs/devtron/pkg/auth/authorisation/casbin"
3738
"github.com/devtron-labs/devtron/pkg/auth/user"
3839
util2 "github.com/devtron-labs/devtron/util"
@@ -57,14 +58,16 @@ type CommonDeploymentRestHandlerImpl struct {
5758
enforcerUtil rbac.EnforcerUtil
5859
enforcerUtilHelm rbac.EnforcerUtilHelm
5960
appStoreDeploymentService service.AppStoreDeploymentService
61+
installedAppService EAMode.InstalledAppDBService
6062
validator *validator.Validate
6163
helmAppService service2.HelmAppService
6264
helmAppRestHandler client.HelmAppRestHandler
6365
argoUserService argo.ArgoUserService
6466
}
6567

6668
func NewCommonDeploymentRestHandlerImpl(Logger *zap.SugaredLogger, userAuthService user.UserService,
67-
enforcer casbin.Enforcer, enforcerUtil rbac.EnforcerUtil, enforcerUtilHelm rbac.EnforcerUtilHelm, appStoreDeploymentService service.AppStoreDeploymentService,
69+
enforcer casbin.Enforcer, enforcerUtil rbac.EnforcerUtil, enforcerUtilHelm rbac.EnforcerUtilHelm,
70+
appStoreDeploymentService service.AppStoreDeploymentService, installedAppService EAMode.InstalledAppDBService,
6871
validator *validator.Validate, helmAppService service2.HelmAppService,
6972
helmAppRestHandler client.HelmAppRestHandler, argoUserService argo.ArgoUserService) *CommonDeploymentRestHandlerImpl {
7073
return &CommonDeploymentRestHandlerImpl{
@@ -74,6 +77,7 @@ func NewCommonDeploymentRestHandlerImpl(Logger *zap.SugaredLogger, userAuthServi
7477
enforcerUtil: enforcerUtil,
7578
enforcerUtilHelm: enforcerUtilHelm,
7679
appStoreDeploymentService: appStoreDeploymentService,
80+
installedAppService: installedAppService,
7781
validator: validator,
7882
helmAppService: helmAppService,
7983
helmAppRestHandler: helmAppRestHandler,
@@ -89,7 +93,7 @@ func (handler *CommonDeploymentRestHandlerImpl) getAppOfferingMode(installedAppI
8993
err = &util.ApiError{HttpStatusCode: http.StatusBadRequest, UserMessage: "invalid app id"}
9094
return appOfferingMode, installedAppDto, err
9195
}
92-
installedAppDto, err = handler.appStoreDeploymentService.GetInstalledAppByClusterNamespaceAndName(appIdentifier.ClusterId, appIdentifier.Namespace, appIdentifier.ReleaseName)
96+
installedAppDto, err = handler.installedAppService.GetInstalledAppByClusterNamespaceAndName(appIdentifier.ClusterId, appIdentifier.Namespace, appIdentifier.ReleaseName)
9397
if err != nil {
9498
err = &util.ApiError{HttpStatusCode: http.StatusBadRequest, UserMessage: "unable to find app in database"}
9599
return appOfferingMode, installedAppDto, err
@@ -115,7 +119,7 @@ func (handler *CommonDeploymentRestHandlerImpl) getAppOfferingMode(installedAppI
115119
err = &util.ApiError{HttpStatusCode: http.StatusBadRequest, UserMessage: "invalid installed app id"}
116120
return appOfferingMode, installedAppDto, err
117121
}
118-
installedAppDto, err = handler.appStoreDeploymentService.GetInstalledAppByInstalledAppId(installedAppId)
122+
installedAppDto, err = handler.installedAppService.GetInstalledAppByInstalledAppId(installedAppId)
119123
if err != nil {
120124
err = &util.ApiError{HttpStatusCode: http.StatusBadRequest, UserMessage: "unable to find app in database"}
121125
return appOfferingMode, installedAppDto, err

‎api/appStore/deployment/wire_appStoreDeployment.go‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ package appStoreDeployment
22

33
import (
44
"github.com/devtron-labs/devtron/client/argocdServer"
5-
appStoreDeploymentCommon "github.com/devtron-labs/devtron/pkg/appStore/deployment/common"
6-
"github.com/devtron-labs/devtron/pkg/appStore/deployment/repository"
7-
"github.com/devtron-labs/devtron/pkg/appStore/deployment/service"
8-
appStoreDeploymentTool "github.com/devtron-labs/devtron/pkg/appStore/deployment/tool"
5+
"github.com/devtron-labs/devtron/pkg/appStore/installedApp/repository"
6+
"github.com/devtron-labs/devtron/pkg/appStore/installedApp/service"
7+
"github.com/devtron-labs/devtron/pkg/appStore/installedApp/service/EAMode"
8+
"github.com/devtron-labs/devtron/pkg/appStore/installedApp/service/common"
99
"github.com/google/wire"
1010
)
1111

@@ -15,8 +15,8 @@ var AppStoreDeploymentWireSet = wire.NewSet(
1515
wire.Bind(new(repository.ClusterInstalledAppsRepository), new(*repository.ClusterInstalledAppsRepositoryImpl)),
1616
appStoreDeploymentCommon.NewAppStoreDeploymentCommonServiceImpl,
1717
wire.Bind(new(appStoreDeploymentCommon.AppStoreDeploymentCommonService), new(*appStoreDeploymentCommon.AppStoreDeploymentCommonServiceImpl)),
18-
appStoreDeploymentTool.NewAppStoreDeploymentHelmServiceImpl,
19-
wire.Bind(new(appStoreDeploymentTool.AppStoreDeploymentHelmService), new(*appStoreDeploymentTool.AppStoreDeploymentHelmServiceImpl)),
18+
EAMode.NewEAModeDeploymentServiceImpl,
19+
wire.Bind(new(EAMode.EAModeDeploymentService), new(*EAMode.EAModeDeploymentServiceImpl)),
2020
service.NewAppStoreDeploymentServiceImpl,
2121
wire.Bind(new(service.AppStoreDeploymentService), new(*service.AppStoreDeploymentServiceImpl)),
2222
NewAppStoreDeploymentRestHandlerImpl,
@@ -31,4 +31,7 @@ var AppStoreDeploymentWireSet = wire.NewSet(
3131
NewCommonDeploymentRouterImpl,
3232
wire.Bind(new(CommonDeploymentRouter), new(*CommonDeploymentRouterImpl)),
3333
argocdServer.GetACDDeploymentConfig,
34+
35+
EAMode.NewInstalledAppDBServiceImpl,
36+
wire.Bind(new(EAMode.InstalledAppDBService), new(*EAMode.InstalledAppDBServiceImpl)),
3437
)

‎api/appStore/values/wire_appStoreValues.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package appStoreValues
22

33
import (
4-
"github.com/devtron-labs/devtron/pkg/appStore/deployment/repository"
4+
"github.com/devtron-labs/devtron/pkg/appStore/installedApp/repository"
55
appStoreValuesRepository "github.com/devtron-labs/devtron/pkg/appStore/values/repository"
66
"github.com/devtron-labs/devtron/pkg/appStore/values/service"
77
"github.com/google/wire"

‎api/helm-app/HelmAppRestHandler.go‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ import (
66
"errors"
77
"github.com/devtron-labs/devtron/api/helm-app/bean"
88
service2 "github.com/devtron-labs/devtron/api/helm-app/service"
9-
"github.com/devtron-labs/devtron/pkg/appStore/deployment/service"
9+
"github.com/devtron-labs/devtron/pkg/appStore/installedApp/service"
10+
"github.com/devtron-labs/devtron/pkg/appStore/installedApp/service/EAMode"
1011
"net/http"
1112
"strconv"
1213
"strings"
@@ -50,6 +51,7 @@ type HelmAppRestHandlerImpl struct {
5051
clusterService cluster.ClusterService
5152
enforcerUtil rbac.EnforcerUtilHelm
5253
appStoreDeploymentService service.AppStoreDeploymentService
54+
installedAppService EAMode.InstalledAppDBService
5355
userAuthService user.UserService
5456
attributesService attributes.AttributesService
5557
serverEnvConfig *serverEnvConfig.ServerEnvConfig
@@ -58,7 +60,7 @@ type HelmAppRestHandlerImpl struct {
5860
func NewHelmAppRestHandlerImpl(logger *zap.SugaredLogger,
5961
helmAppService service2.HelmAppService, enforcer casbin.Enforcer,
6062
clusterService cluster.ClusterService, enforcerUtil rbac.EnforcerUtilHelm,
61-
appStoreDeploymentService service.AppStoreDeploymentService,
63+
appStoreDeploymentService service.AppStoreDeploymentService, installedAppService EAMode.InstalledAppDBService,
6264
userAuthService user.UserService, attributesService attributes.AttributesService, serverEnvConfig *serverEnvConfig.ServerEnvConfig) *HelmAppRestHandlerImpl {
6365
return &HelmAppRestHandlerImpl{
6466
logger: logger,
@@ -67,6 +69,7 @@ func NewHelmAppRestHandlerImpl(logger *zap.SugaredLogger,
6769
clusterService: clusterService,
6870
enforcerUtil: enforcerUtil,
6971
appStoreDeploymentService: appStoreDeploymentService,
72+
installedAppService: installedAppService,
7073
userAuthService: userAuthService,
7174
attributesService: attributesService,
7275
serverEnvConfig: serverEnvConfig,
@@ -120,7 +123,7 @@ func (handler *HelmAppRestHandlerImpl) GetApplicationDetail(w http.ResponseWrite
120123
return
121124
}
122125

123-
installedApp, err := handler.appStoreDeploymentService.GetInstalledAppByClusterNamespaceAndName(appIdentifier.ClusterId, appIdentifier.Namespace, appIdentifier.ReleaseName)
126+
installedApp, err := handler.installedAppService.GetInstalledAppByClusterNamespaceAndName(appIdentifier.ClusterId, appIdentifier.Namespace, appIdentifier.ReleaseName)
124127
if err != nil {
125128
common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
126129
return
@@ -221,7 +224,7 @@ func (handler *HelmAppRestHandlerImpl) GetReleaseInfo(w http.ResponseWriter, r *
221224
common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
222225
return
223226
}
224-
installedApp, err := handler.appStoreDeploymentService.GetInstalledAppByClusterNamespaceAndName(appIdentifier.ClusterId, appIdentifier.Namespace, appIdentifier.ReleaseName)
227+
installedApp, err := handler.installedAppService.GetInstalledAppByClusterNamespaceAndName(appIdentifier.ClusterId, appIdentifier.Namespace, appIdentifier.ReleaseName)
225228
if err != nil {
226229
common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
227230
return

0 commit comments

Comments
 (0)