Config diff

Wire.go

@@ -119,6 +119,7 @@ import (
  "github.com/devtron-labs/devtron/pkg/chart/gitOpsConfig"
  chartRepoRepository "github.com/devtron-labs/devtron/pkg/chartRepo/repository"
  "github.com/devtron-labs/devtron/pkg/commonService"
+ "github.com/devtron-labs/devtron/pkg/configDiff"
  delete2 "github.com/devtron-labs/devtron/pkg/delete"
  deployment2 "github.com/devtron-labs/devtron/pkg/deployment"
  git2 "github.com/devtron-labs/devtron/pkg/deployment/gitOps/git"
@@ -699,6 +700,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)),
+ configDiff.NewDeploymentConfigurationServiceImpl,
+ wire.Bind(new(configDiff.DeploymentConfigurationService), new(*configDiff.DeploymentConfigurationServiceImpl)),
+
  router.NewTelemetryRouterImpl,
  wire.Bind(new(router.TelemetryRouter), new(*router.TelemetryRouterImpl)),
  restHandler.NewTelemetryRestHandlerImpl,

api/restHandler/DeploymentConfigurationRestHandler.go

@@ -0,0 +1,71 @@
+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/configDiff"
+ "github.com/devtron-labs/devtron/util/rbac"
+ "go.uber.org/zap"
+ "gopkg.in/go-playground/validator.v9"
+ "net/http"
+)
+
+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
+ deploymentConfigurationService configDiff.DeploymentConfigurationService
+}
+
+func NewDeploymentConfigurationRestHandlerImpl(logger *zap.SugaredLogger,
+ userAuthService user.UserService,
+ enforcerUtil rbac.EnforcerUtil,
+ deploymentConfigurationService configDiff.DeploymentConfigurationService,
+) *DeploymentConfigurationRestHandlerImpl {
+ return &DeploymentConfigurationRestHandlerImpl{
+ logger: logger,
+ userAuthService: userAuthService,
+ enforcerUtil: enforcerUtil,
+ 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
+ }
+ appId, err := common.ExtractIntQueryParam(w, r, "appId", 0)
+ if err != nil {
+ return
+ }
+ envId, err := common.ExtractIntQueryParam(w, r, "envId", 0)
+ if err != nil {
+ return
+ }
+
+ //RBAC START
+ token := r.Header.Get(common.TokenHeaderKey)
+ 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, ConfigAutoComplete ", "err", err)
+ common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
+ return
+ }
+ common.WriteJsonResp(w, err, res, http.StatusOK)
+}

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

@@ -984,7 +984,7 @@ func (handler *PipelineConfigRestHandlerImpl) GetRestartWorkloadData(w http.Resp
  common.WriteJsonResp(w, err, "Unauthorized User", http.StatusUnauthorized)
  return
  }
- envId, err := common.ExtractIntQueryParam(w, r, "envId", nil)
+ envId, err := common.ExtractIntQueryParam(w, r, "envId", 0)
  if err != nil {
  return
  }

api/restHandler/common/ParamParserUtils.go

@@ -58,15 +58,15 @@ func convertToIntArray(w http.ResponseWriter, paramValue string) ([]int, error)
  return paramValues, nil
 }
 
-func ExtractIntQueryParam(w http.ResponseWriter, r *http.Request, paramName string, defaultVal *int) (int, error) {
+func ExtractIntQueryParam(w http.ResponseWriter, r *http.Request, paramName string, defaultVal int) (int, error) {
  queryParams := r.URL.Query()
  paramValue := queryParams.Get(paramName)
  if len(paramValue) == 0 {
- return *defaultVal, nil
+ return defaultVal, nil
  }
  paramIntValue, err := convertToInt(w, paramValue)
  if err != nil {
- return 0, err
+ return defaultVal, err
  }
  return paramIntValue, nil
 }

api/router/DeploymentConfigRouter.go

@@ -0,0 +1,27 @@
+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("GET")
+}

api/router/router.go

@@ -113,6 +113,7 @@ type MuxRouter struct {
  rbacRoleRouter user.RbacRoleRouter
  scopedVariableRouter ScopedVariableRouter
  ciTriggerCron cron.CiTriggerCron
+ deploymentConfigurationRouter DeploymentConfigurationRouter
  infraConfigRouter infraConfig.InfraConfigRouter
  argoApplicationRouter argoApplication.ArgoApplicationRouter
  devtronResourceRouter devtronResource.DevtronResourceRouter
@@ -144,6 +145,7 @@ func NewMuxRouter(logger *zap.SugaredLogger,
  scopedVariableRouter ScopedVariableRouter,
  ciTriggerCron cron.CiTriggerCron,
  proxyRouter proxy.ProxyRouter,
+ deploymentConfigurationRouter DeploymentConfigurationRouter,
  infraConfigRouter infraConfig.InfraConfigRouter,
  argoApplicationRouter argoApplication.ArgoApplicationRouter,
  devtronResourceRouter devtronResource.DevtronResourceRouter) *MuxRouter {
@@ -206,6 +208,7 @@ func NewMuxRouter(logger *zap.SugaredLogger,
  rbacRoleRouter: rbacRoleRouter,
  scopedVariableRouter: scopedVariableRouter,
  ciTriggerCron: ciTriggerCron,
+ deploymentConfigurationRouter: deploymentConfigurationRouter,
  infraConfigRouter: infraConfigRouter,
  argoApplicationRouter: argoApplicationRouter,
  devtronResourceRouter: devtronResourceRouter,
@@ -288,8 +291,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

@@ -17,6 +17,7 @@
 package chartConfig
 
 import (
+ "github.com/devtron-labs/devtron/pkg/pipeline/bean"
  "github.com/devtron-labs/devtron/pkg/sql"
  "github.com/go-pg/pg"
  "github.com/go-pg/pg/orm"
@@ -38,6 +39,7 @@ type ConfigMapRepository interface {
  GetByAppIdAppLevel(appId int) (*ConfigMapAppModel, error)
  GetByAppIdAndEnvIdEnvLevel(appId int, envId int) (*ConfigMapEnvModel, error)
  GetEnvLevelByAppId(appId int) ([]*ConfigMapEnvModel, error)
+ GetConfigNamesForAppAndEnvLevel(appId int, envId int) ([]bean.ConfigNameAndType, error)
 }
 
 type ConfigMapRepositoryImpl struct {
@@ -49,6 +51,11 @@ func NewConfigMapRepositoryImpl(Logger *zap.SugaredLogger, dbConnection *pg.DB)
  return &ConfigMapRepositoryImpl{dbConnection: dbConnection, Logger: Logger}
 }
 
+const (
+ ConfigMapAppLevel string = "config_map_app_level"
+ ConfigMapEnvLevel string = "config_map_env_level"
+)
+
 type ConfigMapAppModel struct {
  TableName struct{} `sql:"config_map_app_level" pg:",discard_unknown_columns"`
  Id int `sql:"id,pk"`
@@ -57,6 +64,54 @@ type ConfigMapAppModel struct {
  SecretData string `sql:"secret_data"`
  sql.AuditLog
 }
+type cMCSNames struct {
+ Id int `json:"id"`
+ CMName string `json:"cm_name"`
+ CSName string `json:"cs_name"`
+}
+
+func (impl ConfigMapRepositoryImpl) GetConfigNamesForAppAndEnvLevel(appId int, envId int) ([]bean.ConfigNameAndType, error) {
+ var cMCSNames []cMCSNames
+ tableName := ConfigMapEnvLevel
+ if envId == -1 {
+ tableName = ConfigMapAppLevel
+ }
+ query := impl.dbConnection.
+ Model().
+ Table(tableName).
+ Column("id").
+ ColumnExpr("json_array_elements(CASE WHEN (config_map_data::json->'maps')::TEXT != 'null' THEN (config_map_data::json->'maps') ELSE '[]' END )->>'name' AS cm_name").
+ ColumnExpr("json_array_elements(CASE WHEN (secret_data::json->'secrets')::TEXT != 'null' THEN (secret_data::json->'secrets') ELSE '[]' END )->>'name' AS cs_name").
+ Where("app_id = ?", appId)
+
+ if envId > 0 {
+ query = query.Where("environment_id=?", envId)
+ }
+ if err := query.Select(&cMCSNames); err != nil {
+ if err != pg.ErrNoRows {
+ impl.Logger.Errorw("error occurred while fetching CM/CS names", "appId", appId, "err", err)
+ return nil, err
+ }
+ }
+ var configNames []bean.ConfigNameAndType
+ for _, name := range cMCSNames {
+ if name.CMName != "" {
+ configNames = append(configNames, bean.ConfigNameAndType{
+ Id: name.Id,
+ Name: name.CMName,
+ Type: bean.CM,
+ })
+ }
+ if name.CSName != "" {
+ configNames = append(configNames, bean.ConfigNameAndType{
+ Id: name.Id,
+ Name: name.CSName,
+ Type: bean.CS,
+ })
+ }
+ }
+ return configNames, nil
+}
 
 func (impl ConfigMapRepositoryImpl) CreateAppLevel(model *ConfigMapAppModel) (*ConfigMapAppModel, error) {
  err := impl.dbConnection.Insert(model)

pkg/configDiff/DeploymentConfigurationService.go

@@ -0,0 +1,53 @@
+package configDiff
+
+import (
+ bean2 "github.com/devtron-labs/devtron/pkg/configDiff/bean"
+ "github.com/devtron-labs/devtron/pkg/configDiff/helper"
+ "github.com/devtron-labs/devtron/pkg/pipeline"
+ "github.com/devtron-labs/devtron/pkg/pipeline/bean"
+ "go.uber.org/zap"
+)
+
+type DeploymentConfigurationService interface {
+ ConfigAutoComplete(appId int, envId int) (*bean2.ConfigDataResponse, error)
+}
+
+type DeploymentConfigurationServiceImpl struct {
+ logger *zap.SugaredLogger
+ configMapService pipeline.ConfigMapService
+}
+
+func NewDeploymentConfigurationServiceImpl(logger *zap.SugaredLogger,
+ configMapService pipeline.ConfigMapService,
+) (*DeploymentConfigurationServiceImpl, error) {
+ deploymentConfigurationService := &DeploymentConfigurationServiceImpl{
+ logger: logger,
+ configMapService: configMapService,
+ }
+
+ return deploymentConfigurationService, nil
+}
+func (impl *DeploymentConfigurationServiceImpl) ConfigAutoComplete(appId int, envId int) (*bean2.ConfigDataResponse, error) {
+ cMCSNamesAppLevel, cMCSNamesEnvLevel, err := impl.configMapService.FetchCmCsNamesAppAndEnvLevel(appId, envId)
+ if err != nil {
+ impl.logger.Errorw("error in fetching CM and CS names at app or env level", "appId", appId, "envId", envId, "err", err)
+ return nil, err
+ }
+ cmcsKeyPropertyAppLevelMap, cmcsKeyPropertyEnvLevelMap := helper.GetCmCsAppAndEnvLevelMap(cMCSNamesAppLevel, cMCSNamesEnvLevel)
+ for key, configProperty := range cmcsKeyPropertyAppLevelMap {
+ if _, ok := cmcsKeyPropertyEnvLevelMap[key]; !ok {
+ configProperty.Global = true
+ }
+ }
+ for key, configProperty := range cmcsKeyPropertyEnvLevelMap {
+ if _, ok := cmcsKeyPropertyAppLevelMap[key]; ok {
+ configProperty.Global = true
+ configProperty.Overridden = true
+ }
+ }
+ combinedProperties := helper.GetCombinedPropertiesMap(cmcsKeyPropertyAppLevelMap, cmcsKeyPropertyEnvLevelMap)
+ combinedProperties = append(combinedProperties, helper.GetConfigProperty(0, "", bean.DeploymentTemplate, bean2.PublishedConfigState))
+
+ configDataResp := bean2.NewConfigDataResponse().WithResourceConfig(combinedProperties)
+ return configDataResp, nil
+}

pkg/configDiff/bean/bean.go

@@ -0,0 +1,67 @@
+package bean
+
+import (
+ "fmt"
+ "github.com/devtron-labs/devtron/pkg/pipeline/bean"
+)
+
+type ConfigState int
+
+const (
+ PublishedConfigState ConfigState = 3
+)
+
+type ConfigProperty struct {
+ Id int `json:"id"`
+ Name string `json:"name"`
+ ConfigState ConfigState `json:"configState"`
+ Type bean.ResourceType `json:"type"`
+ Overridden bool `json:"overridden"`
+ Global bool `json:"global"`
+}
+
+func NewConfigProperty() *ConfigProperty {
+ return &ConfigProperty{}
+}
+
+func (r *ConfigProperty) IsConfigPropertyGlobal() bool {
+ return r.Global
+}
+
+func (r *ConfigProperty) SetConfigProperty(Name string, ConfigState ConfigState, Type bean.ResourceType, Overridden bool, Global bool) *ConfigProperty {
+ r.Name = Name
+ r.ConfigState = ConfigState
+ r.Type = Type
+ r.Overridden = Overridden
+ r.Global = Global
+ return r
+}
+
+type ConfigDataResponse struct {
+ ResourceConfig []*ConfigProperty `json:"resourceConfig"`
+}
+
+func NewConfigDataResponse() *ConfigDataResponse {
+ return &ConfigDataResponse{}
+}
+
+func (r *ConfigDataResponse) WithResourceConfig(resourceConfig []*ConfigProperty) *ConfigDataResponse {
+ r.ResourceConfig = resourceConfig
+ return r
+}
+
+func (r *ConfigProperty) GetKey() string {
+ return fmt.Sprintf("%s-%s", string(r.Type), r.Name)
+}
+
+type ConfigPropertyIdentifier struct {
+ Name string `json:"name"`
+ Type bean.ResourceType `json:"type"`
+}
+
+func (r *ConfigProperty) GetIdentifier() ConfigPropertyIdentifier {
+ return ConfigPropertyIdentifier{
+ Name: r.Name,
+ Type: r.Type,
+ }
+}