Oss sync (#126)

* chore: Discord notification for a specific label ("pager-duty") (#3249)

* new action added

* changes

* changes

---------

Co-authored-by: Kamal Acharya <[email protected]>

* action added (#3265)

Co-authored-by: Kamal Acharya <[email protected]>
Co-authored-by: Prakarsh <[email protected]>

* fix: updated condition for getting role filters  (#3261)

* removed code which was corrupting data for role filters

* updated condition for user data fetch api role filters dml handling

* wip

* fix: updated condition for handling linked ci creation with parent ci docker config overriden (#3243)

* fix for linked ci creation

* fix for linked ci delete panic

* wip

---------

Co-authored-by: kamal-devtron <[email protected]>
Co-authored-by: Kamal Acharya <[email protected]>
Co-authored-by: Prakarsh <[email protected]>

Author: 4 people

pkg/pipeline/CiCdPipelineOrchestrator.go

@@ -35,8 +35,8 @@ import (
 	repository5 "github.com/devtron-labs/devtron/pkg/pipeline/repository"
 	"github.com/devtron-labs/devtron/pkg/sql"
 	"github.com/devtron-labs/devtron/pkg/user"
-	util2 "github.com/devtron-labs/devtron/util"
 	bean3 "github.com/devtron-labs/devtron/pkg/user/bean"
+	util2 "github.com/devtron-labs/devtron/util"
 	"path"
 	"regexp"
 	"strconv"
@@ -474,21 +474,17 @@ func (impl CiCdPipelineOrchestratorImpl) DeleteCiPipeline(pipeline *pipelineConf
 		impl.logger.Errorw("error in updating ci pipeline materials, DeleteCiPipeline", "err", err, "pipelineId", pipeline.Id)
 		return err
 	}
-	if !request.CiPipeline.IsDockerConfigOverridden {
-
+	if !request.CiPipeline.IsDockerConfigOverridden || request.CiPipeline.IsExternal { //if pipeline is external or if config is not overridden then ignore override and ciBuildConfig values
 		CiTemplateBean := bean2.CiTemplateBean{
 			CiTemplate:         nil,
 			CiTemplateOverride: &pipelineConfig.CiTemplateOverride{},
-			CiBuildConfig:      request.CiPipeline.DockerConfigOverride.CiBuildConfig,
+			CiBuildConfig:      &bean2.CiBuildConfigBean{},
 			UserId:             userId,
 		}
-
-		err := impl.ciPipelineHistoryService.SaveHistory(p, materials, &CiTemplateBean, repository4.TRIGGER_DELETE)
-
+		err = impl.ciPipelineHistoryService.SaveHistory(p, materials, &CiTemplateBean, repository4.TRIGGER_DELETE)
 		if err != nil {
-			impl.logger.Errorw("error in saving delete history for ci pipeline material and ci template overridden")
+			impl.logger.Errorw("error in saving delete history for ci pipeline material and ci template overridden", "err", err)
 		}
-
 	} else {
 		CiTemplateBean := bean2.CiTemplateBean{
 			CiTemplate: nil,
@@ -509,13 +505,10 @@ func (impl CiCdPipelineOrchestratorImpl) DeleteCiPipeline(pipeline *pipelineConf
 			CiBuildConfig: request.CiPipeline.DockerConfigOverride.CiBuildConfig,
 			UserId:        userId,
 		}
-
-		err := impl.ciPipelineHistoryService.SaveHistory(p, materials, &CiTemplateBean, repository4.TRIGGER_DELETE)
-
+		err = impl.ciPipelineHistoryService.SaveHistory(p, materials, &CiTemplateBean, repository4.TRIGGER_DELETE)
 		if err != nil {
-			impl.logger.Errorw("error in saving delete history for ci pipeline material and ci template overridden")
+			impl.logger.Errorw("error in saving delete history for ci pipeline material and ci template overridden", "err", err)
 		}
-
 	}
 
 	return err
@@ -629,8 +622,8 @@ func (impl CiCdPipelineOrchestratorImpl) CreateCiConf(createRequest *bean.CiConf
 		if err != nil {
 			return nil, err
 		}
-
-		if !ciPipeline.IsExternal && ciPipeline.IsDockerConfigOverridden {
+		ciTemplateBean := &bean2.CiTemplateBean{}
+		if ciPipeline.IsDockerConfigOverridden {
 			//creating template override
 			templateOverride := &pipelineConfig.CiTemplateOverride{
 				CiPipelineId:     ciPipeline.Id,
@@ -646,37 +639,26 @@ func (impl CiCdPipelineOrchestratorImpl) CreateCiConf(createRequest *bean.CiConf
 					UpdatedOn: time.Now(),
 				},
 			}
-			ciTemplateBean := &bean2.CiTemplateBean{
+			ciTemplateBean = &bean2.CiTemplateBean{
 				CiTemplateOverride: templateOverride,
 				CiBuildConfig:      ciPipeline.DockerConfigOverride.CiBuildConfig,
 				UserId:             createRequest.UserId,
 			}
-			err = impl.createDockerRepoIfNeeded(ciPipeline.DockerConfigOverride.DockerRegistry, ciPipeline.DockerConfigOverride.DockerRepository)
-			if err != nil {
-				impl.logger.Errorw("error, createDockerRepoIfNeeded", "err", err, "dockerRegistryId", ciPipeline.DockerConfigOverride.DockerRegistry, "dockerRegistry", ciPipeline.DockerConfigOverride.DockerRepository)
-				return nil, err
-			}
-			err := impl.ciTemplateService.Save(ciTemplateBean)
-			if err != nil {
-				return nil, err
-			}
-			err = impl.ciPipelineHistoryService.SaveHistory(ciPipelineObject, pipelineMaterials, ciTemplateBean, repository4.TRIGGER_ADD)
-			if err != nil {
-				impl.logger.Errorw("error in saving history for ci pipeline", "err", err)
-			}
-		} else {
-			ciTemplateBean := &bean2.CiTemplateBean{
-				CiTemplateOverride: &pipelineConfig.CiTemplateOverride{},
-				CiBuildConfig:      nil,
-				UserId:             createRequest.UserId,
-			}
-
-			err = impl.ciPipelineHistoryService.SaveHistory(ciPipelineObject, pipelineMaterials, ciTemplateBean, repository4.TRIGGER_ADD)
-
-			if err != nil {
-				impl.logger.Errorw("error in saving history for ci pipeline")
+			if !ciPipeline.IsExternal {
+				err = impl.createDockerRepoIfNeeded(ciPipeline.DockerConfigOverride.DockerRegistry, ciPipeline.DockerConfigOverride.DockerRepository)
+				if err != nil {
+					impl.logger.Errorw("error, createDockerRepoIfNeeded", "err", err, "dockerRegistryId", ciPipeline.DockerConfigOverride.DockerRegistry, "dockerRegistry", ciPipeline.DockerConfigOverride.DockerRepository)
+					return nil, err
+				}
+				err := impl.ciTemplateService.Save(ciTemplateBean)
+				if err != nil {
+					return nil, err
+				}
 			}
-
+		}
+		err = impl.ciPipelineHistoryService.SaveHistory(ciPipelineObject, pipelineMaterials, ciTemplateBean, repository4.TRIGGER_ADD)
+		if err != nil {
+			impl.logger.Errorw("error in saving history for ci pipeline", "err", err, "ciPipelineId", ciPipelineObject.Id)
 		}
 
 		//creating ci stages after tx commit due to FK constraints
@@ -1159,14 +1141,11 @@ func (impl CiCdPipelineOrchestratorImpl) createMaterial(inputMaterial *bean.GitM
 		AuditLog:        sql.AuditLog{UpdatedBy: userId, CreatedBy: userId, UpdatedOn: time.Now(), CreatedOn: time.Now()},
 	}
 	err := impl.materialRepository.SaveMaterial(material)
-
 	if err != nil {
 		impl.logger.Errorw("error in saving material", "material", material, "err", err)
 		return nil, err
 	}
-
 	err = impl.gitMaterialHistoryService.CreateMaterialHistory(material)
-
 	return material, err
 }
 

pkg/pipeline/history/CiPipelineHistoryService.go

@@ -39,21 +39,20 @@ func (impl *CiPipelineHistoryServiceImpl) SaveHistory(pipeline *pipelineConfig.C
 	if IsDockerConfigOverriden {
 		ciTemplateId := 0
 		ciTemplateOverrideId := 0
-
-		CiBuildConfigDbEntity, _ := bean.ConvertBuildConfigBeanToDbEntity(ciTemplateId, ciTemplateOverrideId, CiTemplateBean.CiBuildConfig, CiTemplateBean.UserId)
-
 		CiTemplateOverride = repository.CiPipelineTemplateOverrideHistoryDTO{
 			DockerRegistryId:      CiTemplateBean.CiTemplateOverride.DockerRegistryId,
 			DockerRepository:      CiTemplateBean.CiTemplateOverride.DockerRepository,
 			DockerfilePath:        CiTemplateBean.CiTemplateOverride.DockerfilePath,
 			Active:                CiTemplateBean.CiTemplateOverride.Active,
-			CiBuildConfigId:       CiBuildConfigDbEntity.Id,
-			BuildMetaDataType:     CiBuildConfigDbEntity.Type,
-			BuildMetadata:         CiBuildConfigDbEntity.BuildMetadata,
 			AuditLog:              CiTemplateBean.CiTemplateOverride.AuditLog,
 			IsCiTemplateOverriden: true,
 		}
-
+		if CiTemplateBean.CiBuildConfig != nil {
+			CiBuildConfigDbEntity, _ := bean.ConvertBuildConfigBeanToDbEntity(ciTemplateId, ciTemplateOverrideId, CiTemplateBean.CiBuildConfig, CiTemplateBean.UserId)
+			CiTemplateOverride.CiBuildConfigId = CiBuildConfigDbEntity.Id
+			CiTemplateOverride.BuildMetaDataType = CiBuildConfigDbEntity.Type
+			CiTemplateOverride.BuildMetadata = CiBuildConfigDbEntity.BuildMetadata
+		}
 	} else {
 
 		CiTemplateOverride = repository.CiPipelineTemplateOverrideHistoryDTO{
@@ -86,7 +85,6 @@ func (impl *CiPipelineHistoryServiceImpl) SaveHistory(pipeline *pipelineConfig.C
 	}
 
 	err := impl.CiPipelineHistoryRepository.Save(&CiPipelineHistory)
-
 	if err != nil {
 		impl.logger.Errorw("error in saving history of ci pipeline")
 		return err

pkg/pipeline/history/GitMaterialHistoryService.go

@@ -40,9 +40,7 @@ func (impl GitMaterialHistoryServiceImpl) CreateMaterialHistory(inputMaterial *p
 		FetchSubmodules: inputMaterial.FetchSubmodules,
 		AuditLog:        sql.AuditLog{UpdatedBy: inputMaterial.UpdatedBy, CreatedBy: inputMaterial.CreatedBy, UpdatedOn: inputMaterial.UpdatedOn, CreatedOn: inputMaterial.CreatedOn},
 	}
-
 	err := impl.gitMaterialHistoryRepository.SaveGitMaterialHistory(material)
-
 	if err != nil {
 		impl.logger.Errorw("error in saving create/update history for git repository")
 	}