Skip to content

Commit 2d2e680

Browse files
compare diff fix
1 parent 041a3e1 commit 2d2e680

File tree

2 files changed

+15
-1
lines changed

2 files changed

+15
-1
lines changed

pkg/config/configDiff/DeploymentConfigurationService.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1329,7 +1329,7 @@ func (impl *DeploymentConfigurationServiceImpl) getAllComparableSecretResponseDt
13291329
return nil, err
13301330
}
13311331
// prepare resolved data part for response
1332-
resolvedSecretConfigData, err := helper.GetConfigDataRequestJsonRawMessage(secretConfigMetadata.SecretScopeVariableMetadata.ResolvedConfigData)
1332+
resolvedSecretConfigData, err := helper.GetJsonRawMessageFromConfigDataRequest(secretConfigMetadata.SecretScopeVariableMetadata.ResolvedConfigData)
13331333
if err != nil {
13341334
impl.logger.Errorw("error in converting resolved secret config data to json raw message", "err", err)
13351335
return nil, err

pkg/config/configDiff/helper/helper.go

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,3 +67,17 @@ func GetConfigDataRequestJsonRawMessage(configDataList []*bean.ConfigData) (json
6767
}
6868
return configDataJson, nil
6969
}
70+
71+
func GetJsonRawMessageFromConfigDataRequest(configDataList []*bean.ConfigData) (json.RawMessage, error) {
72+
configDataReq := &bean.ConfigDataRequest{ConfigData: configDataList}
73+
// doing this because FE wants string version of resolved value
74+
strReq, err := utils.ConvertToString(configDataReq)
75+
if err != nil {
76+
return nil, err
77+
}
78+
configDataJson, err := utils.ConvertToJsonRawMessage(strReq)
79+
if err != nil {
80+
return nil, err
81+
}
82+
return configDataJson, nil
83+
}

0 commit comments

Comments
 (0)