chore: App Store refactoring v2 (#4580)

* removed registerInArgo multiple impls

* extracted app metrics code

* migrated envLevel app metrics code to new service

* chore: Removed unused jira and migration  integration (#4498)

* removed unsued jira integration

* removed test-suite-code

* db migration conf removal

* chore: removed unused injection

* chore: removed dead code

* added: migration script

---------

Co-authored-by: Ash-exp <[email protected]>

* chore: App store dead code cleanup and restructuring  (#4497)

* moved chart-group in seperate code

* removed unused dependency

* removed dead code

* extracted resource tree

* moved notes

* resource movement

* removed unused code

* removed unused dependency

* commit methods

* extracted status update

* chore: clean up unused dead code

* updated: EA mode docker file

* updated: migration number

---------

Co-authored-by: Ash-exp <[email protected]>

* chart ref refactoring

* removed infra metrics db calls

* moved app metrics repositories from /internal to /pkg

* moved: const and types to bean

* removed: unused const

* review comments

* migrated some methods from chartService to chartRefService

* added dt validation service interface

* minor refactoring

* moved validation method - 1

* wip

* removed redundant appMetrics req obj

* moved app metrics bindings  to wireset

* removed multiple dead code

* remove redundant dependency

* moved ChartGroup router and rest handler to respective folder

* stage 1

* gitOps refactoring

* moved gitClient code to a common wrapper service

* chore: AppStoreDeployment Install flow refactoring

* review changes

* wip

* fix for unsupported charts

* refactoring: App Store deployment services

* minor cleanup

* renamed remote package to git

* renamed gitOpsRemoteOpService If and impl

* migrated usages of gitService to gitOperationService

* shifted git service and all gitOps clients to pkg

* gitops repository usages refactor

* refactored gitOpsRepository usages

* gitlab client creation refactoring

* renamed util/ChartService

* reverted renaming changes

* reverted renaming changes

* reverted renaming changes

* wip

* wip

* removed typo

* changes

* changes

* chore: sanity after ent sync

* added: todo comment

* fix: new api added for getting ciPipelineDetails by only ciPipelineId for CLI (#3708)

* new api added for getting ciPipelineDetails by only ciPipelineId

* appName field added in ci-pipeline struct

* appType field added in ci-pipeline struct

* code review comments incorporation

---------

Co-authored-by: kartik-579 <[email protected]>
Co-authored-by: Nishant <[email protected]>
Co-authored-by: nishant <[email protected]>
Co-authored-by: Prakash <[email protected]>

Author: 5 people

Wire.go

@@ -89,7 +89,6 @@ import (
 	"github.com/devtron-labs/devtron/pkg/appStatus"
 	"github.com/devtron-labs/devtron/pkg/appStore/chartGroup"
 	repository4 "github.com/devtron-labs/devtron/pkg/appStore/chartGroup/repository"
-	appStoreDeploymentFullMode "github.com/devtron-labs/devtron/pkg/appStore/deployment/fullMode"
 	"github.com/devtron-labs/devtron/pkg/appStore/deployment/service"
 	appStoreDeploymentGitopsTool "github.com/devtron-labs/devtron/pkg/appStore/deployment/tool"
 	"github.com/devtron-labs/devtron/pkg/appWorkflow"
@@ -720,8 +719,6 @@ func InitializeApp() (*App, error) {
 		delete2.NewDeleteServiceFullModeImpl,
 		wire.Bind(new(delete2.DeleteServiceFullMode), new(*delete2.DeleteServiceFullModeImpl)),
 
-		appStoreDeploymentFullMode.NewAppStoreDeploymentFullModeServiceImpl,
-		wire.Bind(new(appStoreDeploymentFullMode.AppStoreDeploymentFullModeService), new(*appStoreDeploymentFullMode.AppStoreDeploymentFullModeServiceImpl)),
 		appStoreDeploymentGitopsTool.NewAppStoreDeploymentArgoCdServiceImpl,
 		wire.Bind(new(appStoreDeploymentGitopsTool.AppStoreDeploymentArgoCdService), new(*appStoreDeploymentGitopsTool.AppStoreDeploymentArgoCdServiceImpl)),
 		//	util2.NewGoJsonSchemaCustomFormatChecker,

api/appStore/InstalledAppRestHandler.go

@@ -22,13 +22,13 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	client "github.com/devtron-labs/devtron/api/helm-app/gRPC"
 	"net/http"
 	"strconv"
 	"strings"
 	"time"
 
 	bean2 "github.com/devtron-labs/devtron/api/bean"
-	client "github.com/devtron-labs/devtron/api/helm-app"
 	openapi "github.com/devtron-labs/devtron/api/helm-app/openapiClient"
 	"github.com/devtron-labs/devtron/api/restHandler/common"
 	"github.com/devtron-labs/devtron/client/argocdServer/application"

api/appStore/deployment/AppStoreDeploymentRestHandler.go

@@ -22,6 +22,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	service2 "github.com/devtron-labs/devtron/api/helm-app/service"
 	"net/http"
 	"strconv"
 	"strings"
@@ -67,15 +68,15 @@ type AppStoreDeploymentRestHandlerImpl struct {
 	appStoreDeploymentService  service.AppStoreDeploymentService
 	appStoreDeploymentServiceC appStoreDeploymentCommon.AppStoreDeploymentCommonService
 	validator                  *validator.Validate
-	helmAppService             client.HelmAppService
+	helmAppService             service2.HelmAppService
 	helmAppRestHandler         client.HelmAppRestHandler
 	argoUserService            argo.ArgoUserService
 	attributesService          attributes.AttributesService
 }
 
 func NewAppStoreDeploymentRestHandlerImpl(Logger *zap.SugaredLogger, userAuthService user.UserService,
 	enforcer casbin.Enforcer, enforcerUtil rbac.EnforcerUtil, enforcerUtilHelm rbac.EnforcerUtilHelm, appStoreDeploymentService service.AppStoreDeploymentService,
-	validator *validator.Validate, helmAppService client.HelmAppService, appStoreDeploymentServiceC appStoreDeploymentCommon.AppStoreDeploymentCommonService,
+	validator *validator.Validate, helmAppService service2.HelmAppService, appStoreDeploymentServiceC appStoreDeploymentCommon.AppStoreDeploymentCommonService,
 	argoUserService argo.ArgoUserService, attributesService attributes.AttributesService) *AppStoreDeploymentRestHandlerImpl {
 	return &AppStoreDeploymentRestHandlerImpl{
 		Logger:                     Logger,

api/appStore/deployment/CommonDeploymentRestHandler.go

@@ -21,6 +21,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	service2 "github.com/devtron-labs/devtron/api/helm-app/service"
 	"net/http"
 	"strconv"
 	"time"
@@ -31,7 +32,6 @@ import (
 	"github.com/devtron-labs/devtron/api/restHandler/common"
 	"github.com/devtron-labs/devtron/internal/util"
 	appStoreBean "github.com/devtron-labs/devtron/pkg/appStore/bean"
-	appStoreDeploymentCommon "github.com/devtron-labs/devtron/pkg/appStore/deployment/common"
 	"github.com/devtron-labs/devtron/pkg/appStore/deployment/service"
 	"github.com/devtron-labs/devtron/pkg/auth/authorisation/casbin"
 	"github.com/devtron-labs/devtron/pkg/auth/user"
@@ -51,35 +51,33 @@ type CommonDeploymentRestHandler interface {
 }
 
 type CommonDeploymentRestHandlerImpl struct {
-	Logger                     *zap.SugaredLogger
-	userAuthService            user.UserService
-	enforcer                   casbin.Enforcer
-	enforcerUtil               rbac.EnforcerUtil
-	enforcerUtilHelm           rbac.EnforcerUtilHelm
-	appStoreDeploymentService  service.AppStoreDeploymentService
-	appStoreDeploymentServiceC appStoreDeploymentCommon.AppStoreDeploymentCommonService
-	validator                  *validator.Validate
-	helmAppService             client.HelmAppService
-	helmAppRestHandler         client.HelmAppRestHandler
-	argoUserService            argo.ArgoUserService
+	Logger                    *zap.SugaredLogger
+	userAuthService           user.UserService
+	enforcer                  casbin.Enforcer
+	enforcerUtil              rbac.EnforcerUtil
+	enforcerUtilHelm          rbac.EnforcerUtilHelm
+	appStoreDeploymentService service.AppStoreDeploymentService
+	validator                 *validator.Validate
+	helmAppService            service2.HelmAppService
+	helmAppRestHandler        client.HelmAppRestHandler
+	argoUserService           argo.ArgoUserService
 }
 
 func NewCommonDeploymentRestHandlerImpl(Logger *zap.SugaredLogger, userAuthService user.UserService,
 	enforcer casbin.Enforcer, enforcerUtil rbac.EnforcerUtil, enforcerUtilHelm rbac.EnforcerUtilHelm, appStoreDeploymentService service.AppStoreDeploymentService,
-	validator *validator.Validate, helmAppService client.HelmAppService, appStoreDeploymentServiceC appStoreDeploymentCommon.AppStoreDeploymentCommonService,
+	validator *validator.Validate, helmAppService service2.HelmAppService,
 	helmAppRestHandler client.HelmAppRestHandler, argoUserService argo.ArgoUserService) *CommonDeploymentRestHandlerImpl {
 	return &CommonDeploymentRestHandlerImpl{
-		Logger:                     Logger,
-		userAuthService:            userAuthService,
-		enforcer:                   enforcer,
-		enforcerUtil:               enforcerUtil,
-		enforcerUtilHelm:           enforcerUtilHelm,
-		appStoreDeploymentService:  appStoreDeploymentService,
-		validator:                  validator,
-		helmAppService:             helmAppService,
-		appStoreDeploymentServiceC: appStoreDeploymentServiceC,
-		helmAppRestHandler:         helmAppRestHandler,
-		argoUserService:            argoUserService,
+		Logger:                    Logger,
+		userAuthService:           userAuthService,
+		enforcer:                  enforcer,
+		enforcerUtil:              enforcerUtil,
+		enforcerUtilHelm:          enforcerUtilHelm,
+		appStoreDeploymentService: appStoreDeploymentService,
+		validator:                 validator,
+		helmAppService:            helmAppService,
+		helmAppRestHandler:        helmAppRestHandler,
+		argoUserService:           argoUserService,
 	}
 }
 func (handler *CommonDeploymentRestHandlerImpl) getAppOfferingMode(installedAppId string, appId string) (string, *appStoreBean.InstallAppVersionDTO, error) {
@@ -91,7 +89,7 @@ func (handler *CommonDeploymentRestHandlerImpl) getAppOfferingMode(installedAppI
 			err = &util.ApiError{HttpStatusCode: http.StatusBadRequest, UserMessage: "invalid app id"}
 			return appOfferingMode, installedAppDto, err
 		}
-		installedAppDto, err = handler.appStoreDeploymentServiceC.GetInstalledAppByClusterNamespaceAndName(appIdentifier.ClusterId, appIdentifier.Namespace, appIdentifier.ReleaseName)
+		installedAppDto, err = handler.appStoreDeploymentService.GetInstalledAppByClusterNamespaceAndName(appIdentifier.ClusterId, appIdentifier.Namespace, appIdentifier.ReleaseName)
 		if err != nil {
 			err = &util.ApiError{HttpStatusCode: http.StatusBadRequest, UserMessage: "unable to find app in database"}
 			return appOfferingMode, installedAppDto, err
@@ -117,7 +115,7 @@ func (handler *CommonDeploymentRestHandlerImpl) getAppOfferingMode(installedAppI
 			err = &util.ApiError{HttpStatusCode: http.StatusBadRequest, UserMessage: "invalid installed app id"}
 			return appOfferingMode, installedAppDto, err
 		}
-		installedAppDto, err = handler.appStoreDeploymentServiceC.GetInstalledAppByInstalledAppId(installedAppId)
+		installedAppDto, err = handler.appStoreDeploymentService.GetInstalledAppByInstalledAppId(installedAppId)
 		if err != nil {
 			err = &util.ApiError{HttpStatusCode: http.StatusBadRequest, UserMessage: "unable to find app in database"}
 			return appOfferingMode, installedAppDto, err

api/bean/GitOpsConfig.go

@@ -13,6 +13,7 @@ type GitOpsConfigDto struct {
 	BitBucketWorkspaceId string `json:"bitBucketWorkspaceId"`
 	BitBucketProjectKey  string `json:"bitBucketProjectKey"`
 
+	// TODO refactoring: create different struct for internal fields
 	GitRepoName string `json:"gitRepoName"`
 	UserEmailId string `json:"userEmailId"`
 	Description string `json:"description"`

api/helm-app/HelmAppRestHandler.go

@@ -4,6 +4,9 @@ import (
 	"context"
 	"encoding/json"
 	"errors"
+	"github.com/devtron-labs/devtron/api/helm-app/bean"
+	service2 "github.com/devtron-labs/devtron/api/helm-app/service"
+	"github.com/devtron-labs/devtron/pkg/appStore/deployment/service"
 	"net/http"
 	"strconv"
 	"strings"
@@ -14,8 +17,6 @@ import (
 	openapi2 "github.com/devtron-labs/devtron/api/openapi/openapiClient"
 	"github.com/devtron-labs/devtron/api/restHandler/common"
 	"github.com/devtron-labs/devtron/internal/util"
-	appStoreBean "github.com/devtron-labs/devtron/pkg/appStore/bean"
-	appStoreDeploymentCommon "github.com/devtron-labs/devtron/pkg/appStore/deployment/common"
 	"github.com/devtron-labs/devtron/pkg/attributes"
 	"github.com/devtron-labs/devtron/pkg/auth/authorisation/casbin"
 	"github.com/devtron-labs/devtron/pkg/auth/user"
@@ -43,31 +44,32 @@ const HELM_APP_ACCESS_COUNTER = "HelmAppAccessCounter"
 const HELM_APP_UPDATE_COUNTER = "HelmAppUpdateCounter"
 
 type HelmAppRestHandlerImpl struct {
-	logger                          *zap.SugaredLogger
-	helmAppService                  HelmAppService
-	enforcer                        casbin.Enforcer
-	clusterService                  cluster.ClusterService
-	enforcerUtil                    rbac.EnforcerUtilHelm
-	appStoreDeploymentCommonService appStoreDeploymentCommon.AppStoreDeploymentCommonService
-	userAuthService                 user.UserService
-	attributesService               attributes.AttributesService
-	serverEnvConfig                 *serverEnvConfig.ServerEnvConfig
+	logger                    *zap.SugaredLogger
+	helmAppService            service2.HelmAppService
+	enforcer                  casbin.Enforcer
+	clusterService            cluster.ClusterService
+	enforcerUtil              rbac.EnforcerUtilHelm
+	appStoreDeploymentService service.AppStoreDeploymentService
+	userAuthService           user.UserService
+	attributesService         attributes.AttributesService
+	serverEnvConfig           *serverEnvConfig.ServerEnvConfig
 }
 
 func NewHelmAppRestHandlerImpl(logger *zap.SugaredLogger,
-	helmAppService HelmAppService, enforcer casbin.Enforcer,
-	clusterService cluster.ClusterService, enforcerUtil rbac.EnforcerUtilHelm, appStoreDeploymentCommonService appStoreDeploymentCommon.AppStoreDeploymentCommonService,
+	helmAppService service2.HelmAppService, enforcer casbin.Enforcer,
+	clusterService cluster.ClusterService, enforcerUtil rbac.EnforcerUtilHelm,
+	appStoreDeploymentService service.AppStoreDeploymentService,
 	userAuthService user.UserService, attributesService attributes.AttributesService, serverEnvConfig *serverEnvConfig.ServerEnvConfig) *HelmAppRestHandlerImpl {
 	return &HelmAppRestHandlerImpl{
-		logger:                          logger,
-		helmAppService:                  helmAppService,
-		enforcer:                        enforcer,
-		clusterService:                  clusterService,
-		enforcerUtil:                    enforcerUtil,
-		appStoreDeploymentCommonService: appStoreDeploymentCommonService,
-		userAuthService:                 userAuthService,
-		attributesService:               attributesService,
-		serverEnvConfig:                 serverEnvConfig,
+		logger:                    logger,
+		helmAppService:            helmAppService,
+		enforcer:                  enforcer,
+		clusterService:            clusterService,
+		enforcerUtil:              enforcerUtil,
+		appStoreDeploymentService: appStoreDeploymentService,
+		userAuthService:           userAuthService,
+		attributesService:         attributesService,
+		serverEnvConfig:           serverEnvConfig,
 	}
 }
 
@@ -118,15 +120,15 @@ func (handler *HelmAppRestHandlerImpl) GetApplicationDetail(w http.ResponseWrite
 		return
 	}
 
-	installedApp, err := handler.appStoreDeploymentCommonService.GetInstalledAppByClusterNamespaceAndName(appIdentifier.ClusterId, appIdentifier.Namespace, appIdentifier.ReleaseName)
+	installedApp, err := handler.appStoreDeploymentService.GetInstalledAppByClusterNamespaceAndName(appIdentifier.ClusterId, appIdentifier.Namespace, appIdentifier.ReleaseName)
 	if err != nil {
 		common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
 		return
 	}
 
-	res := &AppDetailAndInstalledAppInfo{
+	res := &bean.AppDetailAndInstalledAppInfo{
 		AppDetail:        appdetail,
-		InstalledAppInfo: convertToInstalledAppInfo(installedApp),
+		InstalledAppInfo: bean.ConvertToInstalledAppInfo(installedApp),
 	}
 
 	common.WriteJsonResp(w, err, res, http.StatusOK)
@@ -219,15 +221,15 @@ func (handler *HelmAppRestHandlerImpl) GetReleaseInfo(w http.ResponseWriter, r *
 		common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
 		return
 	}
-
-	installedApp, err := handler.appStoreDeploymentCommonService.GetInstalledAppByClusterNamespaceAndName(appIdentifier.ClusterId, appIdentifier.Namespace, appIdentifier.ReleaseName)
+	installedApp, err := handler.appStoreDeploymentService.GetInstalledAppByClusterNamespaceAndName(appIdentifier.ClusterId, appIdentifier.Namespace, appIdentifier.ReleaseName)
 	if err != nil {
 		common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
 		return
 	}
-	res := &ReleaseAndInstalledAppInfo{
+
+	res := &bean.ReleaseAndInstalledAppInfo{
 		ReleaseInfo:      releaseInfo,
-		InstalledAppInfo: convertToInstalledAppInfo(installedApp),
+		InstalledAppInfo: bean.ConvertToInstalledAppInfo(installedApp),
 	}
 
 	common.WriteJsonResp(w, err, res, http.StatusOK)
@@ -306,7 +308,7 @@ func (handler *HelmAppRestHandlerImpl) DeleteApplication(w http.ResponseWriter,
 	// validate if the devtron-operator helm release, block that for deletion
 	if appIdentifier.ReleaseName == handler.serverEnvConfig.DevtronHelmReleaseName &&
 		appIdentifier.Namespace == handler.serverEnvConfig.DevtronHelmReleaseNamespace &&
-		appIdentifier.ClusterId == DEFAULT_CLUSTER_ID {
+		appIdentifier.ClusterId == bean.DEFAULT_CLUSTER_ID {
 		common.WriteJsonResp(w, errors.New("cannot delete this default helm app"), nil, http.StatusForbidden)
 		return
 	}
@@ -323,7 +325,7 @@ func (handler *HelmAppRestHandlerImpl) DeleteApplication(w http.ResponseWriter,
 }
 
 func (handler *HelmAppRestHandlerImpl) UpdateApplication(w http.ResponseWriter, r *http.Request) {
-	request := &UpdateApplicationRequestDto{}
+	request := &bean.UpdateApplicationRequestDto{}
 	decoder := json.NewDecoder(r.Body)
 	err := decoder.Decode(request)
 	if err != nil {
@@ -346,7 +348,7 @@ func (handler *HelmAppRestHandlerImpl) UpdateApplication(w http.ResponseWriter,
 		return
 	}
 	//RBAC enforcer Ends
-	request.SourceAppType = SOURCE_EXTERNAL_HELM_APP
+	request.SourceAppType = bean.SOURCE_EXTERNAL_HELM_APP
 	// update application externally
 	res, err := handler.helmAppService.UpdateApplication(r.Context(), appIdentifier, request)
 	if err != nil {
@@ -422,57 +424,3 @@ func (handler *HelmAppRestHandlerImpl) SaveHelmAppDetailsViewedTelemetryData(w h
 	common.WriteJsonResp(w, err, nil, http.StatusOK)
 
 }
-
-func convertToInstalledAppInfo(installedApp *appStoreBean.InstallAppVersionDTO) *InstalledAppInfo {
-	if installedApp == nil {
-		return nil
-	}
-
-	chartInfo := installedApp.InstallAppVersionChartDTO
-
-	return &InstalledAppInfo{
-		AppId:                 installedApp.AppId,
-		EnvironmentName:       installedApp.EnvironmentName,
-		AppOfferingMode:       installedApp.AppOfferingMode,
-		InstalledAppId:        installedApp.InstalledAppId,
-		InstalledAppVersionId: installedApp.InstalledAppVersionId,
-		AppStoreChartId:       chartInfo.AppStoreChartId,
-		ClusterId:             installedApp.ClusterId,
-		EnvironmentId:         installedApp.EnvironmentId,
-		AppStoreChartRepoName: chartInfo.InstallAppVersionChartRepoDTO.RepoName,
-		AppStoreChartName:     chartInfo.ChartName,
-		TeamId:                installedApp.TeamId,
-		TeamName:              installedApp.TeamName,
-	}
-}
-
-type AppDetailAndInstalledAppInfo struct {
-	InstalledAppInfo *InstalledAppInfo `json:"installedAppInfo"`
-	AppDetail        *AppDetail        `json:"appDetail"`
-}
-
-type ReleaseAndInstalledAppInfo struct {
-	InstalledAppInfo *InstalledAppInfo `json:"installedAppInfo"`
-	ReleaseInfo      *ReleaseInfo      `json:"releaseInfo"`
-}
-
-type DeploymentHistoryAndInstalledAppInfo struct {
-	InstalledAppInfo  *InstalledAppInfo          `json:"installedAppInfo"`
-	DeploymentHistory []*HelmAppDeploymentDetail `json:"deploymentHistory"`
-}
-
-type InstalledAppInfo struct {
-	AppId                 int    `json:"appId"`
-	InstalledAppId        int    `json:"installedAppId"`
-	InstalledAppVersionId int    `json:"installedAppVersionId"`
-	AppStoreChartId       int    `json:"appStoreChartId"`
-	EnvironmentName       string `json:"environmentName"`
-	AppOfferingMode       string `json:"appOfferingMode"`
-	ClusterId             int    `json:"clusterId"`
-	EnvironmentId         int    `json:"environmentId"`
-	AppStoreChartRepoName string `json:"appStoreChartRepoName"`
-	AppStoreChartName     string `json:"appStoreChartName"`
-	TeamId                int    `json:"teamId"`
-	TeamName              string `json:"teamName"`
-	DeploymentType        string `json:"deploymentType"`
-}