minor changes

Author: prkhrkat

api/cluster/EnvironmentRestHandler.go

@@ -170,15 +170,30 @@ func (impl EnvironmentRestHandlerImpl) Get(w http.ResponseWriter, r *http.Reques
 
 func (impl EnvironmentRestHandlerImpl) GetDataSourceName(w http.ResponseWriter, r *http.Request) {
 	vars := mux.Vars(r)
-	environment := vars["environment"]
+	environmentName := vars["environmentName"]
+
+	bean, err := impl.environmentClusterMappingsService.FindOne(environmentName)
+	if err != nil {
+		impl.logger.Errorw("service err, Get", "err", err, "payload", bean)
+		common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
+		return
+	}
+
+	// RBAC enforcer applying
+	token := r.Header.Get("token")
+	if ok := impl.enforcer.Enforce(token, casbin.ResourceGlobalEnvironment, casbin.ActionGet, bean.EnvironmentIdentifier); !ok {
+		common.WriteJsonResp(w, errors.New("unauthorized"), nil, http.StatusForbidden)
+		return
+	}
+	//RBAC enforcer Ends
 
-	name, err := impl.environmentClusterMappingsService.GetDataSourceName(environment)
+	resp, err := impl.environmentClusterMappingsService.GetDataSourceName(bean)
 	if err != nil {
-		impl.logger.Errorw("service err, Get", "err", err, "env", environment)
+		impl.logger.Errorw("service err, Get", "err", err, "env", environmentName)
 		common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
 		return
 	}
-	common.WriteJsonResp(w, err, name, http.StatusOK)
+	common.WriteJsonResp(w, err, resp, http.StatusOK)
 }
 
 func (impl EnvironmentRestHandlerImpl) GetAll(w http.ResponseWriter, r *http.Request) {

api/cluster/EnvironmentRouter.go

@@ -43,7 +43,7 @@ func (impl EnvironmentRouterImpl) InitEnvironmentClusterMappingsRouter(environme
 		HandlerFunc(impl.environmentClusterMappingsRestHandler.Get)
 	environmentClusterMappingsRouter.Path("/data-source-name").
 		Methods("GET").
-		Queries("environment", "{environment}").
+		Queries("environmentName", "{environmentName}").
 		HandlerFunc(impl.environmentClusterMappingsRestHandler.GetDataSourceName)
 	environmentClusterMappingsRouter.Path("").
 		Methods("GET").

client/grafana/GrafanaClient.go

@@ -380,7 +380,7 @@ func (impl *GrafanaClientImpl) CreateDatasource(createDatasourceRequest CreateDa
 	url = fmt.Sprintf(url, impl.config.GrafanaUsername, impl.config.GrafanaPassword)
 	req, err := http.NewRequest(http.MethodPost, url, bytes.NewBuffer(reqBody))
 	if err != nil {
-		// do not log url or req body as they contains sensitive data
+		// do not log url or req body as they contain sensitive data
 		impl.logger.Errorw("error while creating http request", "destinationURL", impl.config.DestinationURL, "err", err)
 		return nil, err
 	}

pkg/cluster/ClusterServiceExtended.go

@@ -36,6 +36,8 @@ import (
 	repository2 "github.com/devtron-labs/devtron/pkg/appStore/installedApp/repository"
 )
 
+const DataSourceNameFormat = "Prometheus-%s-EnvId-%d"
+
 // extends ClusterServiceImpl and enhances method of ClusterService with full mode specific errors
 type ClusterServiceImplExtended struct {
 	environmentRepository   repository.EnvironmentRepository
@@ -268,7 +270,8 @@ func (impl *ClusterServiceImplExtended) CreateGrafanaDataSource(clusterBean *bea
 		//starts grafana creation
 		// appending envId to ensure unique datasource name for each environment (ex- env got deleted and created with same name)
 		// reverting to old name will be done in next release
-		DataSourceName := "Prometheus-" + env.Name + "-EnvId-" + fmt.Sprint(env.Id)
+
+		DataSourceName := fmt.Sprintf(DataSourceNameFormat, env.Name, env.Id)
 		createDatasourceReq := grafana.CreateDatasourceRequest{
 			Name:      DataSourceName,
 			Type:      "prometheus",

pkg/cluster/environment/EnvironmentService.go

@@ -46,7 +46,7 @@ import (
 
 type EnvironmentService interface {
 	FindOne(environment string) (*bean2.EnvironmentBean, error)
-	GetDataSourceName(environment string) (dataSourceData bean2.DataSourceMetaData, err error)
+	GetDataSourceName(*bean2.EnvironmentBean) (dataSourceData *bean2.DataSourceMetaData, err error)
 	Create(mappings *bean2.EnvironmentBean, userId int32) (*bean2.EnvironmentBean, error)
 	Update(mappings *bean2.EnvironmentBean, userId int32) (*bean2.EnvironmentBean, error)
 	GetAllActive() ([]bean2.EnvironmentBean, error)
@@ -106,24 +106,19 @@ func NewEnvironmentServiceImpl(environmentRepository repository.EnvironmentRepos
 	}
 }
 
-func (impl EnvironmentServiceImpl) GetDataSourceName(environment string) (bean2.DataSourceMetaData, error) {
-	datasource := bean2.DataSourceMetaData{}
-	model, err := impl.environmentRepository.FindOne(environment)
-	if err != nil {
-		impl.logger.Errorw("error in fetching environment", "err", err)
-		return datasource, err
-	}
-	if model.GrafanaDatasourceId == 0 {
+func (impl EnvironmentServiceImpl) GetDataSourceName(bean *bean2.EnvironmentBean) (*bean2.DataSourceMetaData, error) {
+	datasource := &bean2.DataSourceMetaData{}
+	if bean.DataSourceId == 0 || bean.PrometheusEndpoint == "" {
 		return datasource, fmt.Errorf("prometheus endpoint not found")
 	} else {
-		impl.logger.Debugw("environment datasource name", "datasource", model.GrafanaDatasourceId)
-		data, err := impl.grafanaClient.GetDatasource(model.GrafanaDatasourceId)
+		impl.logger.Debugw("environment datasource name", "datasource", bean.DataSourceId)
+		data, err := impl.grafanaClient.GetDatasource(bean.DataSourceId)
 		if err != nil {
 			impl.logger.Errorw("error in fetching datasource", "err", err)
 			return datasource, err
 		}
 		datasource.Name = data.Name
-		datasource.Id = model.GrafanaDatasourceId
+		datasource.Id = bean.DataSourceId
 		return datasource, nil
 	}
 }
@@ -210,6 +205,7 @@ func (impl EnvironmentServiceImpl) FindOne(environment string) (*bean2.Environme
 		Default:               model.Default,
 		EnvironmentIdentifier: model.EnvironmentIdentifier,
 		Description:           model.Description,
+		DataSourceId:          model.GrafanaDatasourceId,
 	}
 	return bean, nil
 }

pkg/cluster/environment/bean/bean.go

@@ -39,6 +39,7 @@ type EnvironmentBean struct {
 	ClusterCAData          string            `json:"-"`
 	ClusterKeyData         string            `json:"-"`
 	ClusterCertData        string            `json:"-"`
+	DataSourceId           int               `json:"-"`
 }
 
 type EnvDto struct {