story(configDiffView) : WIP

Wire.go

@@ -99,6 +99,7 @@ import (
  "github.com/devtron-labs/devtron/pkg/chart"
  chartRepoRepository "github.com/devtron-labs/devtron/pkg/chartRepo/repository"
  "github.com/devtron-labs/devtron/pkg/commonService"
+ "github.com/devtron-labs/devtron/pkg/config"
  delete2 "github.com/devtron-labs/devtron/pkg/delete"
  "github.com/devtron-labs/devtron/pkg/deploymentGroup"
  "github.com/devtron-labs/devtron/pkg/devtronResource"
@@ -671,6 +672,13 @@ func InitializeApp() (*App, error) {
  scopedVariable.NewScopedVariableRestHandlerImpl,
  wire.Bind(new(scopedVariable.ScopedVariableRestHandler), new(*scopedVariable.ScopedVariableRestHandlerImpl)),
 
+ router.NewDeploymentConfigurationRouter,
+ wire.Bind(new(router.DeploymentConfigurationRouter), new(*router.DeploymentConfigurationRouterImpl)),
+ restHandler.NewDeploymentConfigurationRestHandlerImpl,
+ wire.Bind(new(restHandler.DeploymentConfigurationRestHandler), new(*restHandler.DeploymentConfigurationRestHandlerImpl)),
+ config.NewDeploymentConfigurationServiceImpl,
+ wire.Bind(new(config.DeploymentConfigurationService), new(*config.DeploymentConfigurationServiceImpl)),
+
  util.NewGitCliUtil,
 
  router.NewTelemetryRouterImpl,

api/restHandler/DeploymentConfigurationRestHandler.go

@@ -0,0 +1,82 @@
+package restHandler
+
+import (
+ "fmt"
+ "github.com/devtron-labs/devtron/api/restHandler/common"
+ "github.com/devtron-labs/devtron/pkg/auth/authorisation/casbin"
+ "github.com/devtron-labs/devtron/pkg/auth/user"
+ "github.com/devtron-labs/devtron/pkg/config"
+ "github.com/devtron-labs/devtron/util/rbac"
+ "github.com/gorilla/mux"
+ "go.uber.org/zap"
+ "gopkg.in/go-playground/validator.v9"
+ "net/http"
+ "strconv"
+)
+
+type DeploymentConfigurationRestHandler interface {
+ ConfigAutoComplete(w http.ResponseWriter, r *http.Request)
+}
+type DeploymentConfigurationRestHandlerImpl struct {
+ logger *zap.SugaredLogger
+ userAuthService user.UserService
+ validator *validator.Validate
+ enforcerUtil rbac.EnforcerUtil
+ enforcer casbin.Enforcer
+ deploymentConfigurationService config.DeploymentConfigurationService
+}
+
+func NewDeploymentConfigurationRestHandlerImpl(logger *zap.SugaredLogger,
+ userAuthService user.UserService,
+ enforcerUtil rbac.EnforcerUtil,
+ enforcer casbin.Enforcer,
+ deploymentConfigurationService config.DeploymentConfigurationService,
+) *DeploymentConfigurationRestHandlerImpl {
+ return &DeploymentConfigurationRestHandlerImpl{
+ logger: logger,
+ userAuthService: userAuthService,
+ enforcerUtil: enforcerUtil,
+ enforcer: enforcer,
+ deploymentConfigurationService: deploymentConfigurationService,
+ }
+}
+
+func (handler *DeploymentConfigurationRestHandlerImpl) ConfigAutoComplete(w http.ResponseWriter, r *http.Request) {
+ userId, err := handler.userAuthService.GetLoggedInUser(r)
+ if userId == 0 || err != nil {
+ common.WriteJsonResp(w, err, "Unauthorized User", http.StatusUnauthorized)
+ return
+ }
+ vars := mux.Vars(r)
+ //todo aditya get from query params
+ appId, err := strconv.Atoi(vars["appId"])
+ if err != nil {
+ handler.logger.Errorw("request err, CSEnvironmentFetch", "err", err, "appId", appId)
+ common.WriteJsonResp(w, err, nil, http.StatusBadRequest)
+ return
+ }
+ envId, err := strconv.Atoi(vars["envId"])
+ if err != nil {
+ handler.logger.Errorw("bad request", "err", err)
+ common.WriteJsonResp(w, err, nil, http.StatusBadRequest)
+ return
+ }
+
+ //RBAC START
+ token := r.Header.Get("token")
+ object := handler.enforcerUtil.GetAppRBACNameByAppId(appId)
+ ok := handler.enforcerUtil.CheckAppRbacForAppOrJob(token, object, casbin.ActionGet)
+ if !ok {
+ common.WriteJsonResp(w, fmt.Errorf("unauthorized user"), nil, http.StatusForbidden)
+ return
+ }
+ //RBAC END
+
+ res, err := handler.deploymentConfigurationService.ConfigAutoComplete(appId, envId)
+ if err != nil {
+ handler.logger.Errorw("service err, CSEnvironmentFetch", "err", err, "appId", appId)
+ common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
+ return
+ }
+ common.WriteJsonResp(w, err, res, http.StatusOK)
+}

api/router/DeploymentConfigRouter.go

@@ -0,0 +1,26 @@
+package router
+
+import (
+ "github.com/devtron-labs/devtron/api/restHandler"
+ "github.com/gorilla/mux"
+)
+
+type DeploymentConfigurationRouter interface {
+ initDeploymentConfigurationRouter(configRouter *mux.Router)
+}
+
+type DeploymentConfigurationRouterImpl struct {
+ deploymentGroupRestHandler restHandler.DeploymentConfigurationRestHandler
+}
+
+func NewDeploymentConfigurationRouter(deploymentGroupRestHandler restHandler.DeploymentConfigurationRestHandler) *DeploymentConfigurationRouterImpl {
+ router := &DeploymentConfigurationRouterImpl{
+ deploymentGroupRestHandler: deploymentGroupRestHandler,
+ }
+ return router
+}
+
+func (router DeploymentConfigurationRouterImpl) initDeploymentConfigurationRouter(configRouter *mux.Router) {
+ configRouter.Path("/autocomplete").
+ HandlerFunc(router.deploymentGroupRestHandler.ConfigAutoComplete).Methods("POST")
+}

api/router/router.go

@@ -122,6 +122,7 @@ type MuxRouter struct {
  rbacRoleRouter user.RbacRoleRouter
  scopedVariableRouter ScopedVariableRouter
  ciTriggerCron cron.CiTriggerCron
+ deploymentConfigurationRouter DeploymentConfigurationRouter
 }
 
 func NewMuxRouter(logger *zap.SugaredLogger, HelmRouter PipelineTriggerRouter, PipelineConfigRouter PipelineConfigRouter,
@@ -154,7 +155,9 @@ func NewMuxRouter(logger *zap.SugaredLogger, HelmRouter PipelineTriggerRouter, P
  rbacRoleRouter user.RbacRoleRouter,
  scopedVariableRouter ScopedVariableRouter,
  ciTriggerCron cron.CiTriggerCron,
- proxyRouter proxy.ProxyRouter) *MuxRouter {
+ proxyRouter proxy.ProxyRouter,
+ deploymentConfigurationRouter DeploymentConfigurationRouter,
+) *MuxRouter {
  r := &MuxRouter{
  Router: mux.NewRouter(),
  HelmRouter: HelmRouter,
@@ -224,6 +227,7 @@ func NewMuxRouter(logger *zap.SugaredLogger, HelmRouter PipelineTriggerRouter, P
  rbacRoleRouter: rbacRoleRouter,
  scopedVariableRouter: scopedVariableRouter,
  ciTriggerCron: ciTriggerCron,
+ deploymentConfigurationRouter: deploymentConfigurationRouter,
  }
  return r
 }
@@ -309,8 +313,9 @@ func (r MuxRouter) Init() {
  chartRefRouter := r.Router.PathPrefix("/orchestrator/chartref").Subrouter()
  r.ChartRefRouter.initChartRefRouter(chartRefRouter)
 
- configMapRouter := r.Router.PathPrefix("/orchestrator/config").Subrouter()
- r.ConfigMapRouter.initConfigMapRouter(configMapRouter)
+ configRouter := r.Router.PathPrefix("/orchestrator/config/").Subrouter()
+ r.ConfigMapRouter.initConfigMapRouter(configRouter)
+ r.deploymentConfigurationRouter.initDeploymentConfigurationRouter(configRouter)
 
  appStoreRouter := r.Router.PathPrefix("/orchestrator/app-store").Subrouter()
  r.AppStoreRouter.Init(appStoreRouter)

internal/sql/repository/chartConfig/ConfigMapRepository.go

@@ -39,6 +39,8 @@ type ConfigMapRepository interface {
  GetByAppIdAppLevel(appId int) (*ConfigMapAppModel, error)
  GetByAppIdAndEnvIdEnvLevel(appId int, envId int) (*ConfigMapEnvModel, error)
  GetEnvLevelByAppId(appId int) ([]*ConfigMapEnvModel, error)
+ GetConfigNamesAppLevel(appId int) ([]CMCSNames, error)
+ GetConfigNamesEnvLevel(appId int, envId int) ([]CMCSNames, error)
 }
 
 type ConfigMapRepositoryImpl struct {
@@ -58,6 +60,29 @@ type ConfigMapAppModel struct {
  SecretData string `sql:"secret_data"`
  sql.AuditLog
 }
+type CMCSNames struct {
+ CMName string `json:"cm_name"`
+ CSName string `json:"cs_name"`
+}
+
+func (impl ConfigMapRepositoryImpl) GetConfigNamesAppLevel(appId int) ([]CMCSNames, error) {
+ var cMCSNames []CMCSNames
+ query := "SELECT json_array_elements(config_map_data::json->'maps')->>'name' AS cm_name, " +
+ "json_array_elements(secret_data::json->'secrets')->>'name' AS cs_name " +
+ "FROM config_map_app_level WHERE app_id = ?;"
+
+ _, err := impl.dbConnection.Query(cMCSNames, query, appId)
+ return cMCSNames, err
+}
+func (impl ConfigMapRepositoryImpl) GetConfigNamesEnvLevel(appId int, envId int) ([]CMCSNames, error) {
+ var cMCSNames []CMCSNames
+ query := "SELECT json_array_elements(config_map_data::json->'maps')->>'name' AS cm_name, " +
+ "json_array_elements(secret_data::json->'secrets')->>'name' AS cs_name " +
+ "FROM config_map_app_level WHERE app_id = ? AND env_id=?;"
+
+ _, err := impl.dbConnection.Query(cMCSNames, query, appId, envId)
+ return cMCSNames, err
+}
 
 func (impl ConfigMapRepositoryImpl) CreateAppLevel(model *ConfigMapAppModel) (*ConfigMapAppModel, error) {
  err := impl.dbConnection.Insert(model)

pkg/config/DeploymentConfigurationService.go

@@ -0,0 +1,46 @@
+package config
+
+import (
+ "github.com/devtron-labs/devtron/internal/sql/repository/chartConfig"
+ "go.uber.org/zap"
+)
+
+type DeploymentConfigurationService interface {
+ ConfigAutoComplete(appId int, envId int) (*ConfigDataResponse, error)
+}
+
+type DeploymentConfigurationServiceImpl struct {
+ logger *zap.SugaredLogger
+ configMapRepository chartConfig.ConfigMapRepository
+}
+
+func NewDeploymentConfigurationServiceImpl(logger *zap.SugaredLogger, configMapRepository chartConfig.ConfigMapRepository) (*DeploymentConfigurationServiceImpl, error) {
+ deploymentConfigurationService := &DeploymentConfigurationServiceImpl{
+ logger: logger,
+ configMapRepository: configMapRepository,
+ }
+
+ return deploymentConfigurationService, nil
+}
+
+func (impl DeploymentConfigurationServiceImpl) ConfigAutoComplete(appId int, envId int) (*ConfigDataResponse, error) {
+ var configDataResponse ConfigDataResponse
+ var cMCSNamesEnvLevel []chartConfig.CMCSNames
+ cMCSNamesAppLevel, err := impl.configMapRepository.GetConfigNamesAppLevel(appId)
+ if err != nil {
+ return nil, err
+ }
+ if envId > 0 {
+ cMCSNamesEnvLevel, err = impl.configMapRepository.GetConfigNamesEnvLevel(appId, envId)
+ }
+ for i, name := range cMCSNamesAppLevel {
+ configDataResponse.ResourceConfig[i].Name = name.CMName
+ configDataResponse.ResourceConfig[i].Type = CM
+ }
+ for i, name := range cMCSNamesEnvLevel {
+ configDataResponse.ResourceConfig[i].Name = name.CMName
+ configDataResponse.ResourceConfig[i].Type = CM
+ }
+
+ return nil, nil
+}

pkg/config/bean.go

@@ -0,0 +1,24 @@
+package config
+
+type ConfigState int
+
+const (
+ PublishedConfigState ConfigState = iota + 2
+)
+
+type ResourceType string
+
+const (
+ CM ResourceType = "ConfigMap"
+ CS ResourceType = "Secret"
+ DeploymentTemplate ResourceType = "Deployment Template"
+)
+
+type ConfigDefinition struct {
+ Name string `json:"name"`
+ ConfigState ConfigState `json:"draftState"`
+ Type ResourceType `json:"type"`
+}
+type ConfigDataResponse struct {
+ ResourceConfig []ConfigDefinition `json:"resourceConfig"`
+}