From 0d13bb5fa69fb9f3a1e8381b65434af7143d56e9 Mon Sep 17 00:00:00 2001 From: rish2320 Date: Thu, 23 Feb 2023 14:10:09 +0530 Subject: [PATCH 1/4] main-test-for-docker-image --- api/router/pubsub/CiEventHandler.go | 2 ++ pkg/pipeline/WebhookService.go | 1 + 2 files changed, 3 insertions(+) diff --git a/api/router/pubsub/CiEventHandler.go b/api/router/pubsub/CiEventHandler.go index 3fd2f0db83..c032e9f85e 100644 --- a/api/router/pubsub/CiEventHandler.go +++ b/api/router/pubsub/CiEventHandler.go @@ -25,6 +25,7 @@ import ( "github.com/devtron-labs/devtron/internal/sql/repository/pipelineConfig" "github.com/devtron-labs/devtron/pkg/pipeline" "go.uber.org/zap" + "log" ) type CiEventHandler interface { @@ -80,6 +81,7 @@ func (impl *CiEventHandlerImpl) Subscribe() error { if err != nil { return } + log.Printf("rishab-debugger inside orchestrator cieventhandler:", ciCompleteEvent.DockerImage) resp, err := impl.webhookService.HandleCiSuccessEvent(ciCompleteEvent.PipelineId, req) if err != nil { impl.logger.Error(err) diff --git a/pkg/pipeline/WebhookService.go b/pkg/pipeline/WebhookService.go index db2b81611e..6f2180e1a6 100644 --- a/pkg/pipeline/WebhookService.go +++ b/pkg/pipeline/WebhookService.go @@ -167,6 +167,7 @@ func (impl WebhookServiceImpl) HandleCiSuccessEvent(ciPipelineId int, request *C if pipeline.ScanEnabled { artifact.Scanned = true } + impl.logger.Errorw("rishab-debugger inside orchestrator WebHookService.go:", request.Image) if err = impl.ciArtifactRepository.Save(artifact); err != nil { impl.logger.Errorw("error in saving material", "err", err) return 0, err From bfd793f484ae9ef496eccbc3949998fba43313c7 Mon Sep 17 00:00:00 2001 From: rish2320 Date: Mon, 27 Feb 2023 18:09:31 +0530 Subject: [PATCH 2/4] main-test-for-docker-image --- pkg/app/AppService.go | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/pkg/app/AppService.go b/pkg/app/AppService.go index 10039263d5..38b45fcb68 100644 --- a/pkg/app/AppService.go +++ b/pkg/app/AppService.go @@ -1575,6 +1575,18 @@ func (impl *AppServiceImpl) getReleaseOverride(envOverride *chartConfig.EnvConfi artifactImage := artifact.Image imageTag := strings.Split(artifactImage, ":") + length := len(imageTag) + + name := "" + + for i := 0; i < length-1; i++ { + if i != length-2 { + name = name + imageTag[i] + ":" + } else { + name = name + imageTag[i] + } + } + appId := strconv.Itoa(pipeline.App.Id) envId := strconv.Itoa(pipeline.EnvironmentId) @@ -1583,8 +1595,8 @@ func (impl *AppServiceImpl) getReleaseOverride(envOverride *chartConfig.EnvConfi deploymentStrategy = string(strategy.Strategy) } releaseAttribute := ReleaseAttributes{ - Name: imageTag[0], - Tag: imageTag[1], + Name: name, + Tag: imageTag[length-1], PipelineName: pipeline.Name, ReleaseVersion: strconv.Itoa(pipelineOverride.PipelineReleaseCounter), DeploymentType: deploymentStrategy, From 101e9c7cccb637a36a5d4aa00bdc3604d7bc02bf Mon Sep 17 00:00:00 2001 From: rish2320 Date: Mon, 27 Feb 2023 19:20:16 +0530 Subject: [PATCH 3/4] main-test-for-docker-image --- pkg/pipeline/CiConfig.go | 2 +- util/version.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/pipeline/CiConfig.go b/pkg/pipeline/CiConfig.go index 5bf1c7e4e6..163314b624 100644 --- a/pkg/pipeline/CiConfig.go +++ b/pkg/pipeline/CiConfig.go @@ -37,7 +37,7 @@ type CiConfig struct { DefaultCacheBucket string `env:"DEFAULT_CACHE_BUCKET" envDefault:"ci-caching"` DefaultCacheBucketRegion string `env:"DEFAULT_CACHE_BUCKET_REGION" envDefault:"us-east-2"` CiLogsKeyPrefix string `env:"CI_LOGS_KEY_PREFIX" envDefault:"my-artifacts"` - DefaultImage string `env:"DEFAULT_CI_IMAGE" envDefault:"686244538589.dkr.ecr.us-east-2.amazonaws.com/cirunner:47"` + DefaultImage string `env:"DEFAULT_CI_IMAGE" envDefault:"quay.io/devtron/ci-runner:f81491ec-138-11389"` DefaultNamespace string `env:"DEFAULT_NAMESPACE" envDefault:"devtron-ci"` DefaultTimeout int64 `env:"DEFAULT_TIMEOUT" envDefault:"3600"` Mode string `env:"MODE" envDefault:"DEV"` diff --git a/util/version.go b/util/version.go index f64cb32956..417b3fb010 100644 --- a/util/version.go +++ b/util/version.go @@ -31,7 +31,7 @@ type ServerVersion struct { } func GetDevtronVersion() *ServerVersion { - return &ServerVersion{BuildTime: BuildTime, GitCommit: GitCommit, ServerMode: ServerMode} + return &ServerVersion{BuildTime: BuildTime, GitCommit: GitCommit, ServerMode: SERVER_MODE_FULL} } func IsBaseStack() bool { From e8c3abdd7c2709127cb674c9fcf998c76e3d38f1 Mon Sep 17 00:00:00 2001 From: rish2320 Date: Fri, 10 Mar 2023 19:02:50 +0530 Subject: [PATCH 4/4] main-test-for-docker-image --- api/router/pubsub/CiEventHandler.go | 3 +-- pkg/app/AppService.go | 16 ++++++++-------- pkg/pipeline/CiConfig.go | 2 +- pkg/pipeline/WebhookService.go | 2 +- util/version.go | 2 +- 5 files changed, 12 insertions(+), 13 deletions(-) diff --git a/api/router/pubsub/CiEventHandler.go b/api/router/pubsub/CiEventHandler.go index c032e9f85e..8a8a76ac0e 100644 --- a/api/router/pubsub/CiEventHandler.go +++ b/api/router/pubsub/CiEventHandler.go @@ -25,7 +25,6 @@ import ( "github.com/devtron-labs/devtron/internal/sql/repository/pipelineConfig" "github.com/devtron-labs/devtron/pkg/pipeline" "go.uber.org/zap" - "log" ) type CiEventHandler interface { @@ -81,7 +80,7 @@ func (impl *CiEventHandlerImpl) Subscribe() error { if err != nil { return } - log.Printf("rishab-debugger inside orchestrator cieventhandler:", ciCompleteEvent.DockerImage) + resp, err := impl.webhookService.HandleCiSuccessEvent(ciCompleteEvent.PipelineId, req) if err != nil { impl.logger.Error(err) diff --git a/pkg/app/AppService.go b/pkg/app/AppService.go index 38b45fcb68..8f6702cde8 100644 --- a/pkg/app/AppService.go +++ b/pkg/app/AppService.go @@ -1575,15 +1575,15 @@ func (impl *AppServiceImpl) getReleaseOverride(envOverride *chartConfig.EnvConfi artifactImage := artifact.Image imageTag := strings.Split(artifactImage, ":") - length := len(imageTag) + imageTagLen := len(imageTag) - name := "" + imageName := "" - for i := 0; i < length-1; i++ { - if i != length-2 { - name = name + imageTag[i] + ":" + for i := 0; i < imageTagLen-1; i++ { + if i != imageTagLen-2 { + imageName = imageName + imageTag[i] + ":" } else { - name = name + imageTag[i] + imageName = imageName + imageTag[i] } } @@ -1595,8 +1595,8 @@ func (impl *AppServiceImpl) getReleaseOverride(envOverride *chartConfig.EnvConfi deploymentStrategy = string(strategy.Strategy) } releaseAttribute := ReleaseAttributes{ - Name: name, - Tag: imageTag[length-1], + Name: imageName, + Tag: imageTag[imageTagLen-1], PipelineName: pipeline.Name, ReleaseVersion: strconv.Itoa(pipelineOverride.PipelineReleaseCounter), DeploymentType: deploymentStrategy, diff --git a/pkg/pipeline/CiConfig.go b/pkg/pipeline/CiConfig.go index 163314b624..5bf1c7e4e6 100644 --- a/pkg/pipeline/CiConfig.go +++ b/pkg/pipeline/CiConfig.go @@ -37,7 +37,7 @@ type CiConfig struct { DefaultCacheBucket string `env:"DEFAULT_CACHE_BUCKET" envDefault:"ci-caching"` DefaultCacheBucketRegion string `env:"DEFAULT_CACHE_BUCKET_REGION" envDefault:"us-east-2"` CiLogsKeyPrefix string `env:"CI_LOGS_KEY_PREFIX" envDefault:"my-artifacts"` - DefaultImage string `env:"DEFAULT_CI_IMAGE" envDefault:"quay.io/devtron/ci-runner:f81491ec-138-11389"` + DefaultImage string `env:"DEFAULT_CI_IMAGE" envDefault:"686244538589.dkr.ecr.us-east-2.amazonaws.com/cirunner:47"` DefaultNamespace string `env:"DEFAULT_NAMESPACE" envDefault:"devtron-ci"` DefaultTimeout int64 `env:"DEFAULT_TIMEOUT" envDefault:"3600"` Mode string `env:"MODE" envDefault:"DEV"` diff --git a/pkg/pipeline/WebhookService.go b/pkg/pipeline/WebhookService.go index 6f2180e1a6..e882fd4564 100644 --- a/pkg/pipeline/WebhookService.go +++ b/pkg/pipeline/WebhookService.go @@ -167,7 +167,7 @@ func (impl WebhookServiceImpl) HandleCiSuccessEvent(ciPipelineId int, request *C if pipeline.ScanEnabled { artifact.Scanned = true } - impl.logger.Errorw("rishab-debugger inside orchestrator WebHookService.go:", request.Image) + if err = impl.ciArtifactRepository.Save(artifact); err != nil { impl.logger.Errorw("error in saving material", "err", err) return 0, err diff --git a/util/version.go b/util/version.go index 417b3fb010..f64cb32956 100644 --- a/util/version.go +++ b/util/version.go @@ -31,7 +31,7 @@ type ServerVersion struct { } func GetDevtronVersion() *ServerVersion { - return &ServerVersion{BuildTime: BuildTime, GitCommit: GitCommit, ServerMode: SERVER_MODE_FULL} + return &ServerVersion{BuildTime: BuildTime, GitCommit: GitCommit, ServerMode: ServerMode} } func IsBaseStack() bool {