RPPL-2100: Create JQ Rules for Secure Storage API (#555)

* RPPL-2100: Create JQ Rules for Secure Storage API (#547) * fix: error is not part of result * fix: unittest * build: cleanup * fix: handle error in update_response() * build: cleanup * fix: handle error * build: cleanup * build: cleanup * build: cleanup
rdkcentral · Jul 1, 2024 · 57fcfcb · 57fcfcb
1 parent 5de6489
commit 57fcfcb
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 9 deletions.
diff --git a/core/main/src/broker/endpoint_broker.rs b/core/main/src/broker/endpoint_broker.rs
@@ -446,16 +446,24 @@ impl BrokerOutputForwarder {
                                     .transform
                                     .get_filter(super::rules_engine::RuleTransformType::Response)
                                 {
-                                    if let Ok(r) = jq_compile(
-                                        result,
+                                    match jq_compile(
+                                        result.clone(),
                                         &filter,
                                         format!("{}_response", rpc_request.ctx.method),
                                     ) {
-                                        if r.to_string().to_lowercase().contains("null") {
-                                            v.data.result = Some(Value::Null)
-                                        } else {
-                                            v.data.result = Some(r);
+                                        Ok(r) => {
+                                            if r.to_string().to_lowercase().contains("null") {
+                                                v.data.error = None;
+                                                v.data.result = Some(Value::Null);
+                                            } else if result.get("success").is_some() {
+                                                v.data.result = Some(r);
+                                                v.data.error = None;
+                                            } else {
+                                                v.data.error = Some(r);
+                                                v.data.result = None;
+                                            }
                                         }
+                                        Err(e) => error!("jq_compile error {:?}", e),
                                     }
                                 }
                             }

diff --git a/core/main/src/broker/thunder_broker.rs b/core/main/src/broker/thunder_broker.rs
@@ -120,6 +120,8 @@ impl ThunderBroker {
         let mut new_response = response.clone();
         if response.params.is_some() {
             new_response.result = response.params.clone();
+        } else if response.error.is_some() {
+            new_response.result = response.error.clone();
         }
         new_response
     }

diff --git a/device/mock_device/src/mock_data.rs b/device/mock_device/src/mock_data.rs
@@ -79,7 +79,7 @@ impl ParamResponse {
         if let Some(e) = self.error.clone() {
             sink_responses.push(ResponseSink {
                 delay: 0,
-                data: json!({"jsonrpc": "2.0", "id": id, "error": [e]}),
+                data: json!({"jsonrpc": "2.0", "id": id, "error": e}),
             });
         } else if let Some(v) = self.result.clone() {
             sink_responses.push(ResponseSink {
@@ -273,8 +273,6 @@ mod tests {
             .data
             .get("error")
             .unwrap()
-            .as_array()
-            .unwrap()[0]
             .get("code")
             .unwrap()
             .as_i64()