Skip to content

Commit 2f6be75

Browse files
code review comments incorporated
1 parent fdaf1c0 commit 2f6be75

File tree

2 files changed

+4
-24
lines changed

2 files changed

+4
-24
lines changed

pkg/pipeline/CiCdPipelineOrchestrator.go

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1277,14 +1277,7 @@ func (impl CiCdPipelineOrchestratorImpl) CreateMaterials(createMaterialRequest *
12771277
if err != nil {
12781278
return nil, err
12791279
}
1280-
defer func() {
1281-
if err != nil {
1282-
err := tx.Rollback()
1283-
if err != nil {
1284-
impl.logger.Errorw("error in rollback Create material", "err", err)
1285-
}
1286-
}
1287-
}()
1280+
defer tx.Rollback()
12881281
existingMaterials, err := impl.materialRepository.FindByAppId(createMaterialRequest.AppId)
12891282
if err != nil {
12901283
impl.logger.Errorw("err", "err", err)
@@ -1335,14 +1328,7 @@ func (impl CiCdPipelineOrchestratorImpl) UpdateMaterial(updateMaterialDTO *bean.
13351328
if err != nil {
13361329
return nil, err
13371330
}
1338-
defer func() {
1339-
if err != nil {
1340-
err := tx.Rollback()
1341-
if err != nil {
1342-
impl.logger.Errorw("error in rollback Update material", "err", err)
1343-
}
1344-
}
1345-
}()
1331+
defer tx.Rollback()
13461332
updatedMaterial, err := impl.updateMaterial(updateMaterialDTO, tx)
13471333
if err != nil {
13481334
impl.logger.Errorw("err", "err", err)

pkg/pipeline/CiMaterialConfigService.go

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -129,14 +129,8 @@ func (impl *CiMaterialConfigServiceImpl) DeleteMaterial(request *bean.UpdateMate
129129
if err != nil {
130130
return err
131131
}
132-
defer func() {
133-
if err != nil {
134-
err := tx.Rollback()
135-
if err != nil {
136-
impl.logger.Errorw("error in rollback ", "err", err)
137-
}
138-
}
139-
}()
132+
133+
defer tx.Rollback()
140134

141135
err = impl.materialRepo.MarkMaterialDeleted(existingMaterial, tx)
142136
if err != nil {

0 commit comments

Comments
 (0)