@@ -33,7 +33,8 @@ import (
3333 client "github.com/devtron-labs/devtron/api/helm-app/service"
3434 "github.com/devtron-labs/devtron/api/restHandler/common"
3535 util2 "github.com/devtron-labs/devtron/internal/util"
36- "github.com/devtron-labs/devtron/pkg/argoApplication"
36+ "github.com/devtron-labs/devtron/pkg/argoApplication/helper"
37+ "github.com/devtron-labs/devtron/pkg/argoApplication/read"
3738 "github.com/devtron-labs/devtron/pkg/auth/authorisation/casbin"
3839 "github.com/devtron-labs/devtron/pkg/auth/user"
3940 "github.com/devtron-labs/devtron/pkg/cluster"
@@ -81,39 +82,39 @@ type K8sApplicationRestHandler interface {
8182}
8283
8384type K8sApplicationRestHandlerImpl struct {
84- logger * zap.SugaredLogger
85- k8sApplicationService application2.K8sApplicationService
86- pump connector.Pump
87- terminalSessionHandler terminal.TerminalSessionHandler
88- enforcer casbin.Enforcer
89- validator * validator.Validate
90- enforcerUtil rbac.EnforcerUtil
91- enforcerUtilHelm rbac.EnforcerUtilHelm
92- helmAppService client.HelmAppService
93- userService user.UserService
94- k8sCommonService k8s.K8sCommonService
95- terminalEnvVariables * util.TerminalEnvVariables
96- fluxAppService fluxApplication.FluxApplicationService
97- argoApplication argoApplication. ArgoApplicationService
85+ logger * zap.SugaredLogger
86+ k8sApplicationService application2.K8sApplicationService
87+ pump connector.Pump
88+ terminalSessionHandler terminal.TerminalSessionHandler
89+ enforcer casbin.Enforcer
90+ validator * validator.Validate
91+ enforcerUtil rbac.EnforcerUtil
92+ enforcerUtilHelm rbac.EnforcerUtilHelm
93+ helmAppService client.HelmAppService
94+ userService user.UserService
95+ k8sCommonService k8s.K8sCommonService
96+ terminalEnvVariables * util.TerminalEnvVariables
97+ fluxAppService fluxApplication.FluxApplicationService
98+ argoApplicationReadService read. ArgoApplicationReadService
9899}
99100
100- func NewK8sApplicationRestHandlerImpl (logger * zap.SugaredLogger , k8sApplicationService application2.K8sApplicationService , pump connector.Pump , terminalSessionHandler terminal.TerminalSessionHandler , enforcer casbin.Enforcer , enforcerUtilHelm rbac.EnforcerUtilHelm , enforcerUtil rbac.EnforcerUtil , helmAppService client.HelmAppService , userService user.UserService , k8sCommonService k8s.K8sCommonService , validator * validator.Validate , envVariables * util.EnvironmentVariables , fluxAppService fluxApplication.FluxApplicationService , argoApplication argoApplication. ArgoApplicationService ,
101+ func NewK8sApplicationRestHandlerImpl (logger * zap.SugaredLogger , k8sApplicationService application2.K8sApplicationService , pump connector.Pump , terminalSessionHandler terminal.TerminalSessionHandler , enforcer casbin.Enforcer , enforcerUtilHelm rbac.EnforcerUtilHelm , enforcerUtil rbac.EnforcerUtil , helmAppService client.HelmAppService , userService user.UserService , k8sCommonService k8s.K8sCommonService , validator * validator.Validate , envVariables * util.EnvironmentVariables , fluxAppService fluxApplication.FluxApplicationService , argoApplicationReadService read. ArgoApplicationReadService ,
101102) * K8sApplicationRestHandlerImpl {
102103 return & K8sApplicationRestHandlerImpl {
103- logger : logger ,
104- k8sApplicationService : k8sApplicationService ,
105- pump : pump ,
106- terminalSessionHandler : terminalSessionHandler ,
107- enforcer : enforcer ,
108- validator : validator ,
109- enforcerUtilHelm : enforcerUtilHelm ,
110- enforcerUtil : enforcerUtil ,
111- helmAppService : helmAppService ,
112- userService : userService ,
113- k8sCommonService : k8sCommonService ,
114- terminalEnvVariables : envVariables .TerminalEnvVariables ,
115- fluxAppService : fluxAppService ,
116- argoApplication : argoApplication ,
104+ logger : logger ,
105+ k8sApplicationService : k8sApplicationService ,
106+ pump : pump ,
107+ terminalSessionHandler : terminalSessionHandler ,
108+ enforcer : enforcer ,
109+ validator : validator ,
110+ enforcerUtilHelm : enforcerUtilHelm ,
111+ enforcerUtil : enforcerUtil ,
112+ helmAppService : helmAppService ,
113+ userService : userService ,
114+ k8sCommonService : k8sCommonService ,
115+ terminalEnvVariables : envVariables .TerminalEnvVariables ,
116+ fluxAppService : fluxAppService ,
117+ argoApplicationReadService : argoApplicationReadService ,
117118 }
118119}
119120
@@ -289,7 +290,7 @@ func (handler *K8sApplicationRestHandlerImpl) GetHostUrlsByBatch(w http.Response
289290 resourceTreeResponse = appDetail .ResourceTreeResponse
290291
291292 } else if appType == bean2 .ArgoAppType {
292- appIdentifier , err := argoApplication .DecodeExternalArgoAppId (appIdString )
293+ appIdentifier , err := helper .DecodeExternalArgoAppId (appIdString )
293294 if err != nil {
294295 common .WriteJsonResp (w , err , nil , http .StatusBadRequest )
295296 return
@@ -301,7 +302,7 @@ func (handler *K8sApplicationRestHandlerImpl) GetHostUrlsByBatch(w http.Response
301302 }
302303 //RBAC enforcer Ends
303304
304- appDetail , err := handler .argoApplication .GetAppDetail (appIdentifier .AppName , appIdentifier .Namespace , appIdentifier .ClusterId )
305+ appDetail , err := handler .argoApplicationReadService .GetAppDetail (appIdentifier .AppName , appIdentifier .Namespace , appIdentifier .ClusterId )
305306 if err != nil {
306307 apiError := clientErrors .ConvertToApiError (err )
307308 if apiError != nil {
@@ -721,12 +722,12 @@ func (handler *K8sApplicationRestHandlerImpl) requestValidationAndRBAC(w http.Re
721722 }
722723 //RBAC enforcer ends here
723724 } else if request .AppType == bean2 .ArgoAppType && request .ExternalArgoApplicationName != "" {
724- appIdentifier , err := argoApplication .DecodeExternalArgoAppId (request .AppId )
725+ appIdentifier , err := helper .DecodeExternalArgoAppId (request .AppId )
725726 if err != nil {
726727 handler .logger .Errorw (bean2 .AppIdDecodingError , "err" , err , "appIdentifier" , request .AppIdentifier )
727728 common .WriteJsonResp (w , err , nil , http .StatusBadRequest )
728729 }
729- valid , err := handler .k8sApplicationService .ValidateArgoResourceRequest (r .Context (), appIdentifier , request .K8sRequest )
730+ valid , err := handler .argoApplicationReadService .ValidateArgoResourceRequest (r .Context (), appIdentifier , request .K8sRequest )
730731 if err != nil || ! valid {
731732 handler .logger .Errorw ("error in validating resource request" , "err" , err )
732733 common .WriteJsonResp (w , err , nil , http .StatusBadRequest )
@@ -1145,14 +1146,14 @@ func (handler *K8sApplicationRestHandlerImpl) verifyRbacForAppRequests(token str
11451146 envObject := ""
11461147 switch request .AppType {
11471148 case bean2 .ArgoAppType :
1148- argoAppIdentifier , err := argoApplication .DecodeExternalArgoAppId (request .AppId )
1149+ argoAppIdentifier , err := helper .DecodeExternalArgoAppId (request .AppId )
11491150 if err != nil {
11501151 handler .logger .Errorw ("error in decoding appId" , "err" , err , "appId" , request .AppId )
11511152 return false , err
11521153 }
11531154 request .ClusterId = argoAppIdentifier .ClusterId
11541155 request .ExternalArgoApplicationName = argoAppIdentifier .AppName
1155- valid , err := handler .k8sApplicationService .ValidateArgoResourceRequest (r .Context (), argoAppIdentifier , request .K8sRequest )
1156+ valid , err := handler .argoApplicationReadService .ValidateArgoResourceRequest (r .Context (), argoAppIdentifier , request .K8sRequest )
11561157 if err != nil || ! valid {
11571158 handler .logger .Errorw ("error in validating resource request" , "err" , err )
11581159 return false , err
0 commit comments