Merge branch 'develop' into fix-argocd-update-event

Author: Ash-exp

pkg/deployment/manifest/deploymentTemplate/read/chartEnvConfigOverride.go

@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2024. Devtron Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package read
 
 import (
@@ -25,15 +41,16 @@ type EnvConfigOverrideService interface {
 	// EnvConfigOverride.Chart is not populated,
 	// as the chartRepoRepository.Chart contains the reference chart(in bytes).
 	GetAllOverridesForApp(ctx context.Context, appId int) ([]*bean.EnvConfigOverride, error)
+	EnvConfigOverrideServiceEnt
 }
 
 type EnvConfigOverrideReadServiceImpl struct {
 	envConfigOverrideRepository chartConfig.EnvConfigOverrideRepository
 	logger                      *zap.SugaredLogger
 }
 
-func NewEnvConfigOverrideReadServiceImpl(repository chartConfig.EnvConfigOverrideRepository,
-	logger *zap.SugaredLogger) *EnvConfigOverrideReadServiceImpl {
+func NewEnvConfigOverrideReadServiceImpl(repository chartConfig.EnvConfigOverrideRepository, logger *zap.SugaredLogger,
+) *EnvConfigOverrideReadServiceImpl {
 	return &EnvConfigOverrideReadServiceImpl{
 		envConfigOverrideRepository: repository,
 		logger:                      logger,
@@ -46,7 +63,13 @@ func (impl EnvConfigOverrideReadServiceImpl) GetByChartAndEnvironment(chartId, t
 		impl.logger.Errorw("error in getting chart env config override", "chartId", chartId, "targetEnvironmentId", targetEnvironmentId, "err", err)
 		return nil, err
 	}
-	return adapter.EnvOverrideDBToDTO(overrideDBObj), nil
+	overrideDTO := adapter.EnvOverrideDBToDTO(overrideDBObj)
+	overrideDTO, err = impl.getOverrideDataWithUpdatedPatchDataUnResolved(overrideDTO, overrideDTO.Chart.AppId)
+	if err != nil {
+		impl.logger.Errorw("error in patching values with base template values", "envId", targetEnvironmentId, "appId", overrideDTO.Chart.AppId, "err", err)
+		return nil, err
+	}
+	return overrideDTO, nil
 }
 
 func (impl EnvConfigOverrideReadServiceImpl) ActiveEnvConfigOverride(appId, environmentId int) (*bean.EnvConfigOverride, error) {
@@ -55,7 +78,13 @@ func (impl EnvConfigOverrideReadServiceImpl) ActiveEnvConfigOverride(appId, envi
 		impl.logger.Errorw("error in getting chart env config override", "appId", appId, "environmentId", environmentId, "err", err)
 		return nil, err
 	}
-	return adapter.EnvOverrideDBToDTO(overrideDBObj), nil
+	overrideDTO := adapter.EnvOverrideDBToDTO(overrideDBObj)
+	overrideDTO, err = impl.getOverrideDataWithUpdatedPatchDataUnResolved(overrideDTO, appId)
+	if err != nil {
+		impl.logger.Errorw("error in patching values with base template values", "envId", environmentId, "appId", appId, "err", err)
+		return nil, err
+	}
+	return overrideDTO, nil
 }
 
 func (impl EnvConfigOverrideReadServiceImpl) GetByIdIncludingInactive(id int) (*bean.EnvConfigOverride, error) {
@@ -64,7 +93,13 @@ func (impl EnvConfigOverrideReadServiceImpl) GetByIdIncludingInactive(id int) (*
 		impl.logger.Errorw("error in getting chart env config override", "id", id, "err", err)
 		return nil, err
 	}
-	return adapter.EnvOverrideDBToDTO(overrideDBObj), nil
+	overrideDTO := adapter.EnvOverrideDBToDTO(overrideDBObj)
+	overrideDTO, err = impl.getOverrideDataWithUpdatedPatchDataUnResolved(overrideDTO, overrideDTO.Chart.AppId)
+	if err != nil {
+		impl.logger.Errorw("error in patching values with base template values", "envId", overrideDTO.TargetEnvironment, "appId", overrideDTO.Chart.AppId, "err", err)
+		return nil, err
+	}
+	return overrideDTO, nil
 }
 
 func (impl EnvConfigOverrideReadServiceImpl) GetByEnvironment(targetEnvironmentId int) ([]*bean.EnvConfigOverride, error) {
@@ -88,7 +123,13 @@ func (impl EnvConfigOverrideReadServiceImpl) GetEnvConfigByChartId(chartId int)
 	}
 	envConfigOverrides := make([]*bean.EnvConfigOverride, len(overrideDBObjs))
 	for _, dbObj := range overrideDBObjs {
-		envConfigOverrides = append(envConfigOverrides, adapter.EnvOverrideDBToDTO(&dbObj))
+		overrideDTO := adapter.EnvOverrideDBToDTO(&dbObj)
+		overrideDTO, err = impl.getOverrideDataWithUpdatedPatchDataUnResolved(overrideDTO, overrideDTO.Chart.AppId)
+		if err != nil {
+			impl.logger.Errorw("error in patching values with base template values", "envId", overrideDTO.TargetEnvironment, "appId", overrideDTO.Chart.AppId, "err", err)
+			return nil, err
+		}
+		envConfigOverrides = append(envConfigOverrides, overrideDTO)
 	}
 	return envConfigOverrides, nil
 }
@@ -99,7 +140,13 @@ func (impl EnvConfigOverrideReadServiceImpl) FindLatestChartForAppByAppIdAndEnvI
 		impl.logger.Errorw("error in getting chart env config override", "appId", appId, "targetEnvironmentId", targetEnvironmentId, "err", err)
 		return nil, err
 	}
-	return adapter.EnvOverrideDBToDTO(overrideDBObj), nil
+	overrideDTO := adapter.EnvOverrideDBToDTO(overrideDBObj)
+	overrideDTO, err = impl.getOverrideDataWithUpdatedPatchDataUnResolved(overrideDTO, overrideDTO.Chart.AppId)
+	if err != nil {
+		impl.logger.Errorw("error in patching values with base template values", "envId", overrideDTO.TargetEnvironment, "appId", overrideDTO.Chart.AppId, "err", err)
+		return nil, err
+	}
+	return overrideDTO, nil
 }
 
 func (impl EnvConfigOverrideReadServiceImpl) FindChartRefIdsForLatestChartForAppByAppIdAndEnvIds(appId int, targetEnvironmentIds []int) (map[int]int, error) {
@@ -117,7 +164,13 @@ func (impl EnvConfigOverrideReadServiceImpl) FindChartByAppIdAndEnvIdAndChartRef
 		impl.logger.Errorw("error in getting chart env config override", "appId", appId, "targetEnvironmentIds", targetEnvironmentId, "chartRefId", chartRefId, "err", err)
 		return nil, err
 	}
-	return adapter.EnvOverrideDBToDTO(overrideDBObj), nil
+	overrideDTO := adapter.EnvOverrideDBToDTO(overrideDBObj)
+	overrideDTO, err = impl.getOverrideDataWithUpdatedPatchDataUnResolved(overrideDTO, overrideDTO.Chart.AppId)
+	if err != nil {
+		impl.logger.Errorw("error in patching values with base template values", "envId", overrideDTO.TargetEnvironment, "appId", overrideDTO.Chart.AppId, "err", err)
+		return nil, err
+	}
+	return overrideDTO, nil
 }
 
 func (impl EnvConfigOverrideReadServiceImpl) FindChartForAppByAppIdAndEnvId(appId, targetEnvironmentId int) (*bean.EnvConfigOverride, error) {
@@ -126,7 +179,13 @@ func (impl EnvConfigOverrideReadServiceImpl) FindChartForAppByAppIdAndEnvId(appI
 		impl.logger.Errorw("error in getting chart env config override", "appId", appId, "targetEnvironmentId", targetEnvironmentId, "err", err)
 		return nil, err
 	}
-	return adapter.EnvOverrideDBToDTO(overrideDBObj), nil
+	overrideDTO := adapter.EnvOverrideDBToDTO(overrideDBObj)
+	overrideDTO, err = impl.getOverrideDataWithUpdatedPatchDataUnResolved(overrideDTO, appId)
+	if err != nil {
+		impl.logger.Errorw("error in patching values with base template values", "envId", overrideDTO.TargetEnvironment, "appId", appId, "err", err)
+		return nil, err
+	}
+	return overrideDTO, nil
 }
 
 func (impl EnvConfigOverrideReadServiceImpl) GetByAppIdEnvIdAndChartRefId(appId, envId int, chartRefId int) (*bean.EnvConfigOverride, error) {
@@ -135,7 +194,13 @@ func (impl EnvConfigOverrideReadServiceImpl) GetByAppIdEnvIdAndChartRefId(appId,
 		impl.logger.Errorw("error in getting chart env config override", "appId", appId, "envId", envId, "chartRefId", chartRefId, "err", err)
 		return nil, err
 	}
-	return adapter.EnvOverrideDBToDTO(overrideDBObj), nil
+	overrideDTO := adapter.EnvOverrideDBToDTO(overrideDBObj)
+	overrideDTO, err = impl.getOverrideDataWithUpdatedPatchDataUnResolved(overrideDTO, appId)
+	if err != nil {
+		impl.logger.Errorw("error in patching values with base template values", "envId", overrideDTO.TargetEnvironment, "appId", appId, "err", err)
+		return nil, err
+	}
+	return overrideDTO, nil
 }
 
 func (impl EnvConfigOverrideReadServiceImpl) GetAllOverridesForApp(ctx context.Context, appId int) ([]*bean.EnvConfigOverride, error) {

pkg/deployment/manifest/deploymentTemplate/read/chartEnvConfigOverride_ent.go

@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2024. Devtron Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package read
+
+import "github.com/devtron-labs/devtron/pkg/deployment/manifest/deploymentTemplate/bean"
+
+type EnvConfigOverrideServiceEnt interface {
+}
+
+func (impl EnvConfigOverrideReadServiceImpl) getOverrideDataWithUpdatedPatchDataUnResolved(overrideDTO *bean.EnvConfigOverride, appId int) (*bean.EnvConfigOverride, error) {
+	return overrideDTO, nil
+}