Merge branch 'develop' into dev-notif

Author: prkhrkat

Wire.go

@@ -102,14 +102,14 @@ import (
 	appWorkflow2 "github.com/devtron-labs/devtron/internal/sql/repository/appWorkflow"
 	"github.com/devtron-labs/devtron/internal/sql/repository/bulkUpdate"
 	"github.com/devtron-labs/devtron/internal/sql/repository/chartConfig"
-	"github.com/devtron-labs/devtron/internal/sql/repository/deploymentConfig"
 	dockerRegistryRepository "github.com/devtron-labs/devtron/internal/sql/repository/dockerRegistry"
 	"github.com/devtron-labs/devtron/internal/sql/repository/helper"
 	repository8 "github.com/devtron-labs/devtron/internal/sql/repository/imageTagging"
 	"github.com/devtron-labs/devtron/internal/sql/repository/pipelineConfig"
 	resourceGroup "github.com/devtron-labs/devtron/internal/sql/repository/resourceGroup"
 	"github.com/devtron-labs/devtron/internal/util"
 	"github.com/devtron-labs/devtron/pkg/app"
+	read4 "github.com/devtron-labs/devtron/pkg/app/appDetails/read"
 	"github.com/devtron-labs/devtron/pkg/app/dbMigration"
 	"github.com/devtron-labs/devtron/pkg/app/status"
 	"github.com/devtron-labs/devtron/pkg/appClone"
@@ -128,6 +128,7 @@ import (
 	"github.com/devtron-labs/devtron/pkg/bulkAction/service"
 	"github.com/devtron-labs/devtron/pkg/chart"
 	"github.com/devtron-labs/devtron/pkg/chart/gitOpsConfig"
+	read2 "github.com/devtron-labs/devtron/pkg/chart/read"
 	chartRepoRepository "github.com/devtron-labs/devtron/pkg/chartRepo/repository"
 	"github.com/devtron-labs/devtron/pkg/commonService"
 	"github.com/devtron-labs/devtron/pkg/config"
@@ -357,6 +358,8 @@ func InitializeApp() (*App, error) {
 		wire.Bind(new(gitOpsConfig.DevtronAppGitOpConfigService), new(*gitOpsConfig.DevtronAppGitOpConfigServiceImpl)),
 		chart.NewChartServiceImpl,
 		wire.Bind(new(chart.ChartService), new(*chart.ChartServiceImpl)),
+		read2.NewChartReadServiceImpl,
+		wire.Bind(new(read2.ChartReadService), new(*read2.ChartReadServiceImpl)),
 		service.NewBulkUpdateServiceImpl,
 		wire.Bind(new(service.BulkUpdateService), new(*service.BulkUpdateServiceImpl)),
 
@@ -375,6 +378,10 @@ func InitializeApp() (*App, error) {
 		wire.Bind(new(appList.AppListingRouter), new(*appList.AppListingRouterImpl)),
 		appList2.NewAppListingRestHandlerImpl,
 		wire.Bind(new(appList2.AppListingRestHandler), new(*appList2.AppListingRestHandlerImpl)),
+
+		read4.NewAppDetailsReadServiceImpl,
+		wire.Bind(new(read4.AppDetailsReadService), new(*read4.AppDetailsReadServiceImpl)),
+
 		app.NewAppListingServiceImpl,
 		wire.Bind(new(app.AppListingService), new(*app.AppListingServiceImpl)),
 		repository.NewAppListingRepositoryImpl,
@@ -622,6 +629,7 @@ func InitializeApp() (*App, error) {
 		repository9.NewClusterInstalledAppsRepositoryImpl,
 		wire.Bind(new(repository9.ClusterInstalledAppsRepository), new(*repository9.ClusterInstalledAppsRepositoryImpl)),
 
+		commonService.NewCommonBaseServiceImpl,
 		commonService.NewCommonServiceImpl,
 		wire.Bind(new(commonService.CommonService), new(*commonService.CommonServiceImpl)),
 
@@ -659,8 +667,8 @@ func InitializeApp() (*App, error) {
 
 		router.NewCommonRouterImpl,
 		wire.Bind(new(router.CommonRouter), new(*router.CommonRouterImpl)),
-		restHandler.NewCommonRestHanlderImpl,
-		wire.Bind(new(restHandler.CommonRestHanlder), new(*restHandler.CommonRestHanlderImpl)),
+		restHandler.NewCommonRestHandlerImpl,
+		wire.Bind(new(restHandler.CommonRestHandler), new(*restHandler.CommonRestHandlerImpl)),
 
 		router.NewScopedVariableRouterImpl,
 		wire.Bind(new(router.ScopedVariableRouter), new(*router.ScopedVariableRouterImpl)),
@@ -941,11 +949,7 @@ func InitializeApp() (*App, error) {
 		cel.NewCELServiceImpl,
 		wire.Bind(new(cel.EvaluatorService), new(*cel.EvaluatorServiceImpl)),
 
-		deploymentConfig.NewRepositoryImpl,
-		wire.Bind(new(deploymentConfig.Repository), new(*deploymentConfig.RepositoryImpl)),
-
-		common.NewDeploymentConfigServiceImpl,
-		wire.Bind(new(common.DeploymentConfigService), new(*common.DeploymentConfigServiceImpl)),
+		common.WireSet,
 
 		repoCredsK8sClient.NewRepositoryCredsK8sClientImpl,
 		wire.Bind(new(repoCredsK8sClient.RepositoryCredsK8sClient), new(*repoCredsK8sClient.RepositoryCredsK8sClientImpl)),

WiringNilCheck.go

@@ -114,6 +114,8 @@ func skipUnnecessaryFieldsForCheck(fieldName, valName string) bool {
 		"modulecronserviceimpl":        {"cron"},
 		"oteltracingserviceimpl":       {"traceprovider"},
 		"terminalaccessrepositoryimpl": {"templatescache"},
+		"grpcapiclientimpl":            {"serviceclient"},
+		"serverenvconfig":              {"errorencounteredongettingdevtronhelmrelease"},
 	}
 	if _, ok := fieldAndValName[valName]; ok {
 		for _, ignoreFieldName := range fieldAndValName[valName] {

api/argoApplication/ArgoApplicationRestHandler.go

@@ -17,6 +17,7 @@
 package argoApplication
 
 import (
+	"context"
 	"errors"
 	"github.com/devtron-labs/devtron/api/restHandler/common"
 	"github.com/devtron-labs/devtron/pkg/argoApplication"
@@ -89,6 +90,9 @@ func (handler *ArgoApplicationRestHandlerImpl) GetApplicationDetail(w http.Respo
 		common.WriteJsonResp(w, errors.New("unauthorized"), nil, http.StatusForbidden)
 		return
 	}
+	ctx := r.Context()
+	ctx = context.WithValue(ctx, "token", token)
+
 	var err error
 	v := r.URL.Query()
 	resourceName := v.Get("name")
@@ -104,7 +108,7 @@ func (handler *ArgoApplicationRestHandlerImpl) GetApplicationDetail(w http.Respo
 			return
 		}
 	}
-	resp, err := handler.readService.GetAppDetail(resourceName, namespace, clusterId)
+	resp, err := handler.readService.GetAppDetailEA(ctx, resourceName, namespace, clusterId)
 	if err != nil {
 		handler.logger.Errorw("error in getting argo application app detail", "err", err, "resourceName", resourceName, "clusterId", clusterId)
 		common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)

api/argoApplication/wire_argoApplication.go

@@ -30,6 +30,7 @@ var ArgoApplicationWireSetFull = wire.NewSet(
 	config.NewArgoApplicationConfigServiceImpl,
 	wire.Bind(new(config.ArgoApplicationConfigService), new(*config.ArgoApplicationConfigServiceImpl)),
 
+	argoApplication.NewArgoApplicationServiceImpl,
 	argoApplication.NewArgoApplicationServiceExtendedServiceImpl,
 	wire.Bind(new(argoApplication.ArgoApplicationService), new(*argoApplication.ArgoApplicationServiceExtendedImpl)),
 

api/bean/AppView/AppView.go

@@ -294,3 +294,16 @@ type LinkOuts struct {
 	Link          string `json:"link,omitempty"`
 	Description   string `json:"description,omitempty"`
 }
+
+type AppStages struct {
+	AppId                   int    `json:"app_id,omitempty" sql:"app_id"`
+	CiTemplateId            int    `json:"ci_template_id,omitempty" sql:"ci_template_id"`
+	CiPipelineId            int    `json:"ci_pipeline_id,omitempty" sql:"ci_pipeline_id"`
+	ChartId                 int    `json:"chart_id,omitempty" sql:"chart_id"`
+	ChartGitRepoUrl         string `json:"chart_git_repo_url,omitempty" sql:"chart_git_repo_url"`
+	PipelineId              int    `json:"pipeline_id,omitempty" sql:"pipeline_id"`
+	YamlStatus              int    `json:"yaml_status,omitempty" sql:"yaml_status"`
+	YamlReviewed            bool   `json:"yaml_reviewed,omitempty" sql:"yaml_reviewed"`
+	DeploymentConfigRepoURL string `json:"deployment_config_repo_url" sql:"-"`
+	GitMaterialExists       int    `json:"-" sql:"-"`
+}

api/bean/gitOps/GitOpsConfig.go

@@ -42,10 +42,15 @@ type GitOpsConfigDto struct {
 	IsTLSKeyDataPresent  bool `json:"isTLSKeyDataPresent"`
 
 	// TODO refactoring: create different struct for internal fields
-	GitRepoName string `json:"-"`
-	UserEmailId string `json:"-"`
-	Description string `json:"-"`
-	UserId      int32  `json:"-"`
+	GitRepoName    string `json:"-"`
+	TargetRevision string `json:"-"`
+	UserEmailId    string `json:"-"`
+	Description    string `json:"-"`
+	UserId         int32  `json:"-"`
+}
+
+func (dto GitOpsConfigDto) GetHostUrl() string {
+	return dto.Host
 }
 
 type GitRepoRequestDto struct {
@@ -80,5 +85,5 @@ func IsGitOpsRepoNotConfigured(gitRepoUrl string) bool {
 }
 
 func IsGitOpsRepoConfigured(gitRepoUrl string) bool {
-	return len(gitRepoUrl) != 0 || gitRepoUrl != GIT_REPO_NOT_CONFIGURED
+	return !IsGitOpsRepoNotConfigured(gitRepoUrl)
 }

api/helm-app/HelmAppRestHandler.go

@@ -26,6 +26,7 @@ import (
 	"github.com/devtron-labs/devtron/pkg/appStore/installedApp/service/EAMode"
 	"github.com/devtron-labs/devtron/pkg/argoApplication"
 	"github.com/devtron-labs/devtron/pkg/argoApplication/helper"
+	clusterBean "github.com/devtron-labs/devtron/pkg/cluster/bean"
 	clientErrors "github.com/devtron-labs/devtron/pkg/errors"
 	"github.com/devtron-labs/devtron/pkg/fluxApplication"
 	bean2 "github.com/devtron-labs/devtron/pkg/k8s/application/bean"
@@ -467,7 +468,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 == bean.DEFAULT_CLUSTER_ID {
+		appIdentifier.ClusterId == clusterBean.DefaultClusterId {
 		common.WriteJsonResp(w, errors.New("cannot delete this default helm app"), nil, http.StatusForbidden)
 		return
 	}

api/helm-app/bean/bean.go

@@ -23,7 +23,6 @@ import (
 )
 
 const (
-	DEFAULT_CLUSTER_ID                     = 1
 	SOURCE_DEVTRON_APP       SourceAppType = "devtron-app"
 	SOURCE_HELM_APP          SourceAppType = "helm-app"
 	SOURCE_EXTERNAL_HELM_APP SourceAppType = "external-helm-app"

api/k8s/application/k8sApplicationRestHandler.go

@@ -253,6 +253,8 @@ func (handler *K8sApplicationRestHandlerImpl) GetHostUrlsByBatch(w http.Response
 	}
 
 	token := r.Header.Get("token")
+	ctx := r.Context()
+	ctx = context.WithValue(ctx, "token", token)
 	var k8sAppDetail AppView.AppDetailContainer
 	var resourceTreeResponse *gRPC.ResourceTreeResponse
 	var clusterId int
@@ -276,7 +278,7 @@ func (handler *K8sApplicationRestHandlerImpl) GetHostUrlsByBatch(w http.Response
 			return
 		}
 		//RBAC enforcer Ends
-		appDetail, err := handler.helmAppService.GetApplicationDetail(r.Context(), appIdentifier)
+		appDetail, err := handler.helmAppService.GetApplicationDetail(ctx, appIdentifier)
 		if err != nil {
 			apiError := clientErrors.ConvertToApiError(err)
 			if apiError != nil {
@@ -303,7 +305,7 @@ func (handler *K8sApplicationRestHandlerImpl) GetHostUrlsByBatch(w http.Response
 		}
 		//RBAC enforcer Ends
 
-		appDetail, err := handler.argoApplicationReadService.GetAppDetail(appIdentifier.AppName, appIdentifier.Namespace, appIdentifier.ClusterId)
+		appDetail, err := handler.argoApplicationReadService.GetAppDetailEA(r.Context(), appIdentifier.AppName, appIdentifier.Namespace, appIdentifier.ClusterId)
 		if err != nil {
 			apiError := clientErrors.ConvertToApiError(err)
 			if apiError != nil {

api/module/ModuleRestHandler.go

@@ -19,6 +19,7 @@ package module
 import (
 	"encoding/json"
 	"errors"
+	"github.com/devtron-labs/devtron/pkg/module/bean"
 	"net/http"
 
 	"github.com/devtron-labs/devtron/api/restHandler/common"
@@ -135,7 +136,7 @@ func (impl ModuleRestHandlerImpl) HandleModuleAction(w http.ResponseWriter, r *h
 
 	// decode request
 	decoder := json.NewDecoder(r.Body)
-	var moduleActionRequestDto *module.ModuleActionRequestDto
+	var moduleActionRequestDto *bean.ModuleActionRequestDto
 	err = decoder.Decode(&moduleActionRequestDto)
 	if err != nil {
 		impl.logger.Errorw("error in decoding request in HandleModuleAction", "err", err)
@@ -184,7 +185,7 @@ func (impl ModuleRestHandlerImpl) EnableModule(w http.ResponseWriter, r *http.Re
 	}
 	// decode request
 	decoder := json.NewDecoder(r.Body)
-	var moduleEnableRequestDto module.ModuleEnableRequestDto
+	var moduleEnableRequestDto bean.ModuleEnableRequestDto
 	err = decoder.Decode(&moduleEnableRequestDto)
 	if err != nil {
 		impl.logger.Errorw("error in decoding request in ModuleEnableRequestDto", "err", err)