misc: Main sync develop

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 {

go.mod

@@ -288,7 +288,7 @@ require gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
 
 replace (
 	github.com/argoproj/argo-workflows/v3 v3.5.10 => github.com/devtron-labs/argo-workflows/v3 v3.5.10
-	github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241014135751-87207db6607c
+	github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241024135802-b4888f54a136
 	github.com/go-check/check => github.com/go-check/check v0.0.0-20180628173108-788fd7840127
 	github.com/googleapis/gnostic => github.com/googleapis/gnostic v0.5.5
 	k8s.io/api => k8s.io/api v0.29.7

go.sum

@@ -794,8 +794,8 @@ github.com/devtron-labs/argo-workflows/v3 v3.5.10 h1:6rxQOesOzDz6SgQCMDQNHaehsKF
 github.com/devtron-labs/argo-workflows/v3 v3.5.10/go.mod h1:/vqxcovDPT4zqr4DjR5v7CF8ggpY1l3TSa2CIG3jmjA=
 github.com/devtron-labs/authenticator v0.4.35-0.20240809073103-6e11da8083f8 h1:2+Q7Jdhpo/uMiaQiZZzAh+ZX7wEJIFuMFG6DEiMuo64=
 github.com/devtron-labs/authenticator v0.4.35-0.20240809073103-6e11da8083f8/go.mod h1:702R6WIf5y9UzKGoCGxQ+x3l5Ws+l0fXg2xlCpSGFZI=
-github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241014135751-87207db6607c h1:8WIzXcESSOAfkF7SmNLvxNxMnNS9DJtji6qlJr/5XzI=
-github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241014135751-87207db6607c/go.mod h1:KpKnF4OSpQNDJmb4wVZq3Za88ePBw4xec2GOAGRm5UQ=
+github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241024135802-b4888f54a136 h1:rNGxjU5L6NvObxGMt0+vNFmjkqstm7zDASiS+pakrgQ=
+github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241024135802-b4888f54a136/go.mod h1:KpKnF4OSpQNDJmb4wVZq3Za88ePBw4xec2GOAGRm5UQ=
 github.com/devtron-labs/go-bitbucket v0.9.60-beta h1:VEx1jvDgdtDPS6A1uUFoaEi0l1/oLhbr+90xOwr6sDU=
 github.com/devtron-labs/go-bitbucket v0.9.60-beta/go.mod h1:GnuiCesvh8xyHeMCb+twm8lBR/kQzJYSKL28ZfObp1Y=
 github.com/devtron-labs/protos v0.0.3-0.20240802105333-92ee9bb85d80 h1:xwbTeijNTf4/j1v+tSfwVqwLVnReas/NqEKeQHvSTys=

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/appStore/installedApp/repository/InstalledAppRepository.go

@@ -439,15 +439,15 @@ func (impl *InstalledAppRepositoryImpl) GetAllInstalledApps(filter *appStoreBean
 	}
 	if len(filter.ChartRepoId) > 0 {
 		query = query + " AND ch.id IN (?) "
-		queryParams = append(queryParams, sqlIntSeq(filter.ChartRepoId))
+		queryParams = append(queryParams, pg.In(filter.ChartRepoId))
 	}
 	if len(filter.EnvIds) > 0 {
 		query = query + " AND env.id IN (?) "
-		queryParams = append(queryParams, sqlIntSeq(filter.EnvIds))
+		queryParams = append(queryParams, pg.In(filter.EnvIds))
 	}
 	if len(filter.ClusterIds) > 0 {
 		query = query + " AND cluster.id IN (?) "
-		queryParams = append(queryParams, sqlIntSeq(filter.ClusterIds))
+		queryParams = append(queryParams, pg.In(filter.ClusterIds))
 	}
 	if len(filter.AppStatuses) > 0 {
 		appStatuses := pg.In(filter.AppStatuses)

pkg/auth/user/UserCommonService.go

@@ -697,9 +697,9 @@ func BuildRoleFilterKeyForOtherEntity(roleFilterMap map[string]*bean.RoleFilter,
 func (impl UserCommonServiceImpl) GetUniqueKeyForAllEntity(role repository.RoleModel) string {
 	key := ""
 	if len(role.Team) > 0 && role.Entity != bean2.EntityJobs {
-		key = fmt.Sprintf("%s_%s_%s", role.Team, role.Action, role.AccessType)
+		key = fmt.Sprintf("%s_%s_%s_%s", role.Team, role.Environment, role.Action, role.AccessType)
 	} else if role.Entity == bean2.EntityJobs {
-		key = fmt.Sprintf("%s_%s_%s_%s", role.Team, role.Action, role.AccessType, role.Entity)
+		key = fmt.Sprintf("%s_%s_%s_%s_%s", role.Team, role.Environment, role.Action, role.AccessType, role.Entity)
 	} else if len(role.Entity) > 0 {
 		if role.Entity == bean2.CLUSTER_ENTITIY {
 			key = fmt.Sprintf("%s_%s_%s_%s_%s", role.Entity, role.Action, role.Cluster,

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/plugin/GlobalPluginService.go

@@ -389,7 +389,7 @@ func (impl *GlobalPluginServiceImpl) GetRefPluginIdByRefPluginName(pluginName st
 		impl.logger.Errorw("error in fetching plugin metadata by name", "err", err)
 		return nil, err
 	}
-	if pluginMetadata == nil {
+	if len(pluginMetadata) == 0 {
 		return nil, nil
 	}
 	pluginVersionDetail = make([]bean2.PluginsVersionDetail, 0)

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
 	}

scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/templates/ambassador.yaml

@@ -5,10 +5,16 @@
 apiVersion: getambassador.io/v3alpha1
 kind: Mapping
 metadata:
-  name:  {{ include ".Chart.Name .fullname" $ }}-mapping
+  {{- if .name }}
+  name: {{ .name }}
+  {{- else }}
+  name: {{ include ".Chart.Name .fullname" $ }}-mapping
+  {{- end }}
   labels:
     app: {{ template ".Chart.Name .name" $ }}
     chart: {{ template ".Chart.Name .chart" $ }}
+    appId: {{ $.Values.app | quote }}
+    envId: {{ $.Values.env | quote }}
     release: {{ $.Release.Name }}
     releaseVersion: {{ $.Values.releaseVersion | quote }}
     pipelineName: {{ $.Values.pipelineName }}
@@ -57,6 +63,8 @@ kind: TLSContext
 metadata:
   name: {{ .tls.context }}
   labels:
+    appId: {{ $.Values.app | quote }}
+    envId: {{ $.Values.env | quote }}
     app: {{ template ".Chart.Name .name" $ }}
     chart: {{ template ".Chart.Name .chart" $ }}
     release: {{ $.Release.Name }}
@@ -65,6 +73,9 @@ metadata:
     {{- if .tls.labels }}
 {{ toYaml .tls.labels | nindent 4 }}
     {{- end }}
+{{- if $.Values.appLabels }}
+{{ toYaml $.Values.appLabels | indent 4 }}
+{{- end }}
 spec:
   {{- if .tls.secretName }}
   secret: {{ .tls.secretName }}

scripts/devtron-reference-helm-charts/deployment-chart_4-20-0/templates/configmap.yaml

@@ -6,8 +6,13 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ .name}}-{{ $.Values.app }}
-{{- if $.Values.appLabels }}
   labels:
+    appId: {{ $.Values.app | quote }}
+    envId: {{ $.Values.env | quote }}
+    app: {{ template ".Chart.Name .name" $ }}
+    chart: {{ template ".Chart.Name .chart" $ }}
+    release: {{ $.Release.Name }}
+{{- if $.Values.appLabels }}
 {{ toYaml $.Values.appLabels | indent 4 }}
 {{- end }}
 data: