Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Apply generators to message's contents and metadata #342

Merged
merged 2 commits into from
Nov 21, 2023
Merged

feat: Apply generators to message's contents and metadata #342

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e26bf72
feat: Apply generators to message's contents and metadata
tienvx Nov 20, 2023
86aa29a
docs: Update safety comment for pactffi_message_reify
tienvx Nov 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions rust/pact_ffi/src/mock_server/handles.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,10 @@ use pact_models::v4::synch_http::SynchronousHttp;
use serde_json::{json, Value};
use tracing::*;

use pact_matching::generators::generate_message;
use pact_models::generators::GeneratorTestMode;
use futures::executor::block_on;

use crate::{convert_cstr, ffi_fn, safe_str};
use crate::error::set_error_msg;
use crate::mock_server::{StringResult, xml};
Expand Down Expand Up @@ -2136,7 +2140,12 @@ pub extern fn pactffi_message_with_metadata(message_handle: MessageHandle, key:
/// Reifies the given message
///
/// Reification is the process of stripping away any matchers, and returning the original contents.
/// NOTE: the returned string needs to be deallocated with the `free_string` function
///
/// # Safety
///
/// The returned string needs to be deallocated with the `free_string` function.
/// This function must only ever be called from a foreign language. Calling it from a Rust function
/// that has a Tokio runtime in its call stack can result in a deadlock.
#[no_mangle]
pub extern fn pactffi_message_reify(message_handle: MessageHandle) -> *const c_char {
let res = message_handle.with_message(&|_, inner, spec_version| {
Expand All @@ -2145,7 +2154,9 @@ pub extern fn pactffi_message_reify(message_handle: MessageHandle) -> *const c_c
match message.contents.contents {
OptionalBody::Null => "null".to_string(),
OptionalBody::Present(_, _, _) => if spec_version <= pact_models::PactSpecification::V3 {
message.as_message().unwrap_or_default().to_json(&spec_version).to_string()
let message = message.as_message().unwrap_or_default();
let message = block_on(generate_message(&message, &GeneratorTestMode::Consumer, &hashmap!{}, &vec![], &hashmap!{}));
message.to_json(&spec_version).to_string()
} else {
message.to_json().to_string()
},
Expand Down
Loading