Merge branch 'hibernated-fix' into hibernated-fix-refact

Author: prkhrkat

api/restHandler/app/pipeline/configure/BuildPipelineRestHandler.go

@@ -2212,7 +2212,7 @@ func (handler *PipelineConfigRestHandlerImpl) GetAppMetadataListByEnvironment(w
 
 	resp, err := handler.pipelineBuilder.GetAppMetadataListByEnvironment(envId, appIds)
 	if err != nil {
-		handler.Logger.Errorw("service err, GetAppMetadataListByEnvironment", "err", err, "envId", envId)
+		handler.Logger.Errorw("service err, GetAppMetadataListByEnvironment", "envId", envId, "err", err)
 		common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
 		return
 	}
@@ -2231,12 +2231,7 @@ func (handler *PipelineConfigRestHandlerImpl) GetAppMetadataListByEnvironment(w
 
 	// get rbac objects for the appids
 	rbacObjectsWithAppId := handler.enforcerUtil.GetRbacObjectsByAppIds(appIds)
-	rbacObjects := make([]string, len(rbacObjectsWithAppId))
-	itr := 0
-	for _, object := range rbacObjectsWithAppId {
-		rbacObjects[itr] = object
-		itr++
-	}
+	rbacObjects := maps.Values(rbacObjectsWithAppId)
 	// enforce rbac in batch
 	rbacResult := handler.enforcer.EnforceInBatch(token, casbin.ResourceApplications, casbin.ActionGet, rbacObjects)
 	// filter out rbac passed apps

env_gen.json

@@ -168,6 +168,7 @@
  | DEX_CSTOREKEY | string | |  |  | false |
  | DEX_JWTKEY | string | |  |  | false |
  | DEX_RURL | string |http://127.0.0.1:8080/callback |  |  | false |
+ | DEX_SCOPES |  | |  |  | false |
  | DEX_SECRET | string | |  |  | false |
  | DEX_URL | string | |  |  | false |
  | ECR_REPO_NAME_PREFIX | string |test/ |  |  | false |

env_gen.md

@@ -51,7 +51,7 @@ type AppListingRepository interface {
 	DeploymentDetailByArtifactId(ciArtifactId int, envId int) (AppView.DeploymentDetailContainer, error)
 	FindAppCount(isProd bool) (int, error)
 	FetchAppsByEnvironmentV2(appListingFilter helper.AppListingFilter) ([]*AppView.AppEnvironmentContainer, int, error)
-	FetchAppsEnvContainers(envId, limit, offset int, appIds []int) ([]*AppView.AppEnvironmentContainer, error)
+	FetchAppsEnvContainers(envId int, appIds []int, limit, offset int) ([]*AppView.AppEnvironmentContainer, error)
 	FetchLastDeployedImage(appId, envId int) (*LastDeployed, error)
 }
 
@@ -137,15 +137,16 @@ func (impl *AppListingRepositoryImpl) FetchOverviewCiPipelines(jobId int) ([]*Ap
 	return jobContainers, nil
 }
 
-func (impl *AppListingRepositoryImpl) FetchAppsEnvContainers(envId int, limit, offset int, appIds []int) ([]*AppView.AppEnvironmentContainer, error) {
+func (impl *AppListingRepositoryImpl) FetchAppsEnvContainers(envId int, appIds []int, limit, offset int) ([]*AppView.AppEnvironmentContainer, error) {
 	query := ` SELECT a.id as app_id,a.app_name,aps.status as app_status, ld.last_deployed_time, p.id as pipeline_id 
 		 FROM app a 
 		 INNER JOIN pipeline p ON p.app_id = a.id and p.deleted = false and p.environment_id = ? 
 		 LEFT JOIN app_status aps ON aps.app_id = a.id and aps.env_id = ? 
 		 LEFT JOIN 
 		 (SELECT pco.pipeline_id,MAX(pco.created_on) as last_deployed_time from pipeline_config_override pco 
 		 GROUP BY pco.pipeline_id) ld ON ld.pipeline_id = p.id 
-		 WHERE a.active = true`
+		 WHERE a.active = true 
+		 ORDER BY a.app_name `
 
 	queryParams := []interface{}{envId, envId}
 
@@ -155,14 +156,12 @@ func (impl *AppListingRepositoryImpl) FetchAppsEnvContainers(envId int, limit, o
 		queryParams = append(queryParams, pg.In(appIds))
 	}
 
-	query += " ORDER BY a.app_name"
-
 	if limit > 0 {
-		query += " LIMIT ?"
+		query += fmt.Sprintf("LIMIT ? ")
 		queryParams = append(queryParams, limit)
 	}
 	if offset > 0 {
-		query += " OFFSET ?"
+		query += fmt.Sprintf("OFFSET ? ")
 		queryParams = append(queryParams, offset)
 	}
 

internal/sql/repository/AppListingRepository.go

@@ -73,7 +73,7 @@ type AppListingService interface {
 
 	FetchAppsByEnvironmentV2(fetchAppListingRequest FetchAppListingRequest, w http.ResponseWriter, r *http.Request, token string) ([]*AppView.AppEnvironmentContainer, int, error)
 	FetchOverviewAppsByEnvironment(envId, limit, offset int) (*OverviewAppsByEnvironmentBean, error)
-	FetchAppsEnvContainers(envId, limit, offset int, appIds []int) ([]*AppView.AppEnvironmentContainer, error)
+	FetchAppsEnvContainers(envId int, appIds []int, limit, offset int) ([]*AppView.AppEnvironmentContainer, error)
 }
 
 const (
@@ -236,7 +236,7 @@ func (impl AppListingServiceImpl) FetchOverviewAppsByEnvironment(envId, limit, o
 		}
 	}
 	var appIds []int
-	envContainers, err := impl.FetchAppsEnvContainers(envId, limit, offset, appIds)
+	envContainers, err := impl.FetchAppsEnvContainers(envId, appIds, limit, offset)
 	if err != nil {
 		impl.Logger.Errorw("failed to fetch env containers", "err", err, "envId", envId)
 		return resp, err
@@ -290,8 +290,8 @@ func getUniqueArtifacts(artifactIds []int) (uniqueArtifactIds []int) {
 	return uniqueArtifactIds
 }
 
-func (impl AppListingServiceImpl) FetchAppsEnvContainers(envId, limit, offset int, appIds []int) ([]*AppView.AppEnvironmentContainer, error) {
-	envContainers, err := impl.appListingRepository.FetchAppsEnvContainers(envId, limit, offset, appIds)
+func (impl AppListingServiceImpl) FetchAppsEnvContainers(envId int, appIds []int, limit, offset int) ([]*AppView.AppEnvironmentContainer, error) {
+	envContainers, err := impl.appListingRepository.FetchAppsEnvContainers(envId, appIds, limit, offset)
 	if err != nil {
 		impl.Logger.Errorw("failed to fetch environment containers", "err", err, "envId", envId)
 		return nil, err

pkg/app/AppListingService.go

@@ -2165,7 +2165,7 @@ func (impl *CiPipelineConfigServiceImpl) CreateExternalCiAndAppWorkflowMapping(a
 
 func (impl *CiPipelineConfigServiceImpl) GetAppMetadataListByEnvironment(envId int, appIds []int) (appMetadataListBean pipelineConfigBean.AppMetadataListBean, err error) {
 	appMetadataListBean = pipelineConfigBean.AppMetadataListBean{}
-	envContainers, err := impl.appListingService.FetchAppsEnvContainers(envId, 0, 0, appIds)
+	envContainers, err := impl.appListingService.FetchAppsEnvContainers(envId, appIds, 0, 0)
 	if err != nil {
 		impl.logger.Errorw("failed to fetch env containers", "err", err, "envId", envId)
 		return appMetadataListBean, err