Skip to content

refactor: Refactor ci and multi cluster cicd #6505

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.

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 44 commits into from
Apr 22, 2025
Merged
Show file tree
Hide file tree
Changes from 41 commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
237d8d0
changes around ciHandler
kartik-579 Apr 1, 2025
7e7928d
common constants create
kartik-579 Apr 1, 2025
d9dcd09
ci service and trigger service creation
kartik-579 Apr 2, 2025
3bf9cd7
wire file missed
kartik-579 Apr 2, 2025
3d23b35
trigger service moved completely
kartik-579 Apr 2, 2025
eb5eeeb
feat: added ucid validation for ci/cd workflow status update event
Ash-exp Apr 2, 2025
3237725
telemetry svc refactoring
Ash-exp Apr 3, 2025
8525719
updated wire gen files
Ash-exp Apr 3, 2025
44abd3f
fix: CheckIfReTriggerRequired condition and CdHandlerImpl.UpdateWorkf…
Ash-exp Apr 3, 2025
30fd819
fix: workflow message update
Ash-exp Apr 3, 2025
8ca9d53
updated import alias
Ash-exp Apr 3, 2025
4e73878
fix: ci/ cd status update inconsistencies
Ash-exp Apr 3, 2025
2e1d236
Merge remote-tracking branch 'origin/develop' into fix-multi-cluster-…
Ash-exp Apr 3, 2025
b49821e
fix: checkForOptOut method error handling
Ash-exp Apr 3, 2025
186394a
fix: panic handling
Ash-exp Apr 3, 2025
48773ff
fix: updated DevtronAdministratorInstanceLabelKey for system executor
Ash-exp Apr 3, 2025
756be67
fix: reverted base64 encoding
Ash-exp Apr 3, 2025
3c42cd7
fix: ci/ cd workflow msg update
Ash-exp Apr 3, 2025
23befaa
fix: ci/ cd workflow msg update
Ash-exp Apr 4, 2025
87a2f25
matrics for retrigger failed event
Ash-exp Apr 4, 2025
2a76464
updated logger
Ash-exp Apr 4, 2025
e9ac531
ci service ent oss completed
kartik-579 Apr 6, 2025
f6391d7
added app to subdirectory for categorising entity
kartik-579 Apr 6, 2025
414712a
cd handler and ci handle extracted, executor workflow service executed
kartik-579 Apr 7, 2025
1a2de64
workflow service ent change
kartik-579 Apr 7, 2025
3120992
workflow service ent change
kartik-579 Apr 7, 2025
7ae5b3d
Redundant import removed
kartik-579 Apr 7, 2025
5ab4dfb
rename pkg/
kartik-579 Apr 7, 2025
6bd6815
reverted pkg categorisation
kartik-579 Apr 7, 2025
b54bb9e
chore: posthug refactoring and const renamed
Ash-exp Apr 7, 2025
e0a254e
Merge remote-tracking branch 'origin/develop' into fix-multi-cluster-…
Ash-exp Apr 7, 2025
ae11bb2
chore: kubewatch const renamed
Ash-exp Apr 7, 2025
13a26e1
chore: removed posthug module
Ash-exp Apr 7, 2025
0204c13
chore: ci/cd workflow message datatype updated
Ash-exp Apr 7, 2025
a5bf261
wip
kartik-579 Apr 8, 2025
b21694c
file renaming
kartik-579 Apr 8, 2025
3669806
Merge pull request #6488 from devtron-labs/ci-trigger-refactor-k2
kartik-579 Apr 8, 2025
43fb95b
deployStage unstacked file
kartik-579 Apr 8, 2025
cea6bc2
Merge branch 'develop' into ci-trigger-refactor-k1
kartik-579 Apr 8, 2025
0ac8f1f
file renamed
kartik-579 Apr 8, 2025
9b69ba0
Merge branch 'fix-multi-cluster-ci-cd-status' into refactor-ci-and-mu…
kartik-579 Apr 8, 2025
c263f69
Merge remote-tracking branch 'origin/develop' into refactor-ci-and-mu…
Ash-exp Apr 11, 2025
555f96b
updated BuildxCacheFlags description
Ash-exp Apr 11, 2025
77b53e7
Merge remote-tracking branch 'origin/develop' into refactor-ci-and-mu…
Ash-exp Apr 22, 2025
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
6 changes: 3 additions & 3 deletions App.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import (
"fmt"
"github.com/devtron-labs/common-lib/middlewares"
pubsub "github.com/devtron-labs/common-lib/pubsub-lib"
posthogTelemetry "github.com/devtron-labs/common-lib/telemetry"
"github.com/devtron-labs/devtron/pkg/eventProcessor"
"github.com/devtron-labs/devtron/pkg/eventProcessor/in"
"log"
Expand All @@ -31,7 +32,6 @@ import (
"time"

"github.com/devtron-labs/devtron/api/util"
"github.com/devtron-labs/devtron/client/telemetry"
"github.com/devtron-labs/devtron/otel"
"github.com/devtron-labs/devtron/pkg/auth/user"

Expand All @@ -55,7 +55,7 @@ type App struct {
EnforcerV2 *casbinv2.SyncedEnforcer
server *http.Server
db *pg.DB
posthogClient *telemetry.PosthogClient
posthogClient *posthogTelemetry.PosthogClient
// eventProcessor.CentralEventProcessor is used to register event processors
centralEventProcessor *eventProcessor.CentralEventProcessor // do not remove this.
// used for local dev only
Expand All @@ -73,7 +73,7 @@ func NewApp(router *router.MuxRouter,
enforcer *casbin.SyncedEnforcer,
db *pg.DB,
sessionManager2 *authMiddleware.SessionManager,
posthogClient *telemetry.PosthogClient,
posthogClient *posthogTelemetry.PosthogClient,
loggingMiddleware util.LoggingMiddleware,
centralEventProcessor *eventProcessor.CentralEventProcessor,
pubSubClient *pubsub.PubSubClientServiceImpl,
Expand Down
15 changes: 8 additions & 7 deletions Wire.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ package main
import (
"github.com/devtron-labs/authenticator/middleware"
cloudProviderIdentifier "github.com/devtron-labs/common-lib/cloud-provider-identifier"
pubsub1 "github.com/devtron-labs/common-lib/pubsub-lib"
pubSub "github.com/devtron-labs/common-lib/pubsub-lib"
posthogTelemetry "github.com/devtron-labs/common-lib/telemetry"
util4 "github.com/devtron-labs/common-lib/utils/k8s"
"github.com/devtron-labs/devtron/api/apiToken"
appStoreRestHandler "github.com/devtron-labs/devtron/api/appStore"
Expand Down Expand Up @@ -144,6 +145,7 @@ import (
"github.com/devtron-labs/devtron/pkg/deploymentGroup"
"github.com/devtron-labs/devtron/pkg/dockerRegistry"
"github.com/devtron-labs/devtron/pkg/eventProcessor"
"github.com/devtron-labs/devtron/pkg/executor"
"github.com/devtron-labs/devtron/pkg/generateManifest"
"github.com/devtron-labs/devtron/pkg/gitops"
"github.com/devtron-labs/devtron/pkg/imageDigestPolicy"
Expand All @@ -165,6 +167,7 @@ import (
resourceGroup2 "github.com/devtron-labs/devtron/pkg/resourceGroup"
"github.com/devtron-labs/devtron/pkg/resourceQualifiers"
"github.com/devtron-labs/devtron/pkg/sql"
"github.com/devtron-labs/devtron/pkg/ucid"
util3 "github.com/devtron-labs/devtron/pkg/util"
"github.com/devtron-labs/devtron/pkg/variables"
"github.com/devtron-labs/devtron/pkg/variables/parsers"
Expand Down Expand Up @@ -219,7 +222,7 @@ func InitializeApp() (*App, error) {
userResource.UserResourceWireSet,
policyGovernance.PolicyGovernanceWireSet,
resourceScan.ScanningResultWireSet,

executor.ExecutorWireSet,
// -------wireset end ----------
// -------
gitSensor.GetConfig,
Expand Down Expand Up @@ -478,9 +481,6 @@ func InitializeApp() (*App, error) {
util.IntValidator,
types.GetCiCdConfig,

pipeline.NewWorkflowServiceImpl,
wire.Bind(new(pipeline.WorkflowService), new(*pipeline.WorkflowServiceImpl)),

pipeline.NewCiServiceImpl,
wire.Bind(new(pipeline.CiService), new(*pipeline.CiServiceImpl)),

Expand All @@ -501,7 +501,7 @@ func InitializeApp() (*App, error) {
pipeline.NewCiLogServiceImpl,
wire.Bind(new(pipeline.CiLogService), new(*pipeline.CiLogServiceImpl)),

pubsub1.NewPubSubClientServiceImpl,
pubSub.NewPubSubClientServiceImpl,

rbac.NewEnforcerUtilImpl,
wire.Bind(new(rbac.EnforcerUtil), new(*rbac.EnforcerUtilImpl)),
Expand Down Expand Up @@ -696,7 +696,8 @@ func InitializeApp() (*App, error) {
wire.Bind(new(router.TelemetryRouter), new(*router.TelemetryRouterImpl)),
restHandler.NewTelemetryRestHandlerImpl,
wire.Bind(new(restHandler.TelemetryRestHandler), new(*restHandler.TelemetryRestHandlerImpl)),
telemetry.NewPosthogClient,
posthogTelemetry.NewPosthogClient,
ucid.WireSet,

cloudProviderIdentifier.NewProviderIdentifierServiceImpl,
wire.Bind(new(cloudProviderIdentifier.ProviderIdentifierService), new(*cloudProviderIdentifier.ProviderIdentifierServiceImpl)),
Expand Down
12 changes: 6 additions & 6 deletions api/argoApplication/wire_argoApplication.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
package argoApplication

import (
"github.com/devtron-labs/devtron/pkg/argoApplication"
argoApplication3 "github.com/devtron-labs/devtron/pkg/argoApplication"
"github.com/devtron-labs/devtron/pkg/argoApplication/read"
"github.com/devtron-labs/devtron/pkg/argoApplication/read/config"
"github.com/google/wire"
Expand All @@ -30,9 +30,9 @@ var ArgoApplicationWireSetFull = wire.NewSet(
config.NewArgoApplicationConfigServiceImpl,
wire.Bind(new(config.ArgoApplicationConfigService), new(*config.ArgoApplicationConfigServiceImpl)),

argoApplication.NewArgoApplicationServiceImpl,
argoApplication.NewArgoApplicationServiceExtendedServiceImpl,
wire.Bind(new(argoApplication.ArgoApplicationService), new(*argoApplication.ArgoApplicationServiceExtendedImpl)),
argoApplication3.NewArgoApplicationServiceImpl,
argoApplication3.NewArgoApplicationServiceExtendedServiceImpl,
wire.Bind(new(argoApplication3.ArgoApplicationService), new(*argoApplication3.ArgoApplicationServiceExtendedImpl)),

NewArgoApplicationRestHandlerImpl,
wire.Bind(new(ArgoApplicationRestHandler), new(*ArgoApplicationRestHandlerImpl)),
Expand All @@ -48,8 +48,8 @@ var ArgoApplicationWireSetEA = wire.NewSet(
config.NewArgoApplicationConfigServiceImpl,
wire.Bind(new(config.ArgoApplicationConfigService), new(*config.ArgoApplicationConfigServiceImpl)),

argoApplication.NewArgoApplicationServiceImpl,
wire.Bind(new(argoApplication.ArgoApplicationService), new(*argoApplication.ArgoApplicationServiceImpl)),
argoApplication3.NewArgoApplicationServiceImpl,
wire.Bind(new(argoApplication3.ArgoApplicationService), new(*argoApplication3.ArgoApplicationServiceImpl)),

NewArgoApplicationRestHandlerImpl,
wire.Bind(new(ArgoApplicationRestHandler), new(*ArgoApplicationRestHandlerImpl)),
Expand Down
3 changes: 2 additions & 1 deletion api/restHandler/CoreAppRestHandler.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import (
"github.com/devtron-labs/devtron/pkg/build/git/gitProvider"
"github.com/devtron-labs/devtron/pkg/build/git/gitProvider/read"
pipelineBean "github.com/devtron-labs/devtron/pkg/build/pipeline/bean"
common2 "github.com/devtron-labs/devtron/pkg/build/pipeline/bean/common"
bean3 "github.com/devtron-labs/devtron/pkg/chart/bean"
read5 "github.com/devtron-labs/devtron/pkg/chart/read"
"github.com/devtron-labs/devtron/pkg/cluster/environment/repository"
Expand Down Expand Up @@ -1688,7 +1689,7 @@ func (handler CoreAppRestHandlerImpl) createCiPipeline(appId int, userId int32,
ParentCiPipeline: ciPipelineData.ParentCiPipeline,
ParentAppId: ciPipelineData.ParentAppId,
LinkedCount: ciPipelineData.LinkedCount,
PipelineType: pipelineBean.PipelineType(ciPipelineData.PipelineType),
PipelineType: common2.PipelineType(ciPipelineData.PipelineType),
},
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import (
"github.com/devtron-labs/devtron/internal/sql/constants"
"github.com/devtron-labs/devtron/pkg/build/artifacts/imageTagging"
bean2 "github.com/devtron-labs/devtron/pkg/build/pipeline/bean"
eventProcessorBean "github.com/devtron-labs/devtron/pkg/eventProcessor/bean"
constants2 "github.com/devtron-labs/devtron/pkg/pipeline/constants"
"github.com/devtron-labs/devtron/util/stringsUtil"
"golang.org/x/exp/maps"
Expand All @@ -36,7 +37,6 @@ import (
"github.com/devtron-labs/devtron/util/response/pagination"
"github.com/gorilla/schema"

"github.com/argoproj/argo-workflows/v3/pkg/apis/workflow/v1alpha1"
"github.com/devtron-labs/devtron/api/restHandler/common"
"github.com/devtron-labs/devtron/client/gitSensor"
"github.com/devtron-labs/devtron/internal/sql/repository"
Expand Down Expand Up @@ -740,7 +740,7 @@ func (handler *PipelineConfigRestHandlerImpl) TriggerCiPipeline(w http.ResponseW
ciTriggerRequest.TriggeredBy = userId
handler.Logger.Infow("request payload, TriggerCiPipeline", "payload", ciTriggerRequest)
response := make(map[string]string)
resp, err := handler.ciHandler.HandleCIManual(ciTriggerRequest)
resp, err := handler.ciHandlerService.HandleCIManual(ciTriggerRequest)
if errors.Is(err, bean1.ErrImagePathInUse) {
handler.Logger.Errorw("service err duplicate image tag, TriggerCiPipeline", "err", err, "payload", ciTriggerRequest)
common.WriteJsonResp(w, err, err, http.StatusConflict)
Expand Down Expand Up @@ -974,7 +974,7 @@ func (handler *PipelineConfigRestHandlerImpl) DownloadCiWorkflowArtifacts(w http
}
//RBAC

file, err := handler.ciHandler.DownloadCiWorkflowArtifacts(pipelineId, buildId)
file, err := handler.ciHandlerService.DownloadCiWorkflowArtifacts(pipelineId, buildId)
defer file.Close()
if err != nil {
handler.Logger.Errorw("service err, DownloadCiWorkflowArtifacts", "err", err, "pipelineId", pipelineId, "buildId", buildId)
Expand Down Expand Up @@ -1029,7 +1029,7 @@ func (handler *PipelineConfigRestHandlerImpl) GetHistoricBuildLogs(w http.Respon
return
}
//RBAC
resp, err := handler.ciHandler.GetHistoricBuildLogs(workflowId, nil)
resp, err := handler.ciHandlerService.GetHistoricBuildLogs(workflowId, nil)
if err != nil {
handler.Logger.Errorw("service err, GetHistoricBuildLogs", "err", err, "pipelineId", pipelineId, "workflowId", workflowId)
common.WriteJsonResp(w, err, resp, http.StatusInternalServerError)
Expand Down Expand Up @@ -1168,7 +1168,7 @@ func (handler *PipelineConfigRestHandlerImpl) GetBuildLogs(w http.ResponseWriter
return
}
}
logsReader, cleanUp, err := handler.ciHandler.GetRunningWorkflowLogs(workflowId)
logsReader, cleanUp, err := handler.ciHandlerService.GetRunningWorkflowLogs(workflowId)
if err != nil {
handler.Logger.Errorw("service err, GetBuildLogs", "err", err, "pipelineId", pipelineId, "workflowId", workflowId, "lastEventId", lastEventId)
common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
Expand Down Expand Up @@ -1500,15 +1500,15 @@ func (handler *PipelineConfigRestHandlerImpl) DeleteMaterial(w http.ResponseWrit

func (handler *PipelineConfigRestHandlerImpl) HandleWorkflowWebhook(w http.ResponseWriter, r *http.Request) {
decoder := json.NewDecoder(r.Body)
var wfUpdateReq v1alpha1.WorkflowStatus
var wfUpdateReq eventProcessorBean.CiCdStatus
err := decoder.Decode(&wfUpdateReq)
if err != nil {
handler.Logger.Errorw("request err, HandleWorkflowWebhook", "err", err, "payload", wfUpdateReq)
common.WriteJsonResp(w, err, nil, http.StatusBadRequest)
return
}
handler.Logger.Infow("request payload, HandleWorkflowWebhook", "payload", wfUpdateReq)
resp, err := handler.ciHandler.UpdateWorkflow(wfUpdateReq)
resp, _, err := handler.ciHandler.UpdateWorkflow(wfUpdateReq)
if err != nil {
handler.Logger.Errorw("service err, HandleWorkflowWebhook", "err", err, "payload", wfUpdateReq)
common.WriteJsonResp(w, err, resp, http.StatusInternalServerError)
Expand Down Expand Up @@ -1611,7 +1611,7 @@ func (handler *PipelineConfigRestHandlerImpl) CancelWorkflow(w http.ResponseWrit

//RBAC

resp, err := handler.ciHandler.CancelBuild(workflowId, forceAbort)
resp, err := handler.ciHandlerService.CancelBuild(workflowId, forceAbort)
if err != nil {
handler.Logger.Errorw("service err, CancelWorkflow", "err", err, "workflowId", workflowId, "pipelineId", pipelineId)
if util.IsErrNoRows(err) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1620,7 +1620,7 @@ func (handler *PipelineConfigRestHandlerImpl) GetPrePostDeploymentLogs(w http.Re
}
// RBAC CHECK

logsReader, cleanUp, err := handler.cdHandler.GetRunningWorkflowLogs(environmentId, pipelineId, workflowId)
logsReader, cleanUp, err := handler.cdHandlerService.GetRunningWorkflowLogs(environmentId, pipelineId, workflowId)
if err != nil {
handler.Logger.Errorw("service err, GetPrePostDeploymentLogs", "err", err, "appId", appId, "environmentId", environmentId, "pipelineId", pipelineId, "workflowId", workflowId)
common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
Expand Down Expand Up @@ -1745,7 +1745,7 @@ func (handler *PipelineConfigRestHandlerImpl) DownloadArtifacts(w http.ResponseW
}
// RBAC CHECK

file, err := handler.cdHandler.DownloadCdWorkflowArtifacts(buildId)
file, err := handler.cdHandlerService.DownloadCdWorkflowArtifacts(buildId)
defer file.Close()

if err != nil {
Expand Down Expand Up @@ -1929,7 +1929,7 @@ func (handler *PipelineConfigRestHandlerImpl) CancelStage(w http.ResponseWriter,
}
// RBAC

resp, err := handler.cdHandler.CancelStage(workflowRunnerId, forceAbort, userId)
resp, err := handler.cdHandlerService.CancelStage(workflowRunnerId, forceAbort, userId)
if err != nil {
handler.Logger.Errorw("service err, CancelStage", "err", err, "pipelineId", pipelineId, "workflowRunnerId", workflowRunnerId)
if util.IsErrNoRows(err) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,15 @@ import (
read2 "github.com/devtron-labs/devtron/pkg/build/git/gitMaterial/read"
gitProviderRead "github.com/devtron-labs/devtron/pkg/build/git/gitProvider/read"
bean3 "github.com/devtron-labs/devtron/pkg/build/pipeline/bean"
"github.com/devtron-labs/devtron/pkg/build/trigger"
"github.com/devtron-labs/devtron/pkg/chart/gitOpsConfig"
read5 "github.com/devtron-labs/devtron/pkg/chart/read"
repository2 "github.com/devtron-labs/devtron/pkg/cluster/environment/repository"
"github.com/devtron-labs/devtron/pkg/deployment/manifest/deployedAppMetrics"
"github.com/devtron-labs/devtron/pkg/deployment/manifest/deploymentTemplate/chartRef"
"github.com/devtron-labs/devtron/pkg/pipeline/draftAwareConfigService"
validator2 "github.com/devtron-labs/devtron/pkg/deployment/manifest/deploymentTemplate/validator"
"github.com/devtron-labs/devtron/pkg/deployment/trigger/devtronApps"
"github.com/devtron-labs/devtron/pkg/pipeline/draftAwareConfigService"
security2 "github.com/devtron-labs/devtron/pkg/policyGovernance/security/imageScanning"
"github.com/devtron-labs/devtron/pkg/policyGovernance/security/imageScanning/read"
read3 "github.com/devtron-labs/devtron/pkg/team/read"
Expand Down Expand Up @@ -140,6 +142,8 @@ type PipelineConfigRestHandlerImpl struct {
environmentRepository repository2.EnvironmentRepository
chartReadService read5.ChartReadService
draftAwareResourceService draftAwareConfigService.DraftAwareConfigService
ciHandlerService trigger.HandlerService
cdHandlerService devtronApps.HandlerService
}

func NewPipelineRestHandlerImpl(pipelineBuilder pipeline.PipelineBuilder, Logger *zap.SugaredLogger,
Expand Down Expand Up @@ -175,6 +179,8 @@ func NewPipelineRestHandlerImpl(pipelineBuilder pipeline.PipelineBuilder, Logger
EnvironmentRepository repository2.EnvironmentRepository,
chartReadService read5.ChartReadService,
draftAwareResourceService draftAwareConfigService.DraftAwareConfigService,
ciHandlerService trigger.HandlerService,
cdHandlerService devtronApps.HandlerService,
) *PipelineConfigRestHandlerImpl {
envConfig := &PipelineRestHandlerEnvConfig{}
err := env.Parse(envConfig)
Expand Down Expand Up @@ -218,6 +224,8 @@ func NewPipelineRestHandlerImpl(pipelineBuilder pipeline.PipelineBuilder, Logger
environmentRepository: EnvironmentRepository,
chartReadService: chartReadService,
draftAwareResourceService: draftAwareResourceService,
ciHandlerService: ciHandlerService,
cdHandlerService: cdHandlerService,
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ type PipelineTriggerRestHandlerImpl struct {
deploymentGroupService deploymentGroup.DeploymentGroupService
deploymentConfigService pipeline.PipelineDeploymentConfigService
deployedAppService deployedApp.DeployedAppService
cdTriggerService devtronApps.TriggerService
cdHandlerService devtronApps.HandlerService
workflowEventPublishService out.WorkflowEventPublishService
}

Expand All @@ -75,7 +75,7 @@ func NewPipelineRestHandler(appService app.AppService, userAuthService user.User
deploymentGroupService deploymentGroup.DeploymentGroupService,
deploymentConfigService pipeline.PipelineDeploymentConfigService,
deployedAppService deployedApp.DeployedAppService,
cdTriggerService devtronApps.TriggerService,
cdHandlerService devtronApps.HandlerService,
workflowEventPublishService out.WorkflowEventPublishService) *PipelineTriggerRestHandlerImpl {
pipelineHandler := &PipelineTriggerRestHandlerImpl{
appService: appService,
Expand All @@ -88,7 +88,7 @@ func NewPipelineRestHandler(appService app.AppService, userAuthService user.User
deploymentGroupService: deploymentGroupService,
deploymentConfigService: deploymentConfigService,
deployedAppService: deployedAppService,
cdTriggerService: cdTriggerService,
cdHandlerService: cdHandlerService,
workflowEventPublishService: workflowEventPublishService,
}
return pipelineHandler
Expand Down Expand Up @@ -140,7 +140,7 @@ func (handler PipelineTriggerRestHandlerImpl) OverrideConfig(w http.ResponseWrit
triggerContext := bean3.TriggerContext{
Context: ctx,
}
mergeResp, helmPackageName, _, err := handler.cdTriggerService.ManualCdTrigger(triggerContext, &overrideRequest)
mergeResp, helmPackageName, _, err := handler.cdHandlerService.ManualCdTrigger(triggerContext, &overrideRequest)
span.End()
if err != nil {
handler.logger.Errorw("request err, OverrideConfig", "err", err, "payload", overrideRequest)
Expand Down
2 changes: 1 addition & 1 deletion client/argocdServer/config/Config.go
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ func (impl *ArgoCDConfigGetterImpl) GetGRPCConfig() (*bean.ArgoGRPCConfig, error
}

func (impl *ArgoCDConfigGetterImpl) GetK8sConfig() (*bean.ArgoK8sConfig, error) {
clusterBean, err := impl.clusterReadService.FindOne(bean2.DEFAULT_CLUSTER)
clusterBean, err := impl.clusterReadService.FindOne(bean2.DefaultCluster)
if err != nil {
impl.logger.Errorw("error in fetching cluster bean from db", "err", err)
return nil, err
Expand Down
11 changes: 6 additions & 5 deletions client/cron/CiStatusUpdateCron.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"github.com/caarlos0/env"
"github.com/devtron-labs/devtron/internal/sql/repository/pipelineConfig"
"github.com/devtron-labs/devtron/pkg/app"
"github.com/devtron-labs/devtron/pkg/pipeline"
"github.com/devtron-labs/devtron/pkg/workflow/dag"
cron2 "github.com/devtron-labs/devtron/util/cron"
"github.com/robfig/cron/v3"
"go.uber.org/zap"
Expand All @@ -38,12 +38,13 @@ type CiStatusUpdateCronImpl struct {
appService app.AppService
ciWorkflowStatusUpdateConfig *CiWorkflowStatusUpdateConfig
ciPipelineRepository pipelineConfig.CiPipelineRepository
ciHandler pipeline.CiHandler
workflowDagExecutor dag.WorkflowDagExecutor
}

func NewCiStatusUpdateCronImpl(logger *zap.SugaredLogger, appService app.AppService,
ciWorkflowStatusUpdateConfig *CiWorkflowStatusUpdateConfig, ciPipelineRepository pipelineConfig.CiPipelineRepository,
ciHandler pipeline.CiHandler, cronLogger *cron2.CronLoggerImpl) *CiStatusUpdateCronImpl {
cronLogger *cron2.CronLoggerImpl,
workflowDagExecutor dag.WorkflowDagExecutor) *CiStatusUpdateCronImpl {
cron := cron.New(
cron.WithChain(cron.Recover(cronLogger)))
cron.Start()
Expand All @@ -53,7 +54,7 @@ func NewCiStatusUpdateCronImpl(logger *zap.SugaredLogger, appService app.AppServ
appService: appService,
ciWorkflowStatusUpdateConfig: ciWorkflowStatusUpdateConfig,
ciPipelineRepository: ciPipelineRepository,
ciHandler: ciHandler,
workflowDagExecutor: workflowDagExecutor,
}

// execute periodically, update ci workflow status for failed process
Expand Down Expand Up @@ -87,7 +88,7 @@ func (impl *CiStatusUpdateCronImpl) UpdateCiWorkflowStatusFailedCron() {
impl.logger.Errorw("error in converting string to int", "err", err)
return
}
err = impl.ciHandler.UpdateCiWorkflowStatusFailure(timeoutForFailureCiBuild)
err = impl.workflowDagExecutor.UpdateCiWorkflowStatusFailure(timeoutForFailureCiBuild)
if err != nil {
impl.logger.Errorw("error in updating ci workflow status for failed workflows", "err", err)
return
Expand Down
Loading
Loading