chore: code restructuring

api/restHandler/CoreAppRestHandler.go

@@ -1847,11 +1847,11 @@ func (handler CoreAppRestHandlerImpl) createEnvDeploymentTemplate(appId int, use
 			templateRequest := bean3.TemplateRequest{
 				AppId:               appId,
 				ChartRefId:          chartRefId,
-				ValuesOverride:      []byte("{}"),
+				ValuesOverride:      util.GetEmptyJSON(),
 				UserId:              userId,
 				IsAppMetricsEnabled: deploymentTemplateOverride.ShowAppMetrics,
 			}
-			newChartEntry, err := handler.chartService.CreateChartFromEnvOverride(templateRequest, context.Background())
+			newChartEntry, err := handler.chartService.CreateChartFromEnvOverride(context.Background(), templateRequest)
 			if err != nil {
 				handler.logger.Errorw("service err, CreateChartFromEnvOverride", "err", err, "appId", appId, "envId", envId, "chartRefId", chartRefId)
 				return err

api/restHandler/app/pipeline/configure/PipelineConfigRestHandler.go

@@ -30,8 +30,8 @@ import (
 	read5 "github.com/devtron-labs/devtron/pkg/chart/read"
 	repository2 "github.com/devtron-labs/devtron/pkg/cluster/environment/repository"
 	"github.com/devtron-labs/devtron/pkg/deployment/manifest/deployedAppMetrics"
-	"github.com/devtron-labs/devtron/pkg/deployment/manifest/deploymentTemplate"
 	"github.com/devtron-labs/devtron/pkg/deployment/manifest/deploymentTemplate/chartRef"
+	validator2 "github.com/devtron-labs/devtron/pkg/deployment/manifest/deploymentTemplate/validator"
 	security2 "github.com/devtron-labs/devtron/pkg/policyGovernance/security/imageScanning"
 	"github.com/devtron-labs/devtron/pkg/policyGovernance/security/imageScanning/read"
 	read3 "github.com/devtron-labs/devtron/pkg/team/read"
@@ -108,7 +108,7 @@ type PipelineConfigRestHandlerImpl struct {
 	ciPipelineMaterialRepository        pipelineConfig.CiPipelineMaterialRepository
 	ciHandler                           pipeline.CiHandler
 	Logger                              *zap.SugaredLogger
-	deploymentTemplateValidationService deploymentTemplate.DeploymentTemplateValidationService
+	deploymentTemplateValidationService validator2.DeploymentTemplateValidationService
 	chartService                        chart.ChartService
 	devtronAppGitOpConfigService        gitOpsConfig.DevtronAppGitOpConfigService
 	propertiesConfigService             pipeline.PropertiesConfigService
@@ -141,7 +141,7 @@ type PipelineConfigRestHandlerImpl struct {
 }
 
 func NewPipelineRestHandlerImpl(pipelineBuilder pipeline.PipelineBuilder, Logger *zap.SugaredLogger,
-	deploymentTemplateValidationService deploymentTemplate.DeploymentTemplateValidationService,
+	deploymentTemplateValidationService validator2.DeploymentTemplateValidationService,
 	chartService chart.ChartService,
 	devtronAppGitOpConfigService gitOpsConfig.DevtronAppGitOpConfigService,
 	propertiesConfigService pipeline.PropertiesConfigService,

internal/sql/repository/chartConfig/PipelineConfigRepository.go

@@ -42,7 +42,7 @@ type PipelineConfigRepository interface {
 	FindByStrategyAndPipelineId(strategy chartRepoRepository.DeploymentStrategy, pipelineId int) (pipelineStrategy *PipelineStrategy, err error)
 	GetAllStrategyByPipelineId(pipelineId int) ([]*PipelineStrategy, error)
 	GetDefaultStrategyByPipelineId(pipelineId int) (pipelineStrategy *PipelineStrategy, err error)
-	Delete(pipelineStrategy *PipelineStrategy, tx *pg.Tx) error
+	MarkAsDeleted(pipelineStrategy *PipelineStrategy, userId int32, tx *pg.Tx) error
 	GetAllStrategyByPipelineIds(pipelineIds []int) ([]*PipelineStrategy, error)
 }
 
@@ -59,33 +59,41 @@ func (impl PipelineConfigRepositoryImpl) Save(pipelineStrategy *PipelineStrategy
 }
 
 func (impl PipelineConfigRepositoryImpl) Update(pipelineStrategy *PipelineStrategy, tx *pg.Tx) error {
-	_, err := impl.dbConnection.Model(pipelineStrategy).WherePK().UpdateNotNull()
+	_, err := tx.Model(pipelineStrategy).WherePK().UpdateNotNull()
 	return err
 }
 
 func (impl PipelineConfigRepositoryImpl) FindById(id int) (pipelineStrategy *PipelineStrategy, err error) {
 	pipelineStrategy = &PipelineStrategy{}
 	err = impl.dbConnection.Model(pipelineStrategy).
-		Where("id = ?", id).Select()
+		Where("id = ?", id).
+		Where("deleted = ?", false).
+		Select()
 	return pipelineStrategy, err
 }
 
 func (impl PipelineConfigRepositoryImpl) FindByStrategy(strategy chartRepoRepository.DeploymentStrategy) (pipelineStrategy *PipelineStrategy, err error) {
 	pipelineStrategy = &PipelineStrategy{}
 	err = impl.dbConnection.Model(pipelineStrategy).
-		Where("strategy = ?", strategy).Select()
+		Where("strategy = ?", strategy).
+		Where("deleted = ?", false).
+		Select()
 	return pipelineStrategy, err
 }
 
 func (impl PipelineConfigRepositoryImpl) FindByStrategyAndPipelineId(strategy chartRepoRepository.DeploymentStrategy, pipelineId int) (pipelineStrategy *PipelineStrategy, err error) {
 	pipelineStrategy = &PipelineStrategy{}
 	err = impl.dbConnection.Model(pipelineStrategy).
 		Where("strategy = ?", strategy).
-		Where("pipeline_id = ?", pipelineId).Select()
+		Where("pipeline_id = ?", pipelineId).
+		Where("deleted = ?", false).
+		Select()
 	return pipelineStrategy, err
 }
 
-// it will return for multiple pipeline config for pipeline, per pipeline single pipeline config(blue green, canary)
+// GetAllStrategyByPipelineId -
+// it will return for multiple pipeline strategies for a pipeline
+// per pipeline single pipeline strategy (BLUE_GREEN, CANARY, ROLLING, RECREATE) can be there
 func (impl PipelineConfigRepositoryImpl) GetAllStrategyByPipelineId(pipelineId int) ([]*PipelineStrategy, error) {
 	var pipelineStrategies []*PipelineStrategy
 	err := impl.dbConnection.
@@ -99,7 +107,8 @@ func (impl PipelineConfigRepositoryImpl) GetAllStrategyByPipelineId(pipelineId i
 	return pipelineStrategies, err
 }
 
-// it will return single latest pipeline config for requested pipeline
+// GetDefaultStrategyByPipelineId -
+// it will return single latest pipeline strategy for the requested pipeline
 func (impl PipelineConfigRepositoryImpl) GetDefaultStrategyByPipelineId(pipelineId int) (pipelineStrategy *PipelineStrategy, err error) {
 	pipelineStrategy = &PipelineStrategy{}
 	err = impl.dbConnection.
@@ -114,8 +123,12 @@ func (impl PipelineConfigRepositoryImpl) GetDefaultStrategyByPipelineId(pipeline
 	return pipelineStrategy, err
 }
 
-func (impl PipelineConfigRepositoryImpl) Delete(pipelineStrategy *PipelineStrategy, tx *pg.Tx) error {
-	return tx.Delete(pipelineStrategy)
+// MarkAsDeleted -
+// it will soft-delete the pipeline strategy from the database
+func (impl PipelineConfigRepositoryImpl) MarkAsDeleted(pipelineStrategy *PipelineStrategy, userId int32, tx *pg.Tx) error {
+	pipelineStrategy.Deleted = true
+	pipelineStrategy.UpdateAuditLog(userId)
+	return impl.Update(pipelineStrategy, tx)
 }
 
 func (impl PipelineConfigRepositoryImpl) GetAllStrategyByPipelineIds(pipelineIds []int) ([]*PipelineStrategy, error) {

internal/util/ChartTemplateService.go

@@ -63,7 +63,7 @@ type ChartCreateResponse struct {
 }
 
 type ChartTemplateService interface {
-	FetchValuesFromReferenceChart(chartMetaData *chart.Metadata, refChartLocation string, templateName string, userId int32, pipelineStrategyPath string) (*ChartValues, error)
+	FetchValuesFromReferenceChart(chartMetaData *chart.Metadata, refChartLocation string, pipelineStrategyPath string) (*ChartValues, error)
 	GetChartVersion(location string) (string, error)
 	BuildChart(ctx context.Context, chartMetaData *chart.Metadata, referenceTemplatePath string) (string, error)
 	BuildChartProxyForHelmApps(chartCreateRequest *ChartCreateRequest) (chartCreateResponse *ChartCreateResponse, err error)
@@ -116,7 +116,7 @@ func (impl ChartTemplateServiceImpl) GetChartVersion(location string) (string, e
 	return chartContent.Version, nil
 }
 
-func (impl ChartTemplateServiceImpl) FetchValuesFromReferenceChart(chartMetaData *chart.Metadata, refChartLocation string, templateName string, userId int32, pipelineStrategyPath string) (*ChartValues, error) {
+func (impl ChartTemplateServiceImpl) FetchValuesFromReferenceChart(chartMetaData *chart.Metadata, refChartLocation string, pipelineStrategyPath string) (*ChartValues, error) {
 	chartMetaData.APIVersion = "v1" // ensure always v1
 	dir := impl.GetDir()
 	chartDir := filepath.Join(CHART_WORKING_DIR_PATH, dir)

pkg/app/AppService.go

@@ -128,7 +128,8 @@ type AppServiceImpl struct {
 
 type AppService interface {
 	UpdateReleaseStatus(request *bean.ReleaseStatusUpdateRequest) (bool, error)
-	GetConfigMapAndSecretJson(appId int, envId int, pipelineId int) ([]byte, error)
+	// Deprecated: GetConfigMapAndSecretJson
+	GetConfigMapAndSecretJson(appId int, envId int) ([]byte, error)
 	UpdateCdWorkflowRunnerByACDObject(app *v1alpha1.Application, cdWfrId int, updateTimedOutStatus bool) error
 	UpdateDeploymentStatusForGitOpsPipelines(app *v1alpha1.Application, applicationClusterId int, statusTime time.Time, isAppStore bool) (bool, bool, *chartConfig.PipelineOverride, error)
 	WriteCDSuccessEvent(appId int, envId int, override *chartConfig.PipelineOverride)
@@ -807,15 +808,14 @@ func (impl *AppServiceImpl) CreateGitOpsRepo(app *app.App, targetRevision string
 	return gitOpsRepoName, chartGitAttr, nil
 }
 
-// depricated
-// TODO remove this method
-func (impl *AppServiceImpl) GetConfigMapAndSecretJson(appId int, envId int, pipelineId int) ([]byte, error) {
+// GetConfigMapAndSecretJson TODO remove this method
+func (impl *AppServiceImpl) GetConfigMapAndSecretJson(appId int, envId int) ([]byte, error) {
 	var configMapJson string
 	var secretDataJson string
-	merged := []byte("{}")
+	merged := globalUtil.GetEmptyJSON()
 	configMapA, err := impl.configMapRepository.GetByAppIdAppLevel(appId)
 	if err != nil && pg.ErrNoRows != err {
-		return []byte("{}"), err
+		return merged, err
 	}
 	if configMapA != nil && configMapA.Id > 0 {
 		configMapJson = configMapA.ConfigMapData
@@ -828,17 +828,17 @@ func (impl *AppServiceImpl) GetConfigMapAndSecretJson(appId int, envId int, pipe
 		}
 		config, err := impl.mergeUtil.JsonPatch([]byte(configMapJson), []byte(secretDataJson))
 		if err != nil {
-			return []byte("{}"), err
+			return merged, err
 		}
 		merged, err = impl.mergeUtil.JsonPatch(merged, config)
 		if err != nil {
-			return []byte("{}"), err
+			return merged, err
 		}
 	}
 
 	configMapE, err := impl.configMapRepository.GetByAppIdAndEnvIdEnvLevel(appId, envId)
 	if err != nil && pg.ErrNoRows != err {
-		return []byte("{}"), err
+		return globalUtil.GetEmptyJSON(), err
 	}
 	if configMapE != nil && configMapE.Id > 0 {
 		configMapJson = configMapE.ConfigMapData
@@ -851,11 +851,11 @@ func (impl *AppServiceImpl) GetConfigMapAndSecretJson(appId int, envId int, pipe
 		}
 		config, err := impl.mergeUtil.JsonPatch([]byte(configMapJson), []byte(secretDataJson))
 		if err != nil {
-			return []byte("{}"), err
+			return merged, err
 		}
 		merged, err = impl.mergeUtil.JsonPatch(merged, config)
 		if err != nil {
-			return []byte("{}"), err
+			return merged, err
 		}
 	}
 

pkg/appClone/AppCloneService.go

@@ -39,6 +39,7 @@ import (
 	"github.com/devtron-labs/devtron/pkg/deployment/gitOps/config"
 	"github.com/devtron-labs/devtron/pkg/pipeline"
 	bean3 "github.com/devtron-labs/devtron/pkg/pipeline/bean"
+	globalUtil "github.com/devtron-labs/devtron/util"
 	"github.com/go-pg/pg"
 	"go.uber.org/zap"
 	"net/http"
@@ -528,12 +529,12 @@ func (impl *AppCloneServiceImpl) createEnvOverride(oldAppId, newAppId int, userI
 				templateRequest := bean5.TemplateRequest{
 					AppId:             newAppId,
 					ChartRefId:        envPropertiesReq.ChartRefId,
-					ValuesOverride:    []byte("{}"),
+					ValuesOverride:    globalUtil.GetEmptyJSON(),
 					UserId:            userId,
 					IsBasicViewLocked: envPropertiesReq.IsBasicViewLocked,
 					CurrentViewEditor: envPropertiesReq.CurrentViewEditor,
 				}
-				_, err = impl.chartService.CreateChartFromEnvOverride(templateRequest, ctx)
+				_, err = impl.chartService.CreateChartFromEnvOverride(ctx, templateRequest)
 				if err != nil {
 					impl.logger.Error(err)
 					return nil, nil

pkg/appClone/batch/Deployment_test.go

@@ -110,7 +110,7 @@ func Test_transformStrategy(t *testing.T) {
 			},
 				bean.Strategy{
 					DeploymentTemplate: "RECREATE",
-					Config:             []byte("{}"),
+					Config:             globalUtil.GetEmptyJSON(),
 					Default:            false,
 				}},
 			wantErr: false,