fix one more test

Author: IvanGoncharov

apollo-router/src/graphql/mod.rs

@@ -136,12 +136,16 @@ impl Error {
                     reason: format!("invalid `extensions` within error: {}", err),
                 })?
                 .unwrap_or_default();
-        let message = extract_key_value_from_object!(object, "message", Value::String(s) => s)
-            .map_err(|err| MalformedResponseError {
-                reason: format!("invalid `message` within error: {}", err),
-            })?
-            .map(|s| s.as_str().to_string())
-            .unwrap_or_default();
+        let message =
+            match extract_key_value_from_object!(object, "message", Value::String(s) => s) {
+                Ok(Some(s)) => Ok(s.as_str().to_string()),
+                Ok(None) =>  Err(MalformedResponseError {
+                reason: "missing required `message` property within error".to_owned(),
+            }),
+                Err(err) => Err(MalformedResponseError {
+                    reason: format!("invalid `message` within error: {}", err),
+                }),
+            }?;
         let locations = extract_key_value_from_object!(object, "locations")
             .map(skip_invalid_locations)
             .map(serde_json_bytes::from_value)

apollo-router/src/plugins/coprocessor/test.rs

@@ -3,6 +3,8 @@ mod tests {
     use std::collections::HashMap;
     use std::sync::Arc;
 
+    use crate::json_ext::Object;
+    use crate::json_ext::Value;
     use futures::future::BoxFuture;
     use http::HeaderMap;
     use http::HeaderValue;
@@ -19,8 +21,6 @@ mod tests {
     use tower::ServiceExt;
 
     use super::super::*;
-    use crate::json_ext::Object;
-    use crate::json_ext::Value;
     use crate::plugin::test::MockInternalHttpClientService;
     use crate::plugin::test::MockRouterService;
     use crate::plugin::test::MockSubgraphService;
@@ -332,7 +332,7 @@ mod tests {
         let request = subgraph::Request::fake_builder().build();
 
         assert_eq!(
-            "couldn't deserialize coprocessor output body: missing field `message`",
+            "couldn't deserialize coprocessor output body: GraphQL response was malformed: missing required `message` property within error",
             service
                 .oneshot(request)
                 .await