Merge pull request #5837 from devtron-labs/config-diff-3-oss

feat: Config diff 3 oss

Author: prakash100198

api/restHandler/DeploymentConfigurationRestHandler.go

@@ -1,17 +1,20 @@
 package restHandler
 
 import (
+	"context"
 	"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/pkg/configDiff/bean"
+	util2 "github.com/devtron-labs/devtron/util"
 	"github.com/devtron-labs/devtron/util/rbac"
 	"github.com/gorilla/schema"
 	"go.uber.org/zap"
 	"gopkg.in/go-playground/validator.v9"
 	"net/http"
+	"time"
 )
 
 type DeploymentConfigurationRestHandler interface {
@@ -88,6 +91,7 @@ func (handler *DeploymentConfigurationRestHandlerImpl) GetConfigData(w http.Resp
 		return
 	}
 
+	configDataQueryParams.UserId = userId
 	//RBAC START
 	token := r.Header.Get(common.TokenHeaderKey)
 	object := handler.enforcerUtil.GetAppRBACName(configDataQueryParams.AppName)
@@ -97,8 +101,12 @@ func (handler *DeploymentConfigurationRestHandlerImpl) GetConfigData(w http.Resp
 		return
 	}
 	//RBAC END
-
-	res, err := handler.deploymentConfigurationService.GetAllConfigData(r.Context(), configDataQueryParams)
+	isSuperAdmin := handler.enforcer.Enforce(token, casbin.ResourceGlobal, casbin.ActionGet, "*")
+	userHasAdminAccess := handler.enforcer.Enforce(token, casbin.ResourceApplications, casbin.ActionUpdate, object)
+	ctx, cancel := context.WithTimeout(r.Context(), 60*time.Second)
+	defer cancel()
+	ctx = util2.SetSuperAdminInContext(ctx, isSuperAdmin)
+	res, err := handler.deploymentConfigurationService.GetAllConfigData(ctx, configDataQueryParams, userHasAdminAccess)
 	if err != nil {
 		handler.logger.Errorw("service err, GetAllConfigData ", "err", err)
 		common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)

internal/sql/repository/DeploymentTemplateRepository.go

@@ -38,6 +38,7 @@ type DeploymentTemplateComparisonMetadata struct {
 	EnvironmentId               int                    `json:"environmentId,omitempty"`
 	EnvironmentName             string                 `json:"environmentName,omitempty"`
 	DeploymentTemplateHistoryId int                    `json:"deploymentTemplateHistoryId,omitempty"`
+	WfrId                       int                    `json:"wfrId,omitempty"`
 	StartedOn                   *time.Time             `json:"startedOn,omitempty"`
 	FinishedOn                  *time.Time             `json:"finishedOn,omitempty"`
 	Status                      string                 `json:"status,omitempty"`
@@ -69,7 +70,7 @@ func (impl DeploymentTemplateRepositoryImpl) FetchDeploymentHistoryWithChartRefs
 	limit := 15
 
 	query := "select p.id as pipeline_id, dth.id as deployment_template_history_id," +
-		"  wfr.finished_on, wfr.status, c.chart_ref_id, c.chart_version FROM cd_workflow_runner wfr" +
+		"  wfr.id as wfr_id, wfr.finished_on, wfr.status, c.chart_ref_id, c.chart_version FROM cd_workflow_runner wfr" +
 		" JOIN cd_workflow wf ON wf.id = wfr.cd_workflow_id JOIN pipeline p ON p.id = wf.pipeline_id" +
 		" JOIN deployment_template_history dth ON dth.deployed_on = wfr.started_on " +
 		"JOIN pipeline_config_override pco ON pco.cd_workflow_id = wf.id " +

pkg/bean/configSecretData.go

@@ -30,6 +30,8 @@ type SecretList struct {
 	ConfigData []*ConfigData `json:"secrets"`
 }
 
+// there is an adapter written in pkg/bean folder to convert below ConfigData struct to pipeline/bean's ConfigData
+
 // TODO refactoring: duplicate struct of ConfigData in ConfigMapBean.go
 type ConfigData struct {
 	Name                  string           `json:"name"`
@@ -49,6 +51,7 @@ type ConfigData struct {
 	SubPath               bool             `json:"subPath"`
 	ESOSubPath            []string         `json:"esoSubPath"`
 	FilePermission        string           `json:"filePermission"`
+	Overridden            bool             `json:"overridden"`
 }
 
 func (c *ConfigData) IsESOExternalSecretType() bool {

pkg/cluster/repository/EnvironmentRepository.go

@@ -80,6 +80,7 @@ type EnvironmentRepository interface {
 	FindAllActiveWithFilter() ([]*Environment, error)
 	FindEnvClusterInfosByIds([]int) ([]*EnvCluserInfo, error)
 	FindEnvLinkedWithCiPipelines(externalCi bool, ciPipelineIds []int) ([]*Environment, error)
+	FindEnvByNameWithClusterDetails(envName string) (*Environment, error)
 }
 
 func NewEnvironmentRepositoryImpl(dbConnection *pg.DB, logger *zap.SugaredLogger, appStatusRepository appStatus.AppStatusRepository) *EnvironmentRepositoryImpl {
@@ -160,6 +161,17 @@ func (repositoryImpl EnvironmentRepositoryImpl) FindByName(name string) (*Enviro
 	return environment, err
 }
 
+func (repositoryImpl EnvironmentRepositoryImpl) FindEnvByNameWithClusterDetails(envName string) (*Environment, error) {
+	environment := &Environment{}
+	err := repositoryImpl.dbConnection.
+		Model(environment).
+		Column("environment.*", "Cluster").
+		Where("environment.environment_name = ?", envName).
+		Where("environment.active = ?", true).
+		Select()
+	return environment, err
+}
+
 func (repositoryImpl EnvironmentRepositoryImpl) FindIdByName(name string) (int, error) {
 	environment := &Environment{}
 	err := repositoryImpl.dbConnection.