self review fix: env override create

client/argocdServer/ArgoClientWrapperService.go

@@ -86,7 +86,7 @@ type ApplicationClientWrapper interface {
 	// GetArgoAppByName fetches an argoCd app by its name
 	GetArgoAppByName(ctx context.Context, appName string) (*v1alpha1.Application, error)
 
-	GetArgoAppByNameWithK8s(ctx context.Context, clusterId int, namespace, appName string) (map[string]interface{}, error)
+	GetArgoAppByNameWithK8sClient(ctx context.Context, clusterId int, namespace, appName string) (map[string]interface{}, error)
 
 	// SyncArgoCDApplicationIfNeededAndRefresh - if ARGO_AUTO_SYNC_ENABLED=true, app will be refreshed to initiate refresh at argoCD side or else it will be synced and refreshed
 	SyncArgoCDApplicationIfNeededAndRefresh(context context.Context, argoAppName string) error
@@ -406,7 +406,7 @@ func (impl *ArgoClientWrapperServiceImpl) GetArgoAppByName(ctx context.Context,
 	return argoApplication, nil
 }
 
-func (impl *ArgoClientWrapperServiceImpl) GetArgoAppByNameWithK8s(ctx context.Context, clusterId int, namespace, appName string) (map[string]interface{}, error) {
+func (impl *ArgoClientWrapperServiceImpl) GetArgoAppByNameWithK8sClient(ctx context.Context, clusterId int, namespace, appName string) (map[string]interface{}, error) {
 	k8sConfig, err := impl.acdConfigGetter.GetK8sConfigWithClusterIdAndNamespace(clusterId, namespace)
 	if err != nil {
 		impl.logger.Errorw("error in getting k8s config", "err", err)

client/argocdServer/ArgoClientWrapperServiceEA.go

@@ -123,7 +123,7 @@ func (impl *ArgoClientWrapperServiceEAImpl) GetArgoAppByName(ctx context.Context
 	return nil, nil
 }
 
-func (impl *ArgoClientWrapperServiceEAImpl) GetArgoAppByNameWithK8s(ctx context.Context, clusterId int, namespace, appName string) (map[string]interface{}, error) {
+func (impl *ArgoClientWrapperServiceEAImpl) GetArgoAppByNameWithK8sClient(ctx context.Context, clusterId int, namespace, appName string) (map[string]interface{}, error) {
 	impl.logger.Info("not implemented for EA mode")
 	return nil, nil
 }

pkg/app/AppService.go

@@ -40,7 +40,6 @@ import (
 	"github.com/devtron-labs/devtron/pkg/deployment/manifest/deploymentTemplate/read"
 	bean4 "github.com/devtron-labs/devtron/pkg/deployment/trigger/devtronApps/bean"
 	"net/url"
-	"path/filepath"
 	"strconv"
 	"time"
 
@@ -779,8 +778,10 @@ type ValuesOverrideResponse struct {
 }
 
 func (impl *AppServiceImpl) CreateGitOpsRepo(app *app.App, userId int32) (gitopsRepoName string, chartGitAttr *commonBean.ChartGitAttribute, err error) {
-	chart, err := impl.chartRepository.FindLatestChartForAppByAppId(app.Id)
-	if err != nil && pg.ErrNoRows != err {
+
+	deploymentConfig, err := impl.deploymentConfigService.GetConfigForDevtronApps(app.Id, 0)
+	if err != nil {
+		impl.logger.Errorw("error in getting deployment config for devtron apps", "appId", app.Id, "err", err)
 		return "", nil, err
 	}
 	gitOpsRepoName := impl.gitOpsConfigReadService.GetGitOpsRepoName(app.AppName)
@@ -789,7 +790,7 @@ func (impl *AppServiceImpl) CreateGitOpsRepo(app *app.App, userId int32) (gitops
 		impl.logger.Errorw("error in pushing chart to git ", "gitOpsRepoName", gitOpsRepoName, "err", err)
 		return "", nil, err
 	}
-	chartGitAttr.ChartLocation = filepath.Join(chart.ReferenceTemplate, chart.ChartVersion)
+	chartGitAttr.ChartLocation = deploymentConfig.GetChartLocation()
 	return gitOpsRepoName, chartGitAttr, nil
 }
 

pkg/deployment/common/deploymentConfigService.go

@@ -200,8 +200,8 @@ func (impl *DeploymentConfigServiceImpl) parseAppLevelReleaseConfigForDevtronApp
 	if len(appLevelConfig.RepoURL) > 0 {
 		repoURL = appLevelConfig.RepoURL
 	}
-
-	releaseConfig := newAppLevelReleaseConfigFromChart(repoURL, chart.ChartLocation)
+	chartLocation := filepath.Join(chart.ReferenceTemplate, chart.ChartVersion)
+	releaseConfig := newAppLevelReleaseConfigFromChart(repoURL, chartLocation)
 	return releaseConfig, nil
 }
 
@@ -322,7 +322,9 @@ func (impl *DeploymentConfigServiceImpl) parseAppLevelMigrationDataForDevtronApp
 	if err != nil {
 		return nil, err
 	}
-	releaseConfig := newAppLevelReleaseConfigFromChart(chart.GitRepoUrl, chart.ChartLocation)
+
+	chartLocation := filepath.Join(chart.ReferenceTemplate, chart.ChartVersion)
+	releaseConfig := newAppLevelReleaseConfigFromChart(chart.GitRepoUrl, chartLocation)
 	config := &bean.DeploymentConfig{
 		AppId:                appId,
 		ConfigType:           GetDeploymentConfigType(chart.IsCustomGitRepository),
@@ -377,11 +379,11 @@ func (impl *DeploymentConfigServiceImpl) parseEnvLevelReleaseConfigForDevtronApp
 
 		releaseConfig.Version = bean.Version
 
-		envOverride, err := impl.EnvConfigOverrideService.ActiveEnvConfigOverride(appId, envId)
-		if err != nil {
+		envOverride, err := impl.EnvConfigOverrideService.FindLatestChartForAppByAppIdAndEnvId(appId, envId)
+		if err != nil && !errors.Is(err, pg.ErrNoRows) {
+			impl.logger.Errorw("error in fetch")
 			return nil, err
 		}
-
 		var latestChart *chartRepoRepository.Chart
 		if (envOverride.Id == 0) || (envOverride.Id > 0 && !envOverride.IsOverride) {
 			latestChart, err = impl.chartRepository.FindLatestChartForAppByAppId(appId)