Merge pull request #6034 from devtron-labs/sdh-template-list-cartesian-product-fix-oss

fix: fix for showing inaccurate data in template/list api while fetching previous deployments list in template/list api, output shown was cartesian product of deployment_template_history and wfr

Author: prakash100198

api/bean/ConfigMapAndSecret.go

@@ -71,7 +71,7 @@ func (configSecretJson *ConfigSecretJson) SetReferencedSecrets(secrets []ConfigS
 	configSecretJson.Secrets = util.GetReferencedArray(secrets)
 }
 
-func GetTransformedDataForSecretData(data string, mode util.SecretTransformMode) (string, error) {
+func GetTransformedDataForSecretRootJsonData(data string, mode util.SecretTransformMode) (string, error) {
 	secretsJson := ConfigSecretRootJson{}
 	err := json.Unmarshal([]byte(data), &secretsJson)
 	if err != nil {

internal/sql/repository/DeploymentTemplateRepository.go

@@ -71,12 +71,13 @@ func (impl DeploymentTemplateRepositoryImpl) FetchDeploymentHistoryWithChartRefs
 
 	query := "select p.id as pipeline_id, dth.id as deployment_template_history_id," +
 		"  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 " +
-		"JOIN chart_env_config_override ceco ON ceco.id = pco.env_config_override_id JOIN charts c " +
-		"ON c.id = ceco.chart_id where p.environment_id = ?  AND p.app_id = ? AND p.deleted = false  AND wfr.workflow_type = 'DEPLOY' " +
-		"ORDER BY wfr.id DESC LIMIT ? ;"
+		" JOIN deployment_template_history dth ON dth.deployed_on = wfr.started_on" +
+		" JOIN cd_workflow wf ON wf.id = wfr.cd_workflow_id" +
+		" JOIN pipeline p ON p.id = wf.pipeline_id AND p.id = dth.pipeline_id" +
+		" JOIN pipeline_config_override pco ON pco.cd_workflow_id = wf.id" +
+		" JOIN chart_env_config_override ceco ON ceco.id = pco.env_config_override_id JOIN charts c" +
+		" ON c.id = ceco.chart_id where p.environment_id = ?  AND p.app_id = ? AND p.deleted = false  AND wfr.workflow_type = 'DEPLOY'" +
+		" ORDER BY wfr.id DESC LIMIT ? ;"
 
 	_, err := impl.dbConnection.Query(&result, query, envId, appId, limit)
 	if err != nil {

pkg/bean/configSecretData.go

@@ -80,7 +80,7 @@ type ESOData struct {
 	Property  string `json:"property,omitempty"`
 }
 
-func GetTransformedDataForSecretData(data string, mode util.SecretTransformMode) (string, error) {
+func GetTransformedDataForSecretConfigData(data string, mode util.SecretTransformMode) (string, error) {
 	secretDataMap := make(map[string]*ConfigData)
 	err := json.Unmarshal([]byte(data), &secretDataMap)
 	if err != nil {

pkg/variables/ScopedVariableCMCSManager.go

@@ -293,7 +293,7 @@ func (impl *ScopedVariableCMCSManagerImpl) ResolveCMCS(ctx context.Context,
 		return nil, nil, nil, nil, err
 	}
 
-	decodedSecrets, err := serviceBean.GetTransformedDataForSecretData(string(mergedSecretJson), util.DecodeSecret)
+	decodedSecrets, err := serviceBean.GetTransformedDataForSecretConfigData(string(mergedSecretJson), util.DecodeSecret)
 	if err != nil {
 		return nil, nil, nil, nil, err
 	}
@@ -304,7 +304,7 @@ func (impl *ScopedVariableCMCSManagerImpl) ResolveCMCS(ctx context.Context,
 		return nil, nil, nil, nil, err
 	}
 	variableMapCS = parsers.GetVariableMapForUsedVariables(scopedVariables, varNamesCS)
-	encodedSecretData, err = serviceBean.GetTransformedDataForSecretData(resolvedTemplateCS, util.EncodeSecret)
+	encodedSecretData, err = serviceBean.GetTransformedDataForSecretConfigData(resolvedTemplateCS, util.EncodeSecret)
 	if err != nil {
 		return nil, nil, nil, nil, err
 	}
@@ -362,14 +362,14 @@ func (impl *ScopedVariableCMCSManagerImpl) ResolvedVariableForLastSaved(scope re
 	}
 
 	if secretDataByte != nil && len(varNamesCS) > 0 {
-		data, err := bean.GetTransformedDataForSecretData(string(secretDataByte), util.DecodeSecret)
+		data, err := bean.GetTransformedDataForSecretRootJsonData(string(secretDataByte), util.DecodeSecret)
 		if err != nil {
 			return resolvedCM, string(secretDataByte), variableSnapshotForCM, variableSnapshotForCS, err
 		}
 		parserRequest := parsers.CreateParserRequest(data, parsers.StringVariableTemplate, scopedVariables, true)
 		resolvedCSDecoded, err := impl.ParseTemplateWithScopedVariables(parserRequest)
 		variableSnapshotForCS = parsers.GetVariableMapForUsedVariables(scopedVariables, varNamesCS)
-		resolvedCS, err = bean.GetTransformedDataForSecretData(resolvedCSDecoded, util.EncodeSecret)
+		resolvedCS, err = bean.GetTransformedDataForSecretRootJsonData(resolvedCSDecoded, util.EncodeSecret)
 		if err != nil {
 			return resolvedCM, resolvedCM, variableSnapshotForCM, variableSnapshotForCS, err
 		}
@@ -408,12 +408,12 @@ func (impl *ScopedVariableCMCSManagerImpl) ResolvedVariableForSpecificType(confi
 		HistoryReferenceId:   secretHistoryId,
 		HistoryReferenceType: repository1.HistoryReferenceTypeSecret,
 	}
-	data, err := bean.GetTransformedDataForSecretData(string(secretDataByte), util.DecodeSecret)
+	data, err := bean.GetTransformedDataForSecretRootJsonData(string(secretDataByte), util.DecodeSecret)
 	if err != nil {
 		return "", "", nil, nil, err
 	}
 	variableMapCS, resolvedTemplateCS, err := impl.GetVariableSnapshotAndResolveTemplate(data, parsers.StringVariableTemplate, reference, true, true)
-	encodedSecretData, err := bean.GetTransformedDataForSecretData(resolvedTemplateCS, util.EncodeSecret)
+	encodedSecretData, err := bean.GetTransformedDataForSecretRootJsonData(resolvedTemplateCS, util.EncodeSecret)
 	if err != nil {
 		return "", "", nil, nil, err
 	}