Skip to content

fix: cloning app with seq cd pipeline fix #3926

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 19 commits into from
Sep 22, 2023
Merged

fix: cloning app with seq cd pipeline fix #3926

Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
6b86d74
setting parent id and type in cd clone dto req.
prakash100198 Sep 15, 2023
e21b5d7
ignoring parentid if parent is ci_pipeline type
prakash100198 Sep 15, 2023
e5b5c6f
mapping ref vs new cd pipeline in case of cloning app
prakash100198 Sep 15, 2023
b93a5c6
minor fix
prakash100198 Sep 17, 2023
7122356
Merge branch 'main' into cloning-app-seq-fix
prakash100198 Sep 18, 2023
b45213e
passing source to new pipeline id mapping and refpipline id with webh…
prakash100198 Sep 18, 2023
78f6dd9
minor fix
prakash100198 Sep 18, 2023
9aa1374
fix
prakash100198 Sep 18, 2023
6f51760
external ci workflow cloning fix
prakash100198 Sep 18, 2023
2c22dae
minor fix
prakash100198 Sep 19, 2023
c8a5b01
creating appWorkflow in app clone service layer rather than in pipeli…
prakash100198 Sep 19, 2023
1368e1e
minor fixes
prakash100198 Sep 19, 2023
5034cdc
removing pointer map in cdPipelineConfigObject
prakash100198 Sep 20, 2023
d474f0a
further refactoring
prakash100198 Sep 20, 2023
964a980
minor fix
prakash100198 Sep 20, 2023
42ea77e
more refactoring
prakash100198 Sep 20, 2023
0d3bb0c
createWfMapping to createWfInstances
prakash100198 Sep 20, 2023
d2983ad
minor refactoring in AppCloneService
prakash100198 Sep 21, 2023
e707ecd
error handling
prakash100198 Sep 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
174 changes: 105 additions & 69 deletions pkg/appClone/AppCloneService.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,9 @@ type AppCloneServiceImpl struct {
pipelineStageService pipeline.PipelineStageService
ciTemplateService pipeline.CiTemplateService
appRepository app2.AppRepository
ciPipelineRepository pipelineConfig.CiPipelineRepository
pipelineRepository pipelineConfig.PipelineRepository
appWorkflowRepository appWorkflow2.AppWorkflowRepository
}

func NewAppCloneServiceImpl(logger *zap.SugaredLogger,
Expand All @@ -65,7 +68,8 @@ func NewAppCloneServiceImpl(logger *zap.SugaredLogger,
propertiesConfigService pipeline.PropertiesConfigService,
ciTemplateOverrideRepository pipelineConfig.CiTemplateOverrideRepository,
pipelineStageService pipeline.PipelineStageService, ciTemplateService pipeline.CiTemplateService,
appRepository app2.AppRepository) *AppCloneServiceImpl {
appRepository app2.AppRepository, ciPipelineRepository pipelineConfig.CiPipelineRepository,
pipelineRepository pipelineConfig.PipelineRepository, appWorkflowRepository appWorkflow2.AppWorkflowRepository) *AppCloneServiceImpl {
return &AppCloneServiceImpl{
logger: logger,
pipelineBuilder: pipelineBuilder,
Expand All @@ -78,6 +82,9 @@ func NewAppCloneServiceImpl(logger *zap.SugaredLogger,
pipelineStageService: pipelineStageService,
ciTemplateService: ciTemplateService,
appRepository: appRepository,
ciPipelineRepository: ciPipelineRepository,
pipelineRepository: pipelineRepository,
appWorkflowRepository: appWorkflowRepository,
}
}

Expand All @@ -90,6 +97,16 @@ type CloneRequest struct {
AppType helper.AppType `json:"appType"`
}

type CreateWorkflowMappingDto struct {
oldAppId int
newAppId int
userId int32
newWfId int
gitMaterialMapping map[int]int
isSameProject bool
externalCiPipelineId int
}

func (impl *AppCloneServiceImpl) CloneApp(createReq *bean.CreateAppDTO, context context.Context) (*bean.CreateAppDTO, error) {
//validate template app
templateApp, err := impl.appRepository.FindById(createReq.TemplateId)
Expand Down Expand Up @@ -586,6 +603,7 @@ func (impl *AppCloneServiceImpl) CreateWf(oldAppId, newAppId int, userId int32,
return nil, err
}
impl.logger.Debugw("workflow found", "wf", refAppWFs)

for _, refAppWF := range refAppWFs {
thisWf := appWorkflow.AppWorkflowDto{
Id: 0,
Expand All @@ -594,24 +612,50 @@ func (impl *AppCloneServiceImpl) CreateWf(oldAppId, newAppId int, userId int32,
AppWorkflowMappingDto: nil, //first create new mapping then add it
UserId: userId,
}
thisWf, err = impl.appWorkflowService.CreateAppWorkflow(thisWf)
if err != nil {
impl.logger.Errorw("error in creating workflow without external-ci", "err", err)
return nil, err
}
impl.logger.Debugw("app workflow created")

isExternalCiPresent := false
for _, awm := range refAppWF.AppWorkflowMappingDto {
if awm.Type == appWorkflow2.WEBHOOK {
isExternalCiPresent = true
break
}
}

if !isExternalCiPresent {
thisWf, err = impl.appWorkflowService.CreateAppWorkflow(thisWf)
impl.logger.Debugw("workflow found", thisWf)
var externalCiPipelineId int
if isExternalCiPresent {
dbConnection := impl.pipelineRepository.GetConnection()
tx, err := dbConnection.Begin()
if err != nil {
impl.logger.Errorw("error in beginning transaction", "err", err)
return nil, err
}
// Rollback tx on error.
defer tx.Rollback()
externalCiPipelineId, err = impl.pipelineBuilder.CreateExternalCiAndAppWorkflowMapping(newAppId, thisWf.Id, userId, tx)
if err != nil {
impl.logger.Errorw("error in creating new external ci pipeline and new app workflow mapping", "refAppId", oldAppId, "newAppId", newAppId, "err", err)
return nil, err
}
err = tx.Commit()
if err != nil {
impl.logger.Errorw("errir in creating workflow without extenal-ci", "err", err)
return nil, err
}
}

err = impl.createWfMappings(refAppWF.AppWorkflowMappingDto, oldAppId, newAppId, userId, thisWf.Id, gitMaterialMapping, ctx, isSameProject)
createWorkflowMappingDto := CreateWorkflowMappingDto{
oldAppId: oldAppId,
newAppId: newAppId,
userId: userId,
newWfId: thisWf.Id,
gitMaterialMapping: gitMaterialMapping,
isSameProject: isSameProject,
externalCiPipelineId: externalCiPipelineId,
}
err = impl.createWfInstances(refAppWF.AppWorkflowMappingDto, createWorkflowMappingDto, ctx)
if err != nil {
impl.logger.Errorw("error in creating workflow mapping", "err", err)
return nil, err
Expand All @@ -620,7 +664,7 @@ func (impl *AppCloneServiceImpl) CreateWf(oldAppId, newAppId int, userId int32,
return nil, nil
}

func (impl *AppCloneServiceImpl) createWfMappings(refWfMappings []appWorkflow.AppWorkflowMappingDto, oldAppId, newAppId int, userId int32, thisWfId int, gitMaterialMapping map[int]int, ctx context.Context, isSameProject bool) error {
func (impl *AppCloneServiceImpl) createWfInstances(refWfMappings []appWorkflow.AppWorkflowMappingDto, createWorkflowMappingDto CreateWorkflowMappingDto, ctx context.Context) error {
impl.logger.Debugw("wf mapping cloning", "refWfMappings", refWfMappings)
var ciMapping []appWorkflow.AppWorkflowMappingDto
var cdMappings []appWorkflow.AppWorkflowMappingDto
Expand All @@ -636,23 +680,30 @@ func (impl *AppCloneServiceImpl) createWfMappings(refWfMappings []appWorkflow.Ap
return fmt.Errorf("unsupported wf type: %s", appWf.Type)
}
}
refApp, err := impl.pipelineBuilder.GetApp(oldAppId)
sourceToNewPipelineIdMapping := make(map[int]int)
refApp, err := impl.pipelineBuilder.GetApp(createWorkflowMappingDto.oldAppId)
if err != nil {
impl.logger.Errorw("error in getting app from refAppId", "refAppId", createWorkflowMappingDto.oldAppId)
return err
}
if len(webhookMappings) > 0 {
if isSameProject {
if createWorkflowMappingDto.isSameProject {
for _, refwebhookMappings := range cdMappings {
cdCloneReq := &cloneCdPipelineRequest{
refCdPipelineId: refwebhookMappings.ComponentId,
refAppId: oldAppId,
appId: newAppId,
userId: userId,
ciPipelineId: 0,
appWfId: thisWfId,
refAppName: refApp.AppName,
refCdPipelineId: refwebhookMappings.ComponentId,
refAppId: createWorkflowMappingDto.oldAppId,
appId: createWorkflowMappingDto.newAppId,
userId: createWorkflowMappingDto.userId,
ciPipelineId: 0,
appWfId: createWorkflowMappingDto.newWfId,
refAppName: refApp.AppName,
sourceToNewPipelineId: sourceToNewPipelineIdMapping,
externalCiPipelineId: createWorkflowMappingDto.externalCiPipelineId,
}
pipeline, err := impl.CreateCdPipeline(cdCloneReq, ctx)
impl.logger.Debugw("cd pipeline created", "pipeline", pipeline)
if err != nil {
impl.logger.Errorw("error in getting cd-pipeling", "err", err)
impl.logger.Errorw("error in getting cd-pipeline", "refAppId", createWorkflowMappingDto.oldAppId, "newAppId", createWorkflowMappingDto.newAppId, "err", err)
return err
}
}
Expand All @@ -666,7 +717,7 @@ func (impl *AppCloneServiceImpl) createWfMappings(refWfMappings []appWorkflow.Ap
impl.logger.Warn("no ci pipeline found")
return nil
} else if len(ciMapping) != 1 {
impl.logger.Warn("more than one cd pipeline not supported")
impl.logger.Warn("more than one ci pipeline not supported")
return nil
}

Expand All @@ -678,12 +729,12 @@ func (impl *AppCloneServiceImpl) createWfMappings(refWfMappings []appWorkflow.Ap
impl.logger.Debugw("creating ci", "ref", refCiMapping)

cloneCiPipelineRequest := &cloneCiPipelineRequest{
refAppId: oldAppId,
refAppId: createWorkflowMappingDto.oldAppId,
refCiPipelineId: refCiMapping.ComponentId,
userId: userId,
appId: newAppId,
wfId: thisWfId,
gitMaterialMapping: gitMaterialMapping,
userId: createWorkflowMappingDto.userId,
appId: createWorkflowMappingDto.newAppId,
wfId: createWorkflowMappingDto.newWfId,
gitMaterialMapping: createWorkflowMappingDto.gitMaterialMapping,
refAppName: refApp.AppName,
}
ci, err = impl.CreateCiPipeline(cloneCiPipelineRequest)
Expand All @@ -693,16 +744,18 @@ func (impl *AppCloneServiceImpl) createWfMappings(refWfMappings []appWorkflow.Ap
}
impl.logger.Debugw("ci created", "ci", ci)
}
if isSameProject {

if createWorkflowMappingDto.isSameProject {
for _, refCdMapping := range cdMappings {
cdCloneReq := &cloneCdPipelineRequest{
refCdPipelineId: refCdMapping.ComponentId,
refAppId: oldAppId,
appId: newAppId,
userId: userId,
ciPipelineId: ci.CiPipelines[0].Id,
appWfId: thisWfId,
refAppName: refApp.AppName,
refCdPipelineId: refCdMapping.ComponentId,
refAppId: createWorkflowMappingDto.oldAppId,
appId: createWorkflowMappingDto.newAppId,
userId: createWorkflowMappingDto.userId,
ciPipelineId: ci.CiPipelines[0].Id,
appWfId: createWorkflowMappingDto.newWfId,
refAppName: refApp.AppName,
sourceToNewPipelineId: sourceToNewPipelineIdMapping,
}
pipeline, err := impl.CreateCdPipeline(cdCloneReq, ctx)
if err != nil {
Expand Down Expand Up @@ -866,13 +919,15 @@ func (impl *AppCloneServiceImpl) CreateCiPipeline(req *cloneCiPipelineRequest) (
}

type cloneCdPipelineRequest struct {
refCdPipelineId int
refAppId int
appId int
userId int32
ciPipelineId int
appWfId int
refAppName string
refCdPipelineId int
refAppId int
appId int
userId int32
ciPipelineId int
appWfId int
refAppName string
sourceToNewPipelineId map[int]int
externalCiPipelineId int
}

func (impl *AppCloneServiceImpl) CreateCdPipeline(req *cloneCdPipelineRequest, ctx context.Context) (*bean.CdPipelines, error) {
Expand All @@ -890,6 +945,7 @@ func (impl *AppCloneServiceImpl) CreateCdPipeline(req *cloneCdPipelineRequest, c
if refCdPipeline == nil {
return nil, fmt.Errorf("no cd pipeline found")
}
refCdPipeline.SourceToNewPipelineId = req.sourceToNewPipelineId
pipelineName := refCdPipeline.Name
if strings.HasPrefix(pipelineName, req.refAppName) {
pipelineName = strings.Replace(pipelineName, req.refAppName+"-", "", 1)
Expand Down Expand Up @@ -920,35 +976,6 @@ func (impl *AppCloneServiceImpl) CreateCdPipeline(req *cloneCdPipelineRequest, c
deploymentAppType = util.PIPELINE_DEPLOYMENT_TYPE_HELM
}

if refCdPipeline.ParentPipelineType == "WEBHOOK" {
cdPipeline := &bean.CDPipelineConfigObject{
Id: 0,
EnvironmentId: refCdPipeline.EnvironmentId,
CiPipelineId: 0,
TriggerType: refCdPipeline.TriggerType,
Name: pipelineName,
Strategies: refCdPipeline.Strategies,
Namespace: refCdPipeline.Namespace,
AppWorkflowId: 0,
DeploymentTemplate: refCdPipeline.DeploymentTemplate,
PreStage: refCdPipeline.PreStage, //FIXME
PostStage: refCdPipeline.PostStage,
PreStageConfigMapSecretNames: refCdPipeline.PreStageConfigMapSecretNames,
PostStageConfigMapSecretNames: refCdPipeline.PostStageConfigMapSecretNames,
RunPostStageInEnv: refCdPipeline.RunPostStageInEnv,
RunPreStageInEnv: refCdPipeline.RunPreStageInEnv,
DeploymentAppType: refCdPipeline.DeploymentAppType,
ParentPipelineId: 0,
ParentPipelineType: refCdPipeline.ParentPipelineType,
}
cdPipelineReq := &bean.CdPipelines{
Pipelines: []*bean.CDPipelineConfigObject{cdPipeline},
AppId: req.appId,
UserId: req.userId,
}
cdPipelineRes, err := impl.pipelineBuilder.CreateCdPipelines(cdPipelineReq, ctx)
return cdPipelineRes, err
}
cdPipeline := &bean.CDPipelineConfigObject{
Id: 0,
EnvironmentId: refCdPipeline.EnvironmentId,
Expand All @@ -968,6 +995,15 @@ func (impl *AppCloneServiceImpl) CreateCdPipeline(req *cloneCdPipelineRequest, c
DeploymentAppType: deploymentAppType,
PreDeployStage: refCdPipeline.PreDeployStage,
PostDeployStage: refCdPipeline.PostDeployStage,
SourceToNewPipelineId: refCdPipeline.SourceToNewPipelineId,
RefPipelineId: refCdPipeline.Id,
ParentPipelineType: refCdPipeline.ParentPipelineType,
}
if refCdPipeline.ParentPipelineType == "WEBHOOK" {
cdPipeline.CiPipelineId = 0
cdPipeline.ParentPipelineId = req.externalCiPipelineId
} else if refCdPipeline.ParentPipelineType != appWorkflow.CI_PIPELINE_TYPE {
cdPipeline.ParentPipelineId = refCdPipeline.ParentPipelineId
}
cdPipelineReq := &bean.CdPipelines{
Pipelines: []*bean.CDPipelineConfigObject{cdPipeline},
Expand Down
3 changes: 3 additions & 0 deletions pkg/bean/app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -529,6 +529,9 @@ type CDPipelineConfigObject struct {
ManifestStorageType string `json:"manifestStorageType"`
PreDeployStage *bean.PipelineStageDto `json:"preDeployStage,omitempty"`
PostDeployStage *bean.PipelineStageDto `json:"postDeployStage,omitempty"`
SourceToNewPipelineId map[int]int `json:"sourceToNewPipelineId,omitempty"`
RefPipelineId int `json:"refPipelineId,omitempty"`
ExternalCiPipelineId int `json:"externalCiPipelineId,omitempty"`
}

type PreStageConfigMapSecretNames struct {
Expand Down
Loading