handle nil pipeline strategy in case of custom chart

Author: prakash100198

api/restHandler/DeploymentConfigurationRestHandler.go

@@ -103,9 +103,9 @@ func (handler *DeploymentConfigurationRestHandlerImpl) GetConfigData(w http.Resp
 	//RBAC END
 	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)
+	ctx, _ := context.WithTimeout(r.Context(), 60*time.Second)
 	ctx = util2.SetSuperAdminInContext(ctx, isSuperAdmin)
-	defer cancel()
+
 	res, err := handler.deploymentConfigurationService.GetAllConfigData(ctx, configDataQueryParams, userHasAdminAccess)
 	if err != nil {
 		handler.logger.Errorw("service err, GetAllConfigData ", "err", err)

pkg/configDiff/DeploymentConfigurationService.go

@@ -27,6 +27,7 @@ import (
 	repository6 "github.com/devtron-labs/devtron/pkg/variables/repository"
 	util2 "github.com/devtron-labs/devtron/util"
 	"github.com/go-pg/pg"
+	"github.com/juju/errors"
 	"go.uber.org/zap"
 	"net/http"
 )
@@ -190,18 +191,20 @@ func (impl *DeploymentConfigurationServiceImpl) getDeploymentHistoryConfig(ctx c
 
 func (impl *DeploymentConfigurationServiceImpl) getPipelineStrategyConfigHistory(ctx context.Context, configDataQueryParams *bean2.ConfigDataQueryParams) (*bean2.DeploymentAndCmCsConfig, error) {
 	pipelineStrategyJson := json.RawMessage{}
+	pipelineConfig := bean2.NewDeploymentAndCmCsConfig()
 	pipelineStrategyHistory, err := impl.pipelineStrategyHistoryRepository.GetHistoryByPipelineIdAndWfrId(ctx, configDataQueryParams.PipelineId, configDataQueryParams.WfrId)
-	if err != nil {
+	if err != nil && !util.IsErrNoRows(err) {
 		impl.logger.Errorw("error in checking if history exists for pipelineId and wfrId", "pipelineId", configDataQueryParams.PipelineId, "wfrId", configDataQueryParams.WfrId, "err", err)
 		return nil, err
+	} else if util.IsErrNoRows(err) {
+		return pipelineConfig, nil
 	}
 	err = pipelineStrategyJson.UnmarshalJSON([]byte(pipelineStrategyHistory.Config))
 	if err != nil {
 		impl.logger.Errorw("getDeploymentTemplateForEnvLevel, error in unmarshalling string  pipelineStrategyHistory data into json Raw message", "pipelineStrategyHistoryConfig", pipelineStrategyHistory.Config, "err", err)
 		return nil, err
 	}
-	pipelineConfig := bean2.NewDeploymentAndCmCsConfig().
-		WithConfigData(pipelineStrategyJson).
+	pipelineConfig.WithConfigData(pipelineStrategyJson).
 		WithResourceType(bean.PipelineStrategy).
 		WithPipelineStrategyMetadata(pipelineStrategyHistory.PipelineTriggerType, string(pipelineStrategyHistory.Strategy))
 	return pipelineConfig, nil
@@ -640,9 +643,11 @@ func (impl *DeploymentConfigurationServiceImpl) getPublishedPipelineStrategyConf
 		return nil, err
 	}
 	pipelineStrategy, err := impl.deploymentConfigService.GetLatestPipelineStrategyConfig(pipeline)
-	if err != nil {
+	if err != nil && !errors.IsNotFound(err) {
 		impl.logger.Errorw("error in GetLatestPipelineStrategyConfig", "pipelineId", pipeline.Id, "err", err)
 		return nil, err
+	} else if errors.IsNotFound(err) {
+		return pipelineConfig, nil
 	}
 	err = pipelineStrategyJson.UnmarshalJSON([]byte(pipelineStrategy.CodeEditorValue.Value))
 	if err != nil {

pkg/generateManifest/DeploymentTemplateService.go

@@ -335,7 +335,12 @@ func (impl DeploymentTemplateServiceImpl) fetchResolvedTemplateForPublishedEnvs(
 		impl.Logger.Errorw("error in getting overridden values", "err", err)
 		return nil, err
 	}
-	_, _, version, _, err := impl.chartRefService.GetRefChart(override.EnvironmentConfig.ChartRefId)
+	// handle here for chart ref id in case
+	chartRefId := override.EnvironmentConfig.ChartRefId
+	if chartRefId == 0 {
+		chartRefId = override.GlobalChartRefId
+	}
+	_, _, version, _, err := impl.chartRefService.GetRefChart(chartRefId)
 	if err != nil {
 		impl.Logger.Errorw("error in getting chart ref by chartRefId ", "chartRefId", request.ChartRefId, "err", err)
 		return nil, err