@@ -21,20 +21,21 @@ import (
2121 "encoding/json"
2222 "errors"
2323 "fmt"
24+ bean2 "github.com/devtron-labs/devtron/api/bean/AppView"
2425 client "github.com/devtron-labs/devtron/api/helm-app/gRPC"
2526 "github.com/devtron-labs/devtron/pkg/appStore/installedApp/service/FullMode"
2627 "github.com/devtron-labs/devtron/pkg/appStore/installedApp/service/FullMode/deploymentTypeChange"
2728 "github.com/devtron-labs/devtron/pkg/appStore/installedApp/service/FullMode/resource"
2829 util3 "github.com/devtron-labs/devtron/pkg/appStore/util"
2930 "github.com/devtron-labs/devtron/pkg/bean"
31+ "github.com/devtron-labs/devtron/pkg/cluster/read"
3032 "gopkg.in/go-playground/validator.v9"
3133 "net/http"
3234 "reflect"
3335 "strconv"
3436 "strings"
3537 "time"
3638
37- bean2 "github.com/devtron-labs/devtron/api/bean"
3839 "github.com/devtron-labs/devtron/api/restHandler/common"
3940 "github.com/devtron-labs/devtron/client/argocdServer/application"
4041 "github.com/devtron-labs/devtron/client/cron"
@@ -50,7 +51,6 @@ import (
5051 "github.com/devtron-labs/devtron/pkg/auth/user"
5152 "github.com/devtron-labs/devtron/pkg/cluster"
5253 "github.com/devtron-labs/devtron/util"
53- "github.com/devtron-labs/devtron/util/argo"
5454 "github.com/devtron-labs/devtron/util/rbac"
5555 "github.com/devtron-labs/devtron/util/response"
5656 "github.com/go-pg/pg"
@@ -88,11 +88,11 @@ type InstalledAppRestHandlerImpl struct {
8888 appStoreDeploymentService service.AppStoreDeploymentService
8989 appStoreDeploymentDBService service.AppStoreDeploymentDBService
9090 helmAppClient client.HelmAppClient
91- argoUserService argo.ArgoUserService
9291 cdApplicationStatusUpdateHandler cron.CdApplicationStatusUpdateHandler
9392 installedAppRepository repository.InstalledAppRepository
9493 appCrudOperationService app2.AppCrudOperationService
9594 installedAppDeploymentTypeChangeService deploymentTypeChange.InstalledAppDeploymentTypeChangeService
95+ clusterReadService read.ClusterReadService
9696}
9797
9898func NewInstalledAppRestHandlerImpl (Logger * zap.SugaredLogger , userAuthService user.UserService ,
@@ -102,11 +102,13 @@ func NewInstalledAppRestHandlerImpl(Logger *zap.SugaredLogger, userAuthService u
102102 chartGroupService chartGroup.ChartGroupService , validator * validator.Validate , clusterService cluster.ClusterService ,
103103 acdServiceClient application.ServiceClient , appStoreDeploymentService service.AppStoreDeploymentService ,
104104 appStoreDeploymentDBService service.AppStoreDeploymentDBService ,
105- helmAppClient client.HelmAppClient , argoUserService argo.ArgoUserService ,
105+ helmAppClient client.HelmAppClient ,
106+
106107 cdApplicationStatusUpdateHandler cron.CdApplicationStatusUpdateHandler ,
107108 installedAppRepository repository.InstalledAppRepository ,
108109 appCrudOperationService app2.AppCrudOperationService ,
109- installedAppDeploymentTypeChangeService deploymentTypeChange.InstalledAppDeploymentTypeChangeService ) * InstalledAppRestHandlerImpl {
110+ installedAppDeploymentTypeChangeService deploymentTypeChange.InstalledAppDeploymentTypeChangeService ,
111+ clusterReadService read.ClusterReadService ) * InstalledAppRestHandlerImpl {
110112 return & InstalledAppRestHandlerImpl {
111113 Logger : Logger ,
112114 userAuthService : userAuthService ,
@@ -122,11 +124,11 @@ func NewInstalledAppRestHandlerImpl(Logger *zap.SugaredLogger, userAuthService u
122124 appStoreDeploymentService : appStoreDeploymentService ,
123125 appStoreDeploymentDBService : appStoreDeploymentDBService ,
124126 helmAppClient : helmAppClient ,
125- argoUserService : argoUserService ,
126127 cdApplicationStatusUpdateHandler : cdApplicationStatusUpdateHandler ,
127128 installedAppRepository : installedAppRepository ,
128129 appCrudOperationService : appCrudOperationService ,
129130 installedAppDeploymentTypeChangeService : installedAppDeploymentTypeChangeService ,
131+ clusterReadService : clusterReadService ,
130132 }
131133}
132134func (handler * InstalledAppRestHandlerImpl ) FetchAppOverview (w http.ResponseWriter , r * http.Request ) {
@@ -550,7 +552,7 @@ func (impl *InstalledAppRestHandlerImpl) DefaultComponentInstallation(w http.Res
550552 return
551553 }
552554 impl .Logger .Errorw ("request payload, DefaultComponentInstallation" , "clusterId" , clusterId )
553- cluster , err := impl .clusterService .FindById (clusterId )
555+ cluster , err := impl .clusterReadService .FindById (clusterId )
554556 if err != nil {
555557 impl .Logger .Errorw ("service err, DefaultComponentInstallation" , "error" , err , "clusterId" , clusterId )
556558 common .WriteJsonResp (w , err , nil , http .StatusInternalServerError )
@@ -648,13 +650,6 @@ func (handler *InstalledAppRestHandlerImpl) DeleteArgoInstalledAppWithNonCascade
648650 return
649651 }
650652 //rback block ends here
651- acdToken , err := handler .argoUserService .GetLatestDevtronArgoCdUserToken ()
652- if err != nil {
653- handler .Logger .Errorw ("error in getting acd token" , "err" , err )
654- common .WriteJsonResp (w , err , nil , http .StatusInternalServerError )
655- return
656- }
657- ctx := context .WithValue (r .Context (), "token" , acdToken )
658653 request := & appStoreBean.InstallAppVersionDTO {}
659654 request .InstalledAppId = installedAppId
660655 request .AppName = installedApp .AppName
@@ -668,7 +663,7 @@ func (handler *InstalledAppRestHandlerImpl) DeleteArgoInstalledAppWithNonCascade
668663 request .Namespace = installedApp .Namespace
669664 request .AcdPartialDelete = true
670665
671- request , err = handler .appStoreDeploymentService .DeleteInstalledApp (ctx , request )
666+ request , err = handler .appStoreDeploymentService .DeleteInstalledApp (r . Context () , request )
672667 if err != nil {
673668 handler .Logger .Errorw ("service err, DeleteInstalledApp" , "err" , err , "installAppId" , installedAppId )
674669 common .WriteJsonResp (w , err , nil , http .StatusInternalServerError )
0 commit comments