Skip to content

fix:showing right image imagetags in multiplecolons in registry url #3103

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 5 commits into from
Mar 13, 2023
Merged

fix:showing right image imagetags in multiplecolons in registry url #3103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0d13bb5
main-test-for-docker-image
rish2320 Feb 23, 2023
590293a
Merge branch 'main' into main-test
rish2320 Feb 27, 2023
bfd793f
main-test-for-docker-image
rish2320 Feb 27, 2023
101e9c7
main-test-for-docker-image
rish2320 Feb 27, 2023
e8c3abd
main-test-for-docker-image
rish2320 Mar 10, 2023
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
1 change: 1 addition & 0 deletions api/router/pubsub/CiEventHandler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ func (impl *CiEventHandlerImpl) Subscribe() error {
if err != nil {
return
}

resp, err := impl.webhookService.HandleCiSuccessEvent(ciCompleteEvent.PipelineId, req)
if err != nil {
impl.logger.Error(err)
Expand Down
16 changes: 14 additions & 2 deletions pkg/app/AppService.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1575,6 +1575,18 @@ func (impl *AppServiceImpl) getReleaseOverride(envOverride *chartConfig.EnvConfi
artifactImage := artifact.Image
imageTag := strings.Split(artifactImage, ":")

imageTagLen := len(imageTag)

imageName := ""

for i := 0; i < imageTagLen-1; i++ {
if i != imageTagLen-2 {
imageName = imageName + imageTag[i] + ":"
} else {
imageName = imageName + imageTag[i]
}
}

appId := strconv.Itoa(pipeline.App.Id)
envId := strconv.Itoa(pipeline.EnvironmentId)

Expand All @@ -1583,8 +1595,8 @@ func (impl *AppServiceImpl) getReleaseOverride(envOverride *chartConfig.EnvConfi
deploymentStrategy = string(strategy.Strategy)
}
releaseAttribute := ReleaseAttributes{
Name: imageTag[0],
Tag: imageTag[1],
Name: imageName,
Tag: imageTag[imageTagLen-1],
PipelineName: pipeline.Name,
ReleaseVersion: strconv.Itoa(pipelineOverride.PipelineReleaseCounter),
DeploymentType: deploymentStrategy,
Expand Down
1 change: 1 addition & 0 deletions pkg/pipeline/WebhookService.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,7 @@ func (impl WebhookServiceImpl) HandleCiSuccessEvent(ciPipelineId int, request *C
if pipeline.ScanEnabled {
artifact.Scanned = true
}

if err = impl.ciArtifactRepository.Save(artifact); err != nil {
impl.logger.Errorw("error in saving material", "err", err)
return 0, err
Expand Down