Skip to content

Commit 0f766a8

Browse files
committed
reverted changes
1 parent 9a52a06 commit 0f766a8

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

pkg/configDiff/DeploymentConfigurationService.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,12 @@ func (impl *DeploymentConfigurationServiceImpl) getCmCsConfigHistory(ctx context
327327
return nil, err
328328
}
329329
resolvedConfigDataReq := &bean.ConfigDataRequest{ConfigData: resolvedConfigDataList}
330-
resolvedConfigDataStringJson, err := utils.ConvertToJsonRawMessage(resolvedConfigDataReq)
330+
resolvedConfigDataString, err := utils.ConvertToString(resolvedConfigDataReq)
331+
if err != nil {
332+
impl.logger.Errorw("getCmCsPublishedConfigResponse, error in converting config data to json raw message", "pipelineId", configDataQueryParams.PipelineId, "wfrId", configDataQueryParams.WfrId, "err", err)
333+
return nil, err
334+
}
335+
resolvedConfigDataStringJson, err := utils.ConvertToJsonRawMessage(resolvedConfigDataString)
331336
if err != nil {
332337
impl.logger.Errorw("getCmCsPublishedConfigResponse, error in ConvertToJsonRawMessage for resolvedConfigDataString", "pipelineId", configDataQueryParams.PipelineId, "wfrId", configDataQueryParams.WfrId, "err", err)
333338
return nil, err

pkg/pipeline/history/ConfigMapHistoryService.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -763,7 +763,12 @@ func (impl *ConfigMapHistoryServiceImpl) getResolvedConfigData(ctx context.Conte
763763
return nil, err
764764
}
765765
resolvedConfigDataReq := &bean3.ConfigDataRequest{ConfigData: resolvedConfigDataList}
766-
resolvedConfigDataStringJson, err := utils.ConvertToJsonRawMessage(resolvedConfigDataReq)
766+
resolvedConfigDataString, err := utils.ConvertToString(resolvedConfigDataReq)
767+
if err != nil {
768+
impl.logger.Errorw("getCmCsPublishedConfigResponse, error in converting config data to json raw message", "pipelineId", pipelineId, "deployedOn", deployedOn, "err", err)
769+
return nil, err
770+
}
771+
resolvedConfigDataStringJson, err := utils.ConvertToJsonRawMessage(resolvedConfigDataString)
767772
if err != nil {
768773
impl.logger.Errorw("getCmCsPublishedConfigResponse, error in ConvertToJsonRawMessage for resolvedJson", "resolvedJson", resolvedConfigDataStringJson, "err", err)
769774
return nil, err

0 commit comments

Comments
 (0)