refactor: copy create_request to test common mod

1 files changed, 17 insertions, 24 deletions

diff --git a/tests/common/mod.rs b/tests/common/mod.rs
index e2137146..9b2370cb 100644
--- a/tests/common/mod.rs
+++ b/tests/common/mod.rs
@@ -1,31 +1,24 @@
 use envoy_types::ext_authz::v3::pb::CheckRequest;
+use envoy_types::pb::envoy::service::auth::v3::AttributeContext;
+use envoy_types::pb::envoy::service::auth::v3::attribute_context::{HttpRequest, Request};
 use std::collections::HashMap;
-use tonic::Request;
 
-pub fn create_test_request_with_headers(headers: HashMap<String, String>) -> Request<CheckRequest> {
-    use envoy_types::pb::envoy::service::auth::v3::{AttributeContext, attribute_context};
-
-    let http_request = attribute_context::HttpRequest {
-        headers,
-        ..Default::default()
-    };
-
-    let request_context = attribute_context::Request {
-        http: Some(http_request),
-        ..Default::default()
-    };
-
-    let attributes = AttributeContext {
-        request: Some(request_context),
-        ..Default::default()
-    };
-
-    let check_request = CheckRequest {
-        attributes: Some(attributes),
-        ..Default::default()
-    };
+pub fn create_request(f: impl std::ops::FnOnce(&mut HttpRequest)) -> CheckRequest {
+    please::build_with(|item: &mut CheckRequest| {
+        item.attributes = Some(please::build_with(|item: &mut AttributeContext| {
+            item.request = Some(please::build_with(|item: &mut Request| {
+                item.http = Some(please::build_with(|item: &mut HttpRequest| f(item)));
+            }));
+        }));
+    })
+}
 
-    Request::new(check_request)
+pub fn create_test_request_with_headers(
+    headers: HashMap<String, String>,
+) -> tonic::Request<CheckRequest> {
+    tonic::Request::new(create_request(|item: &mut HttpRequest| {
+        item.headers = headers;
+    }))
 }
 
 pub fn create_headers_with_auth(auth_value: &str) -> HashMap<String, String> {