Merge branch 'main' into bypass-ns-check

# Conflicts:
#	env_gen.md

Author: prakash100198

api/helm-app/gRPC/applicationClient.go

@@ -72,6 +72,7 @@ func NewHelmAppClientImpl(logger *zap.SugaredLogger,
 	}
 }
 
+// CATEGORY=INFRA_SETUP
 type HelmClientConfig struct {
 	Url string `env:"HELM_CLIENT_URL" envDefault:"127.0.0.1:50051"`
 }

api/helm-app/service/HelmAppService.go

@@ -146,6 +146,7 @@ func NewHelmAppServiceImpl(Logger *zap.SugaredLogger, clusterService cluster.Clu
 	}
 }
 
+// CATEGORY=CD
 type HelmReleaseConfig struct {
 	RevisionHistoryLimitDevtronApp      int `env:"REVISION_HISTORY_LIMIT_DEVTRON_APP" envDefault:"1"`
 	RevisionHistoryLimitHelmApp         int `env:"REVISION_HISTORY_LIMIT_HELM_APP" envDefault:"1"`

api/restHandler/app/appList/AppListingRestHandler.go

@@ -493,7 +493,7 @@ func (handler AppListingRestHandlerImpl) FetchAppDetailsV2(w http.ResponseWriter
 		return
 	}
 
-	err = handler.updateApprovalConfigDataInAppDetailResp(appDetail, appId, envId)
+	appDetail, err = handler.updateApprovalConfigDataInAppDetailResp(appDetail, appId, envId)
 	if err != nil {
 		common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
 		return

api/restHandler/app/appList/AppListingRestHandler_ent.go

@@ -14,6 +14,6 @@ func (handler AppListingRestHandlerImpl) FetchAutocompleteJobCiPipelines(w http.
 func (handler AppListingRestHandlerImpl) GetAllAppEnvsFromResourceNames(w http.ResponseWriter, r *http.Request) {
 }
 
-func (handler AppListingRestHandlerImpl) updateApprovalConfigDataInAppDetailResp(appDetail AppView.AppDetailContainer, appId, envId int) error {
-	return nil
+func (handler AppListingRestHandlerImpl) updateApprovalConfigDataInAppDetailResp(appDetail AppView.AppDetailContainer, appId, envId int) (AppView.AppDetailContainer, error) {
+	return AppView.AppDetailContainer{}, nil
 }

client/dashboard/Config.go

@@ -20,6 +20,7 @@ import (
 	"github.com/caarlos0/env"
 )
 
+// CATEGORY=INFRA_SETUP
 type Config struct {
 	Host      string `env:"DASHBOARD_HOST" envDefault:"localhost"`
 	Port      string `env:"DASHBOARD_PORT" envDefault:"3000"`

client/gitSensor/GitSensorClient.go

@@ -79,6 +79,7 @@ func NewGitSensorClient(logger *zap.SugaredLogger, config *ClientConfig) (*Clien
 	return client, nil
 }
 
+// CATEGORY=INFRA_SETUP
 type ClientConfig struct {
 	Url      string `env:"GIT_SENSOR_URL" envDefault:"127.0.0.1:7070"`
 	Protocol string `env:"GIT_SENSOR_PROTOCOL" envDefault:"REST"`