Skip to content
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

refactor: changes ciHandler #6487

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

refactor: changes ciHandler #6487

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 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
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
3 changes: 2 additions & 1 deletion api/restHandler/CoreAppRestHandler.go
View file
Open in desktop
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
4 changes: 2 additions & 2 deletions client/cron/CiTriggerCron.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
repository2 "github.com/devtron-labs/devtron/internal/sql/repository"
bean2 "github.com/devtron-labs/devtron/pkg/auth/user/bean"
"github.com/devtron-labs/devtron/pkg/bean"
pipelineConfigBean "github.com/devtron-labs/devtron/pkg/build/pipeline/bean"
"github.com/devtron-labs/devtron/pkg/build/pipeline/bean/common"
"github.com/devtron-labs/devtron/pkg/pipeline"
"github.com/devtron-labs/devtron/pkg/pipeline/repository"
repository3 "github.com/devtron-labs/devtron/pkg/plugin/repository"
Expand Down Expand Up @@ -101,7 +101,7 @@ func (impl *CiTriggerCronImpl) TriggerCiCron() {
CiPipelineMaterial: ciPipelineMaterials,
TriggeredBy: bean2.SYSTEM_USER_ID,
InvalidateCache: false,
PipelineType: string(pipelineConfigBean.CI_JOB),
PipelineType: string(common.CI_JOB),
}
_, err = impl.ciHandler.HandleCIManual(ciTriggerRequest)
if err != nil {
Expand Down
13 changes: 7 additions & 6 deletions client/events/EventBuilder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ package client
import (
"context"
"fmt"
buildBean "github.com/devtron-labs/devtron/pkg/build/pipeline/bean"
repository4 "github.com/devtron-labs/devtron/pkg/cluster/environment/repository"
"strings"
"time"
Expand All @@ -38,7 +39,7 @@ import (
type EventFactory interface {
Build(eventType util.EventType, sourceId *int, appId int, envId *int, pipelineType util.PipelineType) (Event, error)
BuildExtraCDData(event Event, wfr *pipelineConfig.CdWorkflowRunner, pipelineOverrideId int, stage bean2.WorkflowType) Event
BuildExtraCIData(event Event, material *MaterialTriggerInfo) Event
BuildExtraCIData(event Event, material *buildBean.MaterialTriggerInfo) Event
//BuildFinalData(event Event) *Payload
}

Expand Down Expand Up @@ -173,7 +174,7 @@ func (impl *EventSimpleFactoryImpl) BuildExtraCDData(event Event, wfr *pipelineC
return event
}

func (impl *EventSimpleFactoryImpl) BuildExtraCIData(event Event, material *MaterialTriggerInfo) Event {
func (impl *EventSimpleFactoryImpl) BuildExtraCIData(event Event, material *buildBean.MaterialTriggerInfo) Event {
if material == nil {
materialInfo, err := impl.getCiMaterialInfo(event.PipelineId, event.CiArtifactId)
if err != nil {
Expand Down Expand Up @@ -207,22 +208,22 @@ func (impl *EventSimpleFactoryImpl) BuildExtraCIData(event Event, material *Mate
return event
}

func (impl *EventSimpleFactoryImpl) getCiMaterialInfo(ciPipelineId int, ciArtifactId int) (*MaterialTriggerInfo, error) {
materialTriggerInfo := &MaterialTriggerInfo{}
func (impl *EventSimpleFactoryImpl) getCiMaterialInfo(ciPipelineId int, ciArtifactId int) (*buildBean.MaterialTriggerInfo, error) {
materialTriggerInfo := &buildBean.MaterialTriggerInfo{}
if ciPipelineId > 0 {
ciMaterials, err := impl.ciPipelineMaterialRepository.GetByPipelineId(ciPipelineId)
if err != nil {
impl.logger.Errorw("error on fetching materials for", "ciPipelineId", ciPipelineId, "err", err)
return nil, err
}

var ciMaterialsArr []CiPipelineMaterialResponse
var ciMaterialsArr []buildBean.CiPipelineMaterialResponse
for _, m := range ciMaterials {
if m.GitMaterial == nil {
impl.logger.Warnw("git material are empty", "material", m)
continue
}
res := CiPipelineMaterialResponse{
res := buildBean.CiPipelineMaterialResponse{
Id: m.Id,
GitMaterialId: m.GitMaterialId,
GitMaterialName: m.GitMaterial.Name[strings.Index(m.GitMaterial.Name, "-")+1:],
Expand Down
60 changes: 18 additions & 42 deletions client/events/EventClient.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,20 +21,18 @@ import (
"encoding/json"
"errors"
"fmt"
bean2 "github.com/devtron-labs/devtron/pkg/attributes/bean"
"github.com/devtron-labs/devtron/pkg/module"
bean3 "github.com/devtron-labs/devtron/pkg/module/bean"
"net/http"
"time"

"github.com/caarlos0/env"
pubsub "github.com/devtron-labs/common-lib/pubsub-lib"
"github.com/devtron-labs/devtron/api/bean"
"github.com/devtron-labs/devtron/client/gitSensor"
"github.com/devtron-labs/devtron/internal/sql/repository"
"github.com/devtron-labs/devtron/internal/sql/repository/pipelineConfig"
bean2 "github.com/devtron-labs/devtron/pkg/attributes/bean"
buildBean "github.com/devtron-labs/devtron/pkg/build/pipeline/bean"
"github.com/devtron-labs/devtron/pkg/module"
bean3 "github.com/devtron-labs/devtron/pkg/module/bean"
util "github.com/devtron-labs/devtron/util/event"
"go.uber.org/zap"
"net/http"
)

type EventClientConfig struct {
Expand Down Expand Up @@ -81,41 +79,19 @@ type Event struct {
}

type Payload struct {
AppName string `json:"appName"`
EnvName string `json:"envName"`
PipelineName string `json:"pipelineName"`
Source string `json:"source"`
DockerImageUrl string `json:"dockerImageUrl"`
TriggeredBy string `json:"triggeredBy"`
Stage string `json:"stage"`
DeploymentHistoryLink string `json:"deploymentHistoryLink"`
AppDetailLink string `json:"appDetailLink"`
DownloadLink string `json:"downloadLink"`
BuildHistoryLink string `json:"buildHistoryLink"`
MaterialTriggerInfo *MaterialTriggerInfo `json:"material"`
FailureReason string `json:"failureReason"`
}

type CiPipelineMaterialResponse struct {
Id int `json:"id"`
GitMaterialId int `json:"gitMaterialId"`
GitMaterialUrl string `json:"gitMaterialUrl"`
GitMaterialName string `json:"gitMaterialName"`
Type string `json:"type"`
Value string `json:"value"`
Active bool `json:"active"`
History []*gitSensor.GitCommit `json:"history,omitempty"`
LastFetchTime time.Time `json:"lastFetchTime"`
IsRepoError bool `json:"isRepoError"`
RepoErrorMsg string `json:"repoErrorMsg"`
IsBranchError bool `json:"isBranchError"`
BranchErrorMsg string `json:"branchErrorMsg"`
Url string `json:"url"`
}

type MaterialTriggerInfo struct {
GitTriggers map[int]pipelineConfig.GitCommit `json:"gitTriggers"`
CiMaterials []CiPipelineMaterialResponse `json:"ciMaterials"`
AppName string `json:"appName"`
EnvName string `json:"envName"`
PipelineName string `json:"pipelineName"`
Source string `json:"source"`
DockerImageUrl string `json:"dockerImageUrl"`
TriggeredBy string `json:"triggeredBy"`
Stage string `json:"stage"`
DeploymentHistoryLink string `json:"deploymentHistoryLink"`
AppDetailLink string `json:"appDetailLink"`
DownloadLink string `json:"downloadLink"`
BuildHistoryLink string `json:"buildHistoryLink"`
MaterialTriggerInfo *buildBean.MaterialTriggerInfo `json:"material"`
FailureReason string `json:"failureReason"`
}

type EventRESTClientImpl struct {
Expand Down
2 changes: 1 addition & 1 deletion cmd/external-app/wire_gen.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 0 additions & 19 deletions internal/sql/repository/pipelineConfig/CdWorfkflowRepository.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import (
"context"
"errors"
apiBean "github.com/devtron-labs/devtron/api/bean"
"github.com/devtron-labs/devtron/client/gitSensor"
"github.com/devtron-labs/devtron/internal/sql/repository"
"github.com/devtron-labs/devtron/internal/sql/repository/pipelineConfig/bean/workflow"
"github.com/devtron-labs/devtron/internal/sql/repository/pipelineConfig/bean/workflow/cdWorkflow"
Expand Down Expand Up @@ -149,24 +148,6 @@ func (c *CdWorkflowRunner) IsExternalRun() bool {
return isExtCluster
}

type CiPipelineMaterialResponse struct {
Id int `json:"id"`
GitMaterialId int `json:"gitMaterialId"`
GitMaterialUrl string `json:"gitMaterialUrl"`
GitMaterialName string `json:"gitMaterialName"`
Type string `json:"type"`
Value string `json:"value"`
Active bool `json:"active"`
History []*gitSensor.GitCommit `json:"history,omitempty"`
LastFetchTime time.Time `json:"lastFetchTime"`
IsRepoError bool `json:"isRepoError"`
RepoErrorMsg string `json:"repoErrorMsg"`
IsBranchError bool `json:"isBranchError"`
BranchErrorMsg string `json:"branchErrorMsg"`
Url string `json:"url"`
Regex string `json:"regex"`
}

type TriggerWorkflowStatus struct {
CdWorkflowStatus []*CdWorkflowStatus `json:"cdWorkflowStatus"`
CiWorkflowStatus []*CiWorkflowStatus `json:"ciWorkflowStatus"`
Expand Down
8 changes: 4 additions & 4 deletions internal/sql/repository/pipelineConfig/CiPipelineRepository.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (
"fmt"
"github.com/devtron-labs/devtron/internal/sql/repository/app"
"github.com/devtron-labs/devtron/internal/sql/repository/pipelineConfig/bean/ciPipeline"
buildCommonBean "github.com/devtron-labs/devtron/pkg/build/pipeline/bean/common"
repository2 "github.com/devtron-labs/devtron/pkg/cluster/environment/repository"
"github.com/devtron-labs/devtron/pkg/pipeline/constants"
"github.com/devtron-labs/devtron/pkg/sql"
"github.com/devtron-labs/devtron/util/response/pagination"
"github.com/go-pg/pg"
Expand Down Expand Up @@ -641,7 +641,7 @@ func (impl *CiPipelineRepositoryImpl) FindLinkedCiCount(ciPipelineId int) (int,
pipeline := &CiPipeline{}
cnt, err := impl.dbConnection.Model(pipeline).
Where("parent_ci_pipeline = ?", ciPipelineId).
Where("ci_pipeline_type != ?", constants.LINKED_CD).
Where("ci_pipeline_type != ?", buildCommonBean.LINKED_CD).
Where("deleted = ?", false).
Count()
if err == pg.ErrNoRows {
Expand All @@ -656,7 +656,7 @@ func (impl *CiPipelineRepositoryImpl) GetLinkedCiPipelines(ctx context.Context,
var linkedCIPipelines []*CiPipeline
err := impl.dbConnection.Model(&linkedCIPipelines).
Where("parent_ci_pipeline = ?", ciPipelineId).
Where("ci_pipeline_type != ?", constants.LINKED_CD).
Where("ci_pipeline_type != ?", buildCommonBean.LINKED_CD).
Where("deleted = ?", false).
Select()
if err != nil {
Expand Down Expand Up @@ -694,7 +694,7 @@ func (impl *CiPipelineRepositoryImpl) GetDownStreamInfo(ctx context.Context, sou
JoinOn("e.active = ?", true).
// constrains
Where("ci_pipeline.parent_ci_pipeline = ?", sourceCiPipelineId).
Where("ci_pipeline.ci_pipeline_type != ?", constants.LINKED_CD).
Where("ci_pipeline.ci_pipeline_type != ?", buildCommonBean.LINKED_CD).
Where("ci_pipeline.deleted = ?", false)
// app name filtering with lower case
if len(appNameMatch) != 0 {
Expand Down
4 changes: 2 additions & 2 deletions pkg/app/AppListingService.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@ import (
"github.com/devtron-labs/devtron/internal/sql/repository/pipelineConfig/bean/workflow/cdWorkflow"
read4 "github.com/devtron-labs/devtron/pkg/app/appDetails/read"
userrepository "github.com/devtron-labs/devtron/pkg/auth/user/repository"
buildCommonBean "github.com/devtron-labs/devtron/pkg/build/pipeline/bean/common"
ciConfig "github.com/devtron-labs/devtron/pkg/build/pipeline/read"
chartRepoRepository "github.com/devtron-labs/devtron/pkg/chartRepo/repository"
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/read"
"github.com/devtron-labs/devtron/pkg/dockerRegistry"
"github.com/devtron-labs/devtron/pkg/pipeline/constants"
errors2 "github.com/juju/errors"
"go.opentelemetry.io/otel"
"golang.org/x/exp/slices"
Expand Down Expand Up @@ -607,7 +607,7 @@ func (impl AppListingServiceImpl) setIpAccessProvidedData(ctx context.Context, a
}

if ciPipeline != nil && ciPipeline.CiTemplate != nil && len(*ciPipeline.CiTemplate.DockerRegistryId) > 0 {
if !ciPipeline.IsExternal || ciPipeline.ParentCiPipeline != 0 && ciPipeline.PipelineType != string(constants.LINKED_CD) {
if !ciPipeline.IsExternal || ciPipeline.ParentCiPipeline != 0 && ciPipeline.PipelineType != string(buildCommonBean.LINKED_CD) {
appDetailContainer.IsExternalCi = false
}
// get dockerRegistryId starts
Expand Down
Loading
Loading