feat: refactoring argo application service and common-lib constants (#5944)

* refactoring argo application service and common-lib constants

* hash update common-lib

Author: ayu-devtron

Wire.go

@@ -202,7 +202,7 @@ func InitializeApp() (*App, error) {
 		terminal.TerminalWireSet,
 		build.BuildWireSet,
 		deployment2.DeploymentWireSet,
-		argoApplication.ArgoApplicationWireSet,
+		argoApplication.ArgoApplicationWireSetFull,
 		fluxApplication.FluxApplicationWireSet,
 		eventProcessor.EventProcessorWireSet,
 		workflow3.WorkflowWireSet,

api/appStore/AppStoreRouter.go

@@ -83,9 +83,6 @@ func (router AppStoreRouterImpl) Init(configRouter *mux.Router) {
 		HandlerFunc(router.deployRestHandler.CheckAppExists).Methods("POST")
 	configRouter.Path("/group/install").
 		HandlerFunc(router.deployRestHandler.DeployBulk).Methods("POST")
-	configRouter.Path("/installed-app/detail").Queries("installed-app-id", "{installed-app-id}").Queries("env-id", "{env-id}").
-		HandlerFunc(router.deployRestHandler.FetchAppDetailsForInstalledApp).
-		Methods("GET")
 	configRouter.Path("/installed-app/delete/{installedAppId}/non-cascade").
 		HandlerFunc(router.deployRestHandler.DeleteArgoInstalledAppWithNonCascade).
 		Methods("DELETE")

api/appStore/InstalledAppRestHandler.go

@@ -49,7 +49,6 @@ import (
 	"github.com/devtron-labs/devtron/pkg/auth/authorisation/casbin"
 	"github.com/devtron-labs/devtron/pkg/auth/user"
 	"github.com/devtron-labs/devtron/pkg/cluster"
-	bean3 "github.com/devtron-labs/devtron/pkg/deployment/common/bean"
 	"github.com/devtron-labs/devtron/util"
 	"github.com/devtron-labs/devtron/util/argo"
 	"github.com/devtron-labs/devtron/util/rbac"
@@ -65,7 +64,6 @@ type InstalledAppRestHandler interface {
 	DeployBulk(w http.ResponseWriter, r *http.Request)
 	CheckAppExists(w http.ResponseWriter, r *http.Request)
 	DefaultComponentInstallation(w http.ResponseWriter, r *http.Request)
-	FetchAppDetailsForInstalledApp(w http.ResponseWriter, r *http.Request)
 	DeleteArgoInstalledAppWithNonCascade(w http.ResponseWriter, r *http.Request)
 	FetchAppDetailsForInstalledAppV2(w http.ResponseWriter, r *http.Request)
 	FetchResourceTree(w http.ResponseWriter, r *http.Request)
@@ -692,90 +690,6 @@ func (handler *InstalledAppRestHandlerImpl) checkNotesAuth(token string, appName
 	return ok
 }
 
-func (handler *InstalledAppRestHandlerImpl) FetchAppDetailsForInstalledApp(w http.ResponseWriter, r *http.Request) {
-	userId, err := handler.userAuthService.GetLoggedInUser(r)
-	if userId == 0 || err != nil {
-		common.WriteJsonResp(w, err, nil, http.StatusUnauthorized)
-		return
-	}
-
-	vars := mux.Vars(r)
-	installedAppId, err := strconv.Atoi(vars["installed-app-id"])
-	if err != nil {
-		handler.Logger.Errorw("request err, FetchAppDetailsForInstalledApp", "err", err, "installedAppId", installedAppId)
-		common.WriteJsonResp(w, err, nil, http.StatusBadRequest)
-		return
-	}
-	token := r.Header.Get("token")
-	envId, err := strconv.Atoi(vars["env-id"])
-	if err != nil {
-		handler.Logger.Errorw("request err, FetchAppDetailsForInstalledApp", "err", err, "installedAppId", installedAppId, "envId", envId)
-		common.WriteJsonResp(w, err, nil, http.StatusBadRequest)
-		return
-	}
-	handler.Logger.Infow("request payload, FetchAppDetailsForInstalledApp, app store", "installedAppId", installedAppId, "envId", envId)
-
-	installedApp, err := handler.installedAppService.GetInstalledAppById(installedAppId)
-	if err == pg.ErrNoRows {
-		common.WriteJsonResp(w, err, "App not found in database", http.StatusBadRequest)
-		return
-	}
-	if util3.IsExternalChartStoreApp(installedApp.App.DisplayName) {
-		//this is external app case where app_name is a unique identifier, and we want to fetch resource based on display_name
-		handler.installedAppService.ChangeAppNameToDisplayNameForInstalledApp(installedApp)
-	}
-
-	appDetail, err := handler.installedAppService.FindAppDetailsForAppstoreApplication(installedAppId, envId)
-	if err != nil {
-		handler.Logger.Errorw("service err, FetchAppDetailsForInstalledApp, app store", "err", err, "installedAppId", installedAppId, "envId", envId)
-		common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
-		return
-	}
-
-	//rbac block starts from here
-	object, object2 := handler.enforcerUtil.GetHelmObjectByAppNameAndEnvId(appDetail.AppName, appDetail.EnvironmentId)
-
-	var ok bool
-
-	if object2 == "" {
-		ok = handler.enforcer.Enforce(token, casbin.ResourceHelmApp, casbin.ActionGet, object)
-	} else {
-		ok = handler.enforcer.Enforce(token, casbin.ResourceHelmApp, casbin.ActionGet, object) || handler.enforcer.Enforce(token, casbin.ResourceHelmApp, casbin.ActionGet, object2)
-	}
-
-	if !ok {
-		common.WriteJsonResp(w, fmt.Errorf("unauthorized user"), nil, http.StatusForbidden)
-		return
-	}
-	//rback block ends here
-	resourceTreeAndNotesContainer := bean2.AppDetailsContainer{}
-	resourceTreeAndNotesContainer.ResourceTree = map[string]interface{}{}
-
-	if len(installedApp.App.AppName) > 0 && len(installedApp.Environment.Name) > 0 {
-		err = handler.fetchResourceTree(w, r, &resourceTreeAndNotesContainer, *installedApp, appDetail.DeploymentConfig, "", "")
-		if appDetail.DeploymentAppType == util2.PIPELINE_DEPLOYMENT_TYPE_ACD {
-			apiError, ok := err.(*util2.ApiError)
-			if ok && apiError != nil {
-				if apiError.Code == constants.AppDetailResourceTreeNotFound && installedApp.DeploymentAppDeleteRequest == true {
-					// TODO refactoring: should be performed through nats
-					err = handler.appStoreDeploymentService.MarkGitOpsInstalledAppsDeletedIfArgoAppIsDeleted(installedAppId, envId)
-					appDeleteErr, appDeleteErrOk := err.(*util2.ApiError)
-					if appDeleteErrOk && appDeleteErr != nil {
-						handler.Logger.Errorw(appDeleteErr.InternalMessage)
-						return
-					}
-				}
-			}
-		} else if err != nil {
-			common.WriteJsonResp(w, fmt.Errorf("error in fetching resource tree"), nil, http.StatusInternalServerError)
-			return
-		}
-	}
-	appDetail.ResourceTree = resourceTreeAndNotesContainer.ResourceTree
-	appDetail.Notes = resourceTreeAndNotesContainer.Notes
-	common.WriteJsonResp(w, nil, appDetail, http.StatusOK)
-}
-
 func (handler *InstalledAppRestHandlerImpl) FetchAppDetailsForInstalledAppV2(w http.ResponseWriter, r *http.Request) {
 	userId, err := handler.userAuthService.GetLoggedInUser(r)
 	if userId == 0 || err != nil {
@@ -820,6 +734,8 @@ func (handler *InstalledAppRestHandlerImpl) FetchAppDetailsForInstalledAppV2(w h
 }
 
 func (handler *InstalledAppRestHandlerImpl) FetchResourceTree(w http.ResponseWriter, r *http.Request) {
+	token := r.Header.Get("token")
+	ctx := context.WithValue(r.Context(), "token", token)
 	userId, err := handler.userAuthService.GetLoggedInUser(r)
 	if userId == 0 || err != nil {
 		common.WriteJsonResp(w, err, nil, http.StatusUnauthorized)
@@ -853,7 +769,6 @@ func (handler *InstalledAppRestHandlerImpl) FetchResourceTree(w http.ResponseWri
 		common.WriteJsonResp(w, nil, nil, http.StatusOK)
 		return
 	}
-	token := r.Header.Get("token")
 	object, object2 := handler.enforcerUtil.GetHelmObjectByAppNameAndEnvId(installedApp.App.AppName, installedApp.EnvironmentId)
 	var ok bool
 	if object2 == "" {
@@ -876,7 +791,8 @@ func (handler *InstalledAppRestHandlerImpl) FetchResourceTree(w http.ResponseWri
 	resourceTreeAndNotesContainer.ResourceTree = map[string]interface{}{}
 
 	if len(installedApp.App.AppName) > 0 && len(installedApp.Environment.Name) > 0 {
-		err = handler.fetchResourceTree(w, r, &resourceTreeAndNotesContainer, *installedApp, appDetail.DeploymentConfig, appDetail.HelmReleaseInstallStatus, appDetail.Status)
+		cn, _ := w.(http.CloseNotifier)
+		err = handler.installedAppResourceService.FetchResourceTree(ctx, cn, &resourceTreeAndNotesContainer, *installedApp, appDetail.DeploymentConfig, appDetail.HelmReleaseInstallStatus, appDetail.Status)
 		if appDetail.DeploymentAppType == util2.PIPELINE_DEPLOYMENT_TYPE_ACD {
 			//resource tree has been fetched now prepare to sync application deployment status with this resource tree call
 			handler.syncDeploymentStatusWithResourceTreeCall(appDetail)
@@ -968,13 +884,6 @@ func (handler *InstalledAppRestHandlerImpl) FetchResourceTreeForACDApp(w http.Re
 	common.WriteJsonResp(w, err, appDetail, http.StatusOK)
 }
 
-func (handler *InstalledAppRestHandlerImpl) fetchResourceTree(w http.ResponseWriter, r *http.Request, resourceTreeAndNotesContainer *bean2.AppDetailsContainer, installedApp repository.InstalledApps, deploymentConfig *bean3.DeploymentConfig, helmReleaseInstallStatus string, status string) error {
-	ctx := r.Context()
-	cn, _ := w.(http.CloseNotifier)
-	err := handler.installedAppResourceService.FetchResourceTree(ctx, cn, resourceTreeAndNotesContainer, installedApp, deploymentConfig, helmReleaseInstallStatus, status)
-	return err
-}
-
 func (handler *InstalledAppRestHandlerImpl) fetchResourceTreeWithHibernateForACD(w http.ResponseWriter, r *http.Request, appDetail *bean2.AppDetailContainer) {
 	ctx := r.Context()
 	cn, _ := w.(http.CloseNotifier)

api/argoApplication/wire_argoApplication.go

@@ -22,7 +22,21 @@ import (
 	"github.com/google/wire"
 )
 
-var ArgoApplicationWireSet = wire.NewSet(
+var ArgoApplicationWireSetFull = wire.NewSet(
+	read.NewArgoApplicationReadServiceImpl,
+	wire.Bind(new(read.ArgoApplicationReadService), new(*read.ArgoApplicationReadServiceImpl)),
+
+	argoApplication.NewArgoApplicationServiceExtendedServiceImpl,
+	wire.Bind(new(argoApplication.ArgoApplicationService), new(*argoApplication.ArgoApplicationServiceExtendedImpl)),
+
+	NewArgoApplicationRestHandlerImpl,
+	wire.Bind(new(ArgoApplicationRestHandler), new(*ArgoApplicationRestHandlerImpl)),
+
+	NewArgoApplicationRouterImpl,
+	wire.Bind(new(ArgoApplicationRouter), new(*ArgoApplicationRouterImpl)),
+)
+
+var ArgoApplicationWireSetEA = wire.NewSet(
 	read.NewArgoApplicationReadServiceImpl,
 	wire.Bind(new(read.ArgoApplicationReadService), new(*read.ArgoApplicationReadServiceImpl)),
 

api/helm-app/service/HelmAppService.go

@@ -21,6 +21,7 @@ import (
 	"errors"
 	"fmt"
 	"github.com/devtron-labs/common-lib/utils/k8s"
+	"github.com/devtron-labs/common-lib/utils/k8s/commonBean"
 	"github.com/devtron-labs/devtron/api/helm-app/bean"
 	"github.com/devtron-labs/devtron/api/helm-app/gRPC"
 	"github.com/devtron-labs/devtron/api/helm-app/models"
@@ -234,15 +235,15 @@ func (impl *HelmAppServiceImpl) GetClusterConf(clusterId int) (*gRPC.ClusterConf
 	}
 	config := &gRPC.ClusterConfig{
 		ApiServerUrl:          cluster.ServerUrl,
-		Token:                 cluster.Config[k8s.BearerToken],
+		Token:                 cluster.Config[commonBean.BearerToken],
 		ClusterId:             int32(cluster.Id),
 		ClusterName:           cluster.ClusterName,
 		InsecureSkipTLSVerify: cluster.InsecureSkipTLSVerify,
 	}
 	if cluster.InsecureSkipTLSVerify == false {
-		config.KeyData = cluster.Config[k8s.TlsKey]
-		config.CertData = cluster.Config[k8s.CertData]
-		config.CaData = cluster.Config[k8s.CertificateAuthorityData]
+		config.KeyData = cluster.Config[commonBean.TlsKey]
+		config.CertData = cluster.Config[commonBean.CertData]
+		config.CaData = cluster.Config[commonBean.CertificateAuthorityData]
 	}
 	return config, nil
 }
@@ -1095,15 +1096,15 @@ func (impl *HelmAppServiceImpl) listApplications(ctx context.Context, clusterIds
 	for _, clusterDetail := range clusters {
 		config := &gRPC.ClusterConfig{
 			ApiServerUrl:          clusterDetail.ServerUrl,
-			Token:                 clusterDetail.Config[k8s.BearerToken],
+			Token:                 clusterDetail.Config[commonBean.BearerToken],
 			ClusterId:             int32(clusterDetail.Id),
 			ClusterName:           clusterDetail.ClusterName,
 			InsecureSkipTLSVerify: clusterDetail.InsecureSkipTLSVerify,
 		}
 		if clusterDetail.InsecureSkipTLSVerify == false {
-			config.KeyData = clusterDetail.Config[k8s.TlsKey]
-			config.CertData = clusterDetail.Config[k8s.CertData]
-			config.CaData = clusterDetail.Config[k8s.CertificateAuthorityData]
+			config.KeyData = clusterDetail.Config[commonBean.TlsKey]
+			config.CertData = clusterDetail.Config[commonBean.CertData]
+			config.CaData = clusterDetail.Config[commonBean.CertificateAuthorityData]
 		}
 		req.Clusters = append(req.Clusters, config)
 	}

api/restHandler/app/appList/AppListingRestHandler.go

@@ -45,6 +45,7 @@ import (
 	"github.com/devtron-labs/devtron/pkg/appStore/installedApp/service/FullMode"
 	"github.com/devtron-labs/devtron/pkg/appStore/installedApp/service/FullMode/resource"
 	util4 "github.com/devtron-labs/devtron/pkg/appStore/util"
+	argoApplication2 "github.com/devtron-labs/devtron/pkg/argoApplication"
 	"github.com/devtron-labs/devtron/pkg/auth/authorisation/casbin"
 	"github.com/devtron-labs/devtron/pkg/auth/user"
 	"github.com/devtron-labs/devtron/pkg/cluster"
@@ -72,7 +73,6 @@ import (
 )
 
 type AppListingRestHandler interface {
-	FetchAppDetails(w http.ResponseWriter, r *http.Request)
 	FetchJobs(w http.ResponseWriter, r *http.Request)
 	FetchJobOverviewCiPipelines(w http.ResponseWriter, r *http.Request)
 	FetchAppDetailsV2(w http.ResponseWriter, r *http.Request)
@@ -113,6 +113,7 @@ type AppListingRestHandlerImpl struct {
 	k8sApplicationService            application3.K8sApplicationService
 	deploymentTemplateService        generateManifest.DeploymentTemplateService
 	deploymentConfigService          common2.DeploymentConfigService
+	argoApplicationService           argoApplication2.ArgoApplicationService
 }
 
 type AppStatus struct {
@@ -146,6 +147,7 @@ func NewAppListingRestHandlerImpl(application application.ServiceClient,
 	k8sApplicationService application3.K8sApplicationService,
 	deploymentTemplateService generateManifest.DeploymentTemplateService,
 	deploymentConfigService common2.DeploymentConfigService,
+	argoApplicationService argoApplication2.ArgoApplicationService,
 ) *AppListingRestHandlerImpl {
 	appListingHandler := &AppListingRestHandlerImpl{
 		application:                      application,
@@ -170,6 +172,7 @@ func NewAppListingRestHandlerImpl(application application.ServiceClient,
 		k8sApplicationService:            k8sApplicationService,
 		deploymentTemplateService:        deploymentTemplateService,
 		deploymentConfigService:          deploymentConfigService,
+		argoApplicationService:           argoApplicationService,
 	}
 	return appListingHandler
 }
@@ -498,86 +501,6 @@ func (handler AppListingRestHandlerImpl) FetchOverviewAppsByEnvironment(w http.R
 
 }
 
-func (handler AppListingRestHandlerImpl) FetchAppDetails(w http.ResponseWriter, r *http.Request) {
-	vars := mux.Vars(r)
-	token := r.Header.Get("token")
-	appId, err := strconv.Atoi(vars["app-id"])
-	if err != nil {
-		common.WriteJsonResp(w, err, nil, http.StatusBadRequest)
-		return
-	}
-
-	envId, err := strconv.Atoi(vars["env-id"])
-	if err != nil {
-		common.WriteJsonResp(w, err, nil, http.StatusBadRequest)
-		return
-	}
-	pipelines, err := handler.pipelineRepository.FindActiveByAppIdAndEnvironmentId(appId, envId)
-	if err == pg.ErrNoRows {
-		common.WriteJsonResp(w, err, "pipeline Not found in database", http.StatusNotFound)
-		return
-	}
-	if err != nil {
-		handler.logger.Errorw("error in fetching pipelines from db", "appId", appId, "envId", envId)
-		common.WriteJsonResp(w, err, "error in fetching pipeline from database", http.StatusInternalServerError)
-		return
-	}
-	if len(pipelines) == 0 {
-		common.WriteJsonResp(w, fmt.Errorf("app deleted"), nil, http.StatusNotFound)
-		return
-	}
-	if len(pipelines) != 1 {
-		common.WriteJsonResp(w, err, "multiple pipelines found for an envId", http.StatusBadRequest)
-		return
-	}
-	cdPipeline := pipelines[0]
-	appDetail, err := handler.appListingService.FetchAppDetails(r.Context(), appId, envId)
-	if err != nil {
-		handler.logger.Errorw("service err, FetchAppDetails", "err", err, "appId", appId, "envId", envId)
-		common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
-		return
-	}
-
-	object := handler.enforcerUtil.GetAppRBACNameByAppId(appId)
-	if ok := handler.enforcer.Enforce(token, casbin.ResourceApplications, casbin.ActionGet, object); !ok {
-		common.WriteJsonResp(w, fmt.Errorf("unauthorized user"), nil, http.StatusForbidden)
-		return
-	}
-	acdToken, err := handler.argoUserService.GetLatestDevtronArgoCdUserToken()
-	if err != nil {
-		common.WriteJsonResp(w, fmt.Errorf("error in getting acd token"), nil, http.StatusInternalServerError)
-		return
-	}
-	envDeploymentConfig, err := handler.deploymentConfigService.GetConfigForDevtronApps(appId, envId)
-	if err != nil {
-		handler.logger.Errorw("error in fetching deployment config", "appId", appId, "envId", envId, "err", err)
-		common.WriteJsonResp(w, fmt.Errorf("error in getting deployment config for env"), nil, http.StatusInternalServerError)
-		return
-	}
-	resourceTree, err := handler.fetchResourceTree(w, r, appId, envId, acdToken, cdPipeline, envDeploymentConfig)
-	if appDetail.DeploymentAppType == util.PIPELINE_DEPLOYMENT_TYPE_ACD {
-		apiError, ok := err.(*util.ApiError)
-		if ok && apiError != nil {
-			if apiError.Code == constants.AppDetailResourceTreeNotFound && appDetail.DeploymentAppDeleteRequest == true {
-				acdAppFound, _ := handler.pipeline.MarkGitOpsDevtronAppsDeletedWhereArgoAppIsDeleted(acdToken, cdPipeline)
-				if acdAppFound {
-					common.WriteJsonResp(w, fmt.Errorf("unable to fetch resource tree"), nil, http.StatusInternalServerError)
-					return
-				} else {
-					common.WriteJsonResp(w, fmt.Errorf("app deleted"), nil, http.StatusNotFound)
-					return
-				}
-			}
-		}
-	}
-	if err != nil {
-		common.WriteJsonResp(w, fmt.Errorf("unable to fetch resource tree"), nil, http.StatusInternalServerError)
-		return
-	}
-	appDetail.ResourceTree = resourceTree
-	common.WriteJsonResp(w, err, appDetail, http.StatusOK)
-}
-
 func (handler AppListingRestHandlerImpl) FetchAppDetailsV2(w http.ResponseWriter, r *http.Request) {
 	vars := mux.Vars(r)
 	token := r.Header.Get("token")
@@ -1040,7 +963,7 @@ func (handler AppListingRestHandlerImpl) fetchResourceTree(w http.ResponseWriter
 		defer cancel()
 		ctx = context.WithValue(ctx, "token", acdToken)
 		start := time.Now()
-		resp, err := handler.application.ResourceTree(ctx, query)
+		resp, err := handler.argoApplicationService.ResourceTree(ctx, query)
 		elapsed := time.Since(start)
 		handler.logger.Debugw("FetchAppDetailsV2, time elapsed in fetching application for environment ", "elapsed", elapsed, "appId", appId, "envId", envId)
 		if err != nil {

api/router/app/AppRouter.go

@@ -111,13 +111,6 @@ func (router AppRouterImpl) InitAppRouter(AppRouter *mux.Router) {
 		HandlerFunc(router.appListingRestHandler.GetHostUrlsByBatch).
 		Methods("GET")
 
-	//This API used for fetch app details, not deployment details
-	AppRouter.Path("/detail").
-		Queries("app-id", "{app-id}").
-		Queries("env-id", "{env-id}").
-		HandlerFunc(router.appListingRestHandler.FetchAppDetails).
-		Methods("GET")
-
 	AppRouter.Path("/detail/v2").Queries("app-id", "{app-id}").
 		Queries("env-id", "{env-id}").
 		HandlerFunc(router.appListingRestHandler.FetchAppDetailsV2).