devtron-labs
diff --git a/‎api/argoApplication/ArgoApplicationRestHandler.go
Lines changed: 6 additions & 3 deletions b/‎api/argoApplication/ArgoApplicationRestHandler.go
Lines changed: 6 additions & 3 deletions
diff --git a/‎api/argoApplication/wire_argoApplication.go
Lines changed: 4 additions & 0 deletions b/‎api/argoApplication/wire_argoApplication.go
Lines changed: 4 additions & 0 deletions
diff --git a/‎api/helm-app/HelmAppRestHandler.go
Lines changed: 3 additions & 2 deletions b/‎api/helm-app/HelmAppRestHandler.go
Lines changed: 3 additions & 2 deletions
diff --git a/‎api/k8s/application/k8sApplicationRestHandler.go
Lines changed: 37 additions & 36 deletions b/‎api/k8s/application/k8sApplicationRestHandler.go
Lines changed: 37 additions & 36 deletions
diff --git a/‎cmd/external-app/wire_gen.go
Lines changed: 12 additions & 10 deletions b/‎cmd/external-app/wire_gen.go
Lines changed: 12 additions & 10 deletions
@@ -20,6 +20,7 @@ import (
 	"errors"
 	"github.com/devtron-labs/devtron/api/restHandler/common"
 	"github.com/devtron-labs/devtron/pkg/argoApplication"
+	"github.com/devtron-labs/devtron/pkg/argoApplication/read"
 	"github.com/devtron-labs/devtron/pkg/auth/authorisation/casbin"
 	"go.uber.org/zap"
 	"net/http"
@@ -34,14 +35,16 @@ type ArgoApplicationRestHandler interface {
 
 type ArgoApplicationRestHandlerImpl struct {
 	argoApplicationService argoApplication.ArgoApplicationService
+	readService            read.ArgoApplicationReadService
 	logger                 *zap.SugaredLogger
 	enforcer               casbin.Enforcer
 }
 
 func NewArgoApplicationRestHandlerImpl(argoApplicationService argoApplication.ArgoApplicationService,
-	logger *zap.SugaredLogger, enforcer casbin.Enforcer) *ArgoApplicationRestHandlerImpl {
+	readService read.ArgoApplicationReadService, logger *zap.SugaredLogger, enforcer casbin.Enforcer) *ArgoApplicationRestHandlerImpl {
 	return &ArgoApplicationRestHandlerImpl{
 		argoApplicationService: argoApplicationService,
+		readService:            readService,
 		logger:                 logger,
 		enforcer:               enforcer,
 	}
@@ -101,9 +104,9 @@ func (handler *ArgoApplicationRestHandlerImpl) GetApplicationDetail(w http.Respo
 			return
 		}
 	}
-	resp, err := handler.argoApplicationService.GetAppDetail(resourceName, namespace, clusterId)
+	resp, err := handler.readService.GetAppDetail(resourceName, namespace, clusterId)
 	if err != nil {
-		handler.logger.Errorw("error in listing all argo applications", "err", err, "resourceName", resourceName, "clusterId", clusterId)
+		handler.logger.Errorw("error in getting argo application app detail", "err", err, "resourceName", resourceName, "clusterId", clusterId)
 		common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
 		return
 	}
 
@@ -18,10 +18,14 @@ package argoApplication
 
 import (
 	"github.com/devtron-labs/devtron/pkg/argoApplication"
+	"github.com/devtron-labs/devtron/pkg/argoApplication/read"
 	"github.com/google/wire"
 )
 
 var ArgoApplicationWireSet = wire.NewSet(
+	read.NewArgoApplicationReadServiceImpl,
+	wire.Bind(new(read.ArgoApplicationReadService), new(*read.ArgoApplicationReadServiceImpl)),
+
 	argoApplication.NewArgoApplicationServiceImpl,
 	wire.Bind(new(argoApplication.ArgoApplicationService), new(*argoApplication.ArgoApplicationServiceImpl)),
 
 
@@ -25,6 +25,7 @@ import (
 	"github.com/devtron-labs/devtron/pkg/appStore/installedApp/service"
 	"github.com/devtron-labs/devtron/pkg/appStore/installedApp/service/EAMode"
 	"github.com/devtron-labs/devtron/pkg/argoApplication"
+	"github.com/devtron-labs/devtron/pkg/argoApplication/helper"
 	clientErrors "github.com/devtron-labs/devtron/pkg/errors"
 	"github.com/devtron-labs/devtron/pkg/fluxApplication"
 	bean2 "github.com/devtron-labs/devtron/pkg/k8s/application/bean"
@@ -232,7 +233,7 @@ func (handler *HelmAppRestHandlerImpl) handleFluxApplicationHibernate(r *http.Re
 	return handler.fluxApplication.HibernateFluxApplication(r.Context(), appIdentifier, hibernateRequest)
 }
 func (handler *HelmAppRestHandlerImpl) handleArgoApplicationHibernate(r *http.Request, token string, hibernateRequest *openapi.HibernateRequest) ([]*openapi.HibernateStatus, error) {
-	appIdentifier, err := argoApplication.DecodeExternalArgoAppId(*hibernateRequest.AppId)
+	appIdentifier, err := helper.DecodeExternalArgoAppId(*hibernateRequest.AppId)
 	if err != nil {
 		return nil, err
 	}
@@ -316,7 +317,7 @@ func (handler *HelmAppRestHandlerImpl) handleFluxApplicationUnHibernate(r *http.
 	return handler.fluxApplication.UnHibernateFluxApplication(r.Context(), appIdentifier, hibernateRequest)
 }
 func (handler *HelmAppRestHandlerImpl) handleArgoApplicationUnHibernate(r *http.Request, token string, hibernateRequest *openapi.HibernateRequest) ([]*openapi.HibernateStatus, error) {
-	appIdentifier, err := argoApplication.DecodeExternalArgoAppId(*hibernateRequest.AppId)
+	appIdentifier, err := helper.DecodeExternalArgoAppId(*hibernateRequest.AppId)
 	if err != nil {
 		return nil, err
 	}
 
@@ -33,7 +33,8 @@ import (
 	client "github.com/devtron-labs/devtron/api/helm-app/service"
 	"github.com/devtron-labs/devtron/api/restHandler/common"
 	util2 "github.com/devtron-labs/devtron/internal/util"
-	"github.com/devtron-labs/devtron/pkg/argoApplication"
+	"github.com/devtron-labs/devtron/pkg/argoApplication/helper"
+	"github.com/devtron-labs/devtron/pkg/argoApplication/read"
 	"github.com/devtron-labs/devtron/pkg/auth/authorisation/casbin"
 	"github.com/devtron-labs/devtron/pkg/auth/user"
 	"github.com/devtron-labs/devtron/pkg/cluster"
@@ -81,39 +82,39 @@ type K8sApplicationRestHandler interface {
 }
 
 type K8sApplicationRestHandlerImpl struct {
-	logger                 *zap.SugaredLogger
-	k8sApplicationService  application2.K8sApplicationService
-	pump                   connector.Pump
-	terminalSessionHandler terminal.TerminalSessionHandler
-	enforcer               casbin.Enforcer
-	validator              *validator.Validate
-	enforcerUtil           rbac.EnforcerUtil
-	enforcerUtilHelm       rbac.EnforcerUtilHelm
-	helmAppService         client.HelmAppService
-	userService            user.UserService
-	k8sCommonService       k8s.K8sCommonService
-	terminalEnvVariables   *util.TerminalEnvVariables
-	fluxAppService         fluxApplication.FluxApplicationService
-	argoApplication        argoApplication.ArgoApplicationService
+	logger                     *zap.SugaredLogger
+	k8sApplicationService      application2.K8sApplicationService
+	pump                       connector.Pump
+	terminalSessionHandler     terminal.TerminalSessionHandler
+	enforcer                   casbin.Enforcer
+	validator                  *validator.Validate
+	enforcerUtil               rbac.EnforcerUtil
+	enforcerUtilHelm           rbac.EnforcerUtilHelm
+	helmAppService             client.HelmAppService
+	userService                user.UserService
+	k8sCommonService           k8s.K8sCommonService
+	terminalEnvVariables       *util.TerminalEnvVariables
+	fluxAppService             fluxApplication.FluxApplicationService
+	argoApplicationReadService read.ArgoApplicationReadService
 }
 
-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,
+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,
 ) *K8sApplicationRestHandlerImpl {
 	return &K8sApplicationRestHandlerImpl{
-		logger:                 logger,
-		k8sApplicationService:  k8sApplicationService,
-		pump:                   pump,
-		terminalSessionHandler: terminalSessionHandler,
-		enforcer:               enforcer,
-		validator:              validator,
-		enforcerUtilHelm:       enforcerUtilHelm,
-		enforcerUtil:           enforcerUtil,
-		helmAppService:         helmAppService,
-		userService:            userService,
-		k8sCommonService:       k8sCommonService,
-		terminalEnvVariables:   envVariables.TerminalEnvVariables,
-		fluxAppService:         fluxAppService,
-		argoApplication:        argoApplication,
+		logger:                     logger,
+		k8sApplicationService:      k8sApplicationService,
+		pump:                       pump,
+		terminalSessionHandler:     terminalSessionHandler,
+		enforcer:                   enforcer,
+		validator:                  validator,
+		enforcerUtilHelm:           enforcerUtilHelm,
+		enforcerUtil:               enforcerUtil,
+		helmAppService:             helmAppService,
+		userService:                userService,
+		k8sCommonService:           k8sCommonService,
+		terminalEnvVariables:       envVariables.TerminalEnvVariables,
+		fluxAppService:             fluxAppService,
+		argoApplicationReadService: argoApplicationReadService,
 	}
 }
 
@@ -289,7 +290,7 @@ func (handler *K8sApplicationRestHandlerImpl) GetHostUrlsByBatch(w http.Response
 		resourceTreeResponse = appDetail.ResourceTreeResponse
 
 	} else if appType == bean2.ArgoAppType {
-		appIdentifier, err := argoApplication.DecodeExternalArgoAppId(appIdString)
+		appIdentifier, err := helper.DecodeExternalArgoAppId(appIdString)
 		if err != nil {
 			common.WriteJsonResp(w, err, nil, http.StatusBadRequest)
 			return
@@ -301,7 +302,7 @@ func (handler *K8sApplicationRestHandlerImpl) GetHostUrlsByBatch(w http.Response
 		}
 		//RBAC enforcer Ends
 
-		appDetail, err := handler.argoApplication.GetAppDetail(appIdentifier.AppName, appIdentifier.Namespace, appIdentifier.ClusterId)
+		appDetail, err := handler.argoApplicationReadService.GetAppDetail(appIdentifier.AppName, appIdentifier.Namespace, appIdentifier.ClusterId)
 		if err != nil {
 			apiError := clientErrors.ConvertToApiError(err)
 			if apiError != nil {
@@ -721,12 +722,12 @@ func (handler *K8sApplicationRestHandlerImpl) requestValidationAndRBAC(w http.Re
 		}
 		//RBAC enforcer ends here
 	} else if request.AppType == bean2.ArgoAppType && request.ExternalArgoApplicationName != "" {
-		appIdentifier, err := argoApplication.DecodeExternalArgoAppId(request.AppId)
+		appIdentifier, err := helper.DecodeExternalArgoAppId(request.AppId)
 		if err != nil {
 			handler.logger.Errorw(bean2.AppIdDecodingError, "err", err, "appIdentifier", request.AppIdentifier)
 			common.WriteJsonResp(w, err, nil, http.StatusBadRequest)
 		}
-		valid, err := handler.k8sApplicationService.ValidateArgoResourceRequest(r.Context(), appIdentifier, request.K8sRequest)
+		valid, err := handler.argoApplicationReadService.ValidateArgoResourceRequest(r.Context(), appIdentifier, request.K8sRequest)
 		if err != nil || !valid {
 			handler.logger.Errorw("error in validating resource request", "err", err)
 			common.WriteJsonResp(w, err, nil, http.StatusBadRequest)
@@ -1145,14 +1146,14 @@ func (handler *K8sApplicationRestHandlerImpl) verifyRbacForAppRequests(token str
 	envObject := ""
 	switch request.AppType {
 	case bean2.ArgoAppType:
-		argoAppIdentifier, err := argoApplication.DecodeExternalArgoAppId(request.AppId)
+		argoAppIdentifier, err := helper.DecodeExternalArgoAppId(request.AppId)
 		if err != nil {
 			handler.logger.Errorw("error in decoding appId", "err", err, "appId", request.AppId)
 			return false, err
 		}
 		request.ClusterId = argoAppIdentifier.ClusterId
 		request.ExternalArgoApplicationName = argoAppIdentifier.AppName
-		valid, err := handler.k8sApplicationService.ValidateArgoResourceRequest(r.Context(), argoAppIdentifier, request.K8sRequest)
+		valid, err := handler.argoApplicationReadService.ValidateArgoResourceRequest(r.Context(), argoAppIdentifier, request.K8sRequest)
 		if err != nil || !valid {
 			handler.logger.Errorw("error in validating resource request", "err", err)
 			return false, err
Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@ import (`
`25`	`25`	`"github.com/devtron-labs/devtron/pkg/appStore/installedApp/service"`
`26`	`26`	`"github.com/devtron-labs/devtron/pkg/appStore/installedApp/service/EAMode"`
`27`	`27`	`"github.com/devtron-labs/devtron/pkg/argoApplication"`
	`28`	`+ "github.com/devtron-labs/devtron/pkg/argoApplication/helper"`
`28`	`29`	`clientErrors "github.com/devtron-labs/devtron/pkg/errors"`
`29`	`30`	`"github.com/devtron-labs/devtron/pkg/fluxApplication"`
`30`	`31`	`bean2 "github.com/devtron-labs/devtron/pkg/k8s/application/bean"`
`@@ -232,7 +233,7 @@ func (handler HelmAppRestHandlerImpl) handleFluxApplicationHibernate(r http.Re`
`232`	`233`	`return handler.fluxApplication.HibernateFluxApplication(r.Context(), appIdentifier, hibernateRequest)`
`233`	`234`	`}`
`234`	`235`	`func (handler HelmAppRestHandlerImpl) handleArgoApplicationHibernate(r http.Request, token string, hibernateRequest openapi.HibernateRequest) ([]openapi.HibernateStatus, error) {`
`235`		`- appIdentifier, err := argoApplication.DecodeExternalArgoAppId(*hibernateRequest.AppId)`
	`236`	`+ appIdentifier, err := helper.DecodeExternalArgoAppId(*hibernateRequest.AppId)`
`236`	`237`	`if err != nil {`
`237`	`238`	`return nil, err`
`238`	`239`	`}`
`@@ -316,7 +317,7 @@ func (handler HelmAppRestHandlerImpl) handleFluxApplicationUnHibernate(r http.`
`316`	`317`	`return handler.fluxApplication.UnHibernateFluxApplication(r.Context(), appIdentifier, hibernateRequest)`
`317`	`318`	`}`
`318`	`319`	`func (handler HelmAppRestHandlerImpl) handleArgoApplicationUnHibernate(r http.Request, token string, hibernateRequest openapi.HibernateRequest) ([]openapi.HibernateStatus, error) {`
`319`		`- appIdentifier, err := argoApplication.DecodeExternalArgoAppId(*hibernateRequest.AppId)`
	`320`	`+ appIdentifier, err := helper.DecodeExternalArgoAppId(*hibernateRequest.AppId)`
`320`	`321`	`if err != nil {`
`321`	`322`	`return nil, err`
`322`	`323`	`}`