From 2309a49fddd189e5dc9da1e7bf979864f02701e0 Mon Sep 17 00:00:00 2001 From: mo khan Date: Fri, 27 Jun 2025 14:53:48 -0600 Subject: test: rename common module to support --- tests/authorization/cedar_authorizer_test.rs | 2 +- tests/authorization/check_service_test.rs | 2 +- tests/common/factory_bot.rs | 41 ---------------------------- tests/common/mod.rs | 1 - tests/integration_test.rs | 2 +- tests/support/factory_bot.rs | 41 ++++++++++++++++++++++++++++ tests/support/mod.rs | 1 + 7 files changed, 45 insertions(+), 45 deletions(-) delete mode 100644 tests/common/factory_bot.rs delete mode 100644 tests/common/mod.rs create mode 100644 tests/support/factory_bot.rs create mode 100644 tests/support/mod.rs (limited to 'tests') diff --git a/tests/authorization/cedar_authorizer_test.rs b/tests/authorization/cedar_authorizer_test.rs index e7e6eb2c..76bf06df 100644 --- a/tests/authorization/cedar_authorizer_test.rs +++ b/tests/authorization/cedar_authorizer_test.rs @@ -1,6 +1,6 @@ #[cfg(test)] mod tests { - use crate::common::factory_bot::*; + use crate::support::factory_bot::*; use authzd::Authorizer; use envoy_types::pb::envoy::service::auth::v3::attribute_context::HttpRequest; use std::collections::HashMap; diff --git a/tests/authorization/check_service_test.rs b/tests/authorization/check_service_test.rs index 3bdf30c2..3a225974 100644 --- a/tests/authorization/check_service_test.rs +++ b/tests/authorization/check_service_test.rs @@ -1,6 +1,6 @@ #[cfg(test)] mod tests { - use crate::common::factory_bot::*; + use crate::support::factory_bot::*; use authzd::CheckService; use envoy_types::ext_authz::v3::pb::Authorization; use envoy_types::pb::envoy::service::auth::v3::attribute_context::HttpRequest; diff --git a/tests/common/factory_bot.rs b/tests/common/factory_bot.rs deleted file mode 100644 index c64b53a2..00000000 --- a/tests/common/factory_bot.rs +++ /dev/null @@ -1,41 +0,0 @@ -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; - -#[allow(dead_code)] -pub fn build() -> T { - return please::build(); -} - -pub fn build_with(initializer: F) -> T -where - T: Default, - F: std::ops::FnOnce(&mut T), -{ - return please::build_with(initializer); -} - -pub fn build_request(f: impl std::ops::FnOnce(&mut HttpRequest)) -> CheckRequest { - 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))); - })); - })); - }) -} - -pub fn build_headers(headers: Vec<(String, String)>) -> HashMap { - return build_with(|item: &mut HashMap| { - for (key, value) in headers { - item.insert(key, value); - } - }); -} - -pub fn build_cedar_authorizer() -> authzd::CedarAuthorizer { - let realpath = std::fs::canonicalize("./etc/authzd").unwrap(); - let path = realpath.as_path(); - authzd::CedarAuthorizer::new_from(path) -} diff --git a/tests/common/mod.rs b/tests/common/mod.rs deleted file mode 100644 index 5e2a6d78..00000000 --- a/tests/common/mod.rs +++ /dev/null @@ -1 +0,0 @@ -pub mod factory_bot; diff --git a/tests/integration_test.rs b/tests/integration_test.rs index c1edf36e..c17d8e65 100644 --- a/tests/integration_test.rs +++ b/tests/integration_test.rs @@ -1,2 +1,2 @@ mod authorization; -mod common; +mod support; diff --git a/tests/support/factory_bot.rs b/tests/support/factory_bot.rs new file mode 100644 index 00000000..c64b53a2 --- /dev/null +++ b/tests/support/factory_bot.rs @@ -0,0 +1,41 @@ +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; + +#[allow(dead_code)] +pub fn build() -> T { + return please::build(); +} + +pub fn build_with(initializer: F) -> T +where + T: Default, + F: std::ops::FnOnce(&mut T), +{ + return please::build_with(initializer); +} + +pub fn build_request(f: impl std::ops::FnOnce(&mut HttpRequest)) -> CheckRequest { + 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))); + })); + })); + }) +} + +pub fn build_headers(headers: Vec<(String, String)>) -> HashMap { + return build_with(|item: &mut HashMap| { + for (key, value) in headers { + item.insert(key, value); + } + }); +} + +pub fn build_cedar_authorizer() -> authzd::CedarAuthorizer { + let realpath = std::fs::canonicalize("./etc/authzd").unwrap(); + let path = realpath.as_path(); + authzd::CedarAuthorizer::new_from(path) +} diff --git a/tests/support/mod.rs b/tests/support/mod.rs new file mode 100644 index 00000000..5e2a6d78 --- /dev/null +++ b/tests/support/mod.rs @@ -0,0 +1 @@ +pub mod factory_bot; -- cgit v1.2.3