add template version and isAppMetrics enabled in case of deployment template and some more metadata added for pipeline strategy

Author: prakash100198

pkg/configDiff/DeploymentConfigurationService.go

@@ -13,6 +13,7 @@ import (
 	bean2 "github.com/devtron-labs/devtron/pkg/configDiff/bean"
 	"github.com/devtron-labs/devtron/pkg/configDiff/helper"
 	"github.com/devtron-labs/devtron/pkg/configDiff/utils"
+	"github.com/devtron-labs/devtron/pkg/deployment/manifest/deploymentTemplate/chartRef"
 	"github.com/devtron-labs/devtron/pkg/generateManifest"
 	"github.com/devtron-labs/devtron/pkg/pipeline"
 	"github.com/devtron-labs/devtron/pkg/pipeline/adapter"
@@ -45,6 +46,7 @@ type DeploymentConfigurationServiceImpl struct {
 	scopedVariableManager               variables.ScopedVariableCMCSManager
 	configMapRepository                 chartConfig.ConfigMapRepository
 	deploymentConfigService             pipeline.PipelineDeploymentConfigService
+	chartRefService                     chartRef.ChartRefService
 }
 
 func NewDeploymentConfigurationServiceImpl(logger *zap.SugaredLogger,
@@ -59,6 +61,7 @@ func NewDeploymentConfigurationServiceImpl(logger *zap.SugaredLogger,
 	scopedVariableManager variables.ScopedVariableCMCSManager,
 	configMapRepository chartConfig.ConfigMapRepository,
 	deploymentConfigService pipeline.PipelineDeploymentConfigService,
+	chartRefService chartRef.ChartRefService,
 ) (*DeploymentConfigurationServiceImpl, error) {
 	deploymentConfigurationService := &DeploymentConfigurationServiceImpl{
 		logger:                              logger,
@@ -73,6 +76,7 @@ func NewDeploymentConfigurationServiceImpl(logger *zap.SugaredLogger,
 		scopedVariableManager:               scopedVariableManager,
 		configMapRepository:                 configMapRepository,
 		deploymentConfigService:             deploymentConfigService,
+		chartRefService:                     chartRefService,
 	}
 
 	return deploymentConfigurationService, nil
@@ -193,7 +197,8 @@ func (impl *DeploymentConfigurationServiceImpl) getDeploymentHistoryConfig(ctx c
 		WithConfigData(deploymentJson).
 		WithResourceType(bean.DeploymentTemplate).
 		WithVariableSnapshot(map[string]map[string]string{bean.DeploymentTemplate.ToString(): variableSnapshotMap}).
-		WithResolvedValue(json.RawMessage(resolvedTemplate))
+		WithResolvedValue(json.RawMessage(resolvedTemplate)).
+		WithDeploymentConfigMetadata(deploymentHistory.TemplateVersion, deploymentHistory.IsAppMetricsEnabled)
 	return deploymentConfig, nil
 }
 
@@ -209,7 +214,10 @@ func (impl *DeploymentConfigurationServiceImpl) getPipelineStrategyConfigHistory
 		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).WithResourceType(bean.PipelineStrategy)
+	pipelineConfig := bean2.NewDeploymentAndCmCsConfig().
+		WithConfigData(pipelineStrategyJson).
+		WithResourceType(bean.PipelineStrategy).
+		WithPipelineStrategyMetadata(pipelineStrategyHistory.PipelineTriggerType, string(pipelineStrategyHistory.Strategy))
 	return pipelineConfig, nil
 }
 
@@ -582,9 +590,10 @@ func (impl *DeploymentConfigurationServiceImpl) getPublishedDeploymentConfig(ctx
 		variableSnapShotMap[bean.DeploymentTemplate.ToString()] = deplTemplateResp.VariableSnapshot
 
 		return bean2.NewDeploymentAndCmCsConfig().WithConfigData(deploymentJson).WithResourceType(bean.DeploymentTemplate).
-			WithResolvedValue(json.RawMessage(deplTemplateResp.ResolvedData)).WithVariableSnapshot(variableSnapShotMap), nil
+			WithResolvedValue(json.RawMessage(deplTemplateResp.ResolvedData)).WithVariableSnapshot(variableSnapShotMap).
+			WithDeploymentConfigMetadata(deplTemplateResp.TemplateVersion, deplTemplateResp.IsAppMetricsEnabled), nil
 	}
-	deplJson, err := impl.getBaseDeploymentTemplate(appId)
+	deplMetadata, err := impl.getBaseDeploymentTemplate(appId)
 	if err != nil {
 		impl.logger.Errorw("getting base depl. template", "appid", appId, "err", err)
 		return nil, err
@@ -593,15 +602,16 @@ func (impl *DeploymentConfigurationServiceImpl) getPublishedDeploymentConfig(ctx
 		AppId:           appId,
 		RequestDataMode: generateManifest.Values,
 	}
-	resolvedTemplate, variableSnapshot, err := impl.deploymentTemplateService.ResolveTemplateVariables(ctx, string(deplJson), deploymentTemplateRequest)
+	resolvedTemplate, variableSnapshot, err := impl.deploymentTemplateService.ResolveTemplateVariables(ctx, string(deplMetadata.DeploymentTemplateJson), deploymentTemplateRequest)
 	if err != nil {
 		impl.logger.Errorw("error in getting resolved data for base deployment template", "appid", appId, "err", err)
 		return nil, err
 	}
 
 	variableSnapShotMap := map[string]map[string]string{bean.DeploymentTemplate.ToString(): variableSnapshot}
-	return bean2.NewDeploymentAndCmCsConfig().WithConfigData(deplJson).WithResourceType(bean.DeploymentTemplate).
-		WithResolvedValue(json.RawMessage(resolvedTemplate)).WithVariableSnapshot(variableSnapShotMap), nil
+	return bean2.NewDeploymentAndCmCsConfig().WithConfigData(deplMetadata.DeploymentTemplateJson).WithResourceType(bean.DeploymentTemplate).
+		WithResolvedValue(json.RawMessage(resolvedTemplate)).WithVariableSnapshot(variableSnapShotMap).
+		WithDeploymentConfigMetadata(deplMetadata.TemplateVersion, deplMetadata.IsAppMetricsEnabled), nil
 }
 
 func (impl *DeploymentConfigurationServiceImpl) getPublishedConfigData(ctx context.Context, configDataQueryParams *bean2.ConfigDataQueryParams,
@@ -626,14 +636,22 @@ func (impl *DeploymentConfigurationServiceImpl) getPublishedConfigData(ctx conte
 	return configData, nil
 }
 
-func (impl *DeploymentConfigurationServiceImpl) getBaseDeploymentTemplate(appId int) (json.RawMessage, error) {
+func (impl *DeploymentConfigurationServiceImpl) getBaseDeploymentTemplate(appId int) (*bean2.DeploymentTemplateMetadata, error) {
 	deploymentTemplateData, err := impl.chartService.FindLatestChartForAppByAppId(appId)
 	if err != nil {
 		impl.logger.Errorw("error in getting base deployment template for appId", "appId", appId, "err", err)
 		return nil, err
 	}
-
-	return deploymentTemplateData.DefaultAppOverride, nil
+	_, _, version, _, err := impl.chartRefService.GetRefChart(deploymentTemplateData.ChartRefId)
+	if err != nil {
+		impl.logger.Errorw("error in getting chart ref by chartRefId ", "chartRefId", deploymentTemplateData.ChartRefId, "err", err)
+		return nil, err
+	}
+	return &bean2.DeploymentTemplateMetadata{
+		DeploymentTemplateJson: deploymentTemplateData.DefaultAppOverride,
+		IsAppMetricsEnabled:    deploymentTemplateData.IsAppMetricsEnabled,
+		TemplateVersion:        version,
+	}, nil
 }
 
 func (impl *DeploymentConfigurationServiceImpl) getDeploymentTemplateForEnvLevel(ctx context.Context, appId, envId int) (generateManifest.DeploymentTemplateResponse, error) {

pkg/configDiff/bean/bean.go

@@ -4,6 +4,7 @@ import "C"
 import (
 	"encoding/json"
 	"fmt"
+	"github.com/devtron-labs/devtron/internal/sql/repository/pipelineConfig"
 	bean3 "github.com/devtron-labs/devtron/pkg/bean"
 	"github.com/devtron-labs/devtron/pkg/pipeline/bean"
 )
@@ -89,6 +90,12 @@ type DeploymentAndCmCsConfig struct {
 	Data             json.RawMessage              `json:"data"`
 	VariableSnapshot map[string]map[string]string `json:"variableSnapshot"` // for deployment->{Deployment Template: resolvedValuesMap}, for cm->{cmComponentName: resolvedValuesMap}
 	ResolvedValue    json.RawMessage              `json:"resolvedValue"`
+	// for deployment template
+	TemplateVersion     string `json:"templateVersion,omitempty"`
+	IsAppMetricsEnabled bool   `json:"isAppMetricsEnabled,omitempty"`
+	//for pipeline strategy
+	PipelineTriggerType pipelineConfig.TriggerType `json:"pipelineTriggerType,omitempty"`
+	Strategy            string                     `json:"strategy,omitempty"`
 }
 
 func NewDeploymentAndCmCsConfig() *DeploymentAndCmCsConfig {
@@ -115,6 +122,18 @@ func (r *DeploymentAndCmCsConfig) WithResolvedValue(resolvedValue json.RawMessag
 	return r
 }
 
+func (r *DeploymentAndCmCsConfig) WithDeploymentConfigMetadata(templateVersion string, isAppMetricsEnabled bool) *DeploymentAndCmCsConfig {
+	r.TemplateVersion = templateVersion
+	r.IsAppMetricsEnabled = isAppMetricsEnabled
+	return r
+}
+
+func (r *DeploymentAndCmCsConfig) WithPipelineStrategyMetadata(pipelineTriggerType pipelineConfig.TriggerType, strategy string) *DeploymentAndCmCsConfig {
+	r.PipelineTriggerType = pipelineTriggerType
+	r.Strategy = strategy
+	return r
+}
+
 type DeploymentAndCmCsConfigDto struct {
 	DeploymentTemplate *DeploymentAndCmCsConfig `json:"deploymentTemplate"`
 	ConfigMapsData     *DeploymentAndCmCsConfig `json:"configMapData"`
@@ -202,3 +221,9 @@ type ResolvedCmCsMetadataDto struct {
 type ValuesDto struct {
 	Values string `json:"values"`
 }
+
+type DeploymentTemplateMetadata struct {
+	DeploymentTemplateJson json.RawMessage
+	TemplateVersion        string
+	IsAppMetricsEnabled    bool
+}

pkg/generateManifest/DeploymentTemplateService.go

@@ -203,6 +203,7 @@ func (impl DeploymentTemplateServiceImpl) FetchDeploymentsWithChartRefs(appId in
 
 func (impl DeploymentTemplateServiceImpl) GetDeploymentTemplate(ctx context.Context, request DeploymentTemplateRequest) (DeploymentTemplateResponse, error) {
 	var result DeploymentTemplateResponse
+	var response *DeploymentTemplateResponse
 	var values, resolvedValue string
 	var err error
 	var variableSnapshot map[string]string
@@ -219,9 +220,9 @@ func (impl DeploymentTemplateServiceImpl) GetDeploymentTemplate(ctx context.Cont
 			_, values, err = impl.chartRefService.GetAppOverrideForDefaultTemplate(request.ChartRefId)
 			resolvedValue = values
 		case repository.PublishedOnEnvironments:
-			values, resolvedValue, variableSnapshot, err = impl.fetchResolvedTemplateForPublishedEnvs(ctx, request)
+			response, err = impl.fetchResolvedTemplateForPublishedEnvs(ctx, request)
 		case repository.DeployedOnSelfEnvironment, repository.DeployedOnOtherEnvironment:
-			values, resolvedValue, variableSnapshot, err = impl.fetchTemplateForDeployedEnv(ctx, request)
+			response, err = impl.fetchTemplateForDeployedEnv(ctx, request)
 		}
 		if err != nil {
 			impl.Logger.Errorw("error in getting values", "err", err)
@@ -233,9 +234,18 @@ func (impl DeploymentTemplateServiceImpl) GetDeploymentTemplate(ctx context.Cont
 		result.Data = values
 		result.ResolvedData = resolvedValue
 		result.VariableSnapshot = variableSnapshot
+		if response != nil {
+			result.Data = response.Data
+			result.ResolvedData = response.ResolvedData
+			result.VariableSnapshot = response.VariableSnapshot
+			result.TemplateVersion = response.TemplateVersion
+			result.IsAppMetricsEnabled = response.IsAppMetricsEnabled
+		}
 		return result, nil
 	}
-
+	if variableSnapshot != nil {
+		result.VariableSnapshot = variableSnapshot
+	}
 	request = impl.setRequestMetadata(&request)
 	manifest, err := impl.GenerateManifest(ctx, &request, resolvedValue)
 	if err != nil {
@@ -312,7 +322,7 @@ func (impl DeploymentTemplateServiceImpl) setRequestMetadata(request *Deployment
 	return *request
 }
 
-func (impl DeploymentTemplateServiceImpl) fetchResolvedTemplateForPublishedEnvs(ctx context.Context, request DeploymentTemplateRequest) (string, string, map[string]string, error) {
+func (impl DeploymentTemplateServiceImpl) fetchResolvedTemplateForPublishedEnvs(ctx context.Context, request DeploymentTemplateRequest) (*DeploymentTemplateResponse, error) {
 	var values string
 	override, err := impl.propertiesConfigService.GetEnvironmentProperties(request.AppId, request.EnvId, request.ChartRefId)
 	if err == nil && override.GlobalConfig != nil {
@@ -323,24 +333,42 @@ func (impl DeploymentTemplateServiceImpl) fetchResolvedTemplateForPublishedEnvs(
 		}
 	} else {
 		impl.Logger.Errorw("error in getting overridden values", "err", err)
-		return "", "", nil, err
+		return nil, err
+	}
+	_, _, version, _, err := impl.chartRefService.GetRefChart(request.ChartRefId)
+	if err != nil {
+		impl.Logger.Errorw("error in getting chart ref by chartRefId ", "chartRefId", request.ChartRefId, "err", err)
+		return nil, err
 	}
 	resolvedTemplate, variableSnapshot, err := impl.resolveTemplateVariables(ctx, values, request)
 	if err != nil {
-		return values, values, variableSnapshot, err
+		impl.Logger.Errorw("error in resolving template variables for env override  ", "values", values, "err", err)
+		return nil, err
 	}
-	return values, resolvedTemplate, variableSnapshot, nil
+	return &DeploymentTemplateResponse{
+		Data:                values,
+		ResolvedData:        resolvedTemplate,
+		VariableSnapshot:    variableSnapshot,
+		TemplateVersion:     version,
+		IsAppMetricsEnabled: *override.AppMetrics,
+	}, nil
 }
 
-func (impl DeploymentTemplateServiceImpl) fetchTemplateForDeployedEnv(ctx context.Context, request DeploymentTemplateRequest) (string, string, map[string]string, error) {
+func (impl DeploymentTemplateServiceImpl) fetchTemplateForDeployedEnv(ctx context.Context, request DeploymentTemplateRequest) (*DeploymentTemplateResponse, error) {
 	historyObject, err := impl.deploymentTemplateHistoryService.GetHistoryForDeployedTemplateById(ctx, request.DeploymentTemplateHistoryId, request.PipelineId)
 	if err != nil {
 		impl.Logger.Errorw("error in getting deployment template history", "err", err, "id", request.DeploymentTemplateHistoryId, "pipelineId", request.PipelineId)
-		return "", "", nil, err
+		return nil, err
 	}
 
 	//todo Subhashish solve variable leak
-	return historyObject.CodeEditorValue.Value, historyObject.CodeEditorValue.ResolvedValue, historyObject.CodeEditorValue.VariableSnapshot, nil
+	return &DeploymentTemplateResponse{
+		Data:                historyObject.CodeEditorValue.Value,
+		ResolvedData:        historyObject.CodeEditorValue.ResolvedValue,
+		VariableSnapshot:    historyObject.CodeEditorValue.VariableSnapshot,
+		TemplateVersion:     historyObject.TemplateVersion,
+		IsAppMetricsEnabled: *historyObject.IsAppMetricsEnabled,
+	}, nil
 }
 
 func (impl DeploymentTemplateServiceImpl) resolveTemplateVariables(ctx context.Context, values string, request DeploymentTemplateRequest) (string, map[string]string, error) {

pkg/generateManifest/bean.go

@@ -69,9 +69,11 @@ var ReleaseIdentifier = &gRPC.ReleaseIdentifier{
 }
 
 type DeploymentTemplateResponse struct {
-	Data             string            `json:"data"`
-	ResolvedData     string            `json:"resolvedData"`
-	VariableSnapshot map[string]string `json:"variableSnapshot"`
+	Data                string            `json:"data"`
+	ResolvedData        string            `json:"resolvedData"`
+	VariableSnapshot    map[string]string `json:"variableSnapshot"`
+	TemplateVersion     string            `json:"-"`
+	IsAppMetricsEnabled bool              `json:"-"`
 }
 
 type RestartPodResponse struct {