Merge pull request #6262 from devtron-labs/helm-type-pipeline-app-status

feat: Helm type pipeline app status

Author: kartik-579

api/appStore/InstalledAppRestHandler.go

@@ -21,6 +21,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	bean2 "github.com/devtron-labs/devtron/api/bean/AppView"
 	client "github.com/devtron-labs/devtron/api/helm-app/gRPC"
 	"github.com/devtron-labs/devtron/pkg/appStore/installedApp/service/FullMode"
 	"github.com/devtron-labs/devtron/pkg/appStore/installedApp/service/FullMode/deploymentTypeChange"
@@ -35,7 +36,6 @@ import (
 	"strings"
 	"time"
 
-	bean2 "github.com/devtron-labs/devtron/api/bean"
 	"github.com/devtron-labs/devtron/api/restHandler/common"
 	"github.com/devtron-labs/devtron/client/argocdServer/application"
 	"github.com/devtron-labs/devtron/client/cron"

api/bean/AppView.go api/bean/AppView/AppView.go

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package bean
+package AppView
 
 import (
 	"encoding/json"

api/helm-app/gRPC/applicationClient.go

@@ -34,6 +34,7 @@ type HelmAppClient interface {
 	GetAppDetail(ctx context.Context, in *AppDetailRequest) (*AppDetail, error)
 	GetResourceTreeForExternalResources(ctx context.Context, in *ExternalResourceTreeRequest) (*ResourceTreeResponse, error)
 	GetAppStatus(ctx context.Context, in *AppDetailRequest) (*AppStatus, error)
+	GetAppStatusV2(ctx context.Context, in *AppDetailRequest) (*AppStatus, error)
 	Hibernate(ctx context.Context, in *HibernateRequest) (*HibernateResponse, error)
 	UnHibernate(ctx context.Context, in *HibernateRequest) (*HibernateResponse, error)
 	GetDeploymentHistory(ctx context.Context, in *AppDetailRequest) (*HelmAppDeploymentHistory, error)
@@ -164,6 +165,18 @@ func (impl *HelmAppClientImpl) GetAppStatus(ctx context.Context, in *AppDetailRe
 	return appStatus, nil
 }
 
+func (impl *HelmAppClientImpl) GetAppStatusV2(ctx context.Context, in *AppDetailRequest) (*AppStatus, error) {
+	applicationClient, err := impl.getApplicationClient()
+	if err != nil {
+		return nil, err
+	}
+	appStatus, err := applicationClient.GetAppStatusV2(ctx, in)
+	if err != nil {
+		return nil, err
+	}
+	return appStatus, nil
+}
+
 func (impl *HelmAppClientImpl) Hibernate(ctx context.Context, in *HibernateRequest) (*HibernateResponse, error) {
 	applicationClient, err := impl.getApplicationClient()
 	if err != nil {

api/helm-app/gRPC/applist.pb.go

@@ -24,6 +24,7 @@ service ApplicationService {
   rpc ListFluxApplications(AppListRequest) returns (stream FluxApplicationList){}
   rpc GetAppDetail(AppDetailRequest) returns (AppDetail){}
   rpc GetAppStatus(AppDetailRequest) returns (AppStatus){}
+  rpc GetAppStatusV2(AppDetailRequest) returns (AppStatus){}
   rpc Hibernate(HibernateRequest) returns (HibernateResponse){}
   rpc UnHibernate(HibernateRequest) returns (HibernateResponse){}
   rpc GetDeploymentHistory(AppDetailRequest) returns (HelmAppDeploymentHistory){}

api/helm-app/gRPC/applist.proto

@@ -94,6 +94,8 @@ type HelmAppService interface {
 	GetRevisionHistoryMaxValue(appType bean.SourceAppType) int32
 	GetResourceTreeForExternalResources(ctx context.Context, clusterId int, clusterConfig *gRPC.ClusterConfig, resources []*gRPC.ExternalResourceDetail) (*gRPC.ResourceTreeResponse, error)
 	CheckIfNsExistsForClusterIds(clusterIdToNsMap map[int]string) error
+
+	GetAppStatusV2(ctx context.Context, req *gRPC.AppDetailRequest, clusterId int) (*gRPC.AppStatus, error)
 }
 
 type HelmAppServiceImpl struct {
@@ -175,7 +177,7 @@ func (impl *HelmAppServiceImpl) ListHelmApplications(ctx context.Context, cluste
 			http.StatusInternalServerError)
 		return
 	}
-	
+
 	// get helm apps which are created using cd_pipelines
 	newCtx, span := otel.Tracer("pipelineRepository").Start(ctx, "GetAppAndEnvDetailsForDeploymentAppTypePipeline")
 	start = time.Now()
@@ -244,18 +246,18 @@ func (impl *HelmAppServiceImpl) UnHibernateApplication(ctx context.Context, app
 }
 
 func (impl *HelmAppServiceImpl) GetApplicationDetail(ctx context.Context, app *helmBean.AppIdentifier) (*gRPC.AppDetail, error) {
-	return impl.getApplicationDetail(ctx, app, nil)
+	return impl.getApplicationDetailWithInstallerStatus(ctx, app, nil)
 }
 
 func (impl *HelmAppServiceImpl) GetApplicationAndReleaseStatus(ctx context.Context, app *helmBean.AppIdentifier) (*gRPC.AppStatus, error) {
 	return impl.getApplicationAndReleaseStatus(ctx, app)
 }
 
 func (impl *HelmAppServiceImpl) GetApplicationDetailWithFilter(ctx context.Context, app *helmBean.AppIdentifier, resourceTreeFilter *gRPC.ResourceTreeFilter) (*gRPC.AppDetail, error) {
-	return impl.getApplicationDetail(ctx, app, resourceTreeFilter)
+	return impl.getApplicationDetailWithInstallerStatus(ctx, app, resourceTreeFilter)
 }
 
-func (impl *HelmAppServiceImpl) getApplicationDetail(ctx context.Context, app *helmBean.AppIdentifier, resourceTreeFilter *gRPC.ResourceTreeFilter) (*gRPC.AppDetail, error) {
+func (impl *HelmAppServiceImpl) getApplicationDetailWithInstallerStatus(ctx context.Context, app *helmBean.AppIdentifier, resourceTreeFilter *gRPC.ResourceTreeFilter) (*gRPC.AppDetail, error) {
 	config, err := impl.helmAppReadService.GetClusterConf(app.ClusterId)
 	if err != nil {
 		impl.logger.Errorw("error in fetching cluster detail", "err", err)
@@ -267,7 +269,7 @@ func (impl *HelmAppServiceImpl) getApplicationDetail(ctx context.Context, app *h
 		ReleaseName:        app.ReleaseName,
 		ResourceTreeFilter: resourceTreeFilter,
 	}
-	appdetail, err := impl.helmAppClient.GetAppDetail(ctx, req)
+	appDetail, err := impl.getAppDetail(ctx, req)
 	if err != nil {
 		impl.logger.Errorw("error in fetching app detail", "err", err)
 		return nil, err
@@ -281,14 +283,24 @@ func (impl *HelmAppServiceImpl) getApplicationDetail(ctx context.Context, app *h
 		impl.serverDataStore.InstallerCrdObjectExists {
 		if impl.serverDataStore.InstallerCrdObjectStatus != serverBean.InstallerCrdObjectStatusApplied {
 			// if timeout
-			if time.Now().After(appdetail.GetLastDeployed().AsTime().Add(1 * time.Hour)) {
-				appdetail.ApplicationStatus = serverBean.AppHealthStatusDegraded
+			if time.Now().After(appDetail.GetLastDeployed().AsTime().Add(1 * time.Hour)) {
+				appDetail.ApplicationStatus = serverBean.AppHealthStatusDegraded
 			} else {
-				appdetail.ApplicationStatus = serverBean.AppHealthStatusProgressing
+				appDetail.ApplicationStatus = serverBean.AppHealthStatusProgressing
 			}
 		}
 	}
-	return appdetail, err
+	return appDetail, err
+}
+
+func (impl *HelmAppServiceImpl) getAppDetail(ctx context.Context, req *gRPC.AppDetailRequest) (*gRPC.AppDetail, error) {
+	impl.updateAppDetailRequestWithCacheConfig(req)
+	appDetail, err := impl.helmAppClient.GetAppDetail(ctx, req)
+	if err != nil {
+		impl.logger.Errorw("error in fetching app detail", "payload", req, "err", err)
+		return nil, err
+	}
+	return appDetail, nil
 }
 
 func (impl *HelmAppServiceImpl) GetResourceTreeForExternalResources(ctx context.Context, clusterId int,
@@ -308,6 +320,7 @@ func (impl *HelmAppServiceImpl) GetResourceTreeForExternalResources(ctx context.
 		ClusterConfig:          config,
 		ExternalResourceDetail: resources,
 	}
+	impl.updateExternalResTreeRequestWithCacheConfig(clusterId, req)
 	return impl.helmAppClient.GetResourceTreeForExternalResources(ctx, req)
 }
 

api/helm-app/gRPC/applist_grpc.pb.go

@@ -0,0 +1,18 @@
+package service
+
+import (
+	"context"
+	"github.com/devtron-labs/devtron/api/helm-app/gRPC"
+)
+
+func (impl *HelmAppServiceImpl) GetAppStatusV2(ctx context.Context, req *gRPC.AppDetailRequest, clusterId int) (*gRPC.AppStatus, error) {
+	return nil, nil
+}
+
+func (impl *HelmAppServiceImpl) updateAppDetailRequestWithCacheConfig(req *gRPC.AppDetailRequest) {
+	return
+}
+
+func (impl *HelmAppServiceImpl) updateExternalResTreeRequestWithCacheConfig(clusterId int, req *gRPC.ExternalResourceTreeRequest) {
+	return
+}

api/helm-app/service/HelmAppService.go

@@ -27,7 +27,7 @@ import (
 	util3 "github.com/devtron-labs/common-lib/utils/k8s"
 	k8sCommonBean "github.com/devtron-labs/common-lib/utils/k8s/commonBean"
 	"github.com/devtron-labs/common-lib/utils/k8sObjectsUtil"
-	"github.com/devtron-labs/devtron/api/bean"
+	"github.com/devtron-labs/devtron/api/bean/AppView"
 	"github.com/devtron-labs/devtron/api/connector"
 	"github.com/devtron-labs/devtron/api/helm-app/gRPC"
 	client "github.com/devtron-labs/devtron/api/helm-app/service"
@@ -253,7 +253,7 @@ func (handler *K8sApplicationRestHandlerImpl) GetHostUrlsByBatch(w http.Response
 	}
 
 	token := r.Header.Get("token")
-	var k8sAppDetail bean.AppDetailContainer
+	var k8sAppDetail AppView.AppDetailContainer
 	var resourceTreeResponse *gRPC.ResourceTreeResponse
 	var clusterId int
 	var namespace string
@@ -344,8 +344,8 @@ func (handler *K8sApplicationRestHandlerImpl) GetHostUrlsByBatch(w http.Response
 		resourceTreeResponse = appDetail.ResourceTreeResponse
 	}
 
-	k8sAppDetail = bean.AppDetailContainer{
-		DeploymentDetailContainer: bean.DeploymentDetailContainer{
+	k8sAppDetail = AppView.AppDetailContainer{
+		DeploymentDetailContainer: AppView.DeploymentDetailContainer{
 			ClusterId: clusterId,
 			Namespace: namespace,
 		},