Merge branch 'develop' into create-cm-on-cluster-action-oss

# Conflicts:
#	go.mod
#	go.sum
#	vendor/modules.txt

Author: prakash100198

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.21 AS build-env
+FROM golang:1.24.0 AS build-env
 
 RUN echo $GOPATH && \
     apt update && \

DockerfileEA

@@ -1,4 +1,4 @@
-FROM golang:1.21  AS build-env
+FROM golang:1.24.0  AS build-env
 
 RUN echo $GOPATH && \
     apt update && \

go.mod

@@ -40,7 +40,7 @@ type CdWorkflowRepository interface {
 	FindCdWorkflowMetaByEnvironmentId(appId int, environmentId int, offset int, size int) ([]CdWorkflowRunner, error)
 	FindCdWorkflowMetaByPipelineId(pipelineId int, offset int, size int) ([]CdWorkflowRunner, error)
 	FindArtifactByPipelineIdAndRunnerType(pipelineId int, runnerType apiBean.WorkflowType, limit int, runnerStatuses []string) ([]CdWorkflowRunner, error)
-	SaveWorkFlowRunnerWithTx(wfr *CdWorkflowRunner, tx *pg.Tx) (*CdWorkflowRunner, error)
+	SaveWorkFlowRunnerWithTx(wfr *CdWorkflowRunner, tx *pg.Tx) error
 	UpdateWorkFlowRunnerWithTx(wfr *CdWorkflowRunner, tx *pg.Tx) error
 	UpdateIsArtifactUploaded(wfrId int, isArtifactUploaded workflow.ArtifactUploadedType) error
 	GetPreviousQueuedRunners(cdWfrId, pipelineId int) ([]*CdWorkflowRunner, error)
@@ -435,9 +435,11 @@ func (impl *CdWorkflowRepositoryImpl) FindLastPreOrPostTriggeredByEnvironmentId(
 	return wfr, err
 }
 
-func (impl *CdWorkflowRepositoryImpl) SaveWorkFlowRunnerWithTx(wfr *CdWorkflowRunner, tx *pg.Tx) (*CdWorkflowRunner, error) {
-	err := tx.Insert(wfr)
-	return wfr, err
+func (impl *CdWorkflowRepositoryImpl) SaveWorkFlowRunnerWithTx(wfr *CdWorkflowRunner, tx *pg.Tx) error {
+	if tx == nil {
+		return impl.dbConnection.Insert(wfr)
+	}
+	return tx.Insert(wfr)
 }
 
 func (impl *CdWorkflowRepositoryImpl) UpdateWorkFlowRunnerWithTx(wfr *CdWorkflowRunner, tx *pg.Tx) error {

go.sum

@@ -347,9 +347,43 @@ func (impl GitBitbucketClient) CommitValues(ctx context.Context, config *ChartCo
 	}
 
 	//extracting the latest commit hash from the paginated api response of above method, reference of api & response - https://developer.atlassian.com/bitbucket/api/2/reference/resource/repositories/%7Bworkspace%7D/%7Brepo_slug%7D/commits
-	commitHash = commits.(map[string]interface{})["values"].([]interface{})[0].(map[string]interface{})["hash"].(string)
-	commitTimeString := commits.(map[string]interface{})["values"].([]interface{})[0].(map[string]interface{})["date"].(string)
-	commitTime, err = time.Parse(time.RFC3339, commitTimeString)
+	commitsMap, ok := commits.(map[string]interface{})
+	if !ok {
+		impl.logger.Errorw("unexpected response format from bitbucket", "commits", commits)
+		return "", time.Time{}, fmt.Errorf("unexpected response format from bitbucket")
+	}
+
+	values, ok := commitsMap["values"]
+	if !ok || values == nil {
+		impl.logger.Errorw("no values found in bitbucket response", "commits", commits, "commitsMap", commitsMap)
+		return "", time.Time{}, fmt.Errorf("no commits found in bitbucket response")
+	}
+
+	valuesArray, ok := values.([]interface{})
+	if !ok || len(valuesArray) == 0 {
+		impl.logger.Errorw("empty values array in bitbucket response", "commits", commits, "values", values)
+		return "", time.Time{}, fmt.Errorf("empty commits array in bitbucket response")
+	}
+
+	firstCommit, ok := valuesArray[0].(map[string]interface{})
+	if !ok {
+		impl.logger.Errorw("invalid commit format in bitbucket response", "commits", commits, "firstCommit", valuesArray[0])
+		return "", time.Time{}, fmt.Errorf("invalid commit format in bitbucket response")
+	}
+
+	commitHash, ok = firstCommit["hash"].(string)
+	if !ok || commitHash == "" {
+		impl.logger.Errorw("no hash found in commit", "commits", commits, "firstCommit", firstCommit)
+		return "", time.Time{}, fmt.Errorf("no hash found in commit")
+	}
+
+	dateStr, ok := firstCommit["date"].(string)
+	if !ok || dateStr == "" {
+		impl.logger.Errorw("no date found in commit", "firstCommit", firstCommit)
+		return "", time.Time{}, fmt.Errorf("no date found in commit response")
+	}
+
+	commitTime, err = time.Parse(time.RFC3339, dateStr)
 	if err != nil {
 		util.TriggerGitOpsMetrics("CommitValues", "GitBitbucketClient", start, err)
 		impl.logger.Errorw("error in getting commitTime", "err", err)

internal/sql/repository/pipelineConfig/CdWorfkflowRepository.go

@@ -213,7 +213,7 @@ func (impl GitLabClient) DeleteProject(projectName string) (err error) {
 	}()
 
 	impl.logger.Infow("deleting project ", "gitlab project name", projectName)
-	_, err = impl.client.Projects.DeleteProject(fmt.Sprintf("%s/%s", impl.config.GitlabGroupPath, projectName))
+	_, err = impl.client.Projects.DeleteProject(fmt.Sprintf("%s/%s", impl.config.GitlabGroupPath, projectName), nil)
 	return err
 }
 func (impl GitLabClient) createProject(name, description string) (url string, err error) {

pkg/deployment/gitOps/git/GitServiceBitbucket.go

@@ -282,15 +282,15 @@ func (impl *HandlerServiceImpl) ManualCdTrigger(triggerContext bean.TriggerConte
 			AuditLog:     sql.AuditLog{CreatedOn: triggeredAt, CreatedBy: overrideRequest.UserId, UpdatedOn: triggeredAt, UpdatedBy: overrideRequest.UserId},
 			ReferenceId:  triggerContext.ReferenceId,
 		}
-		savedWfr, err := impl.cdWorkflowRunnerService.SaveCDWorkflowRunnerWithStage(runner)
+		err = impl.cdWorkflowRunnerService.SaveWfr(nil, runner)
 		if err != nil {
 			impl.logger.Errorw("err in creating cdWorkflowRunner, ManualCdTrigger", "cdWorkflowId", cdWorkflowId, "err", err)
 			return 0, "", nil, err
 		}
 		runner.CdWorkflow = &pipelineConfig.CdWorkflow{
 			Pipeline: cdPipeline,
 		}
-		overrideRequest.WfrId = savedWfr.Id
+		overrideRequest.WfrId = runner.Id
 		overrideRequest.CdWorkflowId = cdWorkflowId
 		// creating cd pipeline status timeline for deployment initialisation
 		timeline := impl.pipelineStatusTimelineService.NewDevtronAppPipelineStatusTimelineDbObject(runner.Id, timelineStatus.TIMELINE_STATUS_DEPLOYMENT_INITIATED, timelineStatus.TIMELINE_DESCRIPTION_DEPLOYMENT_INITIATED, overrideRequest.UserId)
@@ -419,7 +419,7 @@ func (impl *HandlerServiceImpl) TriggerAutomaticDeployment(request bean.TriggerR
 		AuditLog:     sql.AuditLog{CreatedOn: triggeredAt, CreatedBy: triggeredBy, UpdatedOn: triggeredAt, UpdatedBy: triggeredBy},
 		ReferenceId:  request.TriggerContext.ReferenceId,
 	}
-	savedWfr, err := impl.cdWorkflowRunnerService.SaveCDWorkflowRunnerWithStage(runner)
+	err := impl.cdWorkflowRunnerService.SaveWfr(nil, runner)
 	if err != nil {
 		return err
 	}
@@ -448,7 +448,7 @@ func (impl *HandlerServiceImpl) TriggerAutomaticDeployment(request bean.TriggerR
 		impl.logger.Errorw("validation error deployment request", "cdWfr", runner.Id, "err", validationErr)
 		return validationErr
 	}
-	releaseErr := impl.TriggerCD(ctx, artifact, cdWf.Id, savedWfr.Id, pipeline, envDeploymentConfig, triggeredAt, triggeredBy)
+	releaseErr := impl.TriggerCD(ctx, artifact, cdWf.Id, runner.Id, pipeline, envDeploymentConfig, triggeredAt, triggeredBy)
 	// if releaseErr found, then the mark current deployment Failed and return
 	if releaseErr != nil {
 		err := impl.cdWorkflowCommonService.MarkCurrentDeploymentFailed(runner, releaseErr, triggeredBy)

pkg/deployment/gitOps/git/GitServiceGitlab.go

@@ -766,11 +766,11 @@ func (impl *CiHandlerImpl) FetchMaterialInfoByArtifactId(ciArtifactId int, envId
 			res := buildBean.CiPipelineMaterialResponse{
 				Id:              m.Id,
 				GitMaterialId:   m.GitMaterialId,
-				GitMaterialName: m.GitMaterial.Name[strings.Index(m.GitMaterial.Name, "-")+1:],
+				GitMaterialName: _gitTrigger.GitRepoName,
 				Type:            string(m.Type),
-				Value:           m.Value,
+				Value:           _gitTrigger.CiConfigureSourceValue,
 				Active:          m.Active,
-				Url:             m.GitMaterial.Url,
+				Url:             _gitTrigger.GitRepoUrl,
 				History:         history,
 			}
 			ciMaterialsArr = append(ciMaterialsArr, res)

pkg/deployment/trigger/devtronApps/deployStageHandlerCode.go

@@ -29,11 +29,13 @@ import (
 	"github.com/devtron-labs/devtron/pkg/workflow/cd/adapter"
 	"github.com/devtron-labs/devtron/pkg/workflow/cd/bean"
 	"github.com/devtron-labs/devtron/util"
+	"github.com/go-pg/pg"
 	"go.uber.org/zap"
 )
 
 type CdWorkflowRunnerService interface {
 	UpdateWfr(dto *bean.CdWorkflowRunnerDto, updatedBy int) error
+	SaveWfr(tx *pg.Tx, wfr *pipelineConfig.CdWorkflowRunner) error
 	UpdateIsArtifactUploaded(wfrId int, isArtifactUploaded bool) error
 	SaveCDWorkflowRunnerWithStage(wfr *pipelineConfig.CdWorkflowRunner) (*pipelineConfig.CdWorkflowRunner, error)
 	UpdateCdWorkflowRunnerWithStage(wfr *pipelineConfig.CdWorkflowRunner) error
@@ -103,7 +105,7 @@ func (impl *CdWorkflowRunnerServiceImpl) SaveCDWorkflowRunnerWithStage(wfr *pipe
 	if impl.config.EnableWorkflowExecutionStage {
 		wfr.Status = cdWorkflow.WorkflowWaitingToStart
 	}
-	wfr, err = impl.cdWorkflowRepository.SaveWorkFlowRunnerWithTx(wfr, tx)
+	err = impl.cdWorkflowRepository.SaveWorkFlowRunnerWithTx(wfr, tx)
 	if err != nil {
 		impl.logger.Errorw("error in saving workflow", "payload", wfr, "error", err)
 		return wfr, err
@@ -198,3 +200,7 @@ func (impl *CdWorkflowRunnerServiceImpl) GetPrePostWorkflowStagesByWorkflowRunne
 	}
 	return resp, nil
 }
+
+func (impl *CdWorkflowRunnerServiceImpl) SaveWfr(tx *pg.Tx, wfr *pipelineConfig.CdWorkflowRunner) error {
+	return impl.cdWorkflowRepository.SaveWorkFlowRunnerWithTx(wfr, tx)
+}