Skip to content

fix: workflow getting incorrectly deleted in case of webhook and unreachable cluster's cd pipeline #6602

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 3 commits into from
May 26, 2025
Merged

fix: workflow getting incorrectly deleted in case of webhook and unreachable cluster's cd pipeline #6602

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4032de9
fix
kartik-579 May 22, 2025
7489684
updated log
kartik-579 May 22, 2025
da02302
Merge branch 'develop' into fix-webhook-unreachable-cd-delet
kartik-579 May 26, 2025
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
27 changes: 11 additions & 16 deletions internal/sql/repository/appWorkflow/AppWorkflowRepository.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ type AppWorkflowRepository interface {
FindByIds(ids []int) (*AppWorkflow, error)
FindByAppId(appId int) (appWorkflow []*AppWorkflow, err error)
FindByAppIds(appIds []int) (appWorkflow []*AppWorkflow, err error)
DeleteAppWorkflow(appWorkflow *AppWorkflow, tx *pg.Tx) error
DeleteAppWorkflowAndAllMappings(appWorkflow *AppWorkflow, tx *pg.Tx) error

SaveAppWorkflowMapping(wf *AppWorkflowMapping, tx *pg.Tx) (*AppWorkflowMapping, error)
FindByWorkflowId(workflowId int) ([]*AppWorkflowMapping, error)
Expand Down Expand Up @@ -164,26 +164,21 @@ func (impl AppWorkflowRepositoryImpl) FindByIds(ids []int) (*AppWorkflow, error)
return appWorkflow, err
}

func (impl AppWorkflowRepositoryImpl) DeleteAppWorkflow(appWorkflow *AppWorkflow, tx *pg.Tx) error {
appWorkflowMappings, err := impl.FindWFCIMappingByWorkflowId(appWorkflow.Id)
if err != nil && pg.ErrNoRows != err {
impl.Logger.Errorw("err", err)
return err
}
if len(appWorkflowMappings) > 0 {
for _, item := range appWorkflowMappings {
err = impl.DeleteAppWorkflowMapping(item, tx)
if err != nil {
impl.Logger.Errorw("err", err)
return err
}
func (impl AppWorkflowRepositoryImpl) DeleteAppWorkflowAndAllMappings(appWorkflow *AppWorkflow, tx *pg.Tx) error {
// Delete app workflow mapping
mapping, err := impl.FindWFAllMappingByWorkflowId(appWorkflow.Id)
for _, item := range mapping {
err := impl.DeleteAppWorkflowMapping(item, tx)
if err != nil {
impl.Logger.Errorw("error in deleting workflow mapping", "err", err)
return err
}
}

appWorkflow.Active = false
err = impl.dbConnection.Update(appWorkflow)
err = tx.Update(appWorkflow)
if err != nil {
impl.Logger.Errorw("err", err)
impl.Logger.Errorw("error in deleting app workflow", "appWorkflow", appWorkflow, "err", err)
return err
}
return nil
Expand Down
11 changes: 1 addition & 10 deletions pkg/appWorkflow/AppWorkflowService.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,20 +270,11 @@ func (impl AppWorkflowServiceImpl) DeleteAppWorkflow(appWorkflowId int, userId i
defer tx.Rollback()

// Deleting workflow
err = impl.appWorkflowRepository.DeleteAppWorkflow(wf, tx)
err = impl.appWorkflowRepository.DeleteAppWorkflowAndAllMappings(wf, tx)
if err != nil {
impl.Logger.Errorw("err", err)
return err
}
// Delete app workflow mapping
mapping, err := impl.appWorkflowRepository.FindWFAllMappingByWorkflowId(wf.Id)
for _, item := range mapping {
err := impl.appWorkflowRepository.DeleteAppWorkflowMapping(item, tx)
if err != nil {
impl.Logger.Errorw("error in deleting workflow mapping", "err", err)
return err
}
}
err = impl.userAuthService.DeleteRoles(bean3.WorkflowType, app.AppName, tx, "", wf.Name)
if err != nil {
impl.Logger.Errorw("error in deleting auth roles", "err", err)
Expand Down
3 changes: 2 additions & 1 deletion pkg/pipeline/DeploymentPipelineConfigService.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1337,7 +1337,8 @@ func (impl *CdPipelineConfigServiceImpl) DeleteCdPipeline(pipeline *pipelineConf
impl.logger.Errorw("error in deleting workflow mapping", "err", err)
return deleteResponse, err
}
err = impl.appWorkflowRepository.DeleteAppWorkflow(appWorkflow, tx)
//delete app workflow and all it's mappings
err = impl.appWorkflowRepository.DeleteAppWorkflowAndAllMappings(appWorkflow, tx)
if err != nil {
impl.logger.Errorw("error in deleting workflow mapping", "err", err)
return deleteResponse, err
Expand Down