Skip to content

Commit 9944e19

Browse files
vikramdevtronvikramdevtron
authored
Merge pull request #6047 from devtron-labs/main-sync-develop-4nov
misc: Main sync develop
2 parents c3b8a32 + 53fd688 commit 9944e19

File tree

75 files changed

+1397
-69
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+1397
-69
lines changed

‎api/bean/ConfigMapAndSecret.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ func (configSecretJson *ConfigSecretJson) SetReferencedSecrets(secrets []ConfigS
7171
configSecretJson.Secrets = util.GetReferencedArray(secrets)
7272
}
7373

74-
func GetTransformedDataForSecretData(data string, mode util.SecretTransformMode) (string, error) {
74+
func GetTransformedDataForSecretRootJsonData(data string, mode util.SecretTransformMode) (string, error) {
7575
secretsJson := ConfigSecretRootJson{}
7676
err := json.Unmarshal([]byte(data), &secretsJson)
7777
if err != nil {

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ require gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
288288

289289
replace (
290290
github.com/argoproj/argo-workflows/v3 v3.5.10 => github.com/devtron-labs/argo-workflows/v3 v3.5.10
291-
github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241014135751-87207db6607c
291+
github.com/devtron-labs/common-lib => github.com/devtron-labs/devtron-services/common-lib v0.0.0-20241024135802-b4888f54a136
292292
github.com/go-check/check => github.com/go-check/check v0.0.0-20180628173108-788fd7840127
293293
github.com/googleapis/gnostic => github.com/googleapis/gnostic v0.5.5
294294
k8s.io/api => k8s.io/api v0.29.7

‎go.sum‎

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

‎internal/sql/repository/DeploymentTemplateRepository.go‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,12 +71,13 @@ func (impl DeploymentTemplateRepositoryImpl) FetchDeploymentHistoryWithChartRefs
7171

7272
query := "select p.id as pipeline_id, dth.id as deployment_template_history_id," +
7373
" wfr.id as wfr_id, wfr.finished_on, wfr.status, c.chart_ref_id, c.chart_version FROM cd_workflow_runner wfr" +
74-
" JOIN cd_workflow wf ON wf.id = wfr.cd_workflow_id JOIN pipeline p ON p.id = wf.pipeline_id" +
75-
" JOIN deployment_template_history dth ON dth.deployed_on = wfr.started_on " +
76-
"JOIN pipeline_config_override pco ON pco.cd_workflow_id = wf.id " +
77-
"JOIN chart_env_config_override ceco ON ceco.id = pco.env_config_override_id JOIN charts c " +
78-
"ON c.id = ceco.chart_id where p.environment_id = ? AND p.app_id = ? AND p.deleted = false AND wfr.workflow_type = 'DEPLOY' " +
79-
"ORDER BY wfr.id DESC LIMIT ? ;"
74+
" JOIN deployment_template_history dth ON dth.deployed_on = wfr.started_on" +
75+
" JOIN cd_workflow wf ON wf.id = wfr.cd_workflow_id" +
76+
" JOIN pipeline p ON p.id = wf.pipeline_id AND p.id = dth.pipeline_id" +
77+
" JOIN pipeline_config_override pco ON pco.cd_workflow_id = wf.id" +
78+
" JOIN chart_env_config_override ceco ON ceco.id = pco.env_config_override_id JOIN charts c" +
79+
" ON c.id = ceco.chart_id where p.environment_id = ? AND p.app_id = ? AND p.deleted = false AND wfr.workflow_type = 'DEPLOY'" +
80+
" ORDER BY wfr.id DESC LIMIT ? ;"
8081

8182
_, err := impl.dbConnection.Query(&result, query, envId, appId, limit)
8283
if err != nil {

‎pkg/appStore/installedApp/repository/InstalledAppRepository.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -439,15 +439,15 @@ func (impl *InstalledAppRepositoryImpl) GetAllInstalledApps(filter *appStoreBean
439439
}
440440
if len(filter.ChartRepoId) > 0 {
441441
query = query + " AND ch.id IN (?) "
442-
queryParams = append(queryParams, sqlIntSeq(filter.ChartRepoId))
442+
queryParams = append(queryParams, pg.In(filter.ChartRepoId))
443443
}
444444
if len(filter.EnvIds) > 0 {
445445
query = query + " AND env.id IN (?) "
446-
queryParams = append(queryParams, sqlIntSeq(filter.EnvIds))
446+
queryParams = append(queryParams, pg.In(filter.EnvIds))
447447
}
448448
if len(filter.ClusterIds) > 0 {
449449
query = query + " AND cluster.id IN (?) "
450-
queryParams = append(queryParams, sqlIntSeq(filter.ClusterIds))
450+
queryParams = append(queryParams, pg.In(filter.ClusterIds))
451451
}
452452
if len(filter.AppStatuses) > 0 {
453453
appStatuses := pg.In(filter.AppStatuses)

‎pkg/auth/user/UserCommonService.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -697,9 +697,9 @@ func BuildRoleFilterKeyForOtherEntity(roleFilterMap map[string]*bean.RoleFilter,
697697
func (impl UserCommonServiceImpl) GetUniqueKeyForAllEntity(role repository.RoleModel) string {
698698
key := ""
699699
if len(role.Team) > 0 && role.Entity != bean2.EntityJobs {
700-
key = fmt.Sprintf("%s_%s_%s", role.Team, role.Action, role.AccessType)
700+
key = fmt.Sprintf("%s_%s_%s_%s", role.Team, role.Environment, role.Action, role.AccessType)
701701
} else if role.Entity == bean2.EntityJobs {
702-
key = fmt.Sprintf("%s_%s_%s_%s", role.Team, role.Action, role.AccessType, role.Entity)
702+
key = fmt.Sprintf("%s_%s_%s_%s_%s", role.Team, role.Environment, role.Action, role.AccessType, role.Entity)
703703
} else if len(role.Entity) > 0 {
704704
if role.Entity == bean2.CLUSTER_ENTITIY {
705705
key = fmt.Sprintf("%s_%s_%s_%s_%s", role.Entity, role.Action, role.Cluster,

‎pkg/bean/configSecretData.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ type ESOData struct {
8080
Property string `json:"property,omitempty"`
8181
}
8282

83-
func GetTransformedDataForSecretData(data string, mode util.SecretTransformMode) (string, error) {
83+
func GetTransformedDataForSecretConfigData(data string, mode util.SecretTransformMode) (string, error) {
8484
secretDataMap := make(map[string]*ConfigData)
8585
err := json.Unmarshal([]byte(data), &secretDataMap)
8686
if err != nil {

‎pkg/plugin/GlobalPluginService.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ func (impl *GlobalPluginServiceImpl) GetRefPluginIdByRefPluginName(pluginName st
389389
impl.logger.Errorw("error in fetching plugin metadata by name", "err", err)
390390
return nil, err
391391
}
392-
if pluginMetadata == nil {
392+
if len(pluginMetadata) == 0 {
393393
return nil, nil
394394
}
395395
pluginVersionDetail = make([]bean2.PluginsVersionDetail, 0)

‎pkg/variables/ScopedVariableCMCSManager.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ func (impl *ScopedVariableCMCSManagerImpl) ResolveCMCS(ctx context.Context,
293293
return nil, nil, nil, nil, err
294294
}
295295

296-
decodedSecrets, err := serviceBean.GetTransformedDataForSecretData(string(mergedSecretJson), util.DecodeSecret)
296+
decodedSecrets, err := serviceBean.GetTransformedDataForSecretConfigData(string(mergedSecretJson), util.DecodeSecret)
297297
if err != nil {
298298
return nil, nil, nil, nil, err
299299
}
@@ -304,7 +304,7 @@ func (impl *ScopedVariableCMCSManagerImpl) ResolveCMCS(ctx context.Context,
304304
return nil, nil, nil, nil, err
305305
}
306306
variableMapCS = parsers.GetVariableMapForUsedVariables(scopedVariables, varNamesCS)
307-
encodedSecretData, err = serviceBean.GetTransformedDataForSecretData(resolvedTemplateCS, util.EncodeSecret)
307+
encodedSecretData, err = serviceBean.GetTransformedDataForSecretConfigData(resolvedTemplateCS, util.EncodeSecret)
308308
if err != nil {
309309
return nil, nil, nil, nil, err
310310
}
@@ -362,14 +362,14 @@ func (impl *ScopedVariableCMCSManagerImpl) ResolvedVariableForLastSaved(scope re
362362
}
363363

364364
if secretDataByte != nil && len(varNamesCS) > 0 {
365-
data, err := bean.GetTransformedDataForSecretData(string(secretDataByte), util.DecodeSecret)
365+
data, err := bean.GetTransformedDataForSecretRootJsonData(string(secretDataByte), util.DecodeSecret)
366366
if err != nil {
367367
return resolvedCM, string(secretDataByte), variableSnapshotForCM, variableSnapshotForCS, err
368368
}
369369
parserRequest := parsers.CreateParserRequest(data, parsers.StringVariableTemplate, scopedVariables, true)
370370
resolvedCSDecoded, err := impl.ParseTemplateWithScopedVariables(parserRequest)
371371
variableSnapshotForCS = parsers.GetVariableMapForUsedVariables(scopedVariables, varNamesCS)
372-
resolvedCS, err = bean.GetTransformedDataForSecretData(resolvedCSDecoded, util.EncodeSecret)
372+
resolvedCS, err = bean.GetTransformedDataForSecretRootJsonData(resolvedCSDecoded, util.EncodeSecret)
373373
if err != nil {
374374
return resolvedCM, resolvedCM, variableSnapshotForCM, variableSnapshotForCS, err
375375
}
@@ -408,12 +408,12 @@ func (impl *ScopedVariableCMCSManagerImpl) ResolvedVariableForSpecificType(confi
408408
HistoryReferenceId: secretHistoryId,
409409
HistoryReferenceType: repository1.HistoryReferenceTypeSecret,
410410
}
411-
data, err := bean.GetTransformedDataForSecretData(string(secretDataByte), util.DecodeSecret)
411+
data, err := bean.GetTransformedDataForSecretRootJsonData(string(secretDataByte), util.DecodeSecret)
412412
if err != nil {
413413
return "", "", nil, nil, err
414414
}
415415
variableMapCS, resolvedTemplateCS, err := impl.GetVariableSnapshotAndResolveTemplate(data, parsers.StringVariableTemplate, reference, true, true)
416-
encodedSecretData, err := bean.GetTransformedDataForSecretData(resolvedTemplateCS, util.EncodeSecret)
416+
encodedSecretData, err := bean.GetTransformedDataForSecretRootJsonData(resolvedTemplateCS, util.EncodeSecret)
417417
if err != nil {
418418
return "", "", nil, nil, err
419419
}

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

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,16 @@
55
apiVersion: getambassador.io/v3alpha1
66
kind: Mapping
77
metadata:
8-
name: {{ include ".Chart.Name .fullname" $ }}-mapping
8+
{{- if .name }}
9+
name: {{ .name }}
10+
{{- else }}
11+
name: {{ include ".Chart.Name .fullname" $ }}-mapping
12+
{{- end }}
913
labels:
1014
app: {{ template ".Chart.Name .name" $ }}
1115
chart: {{ template ".Chart.Name .chart" $ }}
16+
appId: {{ $.Values.app | quote }}
17+
envId: {{ $.Values.env | quote }}
1218
release: {{ $.Release.Name }}
1319
releaseVersion: {{ $.Values.releaseVersion | quote }}
1420
pipelineName: {{ $.Values.pipelineName }}
@@ -57,6 +63,8 @@ kind: TLSContext
5763
metadata:
5864
name: {{ .tls.context }}
5965
labels:
66+
appId: {{ $.Values.app | quote }}
67+
envId: {{ $.Values.env | quote }}
6068
app: {{ template ".Chart.Name .name" $ }}
6169
chart: {{ template ".Chart.Name .chart" $ }}
6270
release: {{ $.Release.Name }}
@@ -65,6 +73,9 @@ metadata:
6573
{{- if .tls.labels }}
6674
{{ toYaml .tls.labels | nindent 4 }}
6775
{{- end }}
76+
{{- if $.Values.appLabels }}
77+
{{ toYaml $.Values.appLabels | indent 4 }}
78+
{{- end }}
6879
spec:
6980
{{- if .tls.secretName }}
7081
secret: {{ .tls.secretName }}

0 commit comments

Comments
 (0)