Skip to content

fix: added missing audit logs while deleting cd pipeline #3822

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 1 commit into from
Aug 24, 2023
Merged

fix: added missing audit logs while deleting cd pipeline #3822

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 6 additions & 2 deletions pkg/pipeline/PipelineBuilder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1988,7 +1988,7 @@ func (impl *PipelineBuilderImpl) PatchCdPipelines(cdPipelines *bean.CDPatchReque
impl.logger.Errorw("error in getting cd pipeline by id", "err", err, "id", cdPipelines.Pipeline.Id)
return pipelineRequest, err
}
deleteResponse, err := impl.DeleteCdPipelinePartial(pipeline, ctx, deleteAction)
deleteResponse, err := impl.DeleteCdPipelinePartial(pipeline, ctx, deleteAction, cdPipelines.UserId)
pipelineRequest.AppDeleteResponse = deleteResponse
return pipelineRequest, err
default:
Expand Down Expand Up @@ -2102,6 +2102,8 @@ func (impl *PipelineBuilderImpl) DeleteCdPipeline(pipeline *pipelineConfig.Pipel
}
}
}
appWorkflowMapping.UpdatedBy = userId
appWorkflowMapping.UpdatedOn = time.Now()
err = impl.appWorkflowRepository.DeleteAppWorkflowMapping(appWorkflowMapping, tx)
if err != nil {
impl.logger.Errorw("error in deleting workflow mapping", "err", err)
Expand Down Expand Up @@ -2211,7 +2213,7 @@ func (impl *PipelineBuilderImpl) DeleteCdPipeline(pipeline *pipelineConfig.Pipel
return deleteResponse, nil
}

func (impl *PipelineBuilderImpl) DeleteCdPipelinePartial(pipeline *pipelineConfig.Pipeline, ctx context.Context, deleteAction int) (*bean.AppDeleteResponseDTO, error) {
func (impl *PipelineBuilderImpl) DeleteCdPipelinePartial(pipeline *pipelineConfig.Pipeline, ctx context.Context, deleteAction int, userId int32) (*bean.AppDeleteResponseDTO, error) {
cascadeDelete := true
forceDelete := false
deleteResponse := &bean.AppDeleteResponseDTO{
Expand Down Expand Up @@ -2301,6 +2303,8 @@ func (impl *PipelineBuilderImpl) DeleteCdPipelinePartial(pipeline *pipelineConfi
}
impl.logger.Infow("app deleted from argocd", "id", pipeline.Id, "pipelineName", pipeline.Name, "app", deploymentAppName)
pipeline.DeploymentAppDeleteRequest = true
pipeline.UpdatedOn = time.Now()
pipeline.UpdatedBy = userId
err = impl.pipelineRepository.Update(pipeline, tx)
if err != nil {
impl.logger.Errorw("error in partially delete cd pipeline", "err", err)
Expand Down