return error if unmarshalling while checking empty json

Author: ayu-devtron

pkg/pipeline/util/CiCdUtil.go

@@ -24,7 +24,9 @@ func GetWorkflowCacheConfig(WorkflowCacheConfig common.WorkflowCacheConfigType,
 
 // in oss, only WorkflowCacheConfigInherit is supported
 func GetWorkflowCacheConfigWithBackwardCompatibility(WorkflowCacheConfig common.WorkflowCacheConfigType, WorkflowCacheConfigEnv string, globalValue bool, oldGlobalValue bool) bean.WorkflowCacheConfig {
-	if util.IsEmptyJSONForJsonString(WorkflowCacheConfigEnv) {
+	isEmptyJson, _ := util.IsEmptyJSONForJsonString(WorkflowCacheConfigEnv)
+	//TODO: error handling in next phase
+	if isEmptyJson {
 		//this means new global flag is not configured
 		return bean.WorkflowCacheConfig{
 			Type:        common.WorkflowCacheConfigInherit,

util/JsonHelper.go

@@ -3,19 +3,19 @@ package util
 import "encoding/json"
 
 // IsEmptyJSON checks if a given string represents an empty JSON object
-func IsEmptyJSONForJsonString(jsonStr string) bool {
+func IsEmptyJSONForJsonString(jsonStr string) (bool, error) {
 	var data interface{}
 	err := json.Unmarshal([]byte(jsonStr), &data)
 	if err != nil {
 		// If unmarshaling fails, it's not valid JSON
-		return false
+		return false, err
 	}
 
 	// Check if data is an empty map
 	if obj, ok := data.(map[string]interface{}); ok {
-		return len(obj) == 0
+		return len(obj) == 0, nil
 	}
 
 	// If not a JSON object, return false
-	return false
+	return false, nil
 }