Merge branch 'main' into v2-up-orch

Author: adi6859

api/restHandler/AppListingRestHandler.go

@@ -25,6 +25,7 @@ import (
 	"github.com/devtron-labs/devtron/pkg/pipeline/types"
 	resourceGroup "github.com/devtron-labs/devtron/pkg/resourceGroup"
 	util2 "github.com/devtron-labs/devtron/util"
+	"github.com/devtron-labs/devtron/util/response"
 	"github.com/go-pg/pg"
 	"github.com/gorilla/mux"
 	"go.opentelemetry.io/otel"
@@ -51,6 +52,7 @@ type DevtronAppBuildRestHandler interface {
 	TriggerCiPipeline(w http.ResponseWriter, r *http.Request)
 	GetCiPipelineMin(w http.ResponseWriter, r *http.Request)
 	GetCIPipelineById(w http.ResponseWriter, r *http.Request)
+	GetCIPipelineByPipelineId(w http.ResponseWriter, r *http.Request)
 	HandleWorkflowWebhook(w http.ResponseWriter, r *http.Request)
 	GetBuildLogs(w http.ResponseWriter, r *http.Request)
 	FetchWorkflowDetails(w http.ResponseWriter, r *http.Request)
@@ -1170,6 +1172,69 @@ func (handler PipelineConfigRestHandlerImpl) GetCIPipelineById(w http.ResponseWr
 	common.WriteJsonResp(w, err, ciPipeline, http.StatusOK)
 }
 
+func (handler PipelineConfigRestHandlerImpl) GetCIPipelineByPipelineId(w http.ResponseWriter, r *http.Request) {
+	token := r.Header.Get("token")
+	var ciPipelineId int
+	var err error
+	v := r.URL.Query()
+	pipelineId := v.Get("pipelineId")
+	if len(pipelineId) != 0 {
+		ciPipelineId, err = strconv.Atoi(pipelineId)
+		if err != nil {
+			handler.Logger.Errorw("request err, GetCIPipelineByPipelineId", "err", err, "pipelineIdParam", pipelineId)
+			response.WriteResponse(http.StatusBadRequest, "please send valid pipelineId", w, errors.New("pipelineId id invalid"))
+			return
+		}
+	} else {
+		response.WriteResponse(http.StatusBadRequest, "please send valid pipelineId", w, errors.New("pipelineId id invalid"))
+		return
+	}
+
+	handler.Logger.Infow("request payload, GetCIPipelineByPipelineId", "pipelineId", pipelineId)
+
+	ciPipeline, err := handler.pipelineBuilder.GetCiPipelineById(ciPipelineId)
+	if err != nil {
+		handler.Logger.Infow("service error, GetCIPipelineById", "err", err, "pipelineId", pipelineId)
+		common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
+		return
+	}
+
+	app, err := handler.pipelineBuilder.GetApp(ciPipeline.AppId)
+	if err != nil {
+		handler.Logger.Infow("service error, GetCIPipelineByPipelineId", "err", err, "appId", ciPipeline.AppId, "pipelineId", pipelineId)
+		common.WriteJsonResp(w, err, nil, http.StatusBadRequest)
+		return
+	}
+	ciPipeline.AppName = app.AppName
+	ciPipeline.AppType = app.AppType
+
+	resourceName := handler.enforcerUtil.GetAppRBACNameByAppId(app.Id)
+	if ok := handler.enforcer.Enforce(token, casbin.ResourceApplications, casbin.ActionGet, resourceName); !ok {
+		common.WriteJsonResp(w, fmt.Errorf("unauthorized user"), "Unauthorized User", http.StatusForbidden)
+		return
+	}
+
+	pipelineData, err := handler.pipelineRepository.FindActiveByAppIdAndPipelineId(ciPipeline.AppId, ciPipelineId)
+	if err != nil {
+		common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
+		return
+	}
+	var environmentIds []int
+	for _, pipeline := range pipelineData {
+		environmentIds = append(environmentIds, pipeline.EnvironmentId)
+	}
+	if handler.appWorkflowService.CheckCdPipelineByCiPipelineId(ciPipelineId) {
+		for _, envId := range environmentIds {
+			envObject := handler.enforcerUtil.GetEnvRBACNameByCiPipelineIdAndEnvId(ciPipelineId, envId)
+			if ok := handler.enforcer.Enforce(token, casbin.ResourceEnvironment, casbin.ActionUpdate, envObject); !ok {
+				common.WriteJsonResp(w, fmt.Errorf("unauthorized user"), "Unauthorized User", http.StatusForbidden)
+				return
+			}
+		}
+	}
+	common.WriteJsonResp(w, err, ciPipeline, http.StatusOK)
+}
+
 func (handler PipelineConfigRestHandlerImpl) CreateMaterial(w http.ResponseWriter, r *http.Request) {
 	token := r.Header.Get("token")
 	decoder := json.NewDecoder(r.Body)

api/restHandler/app/BuildPipelineRestHandler.go

@@ -45,11 +45,11 @@ func (router AppListingRouterImpl) initAppListingRouter(appListingRouter *mux.Ro
 		HandlerFunc(router.appListingRestHandler.GetHostUrlsByBatch).Methods("GET")
 
 	appListingRouter.Path("/list").
-		HandlerFunc(router.appListingRestHandler.FetchAppsByEnvironment).
+		HandlerFunc(router.appListingRestHandler.FetchAppsByEnvironmentV2).
 		Methods("POST")
 
-	appListingRouter.Path("/list/{version}").
-		HandlerFunc(router.appListingRestHandler.FetchAppsByEnvironmentVersioned).
+	appListingRouter.Path("/list/v2").
+		HandlerFunc(router.appListingRestHandler.FetchAppsByEnvironmentV2).
 		Methods("POST")
 
 	appListingRouter.Path("/list/group/{env-id}").
@@ -60,7 +60,7 @@ func (router AppListingRouterImpl) initAppListingRouter(appListingRouter *mux.Ro
 		Queries("size", "{size}", "offset", "{offset}").
 		HandlerFunc(router.appListingRestHandler.FetchOverviewAppsByEnvironment).
 		Methods("GET")
-	//This API used for fetch app details, not deployment details
+	// This API used for fetch app details, not deployment details
 	appListingRouter.Path("/detail").Queries("app-id", "{app-id}").Queries("env-id", "{env-id}").
 		HandlerFunc(router.appListingRestHandler.FetchAppDetails).
 		Methods("GET")

api/router/AppListingRouter.go

@@ -81,6 +81,7 @@ func (router PipelineConfigRouterImpl) initPipelineConfigRouter(configRouter *mu
 	configRouter.Path("/env").HandlerFunc(router.restHandler.EnvConfigOverrideUpdate).Methods("PUT")
 	configRouter.Path("/env/{appId}/{environmentId}/{chartRefId}").HandlerFunc(router.restHandler.GetEnvConfigOverride).Methods("GET")
 
+	configRouter.Path("/ci-pipeline").HandlerFunc(router.restHandler.GetCIPipelineByPipelineId).Methods("GET")
 	configRouter.Path("/ci-pipeline").HandlerFunc(router.restHandler.CreateCiConfig).Methods("POST")
 	configRouter.Path("/ci-pipeline/{appId}").HandlerFunc(router.restHandler.GetCiPipeline).Methods("GET")
 	configRouter.Path("/external-ci/{appId}").HandlerFunc(router.restHandler.GetExternalCi).Methods("GET")

api/router/PipelineConfigRouter.go

@@ -641,7 +641,7 @@ func parseResult(resp *v1alpha1.ApplicationTree, query *application.ResourcesQue
 				}
 			}
 		}
-		if node.Kind == "Pod" {
+		if node.Kind == "Pod" && node.NetworkingInfo != nil && node.NetworkingInfo.Labels != nil {
 			relevantCR[prefix+"-"+node.NetworkingInfo.Labels["controller-revision-hash"]] = true
 		}
 	}

client/argocdServer/application/Application.go

@@ -27,7 +27,6 @@ import (
 	"github.com/devtron-labs/devtron/internal/middleware"
 	repository2 "github.com/devtron-labs/devtron/pkg/cluster/repository"
 	"go.opentelemetry.io/otel"
-	"strconv"
 	"strings"
 	"time"
 
@@ -38,7 +37,6 @@ import (
 )
 
 type AppListingRepository interface {
-	FetchAppsByEnvironment(appListingFilter helper.AppListingFilter) ([]*bean.AppEnvironmentContainer, error)
 	FetchJobs(appIds []int, statuses []string, environmentIds []int, sortOrder string) ([]*bean.JobListingContainer, error)
 	FetchOverviewCiPipelines(jobId int) ([]*bean.JobListingContainer, error)
 	FetchJobsLastSucceededOn(ciPipelineIDs []int) ([]*bean.CiPipelineLastSucceededTime, error)
@@ -47,7 +45,7 @@ type AppListingRepository interface {
 	FetchAppTriggerView(appId int) ([]bean.TriggerView, error)
 	FetchAppStageStatus(appId int, appType int) ([]bean.AppStageStatus, error)
 
-	//Not in used
+	// Not in used
 	PrometheusApiByEnvId(id int) (*string, error)
 
 	FetchOtherEnvironment(appId int) ([]*bean.Environment, error)
@@ -193,81 +191,6 @@ func getRequiredAppIdsInSequence(appIds []int) []int {
 	return resIDs
 }
 
-func (impl AppListingRepositoryImpl) FetchAppsByEnvironment(appListingFilter helper.AppListingFilter) ([]*bean.AppEnvironmentContainer, error) {
-	impl.Logger.Debug("reached at FetchAppsByEnvironment:")
-	var appEnvArr []*bean.AppEnvironmentContainer
-
-	query := impl.appListingRepositoryQueryBuilder.BuildAppListingQueryLastDeploymentTime()
-	impl.Logger.Debugw("basic app detail query: ", query)
-	var lastDeployedTimeDTO []*bean.AppEnvironmentContainer
-	lastDeployedTimeMap := map[int]*bean.AppEnvironmentContainer{}
-	start := time.Now()
-	_, err := impl.dbConnection.Query(&lastDeployedTimeDTO, query)
-	middleware.AppListingDuration.WithLabelValues("buildAppListingQueryLastDeploymentTime", "devtron").Observe(time.Since(start).Seconds())
-	if err != nil {
-		impl.Logger.Error(err)
-		return appEnvArr, err
-	}
-	for _, item := range lastDeployedTimeDTO {
-		if _, ok := lastDeployedTimeMap[item.PipelineId]; ok {
-			continue
-		}
-		lastDeployedTimeMap[item.PipelineId] = &bean.AppEnvironmentContainer{
-			LastDeployedTime: item.LastDeployedTime,
-			DataSource:       item.DataSource,
-			MaterialInfoJson: item.MaterialInfoJson,
-			CiArtifactId:     item.CiArtifactId,
-		}
-	}
-
-	var appEnvContainer []*bean.AppEnvironmentContainer
-	appsEnvquery := impl.appListingRepositoryQueryBuilder.BuildAppListingQuery(appListingFilter)
-	impl.Logger.Debugw("basic app detail query: ", appsEnvquery)
-	start = time.Now()
-	_, appsErr := impl.dbConnection.Query(&appEnvContainer, appsEnvquery)
-	middleware.AppListingDuration.WithLabelValues("buildAppListingQuery", "devtron").Observe(time.Since(start).Seconds())
-	if appsErr != nil {
-		impl.Logger.Error(appsErr)
-		return appEnvContainer, appsErr
-	}
-	latestDeploymentStatusMap := map[string]*bean.AppEnvironmentContainer{}
-	for _, item := range appEnvContainer {
-		if item.EnvironmentId > 0 && item.PipelineId > 0 && item.Active == false {
-			// skip adding apps which have linked with cd pipeline and that environment has marked as deleted.
-			continue
-		}
-		// include only apps which are not linked with any cd pipeline + those linked with cd pipeline and env has active.
-		key := strconv.Itoa(item.AppId) + "_" + strconv.Itoa(item.EnvironmentId)
-		if _, ok := latestDeploymentStatusMap[key]; ok {
-			continue
-		}
-
-		if lastDeployedTime, ok := lastDeployedTimeMap[item.PipelineId]; ok {
-			item.LastDeployedTime = lastDeployedTime.LastDeployedTime
-			item.DataSource = lastDeployedTime.DataSource
-			item.MaterialInfoJson = lastDeployedTime.MaterialInfoJson
-			item.CiArtifactId = lastDeployedTime.CiArtifactId
-		}
-
-		if len(item.DataSource) > 0 {
-			mInfo, err := parseMaterialInfo(item.MaterialInfoJson, item.DataSource)
-			if err == nil && len(mInfo) > 0 {
-				item.MaterialInfo = mInfo
-			} else {
-				item.MaterialInfo = []byte("[]")
-			}
-			item.MaterialInfoJson = ""
-		} else {
-			item.MaterialInfo = []byte("[]")
-			item.MaterialInfoJson = ""
-		}
-		appEnvArr = append(appEnvArr, item)
-		latestDeploymentStatusMap[key] = item
-	}
-
-	return appEnvArr, nil
-}
-
 func (impl AppListingRepositoryImpl) FetchAppsByEnvironmentV2(appListingFilter helper.AppListingFilter) ([]*bean.AppEnvironmentContainer, int, error) {
 	impl.Logger.Debugw("reached at FetchAppsByEnvironment ", "appListingFilter", appListingFilter)
 	var appEnvArr []*bean.AppEnvironmentContainer
@@ -306,7 +229,7 @@ func (impl AppListingRepositoryImpl) FetchAppsByEnvironmentV2(appListingFilter h
 
 	} else {
 
-		//to get all the appIds in appEnvs allowed for user and filtered by the appListing filter and sorted by name
+		// to get all the appIds in appEnvs allowed for user and filtered by the appListing filter and sorted by name
 		appIdCountDtos := make([]*bean.AppEnvironmentContainer, 0)
 		appIdCountQuery := impl.appListingRepositoryQueryBuilder.GetAppIdsQueryWithPaginationForAppNameSearch(appListingFilter)
 		impl.Logger.Debug("GetAppIdsQueryWithPaginationForAppNameSearch query ", appIdCountQuery)
@@ -327,7 +250,7 @@ func (impl AppListingRepositoryImpl) FetchAppsByEnvironmentV2(appListingFilter h
 			uniqueAppIds[i] = obj.AppId
 		}
 		appListingFilter.AppIds = uniqueAppIds
-		//set appids required for this page in the filter and get the appEnv containers of these apps
+		// set appids required for this page in the filter and get the appEnv containers of these apps
 		appListingFilter.AppIds = uniqueAppIds
 		appsEnvquery := impl.appListingRepositoryQueryBuilder.GetQueryForAppEnvContainerss(appListingFilter)
 		impl.Logger.Debug("GetQueryForAppEnvContainerss query: ", appsEnvquery)
@@ -341,8 +264,8 @@ func (impl AppListingRepositoryImpl) FetchAppsByEnvironmentV2(appListingFilter h
 
 	}
 
-	//filter out unique pipelineIds from the above result and get the deployment times for them
-	//some items don't have pipelineId if no pipeline is configured for the app in the appEnv container
+	// filter out unique pipelineIds from the above result and get the deployment times for them
+	// some items don't have pipelineId if no pipeline is configured for the app in the appEnv container
 	pipelineIdsSet := make(map[int]bool)
 	pipelineIds := make([]int, 0)
 	for _, item := range appEnvContainer {
@@ -353,7 +276,7 @@ func (impl AppListingRepositoryImpl) FetchAppsByEnvironmentV2(appListingFilter h
 		}
 	}
 
-	//if any pipeline found get the latest deployment time
+	// if any pipeline found get the latest deployment time
 	if len(pipelineIds) > 0 {
 		query := impl.appListingRepositoryQueryBuilder.BuildAppListingQueryLastDeploymentTimeV2(pipelineIds)
 		impl.Logger.Debugw("basic app detail query: ", query)
@@ -366,7 +289,7 @@ func (impl AppListingRepositoryImpl) FetchAppsByEnvironmentV2(appListingFilter h
 		}
 	}
 
-	//get the last deployment time for all the items
+	// get the last deployment time for all the items
 	for _, item := range lastDeployedTimeDTO {
 		if _, ok := lastDeployedTimeMap[item.PipelineId]; ok {
 			continue
@@ -375,7 +298,7 @@ func (impl AppListingRepositoryImpl) FetchAppsByEnvironmentV2(appListingFilter h
 
 	}
 
-	//set the time for corresponding appEnv container
+	// set the time for corresponding appEnv container
 	for _, item := range appEnvContainer {
 		if lastDeployedTime, ok := lastDeployedTimeMap[item.PipelineId]; ok {
 			item.LastDeployedTime = lastDeployedTime
@@ -483,7 +406,7 @@ func (impl AppListingRepositoryImpl) FetchAppDetail(ctx context.Context, appId i
 	var appDetailContainer bean.AppDetailContainer
 	newCtx, span := otel.Tracer("orchestrator").Start(ctx, "DeploymentDetailsByAppIdAndEnvId")
 	defer span.End()
-	//Fetch deployment detail of cd pipeline latest triggered within env of any App.
+	// Fetch deployment detail of cd pipeline latest triggered within env of any App.
 	deploymentDetail, err := impl.deploymentDetailsByAppIdAndEnvId(newCtx, appId, envId)
 	if err != nil {
 		impl.Logger.Warn("unable to fetch deployment detail for app")
@@ -511,7 +434,7 @@ func (impl AppListingRepositoryImpl) PrometheusApiByEnvId(id int) (*string, erro
 	query := "SELECT env.prometheus_endpoint from environment env" +
 		" WHERE env.id = ? AND env.active = TRUE"
 	impl.Logger.Debugw("query", query)
-	//environments := []string{"QA"}
+	// environments := []string{"QA"}
 	_, err := impl.dbConnection.Query(&prometheusEndpoint, query, id)
 	if err != nil {
 		impl.Logger.Error("Exception caught:", err)

internal/sql/repository/AppListingRepository.go

@@ -54,7 +54,7 @@ type AppListingFilter struct {
 	Offset            int       `json:"offset"`
 	Size              int       `json:"size"`
 	DeploymentGroupId int       `json:"deploymentGroupId"`
-	AppIds            []int     `json:"-"` //internal use only
+	AppIds            []int     `json:"-"` // internal use only
 }
 
 type SortBy string
@@ -128,17 +128,6 @@ func getAppListingCommonQueryString() string {
 		" LEFT JOIN app_status aps on aps.app_id = a.id and p.environment_id = aps.env_id "
 }
 
-func (impl AppListingRepositoryQueryBuilder) BuildAppListingQueryForAppIds(appListingFilter AppListingFilter) string {
-	whereCondition := impl.buildAppListingWhereCondition(appListingFilter)
-	orderByClause := impl.buildAppListingSortBy(appListingFilter)
-	query := "SELECT a.id as app_id " + getAppListingCommonQueryString()
-	if appListingFilter.DeploymentGroupId != 0 {
-		query = query + " INNER JOIN deployment_group_app dga ON a.id = dga.app_id "
-	}
-	query = query + whereCondition + orderByClause
-	return query
-}
-
 func (impl AppListingRepositoryQueryBuilder) BuildAppListingQuery(appListingFilter AppListingFilter) string {
 	whereCondition := impl.buildAppListingWhereCondition(appListingFilter)
 	orderByClause := impl.buildAppListingSortBy(appListingFilter)
@@ -152,15 +141,6 @@ func (impl AppListingRepositoryQueryBuilder) BuildAppListingQuery(appListingFilt
 	return query
 }
 
-func (impl AppListingRepositoryQueryBuilder) BuildAppListingQueryLastDeploymentTime() string {
-	query := "select DISTINCT ON( pco.pipeline_id) pco.pipeline_id, pco.pipeline_release_counter, pco.created_on as last_deployed_time," +
-		" cia.data_source, cia.material_info as material_info_json, cia.id as ci_artifact_id" +
-		" from pipeline_config_override pco" +
-		" inner join ci_artifact cia on cia.id=pco.ci_artifact_id" +
-		" order by pco.pipeline_id,pco.pipeline_release_counter desc;"
-	return query
-}
-
 func (impl AppListingRepositoryQueryBuilder) GetQueryForAppEnvContainerss(appListingFilter AppListingFilter) string {
 
 	query := "SELECT p.environment_id , a.id AS app_id, a.app_name,p.id as pipeline_id, a.team_id ,aps.status as app_status "
@@ -242,31 +222,6 @@ func (impl AppListingRepositoryQueryBuilder) buildAppListingSortBy(appListingFil
 	return orderByCondition
 }
 
-func (impl AppListingRepositoryQueryBuilder) buildJobListingSortBy(appListingFilter AppListingFilter) string {
-	orderByCondition := " ORDER BY a.name"
-	return orderByCondition
-}
-
-func (impl AppListingRepositoryQueryBuilder) buildJobListingWhereCondition(jobListingFilter AppListingFilter) string {
-	whereCondition := "WHERE a.active = true and a.app_type = 2 "
-
-	if len(jobListingFilter.Teams) > 0 {
-		teamIds := strings.Trim(strings.Join(strings.Fields(fmt.Sprint(jobListingFilter.Teams)), ","), "[]")
-		whereCondition = whereCondition + "and a.team_id IN (" + teamIds + ") "
-	}
-
-	if jobListingFilter.AppNameSearch != "" {
-		likeClause := "'%" + jobListingFilter.AppNameSearch + "%'"
-		whereCondition = whereCondition + "and a.display_name like " + likeClause + " "
-	}
-	// add job stats filter here
-	if len(jobListingFilter.AppStatuses) > 0 {
-		appStatuses := util.ProcessAppStatuses(jobListingFilter.AppStatuses)
-		whereCondition = whereCondition + "and aps.status IN (" + appStatuses + ") "
-	}
-	return whereCondition
-}
-
 func (impl AppListingRepositoryQueryBuilder) buildAppListingWhereCondition(appListingFilter AppListingFilter) string {
 	whereCondition := "WHERE a.active = true and a.app_type = 0 "
 	if len(appListingFilter.Environments) > 0 {
@@ -287,7 +242,7 @@ func (impl AppListingRepositoryQueryBuilder) buildAppListingWhereCondition(appLi
 	if appListingFilter.DeploymentGroupId > 0 {
 		whereCondition = whereCondition + "and dga.deployment_group_id = " + strconv.Itoa(appListingFilter.DeploymentGroupId) + " "
 	}
-	//add app-status filter here
+	// add app-status filter here
 	var appStatusExcludingNotDeployed []string
 	var isNotDeployedFilterApplied bool
 	if len(appListingFilter.AppStatuses) > 0 {