Skip to content
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.

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

misc: removed deployment group validation when deleting CD pipelines #5989

Merged
merged 1 commit into from
Oct 15, 2024
Merged
Changes from all commits
Commits
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
26 changes: 0 additions & 26 deletions pkg/pipeline/DeploymentPipelineConfigService.go
Original file line number Diff line number Diff line change
Expand Up @@ -708,19 +708,6 @@ func (impl *CdPipelineConfigServiceImpl) DeleteCdPipeline(pipeline *pipelineConf
return deleteResponse, err
}

//getting deployment group for this pipeline
deploymentGroupNames, err := impl.deploymentGroupRepository.GetNamesByAppIdAndEnvId(pipeline.EnvironmentId, pipeline.AppId)
if err != nil && err != pg.ErrNoRows {
impl.logger.Errorw("error in getting deployment group names by appId and envId", "err", err)
return deleteResponse, err
} else if len(deploymentGroupNames) > 0 {
groupNamesByte, err := json.Marshal(deploymentGroupNames)
if err != nil {
impl.logger.Errorw("error in marshaling deployment group names", "err", err, "deploymentGroupNames", deploymentGroupNames)
}
impl.logger.Debugw("cannot delete cd pipeline, is being used in deployment group")
return deleteResponse, fmt.Errorf("Please remove this CD pipeline from deployment groups : %s", string(groupNamesByte))
}
dbConnection := impl.pipelineRepository.GetConnection()
tx, err := dbConnection.Begin()
if err != nil {
Expand Down Expand Up @@ -2034,19 +2021,6 @@ func (impl *CdPipelineConfigServiceImpl) DeleteCdPipelinePartial(pipeline *pipel
return deleteResponse, err
}

//getting deployment group for this pipeline
deploymentGroupNames, err := impl.deploymentGroupRepository.GetNamesByAppIdAndEnvId(pipeline.EnvironmentId, pipeline.AppId)
if err != nil && err != pg.ErrNoRows {
impl.logger.Errorw("error in getting deployment group names by appId and envId", "err", err)
return deleteResponse, err
} else if len(deploymentGroupNames) > 0 {
groupNamesByte, err := json.Marshal(deploymentGroupNames)
if err != nil {
impl.logger.Errorw("error in marshaling deployment group names", "err", err, "deploymentGroupNames", deploymentGroupNames)
}
impl.logger.Debugw("cannot delete cd pipeline, is being used in deployment group")
return deleteResponse, fmt.Errorf("Please remove this CD pipeline from deployment groups : %s", string(groupNamesByte))
}
dbConnection := impl.pipelineRepository.GetConnection()
tx, err := dbConnection.Begin()
if err != nil {
Expand Down
Loading