feat: deployment config migration

Wire.go

@@ -93,6 +93,7 @@ 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"
@@ -122,6 +123,7 @@ import (
 	"github.com/devtron-labs/devtron/pkg/commonService"
 	delete2 "github.com/devtron-labs/devtron/pkg/delete"
 	deployment2 "github.com/devtron-labs/devtron/pkg/deployment"
+	"github.com/devtron-labs/devtron/pkg/deployment/common"
 	git2 "github.com/devtron-labs/devtron/pkg/deployment/gitOps/git"
 	"github.com/devtron-labs/devtron/pkg/deployment/manifest/publish"
 	"github.com/devtron-labs/devtron/pkg/deploymentGroup"
@@ -207,13 +209,13 @@ func InitializeApp() (*App, error) {
 		wire.Bind(new(gitSensor.Client), new(*gitSensor.ClientImpl)),
 		// -------
 		helper.NewAppListingRepositoryQueryBuilder,
-		// sql.GetConfig,
+		// sql.GetConfigForDevtronApps,
 		eClient.GetEventClientConfig,
 		// sql.NewDbConnection,
 		// app.GetACDAuthConfig,
 		util3.GetACDAuthConfig,
 		connection.SettingsManager,
-		// auth.GetConfig,
+		// auth.GetConfigForDevtronApps,
 
 		connection.GetConfig,
 		wire.Bind(new(session2.ServiceClient), new(*middleware.LoginService)),
@@ -434,7 +436,7 @@ func InitializeApp() (*App, error) {
 		wire.Bind(new(repository2.ServiceClient), new(*repository2.ServiceClientImpl)),
 		wire.Bind(new(connector.Pump), new(*connector.PumpImpl)),
 
-		//app.GetConfig,
+		//app.GetConfigForDevtronApps,
 
 		pipeline.GetEcrConfig,
 		// otel.NewOtelTracingServiceImpl,
@@ -877,8 +879,8 @@ func InitializeApp() (*App, error) {
 		wire.Bind(new(repository.UserAttributesRepository), new(*repository.UserAttributesRepositoryImpl)),
 		pipelineConfig.NewPipelineStatusTimelineRepositoryImpl,
 		wire.Bind(new(pipelineConfig.PipelineStatusTimelineRepository), new(*pipelineConfig.PipelineStatusTimelineRepositoryImpl)),
-		wire.Bind(new(pipeline.DeploymentConfigService), new(*pipeline.DeploymentConfigServiceImpl)),
-		pipeline.NewDeploymentConfigServiceImpl,
+		wire.Bind(new(pipeline.PipelineDeploymentConfigService), new(*pipeline.PipelineDeploymentConfigServiceImpl)),
+		pipeline.NewPipelineDeploymentConfigServiceImpl,
 		pipelineConfig.NewCiTemplateOverrideRepositoryImpl,
 		wire.Bind(new(pipelineConfig.CiTemplateOverrideRepository), new(*pipelineConfig.CiTemplateOverrideRepositoryImpl)),
 		pipelineConfig.NewCiBuildConfigRepositoryImpl,
@@ -975,6 +977,12 @@ 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)),
 	)
 	return &App{}, nil
 }

api/appStore/InstalledAppRestHandler.go

@@ -27,6 +27,7 @@ import (
 	"github.com/devtron-labs/devtron/pkg/appStore/installedApp/service/FullMode/resource"
 	util3 "github.com/devtron-labs/devtron/pkg/appStore/util"
 	"github.com/devtron-labs/devtron/pkg/bean"
+	"gopkg.in/go-playground/validator.v9"
 	"net/http"
 	"reflect"
 	"strconv"
@@ -48,14 +49,14 @@ import (
 	"github.com/devtron-labs/devtron/pkg/auth/authorisation/casbin"
 	"github.com/devtron-labs/devtron/pkg/auth/user"
 	"github.com/devtron-labs/devtron/pkg/cluster"
+	bean3 "github.com/devtron-labs/devtron/pkg/deployment/common/bean"
 	"github.com/devtron-labs/devtron/util"
 	"github.com/devtron-labs/devtron/util/argo"
 	"github.com/devtron-labs/devtron/util/rbac"
 	"github.com/devtron-labs/devtron/util/response"
 	"github.com/go-pg/pg"
 	"github.com/gorilla/mux"
 	"go.uber.org/zap"
-	"gopkg.in/go-playground/validator.v9"
 )
 
 type InstalledAppRestHandler interface {
@@ -744,8 +745,8 @@ func (handler *InstalledAppRestHandlerImpl) FetchAppDetailsForInstalledApp(w htt
 	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 {
+		err = handler.fetchResourceTree(w, r, &resourceTreeAndNotesContainer, *installedApp, appDetail.DeploymentConfig, "", "")
+		if appDetail.DeploymentAppType == util2.PIPELINE_DEPLOYMENT_TYPE_ACD {
 			apiError, ok := err.(*util2.ApiError)
 			if ok && apiError != nil {
 				if apiError.Code == constants.AppDetailResourceTreeNotFound && installedApp.DeploymentAppDeleteRequest == true {
@@ -868,8 +869,8 @@ func (handler *InstalledAppRestHandlerImpl) FetchResourceTree(w http.ResponseWri
 	resourceTreeAndNotesContainer.ResourceTree = map[string]interface{}{}
 
 	if len(installedApp.App.AppName) > 0 && len(installedApp.Environment.Name) > 0 {
-		err = handler.fetchResourceTree(w, r, &resourceTreeAndNotesContainer, *installedApp, appDetail.HelmReleaseInstallStatus, appDetail.Status)
-		if installedApp.DeploymentAppType == util2.PIPELINE_DEPLOYMENT_TYPE_ACD {
+		err = handler.fetchResourceTree(w, r, &resourceTreeAndNotesContainer, *installedApp, appDetail.DeploymentConfig, appDetail.HelmReleaseInstallStatus, appDetail.Status)
+		if appDetail.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)
@@ -960,10 +961,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.AppDetailsContainer, installedApp repository.InstalledApps, helmReleaseInstallStatus string, status string) error {
+func (handler *InstalledAppRestHandlerImpl) fetchResourceTree(w http.ResponseWriter, r *http.Request, resourceTreeAndNotesContainer *bean2.AppDetailsContainer, installedApp repository.InstalledApps, deploymentConfig *bean3.DeploymentConfig, helmReleaseInstallStatus string, status string) error {
 	ctx := r.Context()
 	cn, _ := w.(http.CloseNotifier)
-	err := handler.installedAppResourceService.FetchResourceTree(ctx, cn, resourceTreeAndNotesContainer, installedApp, helmReleaseInstallStatus, status)
+	err := handler.installedAppResourceService.FetchResourceTree(ctx, cn, resourceTreeAndNotesContainer, installedApp, deploymentConfig, helmReleaseInstallStatus, status)
 	return err
 }
 

api/bean/AppView.go

@@ -19,6 +19,7 @@ package bean
 import (
 	"encoding/json"
 	"github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
+	"github.com/devtron-labs/devtron/pkg/deployment/common/bean"
 	"time"
 )
 
@@ -141,46 +142,47 @@ type AppEnvironmentContainer struct {
 }
 
 type DeploymentDetailContainer struct {
-	InstalledAppId                int             `json:"installedAppId,omitempty"`
-	AppId                         int             `json:"appId,omitempty"`
-	CdPipelineId                  int             `json:"cdPipelineId,omitempty"`
-	TriggerType                   string          `json:"triggerType,omitempty"`
-	ParentEnvironmentName         string          `json:"parentEnvironmentName"`
-	AppStoreInstalledAppVersionId int             `json:"appStoreInstalledAppVersionId,omitempty"`
-	AppStoreChartName             string          `json:"appStoreChartName,omitempty"`
-	AppStoreChartId               int             `json:"appStoreChartId,omitempty"`
-	AppStoreAppName               string          `json:"appStoreAppName,omitempty"`
-	AppStoreAppVersion            string          `json:"appStoreAppVersion,omitempty"`
-	AppName                       string          `json:"appName"`
-	EnvironmentId                 int             `json:"environmentId"`
-	EnvironmentName               string          `json:"environmentName"`
-	Namespace                     string          `json:"namespace,omitempty"`
-	Status                        string          `json:"status,omitempty"`
-	StatusMessage                 string          `json:"statusMessage,omitempty"`
-	LastDeployedTime              string          `json:"lastDeployedTime,omitempty"`
-	LastDeployedBy                string          `json:"lastDeployedBy,omitempty"`
-	MaterialInfo                  json.RawMessage `json:"materialInfo,omitempty"`
-	MaterialInfoJsonString        string          `json:"-"`
-	ReleaseVersion                string          `json:"releaseVersion,omitempty"`
-	Default                       bool            `json:"default,omitempty"`
-	DataSource                    string          `json:"dataSource,omitempty"`
-	LastDeployedPipeline          string          `json:"lastDeployedPipeline,omitempty"`
-	Deprecated                    bool            `json:"deprecated"`
-	K8sVersion                    string          `json:"k8sVersion"`
-	CiArtifactId                  int             `json:"ciArtifactId"`
-	ParentArtifactId              int             `json:"parentArtifactId"`
-	ClusterId                     int             `json:"clusterId"`
-	DeploymentAppType             string          `json:"deploymentAppType"`
-	CiPipelineId                  int             `json:"ciPipelineId,omitempty"`
-	IsExternalCi                  bool            `json:"externalCi"`
-	ClusterName                   string          `json:"clusterName,omitempty"`
-	DockerRegistryId              string          `json:"dockerRegistryId,omitempty"`
-	IpsAccessProvided             bool            `json:"ipsAccessProvided"`
-	DeploymentAppDeleteRequest    bool            `json:"deploymentAppDeleteRequest"`
-	Description                   string          `json:"description" validate:"max=40"`
-	IsVirtualEnvironment          bool            `json:"isVirtualEnvironment"`
-	HelmPackageName               string          `json:"helmPackageName"`
-	HelmReleaseInstallStatus      string          `json:"-"`
+	InstalledAppId                int                    `json:"installedAppId,omitempty"`
+	AppId                         int                    `json:"appId,omitempty"`
+	CdPipelineId                  int                    `json:"cdPipelineId,omitempty"`
+	TriggerType                   string                 `json:"triggerType,omitempty"`
+	ParentEnvironmentName         string                 `json:"parentEnvironmentName"`
+	AppStoreInstalledAppVersionId int                    `json:"appStoreInstalledAppVersionId,omitempty"`
+	AppStoreChartName             string                 `json:"appStoreChartName,omitempty"`
+	AppStoreChartId               int                    `json:"appStoreChartId,omitempty"`
+	AppStoreAppName               string                 `json:"appStoreAppName,omitempty"`
+	AppStoreAppVersion            string                 `json:"appStoreAppVersion,omitempty"`
+	AppName                       string                 `json:"appName"`
+	EnvironmentId                 int                    `json:"environmentId"`
+	EnvironmentName               string                 `json:"environmentName"`
+	Namespace                     string                 `json:"namespace,omitempty"`
+	Status                        string                 `json:"status,omitempty"`
+	StatusMessage                 string                 `json:"statusMessage,omitempty"`
+	LastDeployedTime              string                 `json:"lastDeployedTime,omitempty"`
+	LastDeployedBy                string                 `json:"lastDeployedBy,omitempty"`
+	MaterialInfo                  json.RawMessage        `json:"materialInfo,omitempty"`
+	MaterialInfoJsonString        string                 `json:"-"`
+	ReleaseVersion                string                 `json:"releaseVersion,omitempty"`
+	Default                       bool                   `json:"default,omitempty"`
+	DataSource                    string                 `json:"dataSource,omitempty"`
+	LastDeployedPipeline          string                 `json:"lastDeployedPipeline,omitempty"`
+	Deprecated                    bool                   `json:"deprecated"`
+	K8sVersion                    string                 `json:"k8sVersion"`
+	CiArtifactId                  int                    `json:"ciArtifactId"`
+	ParentArtifactId              int                    `json:"parentArtifactId"`
+	ClusterId                     int                    `json:"clusterId"`
+	DeploymentAppType             string                 `json:"deploymentAppType"`
+	CiPipelineId                  int                    `json:"ciPipelineId,omitempty"`
+	IsExternalCi                  bool                   `json:"externalCi"`
+	ClusterName                   string                 `json:"clusterName,omitempty"`
+	DockerRegistryId              string                 `json:"dockerRegistryId,omitempty"`
+	IpsAccessProvided             bool                   `json:"ipsAccessProvided"`
+	DeploymentAppDeleteRequest    bool                   `json:"deploymentAppDeleteRequest"`
+	Description                   string                 `json:"description" validate:"max=40"`
+	IsVirtualEnvironment          bool                   `json:"isVirtualEnvironment"`
+	HelmPackageName               string                 `json:"helmPackageName"`
+	HelmReleaseInstallStatus      string                 `json:"-"`
+	DeploymentConfig              *bean.DeploymentConfig `json:"-"`
 }
 
 type AppDetailContainer struct {

api/bean/gitOps/GitOpsConfig.go

@@ -69,3 +69,7 @@ const (
 func IsGitOpsRepoNotConfigured(gitRepoUrl string) bool {
 	return len(gitRepoUrl) == 0 || gitRepoUrl == GIT_REPO_NOT_CONFIGURED
 }
+
+func IsGitOpsRepoConfigured(gitRepoUrl string) bool {
+	return len(gitRepoUrl) != 0 || gitRepoUrl != GIT_REPO_NOT_CONFIGURED
+}

api/helm-app/service/HelmAppService.go

@@ -169,7 +169,7 @@ func (impl *HelmAppServiceImpl) ListHelmApplications(ctx context.Context, cluste
 			impl.logger.Errorw("error in fetching helm app list from DB created using cd_pipelines", "clusters", clusterIds, "err", err)
 		}
 
-		// if not hyperion mode, then fetch from installed_apps whose deployment_app_type is helm (as in hyperion mode, these apps should be treated as external-apps)
+		// if not hyperion mode, then fetch from installed_apps whose deploymentAppType is helm (as in hyperion mode, these apps should be treated as external-apps)
 		if !util2.IsBaseStack() {
 			newCtx, span = otel.Tracer("pipelineRepository").Start(newCtx, "GetAppAndEnvDetailsForDeploymentAppTypePipeline")
 			start = time.Now()