misc: merged main in release-bot

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

@@ -565,15 +565,12 @@ func (handler *PipelineConfigRestHandlerImpl) GetCiPipeline(w http.ResponseWrite
 		common.WriteJsonResp(w, fmt.Errorf("unauthorized user"), "Unauthorized User", http.StatusForbidden)
 		return
 	}
-	ciConf, err := handler.pipelineBuilder.GetCiPipeline(appId)
+	ciConf, err := handler.pipelineBuilder.GetCiPipelineRespResolved(appId)
 	if err != nil {
-		handler.Logger.Errorw("service err, GetCiPipeline", "err", err, "appId", appId)
+		handler.Logger.Errorw("service err, GetCiPipelineRespResolved", "appId", appId, "err", err)
 		common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
 		return
 	}
-	if ciConf == nil || ciConf.Id == 0 {
-		err = &util.ApiError{Code: "404", HttpStatusCode: 200, UserMessage: "no data found"}
-	}
 	common.WriteJsonResp(w, err, ciConf, http.StatusOK)
 }
 
@@ -1286,13 +1283,12 @@ func (handler *PipelineConfigRestHandlerImpl) GetCIPipelineById(w http.ResponseW
 		}
 	}
 
-	ciPipeline, err := handler.pipelineBuilder.GetCiPipelineById(pipelineId)
+	ciPipeline, err := handler.pipelineBuilder.GetCiPipelineByIdWithDefaultTag(pipelineId)
 	if err != nil {
-		handler.Logger.Infow("service error, GetCIPipelineById", "err", err, "appId", appId, "pipelineId", pipelineId)
+		handler.Logger.Infow("service error, GetCiPipelineByIdWithDefaultTag", "err", err, "appId", appId, "pipelineId", pipelineId)
 		common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
 		return
 	}
-	ciPipeline.DefaultTag = []string{"{git_hash}", "{ci_pipeline_id}", "{global_counter}"}
 	common.WriteJsonResp(w, err, ciPipeline, http.StatusOK)
 }
 

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

@@ -41,7 +41,6 @@ import (
 	"github.com/devtron-labs/devtron/pkg/auth/authorisation/casbin"
 	"github.com/devtron-labs/devtron/pkg/bean"
 	"github.com/devtron-labs/devtron/pkg/generateManifest"
-	"github.com/devtron-labs/devtron/pkg/pipeline"
 	pipelineBean "github.com/devtron-labs/devtron/pkg/pipeline/bean"
 	resourceGroup2 "github.com/devtron-labs/devtron/pkg/resourceGroup"
 	"github.com/devtron-labs/devtron/pkg/resourceQualifiers"
@@ -718,48 +717,22 @@ func (handler *PipelineConfigRestHandlerImpl) EnvConfigOverrideCreate(w http.Res
 		return
 	}
 
-	createResp, err := handler.propertiesConfigService.CreateEnvironmentProperties(appId, &envConfigProperties)
-	if err != nil {
-		if err.Error() == bean4.NOCHARTEXIST {
-			ctx, cancel := context.WithCancel(r.Context())
-			if cn, ok := w.(http.CloseNotifier); ok {
-				go func(done <-chan struct{}, closed <-chan bool) {
-					select {
-					case <-done:
-					case <-closed:
-						cancel()
-					}
-				}(ctx.Done(), cn.CloseNotify())
-			}
-			appMetrics := false
-			if envConfigProperties.AppMetrics != nil {
-				appMetrics = *envConfigProperties.AppMetrics
-			}
-			templateRequest := bean3.TemplateRequest{
-				AppId:               appId,
-				ChartRefId:          envConfigProperties.ChartRefId,
-				ValuesOverride:      []byte("{}"),
-				UserId:              userId,
-				IsAppMetricsEnabled: appMetrics,
+	ctx, cancel := context.WithCancel(r.Context())
+	if cn, ok := w.(http.CloseNotifier); ok {
+		go func(done <-chan struct{}, closed <-chan bool) {
+			select {
+			case <-done:
+			case <-closed:
+				cancel()
 			}
+		}(ctx.Done(), cn.CloseNotify())
+	}
 
-			_, err = handler.chartService.CreateChartFromEnvOverride(templateRequest, ctx)
-			if err != nil {
-				handler.Logger.Errorw("service err, EnvConfigOverrideCreate", "err", err, "payload", envConfigProperties)
-				common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
-				return
-			}
-			createResp, err = handler.propertiesConfigService.CreateEnvironmentProperties(appId, &envConfigProperties)
-			if err != nil {
-				handler.Logger.Errorw("service err, EnvConfigOverrideCreate", "err", err, "payload", envConfigProperties)
-				common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
-				return
-			}
-		} else {
-			handler.Logger.Errorw("service err, EnvConfigOverrideCreate", "err", err, "payload", envConfigProperties)
-			common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
-			return
-		}
+	createResp, err := handler.propertiesConfigService.CreateEnvironmentPropertiesAndBaseIfNeeded(ctx, appId, &envConfigProperties)
+	if err != nil {
+		handler.Logger.Errorw("service err, CreateEnvironmentPropertiesAndBaseIfNeeded", "payload", envConfigProperties, "err", err)
+		common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
+		return
 	}
 	common.WriteJsonResp(w, err, createResp, http.StatusOK)
 }
@@ -1037,77 +1010,12 @@ func (handler *PipelineConfigRestHandlerImpl) GetDeploymentTemplate(w http.Respo
 		common.WriteJsonResp(w, fmt.Errorf("unauthorized user"), "Unauthorized User", http.StatusForbidden)
 		return
 	}
-
-	appConfigResponse := make(map[string]interface{})
-	appConfigResponse["globalConfig"] = nil
-
-	err = handler.chartRefService.CheckChartExists(chartRefId)
+	appConfigResponse, err := handler.chartService.GetDeploymentTemplateDataByAppIdAndCharRefId(appId, chartRefId)
 	if err != nil {
 		handler.Logger.Errorw("refChartDir Not Found err, JsonSchemaExtractFromFile", err)
 		common.WriteJsonResp(w, err, nil, http.StatusForbidden)
 		return
 	}
-
-	schema, readme, err := handler.chartRefService.GetSchemaAndReadmeForTemplateByChartRefId(chartRefId)
-	if err != nil {
-		handler.Logger.Errorw("err in getting schema and readme, GetDeploymentTemplate", "err", err, "appId", appId, "chartRefId", chartRefId)
-	}
-
-	template, err := handler.chartReadService.FindLatestChartForAppByAppId(appId)
-	if err != nil && pg.ErrNoRows != err {
-		handler.Logger.Errorw("service err, GetDeploymentTemplate", "err", err, "appId", appId, "chartRefId", chartRefId)
-		common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
-		return
-	}
-
-	if pg.ErrNoRows == err {
-		appOverride, _, err := handler.chartRefService.GetAppOverrideForDefaultTemplate(chartRefId)
-		if err != nil {
-			handler.Logger.Errorw("service err, GetDeploymentTemplate", "err", err, "appId", appId, "chartRefId", chartRefId)
-			common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
-			return
-		}
-		appOverride["schema"] = json.RawMessage(schema)
-		appOverride["readme"] = string(readme)
-		mapB, err := json.Marshal(appOverride)
-		if err != nil {
-			handler.Logger.Errorw("marshal err, GetDeploymentTemplate", "err", err, "appId", appId, "chartRefId", chartRefId)
-			return
-		}
-		appConfigResponse["globalConfig"] = json.RawMessage(mapB)
-	} else {
-		if template.ChartRefId != chartRefId {
-			templateRequested, err := handler.chartService.GetByAppIdAndChartRefId(appId, chartRefId)
-			if err != nil && err != pg.ErrNoRows {
-				handler.Logger.Errorw("service err, GetDeploymentTemplate", "err", err, "appId", appId, "chartRefId", chartRefId)
-				common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
-				return
-			}
-
-			if pg.ErrNoRows == err {
-				template.ChartRefId = chartRefId
-				template.Id = 0
-				template.Latest = false
-			} else {
-				template.ChartRefId = templateRequested.ChartRefId
-				template.Id = templateRequested.Id
-				template.ChartRepositoryId = templateRequested.ChartRepositoryId
-				template.RefChartTemplate = templateRequested.RefChartTemplate
-				template.RefChartTemplateVersion = templateRequested.RefChartTemplateVersion
-				template.Latest = templateRequested.Latest
-			}
-		}
-		template.Schema = schema
-		template.Readme = string(readme)
-		bytes, err := json.Marshal(template)
-		if err != nil {
-			handler.Logger.Errorw("marshal err, GetDeploymentTemplate", "err", err, "appId", appId, "chartRefId", chartRefId)
-			return
-		}
-		appOverride := json.RawMessage(bytes)
-		appConfigResponse["globalConfig"] = appOverride
-	}
-
 	common.WriteJsonResp(w, nil, appConfigResponse, http.StatusOK)
 }
 
@@ -1992,15 +1900,9 @@ func (handler *PipelineConfigRestHandlerImpl) GetCdPipelineById(w http.ResponseW
 		return
 	}
 
-	cdPipeline, err := handler.pipelineBuilder.GetCdPipelineById(pipelineId)
-	if err != nil {
-		handler.Logger.Errorw("service err, GetCdPipelineById", "err", err, "appId", appId, "pipelineId", pipelineId)
-		common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
-		return
-	}
-	cdResp, err := pipeline.CreatePreAndPostStageResponse(cdPipeline, version)
+	cdResp, err := handler.pipelineBuilder.GetCdPipelineByIdResolved(pipelineId, version)
 	if err != nil {
-		handler.Logger.Errorw("service err, CheckForVersionAndCreatePreAndPostStagePayload", "err", err, "appId", appId, "pipelineId", pipelineId)
+		handler.Logger.Errorw("service err, GetCdPipelineByIdResolved", "appId", appId, "pipelineId", pipelineId, "err", err)
 		common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
 		return
 	}

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

@@ -35,6 +35,7 @@ import (
 	security2 "github.com/devtron-labs/devtron/pkg/policyGovernance/security/imageScanning"
 	"github.com/devtron-labs/devtron/pkg/policyGovernance/security/imageScanning/read"
 	read3 "github.com/devtron-labs/devtron/pkg/team/read"
+	"github.com/devtron-labs/devtron/util/beHelper"
 	"io"
 	"net/http"
 	"strconv"
@@ -60,7 +61,6 @@ import (
 	"github.com/devtron-labs/devtron/pkg/bean"
 	"github.com/devtron-labs/devtron/pkg/pipeline"
 	"github.com/devtron-labs/devtron/pkg/team"
-	util2 "github.com/devtron-labs/devtron/util"
 	"github.com/devtron-labs/devtron/util/rbac"
 	"github.com/gorilla/mux"
 	"go.uber.org/zap"
@@ -663,7 +663,7 @@ func (handler *PipelineConfigRestHandlerImpl) PipelineNameSuggestion(w http.Resp
 		common.WriteJsonResp(w, err, nil, http.StatusBadRequest)
 		return
 	}
-	suggestedName := fmt.Sprintf("%s-%d-%s", pType, appId, util2.Generate(4))
+	suggestedName := beHelper.GetPipelineNameByPipelineType(pType, appId)
 	resourceName := handler.enforcerUtil.GetAppRBACName(app.AppName)
 	ok := handler.enforcerUtil.CheckAppRbacForAppOrJob(token, resourceName, casbin.ActionGet)
 	if !ok {

api/restHandler/app/workflow/AppWorkflowRestHandler.go

@@ -188,13 +188,6 @@ func (impl AppWorkflowRestHandlerImpl) FindAppWorkflow(w http.ResponseWriter, r
 		return
 	}
 	token := r.Header.Get("token")
-	app, err := impl.pipelineBuilder.GetApp(appId)
-	if err != nil {
-		impl.Logger.Errorw("bad request", "err", err)
-		common.WriteJsonResp(w, err, nil, http.StatusBadRequest)
-		return
-	}
-
 	v := r.URL.Query()
 	envIdsString := v.Get("envIds")
 	envIds := make([]int, 0)
@@ -207,16 +200,15 @@ func (impl AppWorkflowRestHandlerImpl) FindAppWorkflow(w http.ResponseWriter, r
 	}
 
 	// RBAC enforcer applying
-	object := impl.enforcerUtil.GetAppRBACName(app.AppName)
+	object := impl.enforcerUtil.GetAppRBACNameByAppId(appId)
 	impl.Logger.Debugw("rbac object for other environment list", "object", object)
 	ok := impl.enforcerUtil.CheckAppRbacForAppOrJob(token, object, casbin.ActionGet)
 	if !ok {
 		common.WriteJsonResp(w, err, "unauthorized user", http.StatusForbidden)
 		return
 	}
-	// RBAC enforcer Ends
-	workflows := make(map[string]interface{})
-	workflowsList, err := impl.appWorkflowService.FindAppWorkflows(appId)
+	//RBAC enforcer Ends
+	workflowsListResp, appType, err := impl.appWorkflowService.FindAppWorkflowsListResolvedResp(appId)
 	if err != nil {
 		impl.Logger.Errorw("error in fetching workflows for app", "err", err)
 		common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
@@ -231,7 +223,7 @@ func (impl AppWorkflowRestHandlerImpl) FindAppWorkflow(w http.ResponseWriter, r
 			return
 		}
 		triggerViewPayload := &bean2.TriggerViewWorkflowConfig{
-			Workflows:   workflowsList,
+			Workflows:   workflowsListResp.Workflows,
 			CdPipelines: cdPipelineWfData,
 		}
 		queryParam := bean2.NewWorkflowsFilterQuery().WithEnvIds(envIds)
@@ -242,12 +234,10 @@ func (impl AppWorkflowRestHandlerImpl) FindAppWorkflow(w http.ResponseWriter, r
 			common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
 			return
 		}
-		workflowsList = response.Workflows
+		workflowsListResp.Workflows = response.Workflows
 	}
 
-	workflows["appId"] = app.Id
-	workflows["appName"] = app.AppName
-	if len(workflowsList) > 0 && app.AppType == helper.Job {
+	if len(workflowsListResp.Workflows) > 0 && appType == helper.Job {
 		// RBAC
 
 		var workflowNames []string
@@ -256,15 +246,15 @@ func (impl AppWorkflowRestHandlerImpl) FindAppWorkflow(w http.ResponseWriter, r
 		var rbacObjects []string
 		workNameObjectMap := make(map[string]bean2.AppWorkflowDto)
 
-		for _, workflow := range workflowsList {
+		for _, workflow := range workflowsListResp.Workflows {
 			workflowNames = append(workflowNames, workflow.Name)
 			workflowIds = append(workflowIds, workflow.Id)
 		}
 		workflowIdToObjectMap := impl.enforcerUtil.GetAllWorkflowRBACObjectsByAppId(appId, workflowNames, workflowIds)
 		itr := 0
 		for _, val := range workflowIdToObjectMap {
 			rbacObjects = append(rbacObjects, val)
-			workNameObjectMap[val] = workflowsList[itr]
+			workNameObjectMap[val] = workflowsListResp.Workflows[itr]
 			itr++
 		}
 
@@ -277,20 +267,8 @@ func (impl AppWorkflowRestHandlerImpl) FindAppWorkflow(w http.ResponseWriter, r
 		if len(updatedWorkflowList) == 0 {
 			updatedWorkflowList = []bean2.AppWorkflowDto{}
 		}
-		workflows[bean3.Workflows] = updatedWorkflowList
-	} else if len(workflowsList) > 0 {
-		workflows[bean3.Workflows] = workflowsList
-	} else {
-		workflows[bean3.Workflows] = []bean2.AppWorkflowDto{}
-	}
-	isAppLevelGitOpsConfigured, err := impl.chartService.IsGitOpsRepoConfiguredForDevtronApp(appId)
-	if err != nil && !util.IsErrNoRows(err) {
-		impl.Logger.Errorw("service err, IsGitOpsRepoConfiguredForDevtronApp", "appId", appId, "envIds", envIds, "err", err)
-		common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
-		return
 	}
-	workflows["isGitOpsRepoNotConfigured"] = !isAppLevelGitOpsConfigured
-	common.WriteJsonResp(w, nil, workflows, http.StatusOK)
+	common.WriteJsonResp(w, nil, workflowsListResp, http.StatusOK)
 }
 
 func (impl AppWorkflowRestHandlerImpl) FindAllWorkflows(w http.ResponseWriter, r *http.Request) {

charts/devtron/Chart.yaml

@@ -11,7 +11,7 @@ keywords:
   - argocd
   - Hyperion
 engine: gotpl
-version: 0.22.87
+version: 0.22.88
 sources:
   - https://github.com/devtron-labs/charts
 dependencies:

charts/devtron/templates/configmap-secret.yaml

@@ -29,9 +29,13 @@ metadata:
 data:
 {{- if $.Values.configs }}
 {{ toYaml $.Values.configs | indent 2 }}
+{{- end }}
+{{- if $.Values.devtronEnterprise.enabled }}
+  DEVTRON_INSTALLATION_TYPE:  "enterprise"
 {{- end }}
   INSTALLATION_THROUGH_HELM: "True"
   DEVTRON_HELM_RELEASE_NAME: {{ $.Release.Name }}
+  DEVTRON_HELM_RELEASE_NAMESPACE: {{ $.Release.Namespace }}
 {{- if and ($.Values.minio.enabled) (not $.Values.configs.BLOB_STORAGE_PROVIDER) }}
   BLOB_STORAGE_PROVIDER: "S3"
   BLOB_STORAGE_S3_ENDPOINT: "http://devtron-minio.devtroncd:9000"
@@ -302,7 +306,8 @@ metadata:
 data:
 {{- if $.Values.global.configs }}
 {{- toYaml $.Values.global.configs | nindent 2 }}
-{{- end }} 
+{{- end }}
+{{- if not $.Values.devtronEnterprise.enabled }} 
 ---
 apiVersion: v1
 kind: ConfigMap
@@ -317,7 +322,7 @@ data:
 {{- if $.Values.global.configs }}
 {{- toYaml $.Values.global.configs | nindent 2 }}
 {{- end }} 
-
+{{- end }}
 {{- if $.Values.imagePullSecret }}
 {{- if $.Values.imagePullSecret.create }}
 ---
@@ -356,7 +361,7 @@ metadata:
 type: kubernetes.io/dockerconfigjson
 data:
   .dockerconfigjson: {{ include "imagePullSecret" . }}
-
+{{- if not $.Values.devtronEnterprise.enabled }}
 ---
 apiVersion: v1
 kind: Secret
@@ -371,3 +376,4 @@ data:
 {{- end }}
 {{- end }}
 {{- end }}
+{{- end }}

charts/devtron/templates/dashboard.yaml

@@ -18,6 +18,9 @@ metadata:
   annotations:
     "helm.sh/resource-policy": keep
 data:
+{{- if $.Values.devtronEnterprise.enabled }}
+  GATEKEEPER_URL: "https://license.devtron.ai/dashboard"
+{{- end }}
 {{- if .config }}
   GA_ENABLED: {{ .config.analytics | default "false" | quote }}
   HOTJAR_ENABLED: {{ .config.hotjar | default "false" | quote }}