Skip to content

Fix:Source info missing for linked ci #3032

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 3 commits into from
Feb 28, 2023
Merged

Fix:Source info missing for linked ci #3032

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
86d4f5b
added source info for linked ci
Aravind-2023 Feb 21, 2023
06776fc
after making new_function in cipipelinematerial
Aravind-2023 Feb 22, 2023
de19769
Merge branch 'main' into source-info-missing-for-linked-ci
vikramdevtron Feb 28, 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
10 changes: 10 additions & 0 deletions internal/sql/repository/pipelineConfig/CiPipelineMaterial.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ type CiPipelineMaterialRepository interface {
GetByPipelineId(id int) ([]*CiPipelineMaterial, error)
GetRegexByPipelineId(id int) ([]*CiPipelineMaterial, error)
CheckRegexExistsForMaterial(id int) bool
GetByPipelineIdForRegexAndFixed(id int) ([]*CiPipelineMaterial, error)
}

type CiPipelineMaterialRepositoryImpl struct {
Expand Down Expand Up @@ -86,6 +87,15 @@ func (impl CiPipelineMaterialRepositoryImpl) GetByPipelineId(id int) ([]*CiPipel
Select()
return ciPipelineMaterials, err
}
func (impl CiPipelineMaterialRepositoryImpl) GetByPipelineIdForRegexAndFixed(id int) ([]*CiPipelineMaterial, error) {
var ciPipelineMaterials []*CiPipelineMaterial
err := impl.dbConnection.Model(&ciPipelineMaterials).
Column("ci_pipeline_material.*", "CiPipeline", "CiPipeline.CiTemplate", "CiPipeline.CiTemplate.GitMaterial", "CiPipeline.App", "CiPipeline.CiTemplate.DockerRegistry", "CiPipeline.CiTemplate.CiBuildConfig", "GitMaterial", "GitMaterial.GitProvider").
Where("ci_pipeline_material.ci_pipeline_id = ?", id).
Where("ci_pipeline_material.active = ?", true).
Select()
return ciPipelineMaterials, err
}

func (impl CiPipelineMaterialRepositoryImpl) FindByCiPipelineIdsIn(ids []int) ([]*CiPipelineMaterial, error) {
var ciPipelineMaterials []*CiPipelineMaterial
Expand Down
25 changes: 19 additions & 6 deletions pkg/pipeline/CdHandler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -644,8 +644,25 @@ func (impl *CdHandlerImpl) FetchCdWorkflowDetails(appId int, environmentId int,
if triggeredByUser == nil {
triggeredByUser = &bean.UserInfo{EmailId: "anonymous"}
}
ciArtifactId := workflow.CiArtifactId
if ciArtifactId > 0 {
ciArtifact, err := impl.ciArtifactRepository.Get(ciArtifactId)
if err != nil {
impl.Logger.Errorw("error fetching artifact data", "err", err)
return WorkflowResponse{}, err
}

ciMaterials, err := impl.ciPipelineMaterialRepository.GetByPipelineId(workflowR.CdWorkflow.Pipeline.CiPipelineId)
// handling linked ci pipeline
if ciArtifact.ParentCiArtifact > 0 && ciArtifact.WorkflowId == nil {
ciArtifactId = ciArtifact.ParentCiArtifact
}
}
ciWf, err := impl.ciWorkflowRepository.FindLastTriggeredWorkflowByArtifactId(ciArtifactId)
if err != nil && err != pg.ErrNoRows {
impl.Logger.Errorw("error in fetching ci wf", "artifactId", workflow.CiArtifactId, "err", err)
return WorkflowResponse{}, err
}
ciMaterials, err := impl.ciPipelineMaterialRepository.GetByPipelineIdForRegexAndFixed(ciWf.CiPipelineId)
if err != nil {
impl.Logger.Errorw("err", "err", err)
return WorkflowResponse{}, err
Expand All @@ -664,11 +681,6 @@ func (impl *CdHandlerImpl) FetchCdWorkflowDetails(appId int, environmentId int,
}
ciMaterialsArr = append(ciMaterialsArr, res)
}
ciWf, err := impl.ciWorkflowRepository.FindLastTriggeredWorkflowByArtifactId(workflow.CiArtifactId)
if err != nil && err != pg.ErrNoRows {
impl.Logger.Errorw("error in fetching ci wf", "artifactId", workflow.CiArtifactId, "err", err)
return WorkflowResponse{}, err
}
gitTriggers := make(map[int]pipelineConfig.GitCommit)
if ciWf.GitTriggers != nil {
gitTriggers = ciWf.GitTriggers
Expand All @@ -692,6 +704,7 @@ func (impl *CdHandlerImpl) FetchCdWorkflowDetails(appId int, environmentId int,
BlobStorageEnabled: workflow.BlobStorageEnabled,
}
return workflowResponse, nil

}

func (impl *CdHandlerImpl) DownloadCdWorkflowArtifacts(pipelineId int, buildId int) (*os.File, error) {
Expand Down