From 72b46014fec049c5e3da623cc48ad6bd33ae0bfe Mon Sep 17 00:00:00 2001 From: kartik-579 Date: Wed, 9 Nov 2022 16:02:20 +0530 Subject: [PATCH] fix for deploymentApp creation check update --- pkg/app/AppService.go | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/pkg/app/AppService.go b/pkg/app/AppService.go index b7e1643659..cef888c69f 100644 --- a/pkg/app/AppService.go +++ b/pkg/app/AppService.go @@ -257,6 +257,12 @@ func (impl AppServiceImpl) createArgoApplicationIfRequired(appId int, appName st if err != nil { return "", err } + //update cd pipeline to mark deployment app created + _, err = impl.updatePipeline(pipeline, userId) + if err != nil { + impl.logger.Errorw("error in update cd pipeline for deployment app created or not", "err", err) + return "", err + } return argoAppName, nil } } @@ -943,7 +949,7 @@ func (impl AppServiceImpl) TriggerRelease(overrideRequest *bean.ValuesOverrideRe // ACD app creation STARTS HERE, it will use existing if already created impl.logger.Debugw("new pipeline found", "pipeline", pipeline) - name, err := impl.createArgoApplicationIfRequired(overrideRequest.AppId, pipeline.App.AppName, envOverride, pipeline, deployedBy) + name, err := impl.createArgoApplicationIfRequired(overrideRequest.AppId, pipeline.App.AppName, envOverride, pipeline, overrideRequest.UserId) if err != nil { impl.logger.Errorw("acd application create error on cd trigger", "err", err, "req", overrideRequest) return 0, err @@ -1039,13 +1045,6 @@ func (impl AppServiceImpl) TriggerRelease(overrideRequest *bean.ValuesOverrideRe } } - //update cd pipeline to mark deployment app created - _, err = impl.updatePipeline(pipeline, overrideRequest.UserId) - if err != nil { - impl.logger.Errorw("error in update cd pipeline for deployment app created or not", "err", err) - return 0, err - } - go impl.WriteCDTriggerEvent(overrideRequest, pipeline, envOverride, materialInfoMap, artifact, releaseId, pipelineOverrideId) if artifact.ScanEnabled { _ = impl.MarkImageScanDeployed(overrideRequest.AppId, envOverride.TargetEnvironment, artifact.ImageDigest, pipeline.Environment.ClusterId) @@ -1931,6 +1930,12 @@ func (impl AppServiceImpl) createHelmAppForCdPipeline(overrideRequest *bean.Valu return false, err } isSuccess = helmResponse.Success + //update cd pipeline to mark deployment app created + _, err = impl.updatePipeline(pipeline, overrideRequest.UserId) + if err != nil { + impl.logger.Errorw("error in update cd pipeline for deployment app created or not", "err", err) + return false, err + } } // update deployment status, used in deployment history