feat: show deployment status and timeline for helm apps deployed via gitops

Wire.go

@@ -74,6 +74,7 @@ import (
 	"github.com/devtron-labs/devtron/internal/util"
 	"github.com/devtron-labs/devtron/internal/util/ArgoUtil"
 	"github.com/devtron-labs/devtron/pkg/app"
+	"github.com/devtron-labs/devtron/pkg/app/status"
 	"github.com/devtron-labs/devtron/pkg/appClone"
 	"github.com/devtron-labs/devtron/pkg/appClone/batch"
 	"github.com/devtron-labs/devtron/pkg/appGroup"
@@ -459,7 +460,8 @@ func InitializeApp() (*App, error) {
 
 		notifier.NewNotificationConfigBuilderImpl,
 		wire.Bind(new(notifier.NotificationConfigBuilder), new(*notifier.NotificationConfigBuilderImpl)),
-
+		appStoreRestHandler.NewAppStoreStatusTimelineRestHandlerImpl,
+		wire.Bind(new(appStoreRestHandler.AppStoreStatusTimelineRestHandler), new(*appStoreRestHandler.AppStoreStatusTimelineRestHandlerImpl)),
 		appStoreRestHandler.NewInstalledAppRestHandlerImpl,
 		wire.Bind(new(appStoreRestHandler.InstalledAppRestHandler), new(*appStoreRestHandler.InstalledAppRestHandlerImpl)),
 		service.NewInstalledAppServiceImpl,
@@ -774,8 +776,8 @@ func InitializeApp() (*App, error) {
 		restHandler.NewPipelineStatusTimelineRestHandlerImpl,
 		wire.Bind(new(restHandler.PipelineStatusTimelineRestHandler), new(*restHandler.PipelineStatusTimelineRestHandlerImpl)),
 
-		app.NewPipelineStatusTimelineServiceImpl,
-		wire.Bind(new(app.PipelineStatusTimelineService), new(*app.PipelineStatusTimelineServiceImpl)),
+		status.NewPipelineStatusTimelineServiceImpl,
+		wire.Bind(new(status.PipelineStatusTimelineService), new(*status.PipelineStatusTimelineServiceImpl)),
 
 		router.NewUserAttributesRouterImpl,
 		wire.Bind(new(router.UserAttributesRouter), new(*router.UserAttributesRouterImpl)),
@@ -811,13 +813,13 @@ func InitializeApp() (*App, error) {
 		chartRepoRepository.NewGlobalStrategyMetadataChartRefMappingRepositoryImpl,
 		wire.Bind(new(chartRepoRepository.GlobalStrategyMetadataChartRefMappingRepository), new(*chartRepoRepository.GlobalStrategyMetadataChartRefMappingRepositoryImpl)),
 
-		app.NewPipelineStatusTimelineResourcesServiceImpl,
-		wire.Bind(new(app.PipelineStatusTimelineResourcesService), new(*app.PipelineStatusTimelineResourcesServiceImpl)),
+		status.NewPipelineStatusTimelineResourcesServiceImpl,
+		wire.Bind(new(status.PipelineStatusTimelineResourcesService), new(*status.PipelineStatusTimelineResourcesServiceImpl)),
 		pipelineConfig.NewPipelineStatusTimelineResourcesRepositoryImpl,
 		wire.Bind(new(pipelineConfig.PipelineStatusTimelineResourcesRepository), new(*pipelineConfig.PipelineStatusTimelineResourcesRepositoryImpl)),
 
-		app.NewPipelineStatusSyncDetailServiceImpl,
-		wire.Bind(new(app.PipelineStatusSyncDetailService), new(*app.PipelineStatusSyncDetailServiceImpl)),
+		status.NewPipelineStatusSyncDetailServiceImpl,
+		wire.Bind(new(status.PipelineStatusSyncDetailService), new(*status.PipelineStatusSyncDetailServiceImpl)),
 		pipelineConfig.NewPipelineStatusSyncDetailRepositoryImpl,
 		wire.Bind(new(pipelineConfig.PipelineStatusSyncDetailRepository), new(*pipelineConfig.PipelineStatusSyncDetailRepositoryImpl)),
 

api/appStore/AppStoreRouter.go

@@ -29,27 +29,34 @@ type AppStoreRouter interface {
 }
 
 type AppStoreRouterImpl struct {
-	deployRestHandler        InstalledAppRestHandler
-	appStoreValuesRouter     appStoreValues.AppStoreValuesRouter
-	appStoreDiscoverRouter   appStoreDiscover.AppStoreDiscoverRouter
-	appStoreDeploymentRouter appStoreDeployment.AppStoreDeploymentRouter
+	deployRestHandler                 InstalledAppRestHandler
+	appStoreValuesRouter              appStoreValues.AppStoreValuesRouter
+	appStoreDiscoverRouter            appStoreDiscover.AppStoreDiscoverRouter
+	appStoreDeploymentRouter          appStoreDeployment.AppStoreDeploymentRouter
+	appStoreStatusTimelineRestHandler AppStoreStatusTimelineRestHandler
 }
 
 func NewAppStoreRouterImpl(restHandler InstalledAppRestHandler,
 	appStoreValuesRouter appStoreValues.AppStoreValuesRouter, appStoreDiscoverRouter appStoreDiscover.AppStoreDiscoverRouter,
-	appStoreDeploymentRouter appStoreDeployment.AppStoreDeploymentRouter) *AppStoreRouterImpl {
+	appStoreDeploymentRouter appStoreDeployment.AppStoreDeploymentRouter,
+	appStoreStatusTimelineRestHandler AppStoreStatusTimelineRestHandler) *AppStoreRouterImpl {
 	return &AppStoreRouterImpl{
-		deployRestHandler:        restHandler,
-		appStoreValuesRouter:     appStoreValuesRouter,
-		appStoreDiscoverRouter:   appStoreDiscoverRouter,
-		appStoreDeploymentRouter: appStoreDeploymentRouter,
+		deployRestHandler:                 restHandler,
+		appStoreValuesRouter:              appStoreValuesRouter,
+		appStoreDiscoverRouter:            appStoreDiscoverRouter,
+		appStoreDeploymentRouter:          appStoreDeploymentRouter,
+		appStoreStatusTimelineRestHandler: appStoreStatusTimelineRestHandler,
 	}
 }
 
 func (router AppStoreRouterImpl) Init(configRouter *mux.Router) {
 	// deployment router starts
 	appStoreDeploymentSubRouter := configRouter.PathPrefix("/deployment").Subrouter()
 	router.appStoreDeploymentRouter.Init(appStoreDeploymentSubRouter)
+
+	configRouter.Path("/deployment-status/timeline/{installedAppId}/{envId}").
+		HandlerFunc(router.appStoreStatusTimelineRestHandler.FetchTimelinesForAppStore).Methods("GET")
+
 	// deployment router ends
 
 	// values router starts

api/appStore/AppStoreStatusTimelineRestHandler.go

@@ -0,0 +1,74 @@
+package appStore
+
+import (
+	"fmt"
+	"github.com/devtron-labs/devtron/api/restHandler/common"
+	"github.com/devtron-labs/devtron/pkg/app/status"
+	"github.com/devtron-labs/devtron/pkg/user/casbin"
+	"github.com/devtron-labs/devtron/util/rbac"
+	"github.com/gorilla/mux"
+	"go.uber.org/zap"
+	"net/http"
+	"strconv"
+)
+
+type AppStoreStatusTimelineRestHandler interface {
+	FetchTimelinesForAppStore(w http.ResponseWriter, r *http.Request)
+}
+
+type AppStoreStatusTimelineRestHandlerImpl struct {
+	logger                        *zap.SugaredLogger
+	pipelineStatusTimelineService status.PipelineStatusTimelineService
+	enforcerUtil                  rbac.EnforcerUtil
+	enforcer                      casbin.Enforcer
+}
+
+func NewAppStoreStatusTimelineRestHandlerImpl(logger *zap.SugaredLogger,
+	pipelineStatusTimelineService status.PipelineStatusTimelineService,
+	enforcerUtil rbac.EnforcerUtil,
+	enforcer casbin.Enforcer) *AppStoreStatusTimelineRestHandlerImpl {
+	return &AppStoreStatusTimelineRestHandlerImpl{
+		logger:                        logger,
+		pipelineStatusTimelineService: pipelineStatusTimelineService,
+		enforcerUtil:                  enforcerUtil,
+		enforcer:                      enforcer,
+	}
+}
+
+func (handler AppStoreStatusTimelineRestHandlerImpl) FetchTimelinesForAppStore(w http.ResponseWriter, r *http.Request) {
+	vars := mux.Vars(r)
+	installedAppId, err := strconv.Atoi(vars["installedAppId"])
+	if err != nil {
+		common.WriteJsonResp(w, err, nil, http.StatusBadRequest)
+		return
+	}
+	envId, err := strconv.Atoi(vars["envId"])
+	if err != nil {
+		common.WriteJsonResp(w, err, nil, http.StatusBadRequest)
+		return
+	}
+	installedAppVersionHistoryId := 0
+	installedAppVersionHistoryIdParam := r.URL.Query().Get("installedAppVersionHistoryId")
+	if len(installedAppVersionHistoryIdParam) != 0 {
+		installedAppVersionHistoryId, err = strconv.Atoi(installedAppVersionHistoryIdParam)
+		if err != nil {
+			common.WriteJsonResp(w, err, nil, http.StatusBadRequest)
+			return
+		}
+	}
+	resourceName := handler.enforcerUtil.GetAppRBACNameByAppId(installedAppId)
+	token := r.Header.Get("token")
+	if ok := handler.enforcer.Enforce(token, casbin.ResourceApplications, casbin.ActionGet, resourceName); !ok {
+		common.WriteJsonResp(w, fmt.Errorf("unauthorized user"), "Unauthorized User", http.StatusForbidden)
+		return
+	}
+
+	timelines, err := handler.pipelineStatusTimelineService.FetchTimelinesForAppStore(installedAppId, envId, installedAppVersionHistoryId)
+	if err != nil {
+		handler.logger.Errorw("error in getting pipeline status timelines by installedAppVersionHistoryId", "err", err, "installedAppVersionHistoryId", installedAppVersionHistoryId, "installedAppId", installedAppId, "envId", envId)
+		common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
+		return
+	}
+	common.WriteJsonResp(w, err, timelines, http.StatusOK)
+	return
+}

api/appStore/InstalledAppRestHandler.go

@@ -26,6 +26,7 @@ import (
 	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"
+	"github.com/devtron-labs/devtron/client/cron"
 	"github.com/devtron-labs/devtron/internal/constants"
 	"github.com/devtron-labs/devtron/internal/middleware"
 	util2 "github.com/devtron-labs/devtron/internal/util"
@@ -61,39 +62,45 @@ type InstalledAppRestHandler interface {
 }
 
 type InstalledAppRestHandlerImpl struct {
-	Logger                    *zap.SugaredLogger
-	userAuthService           user.UserService
-	enforcer                  casbin.Enforcer
-	enforcerUtil              rbac.EnforcerUtil
-	installedAppService       service.InstalledAppService
-	validator                 *validator.Validate
-	clusterService            cluster.ClusterService
-	acdServiceClient          application.ServiceClient
-	appStoreDeploymentService service.AppStoreDeploymentService
-	helmAppClient             client.HelmAppClient
-	helmAppService            client.HelmAppService
-	argoUserService           argo.ArgoUserService
+	Logger                           *zap.SugaredLogger
+	userAuthService                  user.UserService
+	enforcer                         casbin.Enforcer
+	enforcerUtil                     rbac.EnforcerUtil
+	installedAppService              service.InstalledAppService
+	validator                        *validator.Validate
+	clusterService                   cluster.ClusterService
+	acdServiceClient                 application.ServiceClient
+	appStoreDeploymentService        service.AppStoreDeploymentService
+	helmAppClient                    client.HelmAppClient
+	helmAppService                   client.HelmAppService
+	argoUserService                  argo.ArgoUserService
+	cdApplicationStatusUpdateHandler cron.CdApplicationStatusUpdateHandler
+	installedAppRepository           repository.InstalledAppRepository
 }
 
 func NewInstalledAppRestHandlerImpl(Logger *zap.SugaredLogger, userAuthService user.UserService,
 	enforcer casbin.Enforcer, enforcerUtil rbac.EnforcerUtil, installedAppService service.InstalledAppService,
 	validator *validator.Validate, clusterService cluster.ClusterService, acdServiceClient application.ServiceClient,
 	appStoreDeploymentService service.AppStoreDeploymentService, helmAppClient client.HelmAppClient, helmAppService client.HelmAppService,
 	argoUserService argo.ArgoUserService,
+	cdApplicationStatusUpdateHandler cron.CdApplicationStatusUpdateHandler,
+	installedAppRepository repository.InstalledAppRepository,
 ) *InstalledAppRestHandlerImpl {
 	return &InstalledAppRestHandlerImpl{
-		Logger:                    Logger,
-		userAuthService:           userAuthService,
-		enforcer:                  enforcer,
-		enforcerUtil:              enforcerUtil,
-		installedAppService:       installedAppService,
-		validator:                 validator,
-		clusterService:            clusterService,
-		acdServiceClient:          acdServiceClient,
-		appStoreDeploymentService: appStoreDeploymentService,
-		helmAppService:            helmAppService,
-		helmAppClient:             helmAppClient,
-		argoUserService:           argoUserService,
+		Logger:                           Logger,
+		userAuthService:                  userAuthService,
+		enforcer:                         enforcer,
+		enforcerUtil:                     enforcerUtil,
+		installedAppService:              installedAppService,
+		validator:                        validator,
+		clusterService:                   clusterService,
+		acdServiceClient:                 acdServiceClient,
+		appStoreDeploymentService:        appStoreDeploymentService,
+		helmAppService:                   helmAppService,
+		helmAppClient:                    helmAppClient,
+		argoUserService:                  argoUserService,
+		cdApplicationStatusUpdateHandler: cdApplicationStatusUpdateHandler,
+		installedAppRepository:           installedAppRepository,
 	}
 }
 
@@ -594,13 +601,21 @@ func (handler *InstalledAppRestHandlerImpl) FetchResourceTree(w http.ResponseWri
 		common.WriteJsonResp(w, fmt.Errorf("unauthorized user"), nil, http.StatusForbidden)
 		return
 	}
+	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
+	}
 
 	resourceTreeAndNotesContainer := bean2.ResourceTreeAndNotesContainer{}
 	resourceTreeAndNotesContainer.ResourceTree = map[string]interface{}{}
 
 	if len(installedApp.App.AppName) > 0 && len(installedApp.Environment.Name) > 0 {
 		err = handler.fetchResourceTree(w, r, &resourceTreeAndNotesContainer, *installedApp)
 		if installedApp.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)
 			apiError, ok := err.(*util2.ApiError)
 			if ok && apiError != nil {
 				if apiError.Code == constants.AppDetailResourceTreeNotFound && installedApp.DeploymentAppDeleteRequest == true {
@@ -620,6 +635,19 @@ func (handler *InstalledAppRestHandlerImpl) FetchResourceTree(w http.ResponseWri
 	common.WriteJsonResp(w, nil, resourceTreeAndNotesContainer, http.StatusOK)
 }
 
+func (handler *InstalledAppRestHandlerImpl) syncDeploymentStatusWithResourceTreeCall(appDetail bean2.AppDetailContainer) {
+	go func() {
+		installedAppVersion, err := handler.installedAppRepository.GetInstalledAppVersion(appDetail.AppStoreInstalledAppVersionId)
+		if err != nil {
+			handler.Logger.Errorw("error in getting installed_app_version in FetchAppDetailsForInstalledApp", "err", err)
+		}
+		err = handler.cdApplicationStatusUpdateHandler.SyncPipelineStatusForAppStoreForResourceTreeCall(installedAppVersion)
+		if err != nil {
+			handler.Logger.Errorw("error in syncing deployment status for installed_app ", "err", err, "installedAppVersion", installedAppVersion)
+		}
+	}()
+}
+
 func (handler *InstalledAppRestHandlerImpl) FetchResourceTreeForACDApp(w http.ResponseWriter, r *http.Request) {
 	userId, err := handler.userAuthService.GetLoggedInUser(r)
 	if userId == 0 || err != nil {

api/appStore/deployment/AppStoreDeploymentRestHandler.go

@@ -41,6 +41,7 @@ import (
 	"net/http"
 	"strconv"
 	"strings"
+	"time"
 )
 
 const HELM_APP_UPDATE_COUNTER = "HelmAppUpdateCounter"
@@ -463,6 +464,7 @@ func (handler AppStoreDeploymentRestHandlerImpl) UpdateInstalledApp(w http.Respo
 		}
 		ctx = context.WithValue(r.Context(), "token", acdToken)
 	}
+	triggeredAt := time.Now()
 	res, err := handler.appStoreDeploymentService.UpdateInstalledApp(ctx, &request)
 	if err != nil {
 		if strings.Contains(err.Error(), "application spec is invalid") {
@@ -472,6 +474,11 @@ func (handler AppStoreDeploymentRestHandlerImpl) UpdateInstalledApp(w http.Respo
 		common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
 		return
 	}
+	err1 := handler.appStoreDeploymentService.UpdatePreviousDeploymentStatusForAppStore(res, triggeredAt, err)
+	if err1 != nil {
+		handler.Logger.Errorw("error while update previous installed app version history", "err", err, "installAppVersionRequest", res)
+		//if installed app is updated and error is in updating previous deployment status, then don't block user, just show error.
+	}
 
 	err = handler.attributesService.UpdateKeyValueByOne(HELM_APP_UPDATE_COUNTER)
 

api/helm-app/HelmAppRestHandler.go

@@ -464,4 +464,5 @@ type InstalledAppInfo struct {
 	AppStoreChartName     string `json:"appStoreChartName"`
 	TeamId                int    `json:"teamId"`
 	TeamName              string `json:"teamName"`
+	DeploymentType        string `json:"deploymentType"`
 }