feat: Helm async install

api/appStore/InstalledAppRestHandler.go

@@ -576,11 +576,11 @@ func (handler *InstalledAppRestHandlerImpl) FetchAppDetailsForInstalledApp(w htt
 		return
 	}
 	//rback block ends here
-	resourceTreeAndNotesContainer := bean2.ResourceTreeAndNotesContainer{}
+	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)
+		err = handler.fetchResourceTree(w, r, &resourceTreeAndNotesContainer, *installedApp, "")
 		if installedApp.DeploymentAppType == util2.PIPELINE_DEPLOYMENT_TYPE_ACD {
 			apiError, ok := err.(*util2.ApiError)
 			if ok && apiError != nil {
@@ -691,11 +691,11 @@ func (handler *InstalledAppRestHandlerImpl) FetchResourceTree(w http.ResponseWri
 		return
 	}
 
-	resourceTreeAndNotesContainer := bean2.ResourceTreeAndNotesContainer{}
+	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)
+		err = handler.fetchResourceTree(w, r, &resourceTreeAndNotesContainer, *installedApp, appDetail.HelmReleaseInstallStatus)
 		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)
@@ -786,10 +786,10 @@ 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.ResourceTreeAndNotesContainer, installedApp repository.InstalledApps) error {
+func (handler *InstalledAppRestHandlerImpl) fetchResourceTree(w http.ResponseWriter, r *http.Request, resourceTreeAndNotesContainer *bean2.AppDetailsContainer, installedApp repository.InstalledApps, helmReleaseInstallStatus string) error {
 	ctx := r.Context()
 	cn, _ := w.(http.CloseNotifier)
-	err := handler.installedAppService.FetchResourceTree(ctx, cn, resourceTreeAndNotesContainer, installedApp)
+	err := handler.installedAppService.FetchResourceTree(ctx, cn, resourceTreeAndNotesContainer, installedApp, helmReleaseInstallStatus)
 	return err
 }
 

api/bean/AppView.go

@@ -169,6 +169,7 @@ type DeploymentDetailContainer struct {
 	DeploymentAppDeleteRequest    bool            `json:"deploymentAppDeleteRequest"`
 	Description                   string          `json:"description" validate:"max=40"`
 	IsVirtualEnvironment          bool            `json:"isVirtualEnvironment"`
+	HelmReleaseInstallStatus      string          `json:"-"`
 }
 
 type AppDetailContainer struct {
@@ -179,9 +180,10 @@ type AppDetailContainer struct {
 	ResourceTree              map[string]interface{} `json:"resourceTree,omitempty"`
 	Notes                     string                 `json:"notes,omitempty"`
 }
-type ResourceTreeAndNotesContainer struct {
-	ResourceTree map[string]interface{} `json:"resourceTree,omitempty"`
-	Notes        string                 `json:"notes,omitempty"`
+type AppDetailsContainer struct {
+	ResourceTree  map[string]interface{} `json:"resourceTree,omitempty"`
+	Notes         string                 `json:"notes,omitempty"`
+	ReleaseStatus map[string]interface{} `json:"releaseStatus"`
 }
 type Notes struct {
 	Notes string `json:"gitOpsNotes,omitempty"`

api/helm-app/applist.proto

@@ -76,6 +76,7 @@ message AppDetail{
   ChartMetadata chartMetadata = 7;
   ResourceTreeResponse resourceTreeResponse = 8;
   EnvironmentDetails environmentDetails = 9;
+  bool ReleaseExist = 10;
 }
 
 message AppStatus{
@@ -262,6 +263,7 @@ message InstallReleaseRequest {
   ChartRepository chartRepository = 5;
   string K8sVersion = 6;
   int32 historyMax = 7;
+  int32 installAppVersionHistoryId = 8;
 }
 
 message InstallReleaseResponse {

api/restHandler/AppListingRestHandler.go

@@ -1345,10 +1345,10 @@ func (handler AppListingRestHandlerImpl) RedirectToLinkouts(w http.ResponseWrite
 	}
 	http.Redirect(w, r, link, http.StatusOK)
 }
-func (handler AppListingRestHandlerImpl) fetchResourceTreeFromInstallAppService(w http.ResponseWriter, r *http.Request, resourceTreeAndNotesContainer bean.ResourceTreeAndNotesContainer, installedApps repository.InstalledApps) (bean.ResourceTreeAndNotesContainer, error) {
+func (handler AppListingRestHandlerImpl) fetchResourceTreeFromInstallAppService(w http.ResponseWriter, r *http.Request, resourceTreeAndNotesContainer bean.AppDetailsContainer, installedApps repository.InstalledApps) (bean.AppDetailsContainer, error) {
 	rctx := r.Context()
 	cn, _ := w.(http.CloseNotifier)
-	err := handler.installedAppService.FetchResourceTree(rctx, cn, &resourceTreeAndNotesContainer, installedApps)
+	err := handler.installedAppService.FetchResourceTree(rctx, cn, &resourceTreeAndNotesContainer, installedApps, "")
 	return resourceTreeAndNotesContainer, err
 }
 func (handler AppListingRestHandlerImpl) GetHostUrlsByBatch(w http.ResponseWriter, r *http.Request) {
@@ -1420,7 +1420,7 @@ func (handler AppListingRestHandlerImpl) GetHostUrlsByBatch(w http.ResponseWrite
 			common.WriteJsonResp(w, err, "App not found in database", http.StatusBadRequest)
 			return
 		}
-		resourceTreeAndNotesContainer := bean.ResourceTreeAndNotesContainer{}
+		resourceTreeAndNotesContainer := bean.AppDetailsContainer{}
 		resourceTreeAndNotesContainer, err = handler.fetchResourceTreeFromInstallAppService(w, r, resourceTreeAndNotesContainer, *installedApp)
 		if err != nil {
 			common.WriteJsonResp(w, fmt.Errorf("error in fetching resource tree"), nil, http.StatusInternalServerError)
@@ -1590,7 +1590,9 @@ func (handler AppListingRestHandlerImpl) fetchResourceTree(w http.ResponseWriter
 		}
 		if detail != nil {
 			resourceTree = util2.InterfaceToMapAdapter(detail.ResourceTreeResponse)
+			releaseStatus := util2.InterfaceToMapAdapter(detail.ReleaseStatus)
 			applicationStatus := detail.ApplicationStatus
+			resourceTree["releaseStatus"] = releaseStatus
 			resourceTree["status"] = applicationStatus
 			if applicationStatus == application.Healthy {
 				status, err := handler.appListingService.ISLastReleaseStopType(appId, envId)

cmd/external-app/wire.go

@@ -5,6 +5,7 @@ package main
 
 import (
 	"github.com/devtron-labs/authenticator/middleware"
+	pubsub_lib "github.com/devtron-labs/common-lib/pubsub-lib"
 	"github.com/devtron-labs/devtron/api/apiToken"
 	appStoreDeployment "github.com/devtron-labs/devtron/api/appStore/deployment"
 	appStoreDiscover "github.com/devtron-labs/devtron/api/appStore/discover"
@@ -179,6 +180,7 @@ func InitializeApp() (*App, error) {
 
 		security2.NewScanToolMetadataRepositoryImpl,
 		wire.Bind(new(security2.ScanToolMetadataRepository), new(*security2.ScanToolMetadataRepositoryImpl)),
+		pubsub_lib.NewPubSubClientServiceImpl,
 	)
 	return &App{}, nil
 }

go.mod

@@ -15,7 +15,7 @@ require (
 	github.com/coreos/go-oidc v2.2.1+incompatible
 	github.com/davecgh/go-spew v1.1.1
 	github.com/devtron-labs/authenticator v0.4.31-0.20221213131053-6e4668309f53
-	github.com/devtron-labs/common-lib v0.0.0-20230407072229-d4f665f5ca12
+	github.com/devtron-labs/common-lib v0.0.0-20230821120530-56d8ed4bc327
 	github.com/devtron-labs/protos v0.0.0-20230503113602-282404f70fd2
 	github.com/evanphx/json-patch v5.6.0+incompatible
 	github.com/go-pg/pg v6.15.1+incompatible

go.sum

@@ -282,8 +282,8 @@ github.com/denisenkom/go-mssqldb v0.0.0-20190707035753-2be1aa521ff4 h1:YcpmyvADG
 github.com/denisenkom/go-mssqldb v0.0.0-20190707035753-2be1aa521ff4/go.mod h1:zAg7JM8CkOJ43xKXIj7eRO9kmWm/TW578qo+oDO6tuM=
 github.com/devtron-labs/authenticator v0.4.31-0.20221213131053-6e4668309f53 h1:oHDpsCsuYiL+u5TEhilKNLGhH9lwRNkIqrzhHQA6d3c=
 github.com/devtron-labs/authenticator v0.4.31-0.20221213131053-6e4668309f53/go.mod h1:ozNfT8WcruiSgnUbyp48WVfc41++W6xYXhKFp67lNTU=
-github.com/devtron-labs/common-lib v0.0.0-20230407072229-d4f665f5ca12 h1:tcwNgAWTzalItF5XT0WxicRvY4wzz/o0HYLMVLxsxjg=
-github.com/devtron-labs/common-lib v0.0.0-20230407072229-d4f665f5ca12/go.mod h1:R24nOqgk4buk9zv+BXzORfObZsOe3NE9P55KrZXGX9k=
+github.com/devtron-labs/common-lib v0.0.0-20230821120530-56d8ed4bc327 h1:BNyGu3HBIiHDNo2rbk/tv75O3rt9dSY/9OkGPhwD/8s=
+github.com/devtron-labs/common-lib v0.0.0-20230821120530-56d8ed4bc327/go.mod h1:R24nOqgk4buk9zv+BXzORfObZsOe3NE9P55KrZXGX9k=
 github.com/devtron-labs/protos v0.0.0-20230503113602-282404f70fd2 h1:/IEIsJTxDZ3hv8uOoCaqdWCXqcv7nCAgX9AP/v84dUY=
 github.com/devtron-labs/protos v0.0.0-20230503113602-282404f70fd2/go.mod h1:l85jxWHlcSo910hdUfRycL40yGzC6glE93V1sVxVPto=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=

pkg/appStore/bean/bean.go

@@ -370,3 +370,9 @@ type PushChartToGitRequestDTO struct {
 	TempChartRefDir   string
 	UserId            int32
 }
+
+type HelmInstallNatsMessage struct {
+	InstallAppVersionHistoryId int
+	Message                    string
+	IsReleaseInstalled         bool
+}

pkg/appStore/deployment/repository/InstalledAppRepository.go

@@ -71,6 +71,7 @@ type InstalledAppRepository interface {
 
 	GetArgoPipelinesHavingLatestTriggerStuckInNonTerminalStatusesForAppStore(getPipelineDeployedBeforeMinutes int, getPipelineDeployedWithinHours int) ([]*InstalledAppVersions, error)
 	GetArgoPipelinesHavingTriggersStuckInLastPossibleNonTerminalTimelinesForAppStore(pendingSinceSeconds int, timeForDegradation int) ([]*InstalledAppVersions, error)
+	GetHelmReleaseStatusConfigByInstalledAppId(installedAppVersionHistoryId int) (string, error)
 }
 
 type InstalledAppRepositoryImpl struct {
@@ -658,3 +659,14 @@ func (impl InstalledAppRepositoryImpl) GetArgoPipelinesHavingTriggersStuckInLast
 	}
 	return installedAppVersions, nil
 }
+
+func (impl InstalledAppRepositoryImpl) GetHelmReleaseStatusConfigByInstalledAppId(installedAppVersionHistoryId int) (string, error) {
+	var helmReleaseStatusConfig string
+	queryString := `select helm_release_status_config  from installed_app_version_history inner join installed_app_versions on installed_app_version_history.installed_app_version_id=installed_app_versions.id inner join installed_apps on installed_apps.id=installed_app_versions.installed_app_id where installed_apps.id = ? order by installed_app_version_history.created_on desc limit 1;`
+	_, err := impl.dbConnection.Query(&helmReleaseStatusConfig, queryString, installedAppVersionHistoryId)
+	if err != nil {
+		impl.Logger.Errorw("error in GetAllGitOpsDeploymentAppName", "err", err)
+		return helmReleaseStatusConfig, err
+	}
+	return helmReleaseStatusConfig, nil
+}

pkg/appStore/deployment/repository/InstalledAppVersionHistory.go

@@ -34,14 +34,15 @@ func NewInstalledAppVersionHistoryRepositoryImpl(Logger *zap.SugaredLogger, dbCo
 }
 
 type InstalledAppVersionHistory struct {
-	TableName             struct{}  `sql:"installed_app_version_history" pg:",discard_unknown_columns"`
-	Id                    int       `sql:"id,pk"`
-	InstalledAppVersionId int       `sql:"installed_app_version_id,notnull"`
-	ValuesYamlRaw         string    `sql:"values_yaml_raw"`
-	Status                string    `sql:"status"`
-	GitHash               string    `sql:"git_hash"`
-	StartedOn             time.Time `sql:"started_on,type:timestamptz"`
-	FinishedOn            time.Time `sql:"finished_on,type:timestamptz"`
+	TableName               struct{}  `sql:"installed_app_version_history" pg:",discard_unknown_columns"`
+	Id                      int       `sql:"id,pk"`
+	InstalledAppVersionId   int       `sql:"installed_app_version_id,notnull"`
+	ValuesYamlRaw           string    `sql:"values_yaml_raw"`
+	Status                  string    `sql:"status"`
+	GitHash                 string    `sql:"git_hash"`
+	StartedOn               time.Time `sql:"started_on,type:timestamptz"`
+	FinishedOn              time.Time `sql:"finished_on,type:timestamptz"`
+	HelmReleaseStatusConfig string    `sql: "helm_release_status"`
 	sql.AuditLog
 }