Merge pull request #6196 from devtron-labs/main-sync-rc25

misc: Main sync rc25

Author: vikramdevtron

assets/plugin-icons/ic-plugin-orca-security.png

@@ -44,7 +44,7 @@ type BulkUpdateRepository interface {
 	FindAppByChartEnvId(chartEnvId int) (*app.App, error)
 	FindBulkChartsByAppNameSubstring(appNameIncludes []string, appNameExcludes []string) ([]*chartRepoRepository.Chart, error)
 	FindBulkChartsEnvByAppNameSubstring(appNameIncludes []string, appNameExcludes []string, envId int) ([]*chartConfig.EnvConfigOverride, error)
-	BulkUpdateChartsValuesYamlAndGlobalOverrideById(id int, patch string) error
+	BulkUpdateChartsValuesYamlAndGlobalOverrideById(id int, patchValuesYml string, patchGlobalOverrideYml string) error
 	BulkUpdateChartsEnvYamlOverrideById(id int, patch string) error
 
 	//For ConfigMap & Secret :
@@ -222,12 +222,12 @@ func (repositoryImpl BulkUpdateRepositoryImpl) FindBulkChartsEnvByAppNameSubstri
 	err := q.Select()
 	return charts, err
 }
-func (repositoryImpl BulkUpdateRepositoryImpl) BulkUpdateChartsValuesYamlAndGlobalOverrideById(id int, patch string) error {
+func (repositoryImpl BulkUpdateRepositoryImpl) BulkUpdateChartsValuesYamlAndGlobalOverrideById(id int, patchValuesYml string, patchGlobalOverrideYml string) error {
 	chart := &chartRepoRepository.Chart{}
 	_, err := repositoryImpl.dbConnection.
 		Model(chart).
-		Set("values_yaml = ?", patch).
-		Set("global_override = ?", patch).
+		Set("values_yaml = ?", patchValuesYml).
+		Set("global_override = ?", patchGlobalOverrideYml).
 		Where("id = ?", id).
 		Update()
 	if err != nil {

internal/sql/repository/bulkUpdate/BulkUpdateRepository.go

@@ -407,52 +407,64 @@ func (impl BulkUpdateServiceImpl) BulkUpdateDeploymentTemplate(bulkUpdatePayload
 			} else {
 				for _, chart := range charts {
 					appDetailsByChart, _ := impl.bulkUpdateRepository.FindAppByChartId(chart.Id)
-					modified, err := impl.ApplyJsonPatch(deploymentTemplatePatch, chart.Values)
+					modifiedValuesYml, err := impl.ApplyJsonPatch(deploymentTemplatePatch, chart.Values)
 					if err != nil {
-						impl.logger.Errorw("error in applying JSON patch", "err", err)
+						impl.logger.Errorw("error in applying JSON patch to chart.Values", "err", err)
 						bulkUpdateFailedResponse := &DeploymentTemplateBulkUpdateResponseForOneApp{
 							AppId:   appDetailsByChart.Id,
 							AppName: appDetailsByChart.AppName,
 							Message: fmt.Sprintf("Error in applying JSON patch : %s", err.Error()),
 						}
 						deploymentTemplateBulkUpdateResponse.Failure = append(deploymentTemplateBulkUpdateResponse.Failure, bulkUpdateFailedResponse)
 					} else {
-						err = impl.bulkUpdateRepository.BulkUpdateChartsValuesYamlAndGlobalOverrideById(chart.Id, modified)
+						modifiedGlobalOverrideYml, err := impl.ApplyJsonPatch(deploymentTemplatePatch, chart.GlobalOverride)
 						if err != nil {
-							impl.logger.Errorw("error in bulk updating charts", "err", err)
+							impl.logger.Errorw("error in applying JSON patch to GlobalOverride", "err", err)
 							bulkUpdateFailedResponse := &DeploymentTemplateBulkUpdateResponseForOneApp{
 								AppId:   appDetailsByChart.Id,
 								AppName: appDetailsByChart.AppName,
-								Message: fmt.Sprintf("Error in updating in db : %s", err.Error()),
+								Message: fmt.Sprintf("Error in applying JSON patch : %s", err.Error()),
 							}
 							deploymentTemplateBulkUpdateResponse.Failure = append(deploymentTemplateBulkUpdateResponse.Failure, bulkUpdateFailedResponse)
 						} else {
-							bulkUpdateSuccessResponse := &DeploymentTemplateBulkUpdateResponseForOneApp{
-								AppId:   appDetailsByChart.Id,
-								AppName: appDetailsByChart.AppName,
-								Message: "Updated Successfully",
-							}
-							deploymentTemplateBulkUpdateResponse.Successful = append(deploymentTemplateBulkUpdateResponse.Successful, bulkUpdateSuccessResponse)
-
-							//creating history entry for deployment template
-							appLevelAppMetricsEnabled, err := impl.deployedAppMetricsService.GetMetricsFlagByAppId(chart.AppId)
+							err = impl.bulkUpdateRepository.BulkUpdateChartsValuesYamlAndGlobalOverrideById(chart.Id, modifiedValuesYml, modifiedGlobalOverrideYml)
 							if err != nil {
-								impl.logger.Errorw("error in getting app level metrics app level", "error", err, "appId", chart.AppId)
-								return nil
-							}
-							chart.GlobalOverride = modified
-							chart.Values = modified
-							err = impl.deploymentTemplateHistoryService.CreateDeploymentTemplateHistoryFromGlobalTemplate(chart, nil, appLevelAppMetricsEnabled)
-							if err != nil {
-								impl.logger.Errorw("error in creating entry for deployment template history", "err", err, "chart", chart)
-							}
-							//VARIABLE_MAPPING_UPDATE
-							//NOTE: this flow is doesn't have the user info, therefore updated by is being set to the last updated by
-							err = impl.scopedVariableManager.ExtractAndMapVariables(chart.GlobalOverride, chart.Id, repository5.EntityTypeDeploymentTemplateAppLevel, chart.UpdatedBy, nil)
-							if err != nil {
-								return nil
+								impl.logger.Errorw("error in bulk updating charts", "err", err)
+								bulkUpdateFailedResponse := &DeploymentTemplateBulkUpdateResponseForOneApp{
+									AppId:   appDetailsByChart.Id,
+									AppName: appDetailsByChart.AppName,
+									Message: fmt.Sprintf("Error in updating in db : %s", err.Error()),
+								}
+								deploymentTemplateBulkUpdateResponse.Failure = append(deploymentTemplateBulkUpdateResponse.Failure, bulkUpdateFailedResponse)
+							} else {
+								bulkUpdateSuccessResponse := &DeploymentTemplateBulkUpdateResponseForOneApp{
+									AppId:   appDetailsByChart.Id,
+									AppName: appDetailsByChart.AppName,
+									Message: "Updated Successfully",
+								}
+								deploymentTemplateBulkUpdateResponse.Successful = append(deploymentTemplateBulkUpdateResponse.Successful, bulkUpdateSuccessResponse)
+
+								//creating history entry for deployment template
+								appLevelAppMetricsEnabled, err := impl.deployedAppMetricsService.GetMetricsFlagByAppId(chart.AppId)
+								if err != nil {
+									impl.logger.Errorw("error in getting app level metrics app level", "error", err, "appId", chart.AppId)
+									return nil
+								}
+								chart.GlobalOverride = modifiedGlobalOverrideYml
+								chart.Values = modifiedValuesYml
+								err = impl.deploymentTemplateHistoryService.CreateDeploymentTemplateHistoryFromGlobalTemplate(chart, nil, appLevelAppMetricsEnabled)
+								if err != nil {
+									impl.logger.Errorw("error in creating entry for deployment template history", "err", err, "chart", chart)
+								}
+								//VARIABLE_MAPPING_UPDATE
+								//NOTE: this flow is doesn't have the user info, therefore updated by is being set to the last updated by
+								err = impl.scopedVariableManager.ExtractAndMapVariables(chart.GlobalOverride, chart.Id, repository5.EntityTypeDeploymentTemplateAppLevel, chart.UpdatedBy, nil)
+								if err != nil {
+									return nil
+								}
 							}
 						}
+
 					}
 				}
 			}