code review

Author: prakash100198

pkg/configDiff/DeploymentConfigurationService.go

@@ -927,7 +927,7 @@ func (impl *DeploymentConfigurationServiceImpl) getSecretConfigResponse(resource
 		if envId > 0 {
 			return impl.configMapService.CSEnvironmentFetchForEdit(resourceName, resourceId, appId, envId)
 		}
-		return impl.configMapService.ConfigGlobalFetchEditUsingAppId(resourceName, appId, bean.CS)
+		return impl.configMapService.CmCsConfigGlobalFetchUsingAppId(resourceName, appId, bean.CS)
 	}
 
 	if envId > 0 {
@@ -941,7 +941,7 @@ func (impl *DeploymentConfigurationServiceImpl) getConfigMapResponse(resourceNam
 		if envId > 0 {
 			return impl.configMapService.CMEnvironmentFetchForEdit(resourceName, resourceId, appId, envId)
 		}
-		return impl.configMapService.ConfigGlobalFetchEditUsingAppId(resourceName, appId, bean.CM)
+		return impl.configMapService.CmCsConfigGlobalFetchUsingAppId(resourceName, appId, bean.CM)
 	}
 
 	if envId > 0 {

pkg/pipeline/ConfigMapService.go

@@ -54,7 +54,9 @@ type ConfigMapService interface {
 	CMEnvironmentFetch(appId int, envId int) (*bean.ConfigDataRequest, error)
 	CMGlobalFetchForEdit(name string, id int) (*bean.ConfigDataRequest, error)
 	CMEnvironmentFetchForEdit(name string, id int, appId int, envId int) (*bean.ConfigDataRequest, error)
-	ConfigGlobalFetchEditUsingAppId(name string, appId int, resourceType bean.ResourceType) (*bean.ConfigDataRequest, error)
+
+	CmCsConfigGlobalFetchUsingAppId(name string, appId int, resourceType bean.ResourceType) (*bean.ConfigDataRequest, error)
+	CmCsConfigOverrideFetchUsingAppAndEnvId(name string, appId, envId int, resourceType bean.ResourceType) (*bean.ConfigDataRequest, error)
 
 	CSGlobalAddUpdate(configMapRequest *bean.ConfigDataRequest) (*bean.ConfigDataRequest, error)
 	CSGlobalFetch(appId int) (*bean.ConfigDataRequest, error)
@@ -1938,7 +1940,7 @@ func (impl ConfigMapServiceImpl) FetchCmCsNamesAppAndEnvLevel(appId int, envId i
 	return cMCSNamesAppLevel, cMCSNamesEnvLevel, nil
 }
 
-func (impl ConfigMapServiceImpl) ConfigGlobalFetchEditUsingAppId(name string, appId int, resourceType bean.ResourceType) (*bean.ConfigDataRequest, error) {
+func (impl ConfigMapServiceImpl) CmCsConfigGlobalFetchUsingAppId(name string, appId int, resourceType bean.ResourceType) (*bean.ConfigDataRequest, error) {
 	var fetchGlobalConfigFunc func(int) (*bean.ConfigDataRequest, error)
 	if resourceType == bean.CS {
 		fetchGlobalConfigFunc = impl.CSGlobalFetch
@@ -1959,3 +1961,25 @@ func (impl ConfigMapServiceImpl) ConfigGlobalFetchEditUsingAppId(name string, ap
 	configDataRequest.ConfigData = configs
 	return configDataRequest, nil
 }
+
+func (impl ConfigMapServiceImpl) CmCsConfigOverrideFetchUsingAppAndEnvId(name string, appId, envId int, resourceType bean.ResourceType) (*bean.ConfigDataRequest, error) {
+	var fetchGlobalConfigFunc func(int, int) (*bean.ConfigDataRequest, error)
+	if resourceType == bean.CS {
+		fetchGlobalConfigFunc = impl.CSEnvironmentFetch
+	} else if resourceType == bean.CM {
+		fetchGlobalConfigFunc = impl.CMEnvironmentFetch
+	}
+	configDataRequest, err := fetchGlobalConfigFunc(appId, envId)
+	if err != nil {
+		impl.logger.Errorw("error in fetching global cm using app id ", "cmName", name, "appId", appId, "err", err)
+		return nil, err
+	}
+	configs := make([]*bean.ConfigData, 0, len(configDataRequest.ConfigData))
+	for _, configData := range configDataRequest.ConfigData {
+		if configData.Name == name {
+			configs = append(configs, configData)
+		}
+	}
+	configDataRequest.ConfigData = configs
+	return configDataRequest, nil
+}