Skip to content

Commit 58ea126

Browse files
authored
fix:showing right image imagetags in multiplecolons in registry url (#3103)
* main-test-for-docker-image * main-test-for-docker-image * main-test-for-docker-image * main-test-for-docker-image
1 parent 31b5258 commit 58ea126

File tree

3 files changed

+16
-2
lines changed

3 files changed

+16
-2
lines changed

api/router/pubsub/CiEventHandler.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ func (impl *CiEventHandlerImpl) Subscribe() error {
9797
if err != nil {
9898
return
9999
}
100+
100101
resp, err := impl.webhookService.HandleCiSuccessEvent(ciCompleteEvent.PipelineId, req)
101102
if err != nil {
102103
impl.logger.Error(err)

pkg/app/AppService.go

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1592,6 +1592,18 @@ func (impl *AppServiceImpl) getReleaseOverride(envOverride *chartConfig.EnvConfi
15921592
artifactImage := artifact.Image
15931593
imageTag := strings.Split(artifactImage, ":")
15941594

1595+
imageTagLen := len(imageTag)
1596+
1597+
imageName := ""
1598+
1599+
for i := 0; i < imageTagLen-1; i++ {
1600+
if i != imageTagLen-2 {
1601+
imageName = imageName + imageTag[i] + ":"
1602+
} else {
1603+
imageName = imageName + imageTag[i]
1604+
}
1605+
}
1606+
15951607
appId := strconv.Itoa(pipeline.App.Id)
15961608
envId := strconv.Itoa(pipeline.EnvironmentId)
15971609

@@ -1600,8 +1612,8 @@ func (impl *AppServiceImpl) getReleaseOverride(envOverride *chartConfig.EnvConfi
16001612
deploymentStrategy = string(strategy.Strategy)
16011613
}
16021614
releaseAttribute := ReleaseAttributes{
1603-
Name: imageTag[0],
1604-
Tag: imageTag[1],
1615+
Name: imageName,
1616+
Tag: imageTag[imageTagLen-1],
16051617
PipelineName: pipeline.Name,
16061618
ReleaseVersion: strconv.Itoa(pipelineOverride.PipelineReleaseCounter),
16071619
DeploymentType: deploymentStrategy,

pkg/pipeline/WebhookService.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,7 @@ func (impl WebhookServiceImpl) HandleCiSuccessEvent(ciPipelineId int, request *C
167167
if pipeline.ScanEnabled {
168168
artifact.Scanned = true
169169
}
170+
170171
if err = impl.ciArtifactRepository.Save(artifact); err != nil {
171172
impl.logger.Errorw("error in saving material", "err", err)
172173
return 0, err

0 commit comments

Comments
 (0)