Merge branch 'develop' into chart-service-refactoring

Author: iamayushm

Wire.go

@@ -303,6 +303,9 @@ func InitializeApp() (*App, error) {
 		pipeline.NewCiMaterialConfigServiceImpl,
 		wire.Bind(new(pipeline.CiMaterialConfigService), new(*pipeline.CiMaterialConfigServiceImpl)),
 
+		app.NewDeploymentEventHandlerImpl,
+		wire.Bind(new(app.DeploymentEventHandler), new(*app.DeploymentEventHandlerImpl)),
+
 		pipeline.NewAppArtifactManagerImpl,
 		wire.Bind(new(pipeline.AppArtifactManager), new(*pipeline.AppArtifactManagerImpl)),
 		pipeline.NewDevtronAppCMCSServiceImpl,

api/bean/AppView/AppView.go

@@ -64,6 +64,7 @@ type GenericNoteResponseBean struct {
 	Description string    `json:"description"`
 	UpdatedBy   string    `json:"updatedBy"`
 	UpdatedOn   time.Time `json:"updatedOn"`
+	CreatedBy   string    `json:"createdBy"`
 }
 
 type JobContainer struct {
@@ -100,6 +101,7 @@ type JobListingContainer struct {
 	LastTriggeredEnvironmentName string    `sql:"last_triggered_environment_name" json:"lastTriggeredEnvironmentName"`
 	LastTriggeredEnvironmentId   int       `sql:"last_triggered_environment_id" json:"lastEnvironmentId"`
 	ProjectId                    int       `sql:"team_id" json:"projectId"`
+	CreatedBy                    int32     `sql:"created_by" json:"createdBy"`
 }
 
 type CiPipelineLastSucceededTime struct {

api/k8s/application/k8sApplicationRestHandler.go

@@ -1025,6 +1025,8 @@ func (handler *K8sApplicationRestHandlerImpl) CreateEphemeralContainer(w http.Re
 		return
 	}
 	request.UserId = userId
+	request.ExternalArgoAppIdentifier = resourceRequestBean.ExternalArgoAppIdentifier
+
 	err = handler.k8sApplicationService.CreatePodEphemeralContainers(&request)
 	if err != nil {
 		handler.logger.Errorw("error occurred in creating ephemeral container", "err", err, "requestPayload", request)
@@ -1073,6 +1075,7 @@ func (handler *K8sApplicationRestHandlerImpl) DeleteEphemeralContainer(w http.Re
 		return
 	}
 	request.UserId = userId
+	request.ExternalArgoAppIdentifier = resourceRequestBean.ExternalArgoAppIdentifier
 	_, err = handler.k8sApplicationService.TerminatePodEphemeralContainer(request)
 	if err != nil {
 		handler.logger.Errorw("error occurred in terminating ephemeral container", "err", err, "requestPayload", request)
@@ -1156,6 +1159,7 @@ func (handler *K8sApplicationRestHandlerImpl) verifyRbacForAppRequests(token str
 			handler.logger.Errorw("error in decoding appId", "err", err, "appId", request.AppId)
 			return false, err
 		}
+		request.ExternalArgoAppIdentifier = argoAppIdentifier
 		request.ClusterId = argoAppIdentifier.ClusterId
 		request.ExternalArgoApplicationName = argoAppIdentifier.AppName
 		valid, err := handler.argoApplicationReadService.ValidateArgoResourceRequest(r.Context(), argoAppIdentifier, request.K8sRequest)

api/restHandler/app/pipeline/AutoCompleteRestHandler.go

@@ -18,6 +18,7 @@ package pipeline
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"github.com/devtron-labs/devtron/pkg/auth/user"
 	"github.com/devtron-labs/devtron/pkg/build/git/gitProvider/read"
@@ -93,6 +94,24 @@ func (handler DevtronAppAutoCompleteRestHandlerImpl) GetAppListForAutocomplete(w
 	v := r.URL.Query()
 	teamId := v.Get("teamId")
 	appName := v.Get("appName")
+	offset := 0
+	size := 0 // default value is 0, it means if not provided in query param it will fetch all
+	sizeStr := v.Get("size")
+	if sizeStr != "" {
+		size, err = strconv.Atoi(sizeStr)
+		if err != nil || size < 0 {
+			common.WriteJsonResp(w, errors.New("invalid size"), nil, http.StatusBadRequest)
+			return
+		}
+	}
+	offsetStr := v.Get("offset")
+	if offsetStr != "" {
+		offset, err = strconv.Atoi(offsetStr)
+		if err != nil || offset < 0 {
+			common.WriteJsonResp(w, errors.New("invalid offset"), nil, http.StatusBadRequest)
+			return
+		}
+	}
 	appTypeParam := v.Get("appType")
 	var appType int
 	if appTypeParam != "" {
@@ -131,6 +150,7 @@ func (handler DevtronAppAutoCompleteRestHandlerImpl) GetAppListForAutocomplete(w
 		}
 	}
 	if isActionUserSuperAdmin {
+		apps = handler.getPaginatedResultsForApps(offset, size, apps)
 		common.WriteJsonResp(w, err, apps, http.StatusOK)
 		return
 	}
@@ -161,6 +181,7 @@ func (handler DevtronAppAutoCompleteRestHandlerImpl) GetAppListForAutocomplete(w
 	}
 	span.End()
 	// RBAC
+	accessedApps = handler.getPaginatedResultsForApps(offset, size, accessedApps)
 	common.WriteJsonResp(w, err, accessedApps, http.StatusOK)
 }
 
@@ -290,3 +311,14 @@ func (handler DevtronAppAutoCompleteRestHandlerImpl) TeamListAutocomplete(w http
 
 	common.WriteJsonResp(w, err, result, http.StatusOK)
 }
+
+func (handler DevtronAppAutoCompleteRestHandlerImpl) getPaginatedResultsForApps(offset int, size int, apps []*pipeline.AppBean) []*pipeline.AppBean {
+	if size > 0 {
+		if offset+size <= len(apps) {
+			apps = apps[offset : offset+size]
+		} else {
+			apps = apps[offset:]
+		}
+	}
+	return apps
+}

cmd/external-app/wire_gen.go

@@ -307,8 +307,8 @@ require (
 
 replace (
 	github.com/argoproj/argo-workflows/v3 v3.5.13 => github.com/devtron-labs/argo-workflows/v3 v3.5.13
-	github.com/devtron-labs/authenticator => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250526125952-d9add5acd6a4
-	github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250526125952-d9add5acd6a4
+	github.com/devtron-labs/authenticator => github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250602065932-06089729a1c2
+	github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250602065932-06089729a1c2
 	github.com/go-check/check => github.com/go-check/check v0.0.0-20180628173108-788fd7840127
 	github.com/googleapis/gnostic => github.com/googleapis/gnostic v0.5.5
 	k8s.io/api => k8s.io/api v0.29.7

go.mod

@@ -829,10 +829,10 @@ github.com/denisenkom/go-mssqldb v0.0.0-20200428022330-06a60b6afbbc h1:VRRKCwnzq
 github.com/denisenkom/go-mssqldb v0.0.0-20200428022330-06a60b6afbbc/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU=
 github.com/devtron-labs/argo-workflows/v3 v3.5.13 h1:3pINq0gXOSeTw2z/vYe+j80lRpSN5Rp/8mfQORh8SmU=
 github.com/devtron-labs/argo-workflows/v3 v3.5.13/go.mod h1:/vqxcovDPT4zqr4DjR5v7CF8ggpY1l3TSa2CIG3jmjA=
-github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250526125952-d9add5acd6a4 h1:oN526uO6xFroV22CvVAgnXHd8rXoIdTdQQ5qjBQ3tDE=
-github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250526125952-d9add5acd6a4/go.mod h1:FfaLDXN1ZXxyRpnskBqVIYkpkWDCzBmDgIO9xqLnxdQ=
-github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250526125952-d9add5acd6a4 h1:6IITdigvNJgWhEQ1T0KlzsYwT18G67H32ggBM0prxpk=
-github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250526125952-d9add5acd6a4/go.mod h1:HQVUnQI7WHwVq89Bib/18xJqM89S1+xI0O7REctMMrA=
+github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250602065932-06089729a1c2 h1:X0pXpqQrEEt+aXck0WTTokdNs0RfTVufotoATL10shw=
+github.com/devtron-labs/devtron-services/authenticator v0.0.0-20250602065932-06089729a1c2/go.mod h1:FfaLDXN1ZXxyRpnskBqVIYkpkWDCzBmDgIO9xqLnxdQ=
+github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250602065932-06089729a1c2 h1:1uzqPQQvbQVyip6UU/YN8pYwjQOD8K8rEmql7HrrsBk=
+github.com/devtron-labs/devtron-services/common-lib v0.0.0-20250602065932-06089729a1c2/go.mod h1:HQVUnQI7WHwVq89Bib/18xJqM89S1+xI0O7REctMMrA=
 github.com/devtron-labs/go-bitbucket v0.9.60-beta h1:VEx1jvDgdtDPS6A1uUFoaEi0l1/oLhbr+90xOwr6sDU=
 github.com/devtron-labs/go-bitbucket v0.9.60-beta/go.mod h1:GnuiCesvh8xyHeMCb+twm8lBR/kQzJYSKL28ZfObp1Y=
 github.com/devtron-labs/protos v0.0.3-0.20250323220609-ecf8a0f7305e h1:U6UdYbW8a7xn5IzFPd8cywjVVPfutGJCudjePAfL/Hs=

go.sum

@@ -73,7 +73,7 @@ const (
 func (impl AppListingRepositoryQueryBuilder) BuildJobListingQuery(appIDs []int, statuses []string, environmentIds []int, sortOrder string) (string, []interface{}) {
 	var queryParams []interface{}
 	query := `select ci_pipeline.name as ci_pipeline_name,ci_pipeline.id as ci_pipeline_id,app.id as job_id,app.display_name 
-		  as job_name, app.app_name,app.description,app.team_id,cwr.started_on,cwr.status,cem.environment_id,cwr.environment_id as last_triggered_environment_id from app left join ci_pipeline on 
+		  as job_name, app.app_name,app.description,app.created_by,app.team_id,cwr.started_on,cwr.status,cem.environment_id,cwr.environment_id as last_triggered_environment_id from app left join ci_pipeline on 
 		  app.id = ci_pipeline.app_id and ci_pipeline.active=true left join (select cw.ci_pipeline_id, cw.status, cw.started_on, cw.environment_id 
 		  from ci_workflow cw inner join (select ci_pipeline_id, MAX(started_on) max_started_on from ci_workflow group by ci_pipeline_id ) 
 		  cws on cw.ci_pipeline_id = cws.ci_pipeline_id 

internal/sql/repository/helper/AppListingRepositoryQueryBuilder.go

@@ -21,6 +21,7 @@ import (
 	repository2 "github.com/devtron-labs/devtron/pkg/build/git/gitMaterial/repository"
 	"github.com/devtron-labs/devtron/pkg/sql"
 	"github.com/go-pg/pg"
+	"github.com/go-pg/pg/orm"
 	"go.uber.org/zap"
 )
 
@@ -47,6 +48,7 @@ type CiTemplateOverrideRepository interface {
 	FindByAppId(appId int) ([]*CiTemplateOverride, error)
 	FindByCiPipelineIds(ciPipelineIds []int) ([]*CiTemplateOverride, error)
 	FindByCiPipelineId(ciPipelineId int) (*CiTemplateOverride, error)
+	FindIfTemplateOverrideExistsByCiPipelineIdsAndGitMaterialId(ciPipelineIds []int, gitMaterialId int) (bool, error)
 }
 
 type CiTemplateOverrideRepositoryImpl struct {
@@ -125,3 +127,22 @@ func (repo *CiTemplateOverrideRepositoryImpl) FindByCiPipelineId(ciPipelineId in
 	}
 	return ciTemplateOverride, nil
 }
+
+func (repo *CiTemplateOverrideRepositoryImpl) FindIfTemplateOverrideExistsByCiPipelineIdsAndGitMaterialId(ciPipelineIds []int, gitMaterialId int) (bool, error) {
+	if len(ciPipelineIds) == 0 {
+		return false, nil
+	}
+	count, err := repo.dbConnection.Model((*CiTemplateOverride)(nil)).
+		Where("ci_pipeline_id in (?)", pg.In(ciPipelineIds)).
+		WhereGroup(func(q *orm.Query) (*orm.Query, error) {
+			return q.Where("git_material_id = ?", gitMaterialId).WhereOr("build_context_git_material_id = ?", gitMaterialId), nil
+		}).
+		Where("active = ?", true).
+		Count()
+	if err != nil {
+		repo.logger.Errorw("error in checking if template override exists", "ciPipelineIds", ciPipelineIds, "gitMaterialId", gitMaterialId, "err", err)
+		return false, err
+	}
+	return count > 0, nil
+
+}

internal/sql/repository/pipelineConfig/CiTemplateOverrideRepository.go

@@ -118,7 +118,7 @@ type PipelineRepository interface {
 	FindActiveByInFilter(envId int, appIdIncludes []int) (pipelines []*Pipeline, err error)
 	FindActivePipelineAppIdsByInFilter(envId int, appIdIncludes []int) ([]int, error)
 	FindActiveByNotFilter(envId int, appIdExcludes []int) (pipelines []*Pipeline, err error)
-	FindAllPipelinesByChartsOverrideAndAppIdAndChartId(chartOverridden bool, appId int, chartId int) (pipelines []*Pipeline, err error)
+	FindAllPipelinesWithoutOverriddenCharts(appId int) (pipelineIds []int, err error)
 	FindActiveByAppIdAndPipelineId(appId int, pipelineId int) ([]*Pipeline, error)
 	FindActiveByAppIdAndEnvId(appId int, envId int) (*Pipeline, error)
 	SetDeploymentAppCreatedInPipeline(deploymentAppCreated bool, pipelineId int, userId int32) error
@@ -578,19 +578,16 @@ func (impl *PipelineRepositoryImpl) FindActiveByNotFilter(envId int, appIdExclud
 	return pipelines, err
 }
 
-func (impl *PipelineRepositoryImpl) FindAllPipelinesByChartsOverrideAndAppIdAndChartId(hasConfigOverridden bool, appId int, chartId int) (pipelines []*Pipeline, err error) {
-	err = impl.dbConnection.Model(&pipelines).
-		Column("pipeline.*").
-		Join("inner join charts on pipeline.app_id = charts.app_id").
-		Join("inner join chart_env_config_override ceco on charts.id = ceco.chart_id").
-		Where("pipeline.app_id = ?", appId).
-		Where("charts.id = ?", chartId).
-		Where("ceco.is_override = ?", hasConfigOverridden).
-		Where("pipeline.deleted = ?", false).
-		Where("ceco.active = ?", true).
-		Where("charts.active = ?", true).
-		Select()
-	return pipelines, err
+func (impl *PipelineRepositoryImpl) FindAllPipelinesWithoutOverriddenCharts(appId int) (pipelineIds []int, err error) {
+	err = impl.dbConnection.Model().Table("pipeline").Column("pipeline.id").
+		Where("pipeline.deleted = ?", false).Where("pipeline.app_id = ?", appId).
+		Where(`pipeline.environment_id NOT IN (
+				SELECT ceco.target_environment FROM chart_env_config_override ceco 
+				INNER JOIN charts ON charts.id = ceco.chart_id
+				WHERE charts.app_id = ? AND charts.active = ? AND ceco.is_override = ?
+				AND ceco.active = ? AND ceco.latest = ?)`, appId, true, true, true, true).
+		Select(&pipelineIds)
+	return pipelineIds, err
 }
 
 func (impl *PipelineRepositoryImpl) FindActiveByAppIdAndPipelineId(appId int, pipelineId int) ([]*Pipeline, error) {