@@ -23,8 +23,8 @@ import (
2323 apiBean "github.com/devtron-labs/devtron/api/bean"
2424 "github.com/devtron-labs/devtron/client/gitSensor"
2525 "github.com/devtron-labs/devtron/internal/sql/repository"
26- repository2 "github.com/devtron-labs/devtron/internal/sql/repository/imageTagging "
27- "github.com/devtron-labs/devtron/internal/sql/repository/pipelineConfig/bean/cdWorkflow"
26+ "github.com/devtron-labs/devtron/internal/sql/repository/pipelineConfig/bean/workflow "
27+ "github.com/devtron-labs/devtron/internal/sql/repository/pipelineConfig/bean/workflow/ cdWorkflow"
2828 "github.com/devtron-labs/devtron/internal/util"
2929 "github.com/devtron-labs/devtron/pkg/sql"
3030 "github.com/go-pg/pg"
@@ -43,13 +43,13 @@ type CdWorkflowRepository interface {
4343 FindArtifactByPipelineIdAndRunnerType (pipelineId int , runnerType apiBean.WorkflowType , limit int , runnerStatuses []string ) ([]CdWorkflowRunner , error )
4444 SaveWorkFlowRunner (wfr * CdWorkflowRunner ) (* CdWorkflowRunner , error )
4545 UpdateWorkFlowRunner (wfr * CdWorkflowRunner ) error
46+ UpdateIsArtifactUploaded (wfrId int , isArtifactUploaded workflow.ArtifactUploadedType ) error
4647 GetPreviousQueuedRunners (cdWfrId , pipelineId int ) ([]* CdWorkflowRunner , error )
4748 UpdateRunnerStatusToFailedForIds (errMsg string , triggeredBy int32 , cdWfrIds ... int ) error
4849 UpdateWorkFlowRunnersWithTxn (wfrs []* CdWorkflowRunner , tx * pg.Tx ) error
4950 UpdateWorkFlowRunners (wfr []* CdWorkflowRunner ) error
5051 FindWorkflowRunnerByCdWorkflowId (wfIds []int ) ([]* CdWorkflowRunner , error )
5152 FindPreviousCdWfRunnerByStatus (pipelineId int , currentWFRunnerId int , status []string ) ([]* CdWorkflowRunner , error )
52- FindConfigByPipelineId (pipelineId int ) (* CdWorkflowConfig , error )
5353 FindWorkflowRunnerById (wfrId int ) (* CdWorkflowRunner , error )
5454 FindBasicWorkflowRunnerById (wfrId int ) (* CdWorkflowRunner , error )
5555 FindRetriedWorkflowCountByReferenceId (wfrId int ) (int , error )
@@ -76,6 +76,9 @@ type CdWorkflowRepository interface {
7676 FetchArtifactsByCdPipelineId (pipelineId int , runnerType apiBean.WorkflowType , offset , limit int , searchString string ) ([]CdWorkflowRunner , error )
7777 GetLatestTriggersOfHelmPipelinesStuckInNonTerminalStatuses (getPipelineDeployedWithinHours int ) ([]* CdWorkflowRunner , error )
7878 FindLatestRunnerByPipelineIdsAndRunnerType (ctx context.Context , pipelineIds []int , runnerType apiBean.WorkflowType ) ([]CdWorkflowRunner , error )
79+
80+ MigrateIsArtifactUploaded (wfrId int , isArtifactUploaded bool )
81+ MigrateCdArtifactLocation (wfrId int , cdArtifactLocation string )
7982}
8083
8184type CdWorkflowRepositoryImpl struct {
@@ -95,27 +98,6 @@ type CdWorkflow struct {
9598 sql.AuditLog
9699}
97100
98- type CdWorkflowConfig struct {
99- tableName struct {} `sql:"cd_workflow_config" pg:",discard_unknown_columns"`
100- Id int `sql:"id,pk"`
101- CdTimeout int64 `sql:"cd_timeout"`
102- MinCpu string `sql:"min_cpu"`
103- MaxCpu string `sql:"max_cpu"`
104- MinMem string `sql:"min_mem"`
105- MaxMem string `sql:"max_mem"`
106- MinStorage string `sql:"min_storage"`
107- MaxStorage string `sql:"max_storage"`
108- MinEphStorage string `sql:"min_eph_storage"`
109- MaxEphStorage string `sql:"max_eph_storage"`
110- CdCacheBucket string `sql:"cd_cache_bucket"`
111- CdCacheRegion string `sql:"cd_cache_region"`
112- CdImage string `sql:"cd_image"`
113- Namespace string `sql:"wf_namespace"`
114- CdPipelineId int `sql:"cd_pipeline_id"`
115- LogsBucket string `sql:"logs_bucket"`
116- CdArtifactLocationFormat string `sql:"cd_artifact_location_format"`
117- }
118-
119101type CdWorkflowRunnerWithExtraFields struct {
120102 CdWorkflowRunner
121103 TotalCount int
@@ -134,6 +116,8 @@ type CdWorkflowRunner struct {
134116 FinishedOn time.Time `sql:"finished_on"`
135117 Namespace string `sql:"namespace"`
136118 LogLocation string `sql:"log_file_path"`
119+ CdArtifactLocation string `sql:"cd_artifact_location"`
120+ IsArtifactUploaded workflow.ArtifactUploadedType `sql:"is_artifact_uploaded"`
137121 TriggeredBy int32 `sql:"triggered_by"`
138122 CdWorkflowId int `sql:"cd_workflow_id"`
139123 PodName string `sql:"pod_name"`
@@ -145,6 +129,15 @@ type CdWorkflowRunner struct {
145129 sql.AuditLog
146130}
147131
132+ func (c * CdWorkflowRunner ) GetIsArtifactUploaded () (isArtifactUploaded bool , isMigrationRequired bool ) {
133+ return workflow .IsArtifactUploaded (c .IsArtifactUploaded )
134+ }
135+
136+ func (c * CdWorkflowRunner ) WithIsArtifactUploaded (isArtifactUploaded bool ) * CdWorkflowRunner {
137+ c .IsArtifactUploaded = workflow .GetArtifactUploadedType (isArtifactUploaded )
138+ return c
139+ }
140+
148141func (c * CdWorkflowRunner ) IsExternalRun () bool {
149142 var isExtCluster bool
150143 if c .WorkflowType == cdWorkflow .WorkflowTypePre {
@@ -173,34 +166,6 @@ type CiPipelineMaterialResponse struct {
173166 Regex string `json:"regex"`
174167}
175168
176- type CdWorkflowWithArtifact struct {
177- Id int `json:"id"`
178- CdWorkflowId int `json:"cd_workflow_id"`
179- Name string `json:"name"`
180- Status string `json:"status"`
181- PodStatus string `json:"pod_status"`
182- Message string `json:"message"`
183- StartedOn time.Time `json:"started_on"`
184- FinishedOn time.Time `json:"finished_on"`
185- PipelineId int `json:"pipeline_id"`
186- Namespace string `json:"namespace"`
187- LogFilePath string `json:"log_file_path"`
188- TriggeredBy int32 `json:"triggered_by"`
189- EmailId string `json:"email_id"`
190- Image string `json:"image"`
191- MaterialInfo string `json:"material_info,omitempty"`
192- DataSource string `json:"data_source,omitempty"`
193- CiArtifactId int `json:"ci_artifact_id,omitempty"`
194- WorkflowType string `json:"workflow_type,omitempty"`
195- ExecutorType string `json:"executor_type,omitempty"`
196- BlobStorageEnabled bool `json:"blobStorageEnabled"`
197- GitTriggers map [int ]GitCommit `json:"gitTriggers"`
198- CiMaterials []CiPipelineMaterialResponse `json:"ciMaterials"`
199- ImageReleaseTags []* repository2.ImageTag `json:"imageReleaseTags"`
200- ImageComment * repository2.ImageComment `json:"imageComment"`
201- RefCdWorkflowRunnerId int `json:"referenceCdWorkflowRunnerId"`
202- }
203-
204169type TriggerWorkflowStatus struct {
205170 CdWorkflowStatus []* CdWorkflowStatus `json:"cdWorkflowStatus"`
206171 CiWorkflowStatus []* CiWorkflowStatus `json:"ciWorkflowStatus"`
@@ -277,12 +242,6 @@ func (impl *CdWorkflowRepositoryImpl) FindById(wfId int) (*CdWorkflow, error) {
277242 return ddWorkflow , err
278243}
279244
280- func (impl * CdWorkflowRepositoryImpl ) FindConfigByPipelineId (pipelineId int ) (* CdWorkflowConfig , error ) {
281- cdWorkflowConfig := & CdWorkflowConfig {}
282- err := impl .dbConnection .Model (cdWorkflowConfig ).Where ("cd_pipeline_id = ?" , pipelineId ).Select ()
283- return cdWorkflowConfig , err
284- }
285-
286245func (impl * CdWorkflowRepositoryImpl ) FindLatestCdWorkflowByPipelineId (pipelineIds []int ) (* CdWorkflow , error ) {
287246 cdWorkflow := & CdWorkflow {}
288247 err := impl .dbConnection .Model (cdWorkflow ).Where ("pipeline_id in (?)" , pg .In (pipelineIds )).Order ("id DESC" ).Limit (1 ).Select ()
@@ -502,6 +461,14 @@ func (impl *CdWorkflowRepositoryImpl) UpdateWorkFlowRunner(wfr *CdWorkflowRunner
502461 return err
503462}
504463
464+ func (impl * CdWorkflowRepositoryImpl ) UpdateIsArtifactUploaded (wfrId int , isArtifactUploaded workflow.ArtifactUploadedType ) error {
465+ _ , err := impl .dbConnection .Model ((* CdWorkflowRunner )(nil )).
466+ Set ("is_artifact_uploaded = ?" , isArtifactUploaded ).
467+ Where ("id = ?" , wfrId ).
468+ Update ()
469+ return err
470+ }
471+
505472func (impl * CdWorkflowRepositoryImpl ) GetPreviousQueuedRunners (cdWfrId , pipelineId int ) ([]* CdWorkflowRunner , error ) {
506473 var cdWfrs []* CdWorkflowRunner
507474 err := impl .dbConnection .Model (& cdWfrs ).
@@ -773,3 +740,23 @@ func (impl *CdWorkflowRepositoryImpl) FindLatestRunnerByPipelineIdsAndRunnerType
773740 }
774741 return latestWfrs , err
775742}
743+
744+ func (impl * CdWorkflowRepositoryImpl ) MigrateIsArtifactUploaded (wfrId int , isArtifactUploaded bool ) {
745+ _ , err := impl .dbConnection .Model ((* CdWorkflowRunner )(nil )).
746+ Set ("is_artifact_uploaded = ?" , workflow .GetArtifactUploadedType (isArtifactUploaded )).
747+ Where ("id = ?" , wfrId ).
748+ Update ()
749+ if err != nil {
750+ impl .logger .Errorw ("error in updating is artifact uploaded" , "wfrId" , wfrId , "err" , err )
751+ }
752+ }
753+
754+ func (impl * CdWorkflowRepositoryImpl ) MigrateCdArtifactLocation (wfrId int , cdArtifactLocation string ) {
755+ _ , err := impl .dbConnection .Model ((* CdWorkflowRunner )(nil )).
756+ Set ("cd_artifact_location = ?" , cdArtifactLocation ).
757+ Where ("id = ?" , wfrId ).
758+ Update ()
759+ if err != nil {
760+ impl .logger .Errorw ("error in updating cd artifact location" , "wfrId" , wfrId , "err" , err )
761+ }
762+ }
0 commit comments