dev test fix:- instead of checking on global field in secret config data while unmarshalling leverage data and defaultData fields

Author: prakash100198

api/restHandler/app/configDiff/DeploymentConfigurationRestHandler.go

@@ -197,7 +197,6 @@ func (handler *DeploymentConfigurationRestHandlerImpl) CompareCategoryWiseConfig
 		common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
 		return
 	}
-	//res.IsAppAdmin = handler.enforceForAppAndEnv(configDataQueryParams.AppName, configDataQueryParams.EnvName, token, casbin.ActionUpdate)
 
 	common.WriteJsonResp(w, nil, res, http.StatusOK)
 }

pkg/configDiff/bean/bean.go

@@ -144,7 +144,7 @@ type DeploymentAndCmCsConfigDto struct {
 	SecretsData        *DeploymentAndCmCsConfig `json:"secretsData"`
 	PipelineConfigData *DeploymentAndCmCsConfig `json:"pipelineConfigData,omitempty"`
 	IsAppAdmin         bool                     `json:"isAppAdmin"`
-	Index              int                      `json:"index,omitempty"`
+	Index              int                      `json:"index"`
 }
 
 func NewDeploymentAndCmCsConfigDto() *DeploymentAndCmCsConfigDto {

pkg/configDiff/utils/utils.go

@@ -40,9 +40,9 @@ func GetKeyValMapForSecretConfigDataAndMaskData(configDataList []*bean.ConfigDat
 		if secretConfigData.IsESOExternalSecretType() || secretConfigData.External {
 			continue
 		}
-		secretRawData := secretConfigData.Data
-		if secretConfigData.Global {
-			secretRawData = secretConfigData.DefaultData
+		secretRawData := secretConfigData.DefaultData
+		if len(secretConfigData.Data) > 0 {
+			secretRawData = secretConfigData.Data
 		}
 		var secretData map[string]string
 		if err := json.Unmarshal(secretRawData, &secretData); err != nil {
@@ -60,10 +60,10 @@ func GetKeyValMapForSecretConfigDataAndMaskData(configDataList []*bean.ConfigDat
 		if err != nil {
 			return nil, err
 		}
-		if secretConfigData.Global {
-			secretConfigData.DefaultData = maskedSecretJson
-		} else {
+		if len(secretConfigData.Data) > 0 {
 			secretConfigData.Data = maskedSecretJson
+		} else {
+			secretConfigData.DefaultData = maskedSecretJson
 		}
 	}
 	return keyValMapForSecretConfig, nil
@@ -80,9 +80,9 @@ func CompareAndMaskSecretValuesInConfigData(configDataList []*bean.ConfigData, k
 		if secretConfigData.IsESOExternalSecretType() || secretConfigData.External {
 			continue
 		}
-		secretConfig := secretConfigData.Data
-		if secretConfigData.Global {
-			secretConfig = secretConfigData.DefaultData
+		secretConfig := secretConfigData.DefaultData
+		if len(secretConfigData.Data) > 0 {
+			secretConfig = secretConfigData.Data
 		}
 		var secretDataMap map[string]string
 		if err := json.Unmarshal(secretConfig, &secretDataMap); err != nil {
@@ -106,10 +106,10 @@ func CompareAndMaskSecretValuesInConfigData(configDataList []*bean.ConfigData, k
 			if err != nil {
 				return err
 			}
-			if secretConfigData.Global {
-				secretConfigData.DefaultData = maskedSecretJson
-			} else {
+			if len(secretConfigData.Data) > 0 {
 				secretConfigData.Data = maskedSecretJson
+			} else {
+				secretConfigData.DefaultData = maskedSecretJson
 			}
 
 		} else {
@@ -122,10 +122,10 @@ func CompareAndMaskSecretValuesInConfigData(configDataList []*bean.ConfigData, k
 			if err != nil {
 				return err
 			}
-			if secretConfigData.Global {
-				secretConfigData.DefaultData = maskedSecretJson
-			} else {
+			if len(secretConfigData.Data) > 0 {
 				secretConfigData.Data = maskedSecretJson
+			} else {
+				secretConfigData.DefaultData = maskedSecretJson
 			}
 
 		}