tests: Genericize test_error method

Signed-off-by: Jakob Naucke <jnaucke@redhat.com>

Author: Jakob-Naucke

operator/src/attestation_key_register.rs

@@ -381,7 +381,9 @@ pub async fn launch_secret_ak_controller(client: Client) {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use http::{Method, Request, StatusCode};
     use trusted_cluster_operator_test_utils::mock_client::*;
+    use trusted_cluster_operator_test_utils::test_error_method;
 
     #[tokio::test]
     async fn test_create_ak_register_depl_success() {
@@ -396,7 +398,7 @@ mod tests {
         let clos = |client| {
             create_attestation_key_register_deployment(client, Default::default(), "image")
         };
-        test_create_error(clos).await;
+        test_error_method!(clos, Method::POST);
     }
 
     #[tokio::test]
@@ -410,6 +412,6 @@ mod tests {
     async fn test_create_ak_register_svc_error() {
         let clos =
             |client| create_attestation_key_register_service(client, Default::default(), Some(80));
-        test_create_error(clos).await;
+        test_error_method!(clos, Method::POST);
     }
 }

operator/src/reference_values.rs

@@ -413,10 +413,11 @@ pub async fn disallow_image(ctx: RvContextData, resource_name: &str) -> Result<(
 mod tests {
     use super::*;
     use crate::test_utils::*;
-    use http::{Method, Request};
+    use http::{Method, Request, StatusCode};
     use k8s_openapi::api::batch::v1::JobStatus;
     use k8s_openapi::apimachinery::pkg::apis::meta::v1::Time;
     use trusted_cluster_operator_test_utils::mock_client::*;
+    use trusted_cluster_operator_test_utils::test_error_method;
 
     #[tokio::test]
     async fn test_create_pcrs_cm_success() {
@@ -433,7 +434,7 @@ mod tests {
     #[tokio::test]
     async fn test_create_pcrs_cm_error() {
         let clos = |client| create_pcrs_config_map(client, Default::default());
-        test_create_error(clos).await;
+        test_error_method!(clos, Method::POST);
     }
 
     fn dummy_job() -> Job {
@@ -509,7 +510,7 @@ mod tests {
     #[tokio::test]
     async fn test_compute_fresh_pcrs_error() {
         let clos = |client| compute_fresh_pcrs(generate_rv_ctx(client), "image", "registry");
-        test_create_error(clos).await;
+        test_error_method!(clos, Method::POST);
     }
 
     // handle_new_image is an inherently online function and not tested here.

operator/src/register_server.rs

@@ -200,7 +200,9 @@ pub async fn launch_keygen_controller(client: Client) {
 #[cfg(test)]
 mod tests {
     use super::*;
+    use http::{Method, Request, StatusCode};
     use trusted_cluster_operator_test_utils::mock_client::*;
+    use trusted_cluster_operator_test_utils::test_error_method;
 
     #[tokio::test]
     async fn test_create_reg_server_depl_success() {
@@ -211,7 +213,7 @@ mod tests {
     #[tokio::test]
     async fn test_create_reg_server_depl_error() {
         let clos = |client| create_register_server_deployment(client, Default::default(), "image");
-        test_create_error(clos).await;
+        test_error_method!(clos, Method::POST);
     }
 
     #[tokio::test]
@@ -223,6 +225,6 @@ mod tests {
     #[tokio::test]
     async fn test_create_reg_server_svc_error() {
         let clos = |client| create_register_server_service(client, Default::default(), Some(80));
-        test_create_error(clos).await;
+        test_error_method!(clos, Method::POST);
     }
 }

operator/src/trustee.rs

@@ -550,6 +550,7 @@ mod tests {
     use http::{Method, Request, StatusCode};
     use kube::client::Body;
     use trusted_cluster_operator_test_utils::mock_client::*;
+    use trusted_cluster_operator_test_utils::test_error_method;
 
     #[test]
     fn test_get_image_pcrs_success() {
@@ -792,7 +793,7 @@ mod tests {
     #[tokio::test]
     async fn test_generate_att_policy_error() {
         let clos = |client| generate_attestation_policy(client, Default::default());
-        test_create_error(clos).await;
+        test_error_method!(clos, Method::POST);
     }
 
     #[tokio::test]
@@ -810,7 +811,7 @@ mod tests {
     #[tokio::test]
     async fn test_generate_secret_error() {
         let clos = |client| generate_secret(client, "id", Default::default());
-        test_create_error(clos).await;
+        test_error_method!(clos, Method::POST);
     }
 
     #[tokio::test]
@@ -828,7 +829,7 @@ mod tests {
     #[tokio::test]
     async fn test_generate_trustee_data_error() {
         let clos = |client| generate_trustee_data(client, Default::default());
-        test_create_error(clos).await;
+        test_error_method!(clos, Method::POST);
     }
 
     #[tokio::test]
@@ -840,7 +841,7 @@ mod tests {
     #[tokio::test]
     async fn test_generate_kbs_service_error() {
         let clos = |client| generate_kbs_service(client, Default::default(), Some(80));
-        test_create_error(clos).await;
+        test_error_method!(clos, Method::POST);
     }
 
     #[tokio::test]
@@ -852,6 +853,6 @@ mod tests {
     #[tokio::test]
     async fn test_generate_kbs_depl_error() {
         let clos = |client| generate_kbs_deployment(client, Default::default(), "image");
-        test_create_error(clos).await;
+        test_error_method!(clos, Method::POST);
     }
 }

register-server/src/main.rs

@@ -215,10 +215,15 @@ async fn main() {
 
 #[cfg(test)]
 mod tests {
-    use super::*;
+    use super::{create_machine, EndpointInfo, Machine};
+    use http::{Method, Request, StatusCode};
+    use k8s_openapi::apimachinery::pkg::apis::meta::v1::OwnerReference;
     use kube::api::ObjectList;
+    use kube::api::ObjectMeta;
+    use trusted_cluster_operator_lib::MachineSpec;
     use trusted_cluster_operator_lib::TrustedExecutionCluster;
     use trusted_cluster_operator_test_utils::mock_client::*;
+    use trusted_cluster_operator_test_utils::test_error_method;
 
     fn dummy_clusters() -> ObjectList<TrustedExecutionCluster> {
         ObjectList {
@@ -280,7 +285,8 @@ mod tests {
 
     #[tokio::test]
     async fn test_get_public_trustee_error() {
-        test_get_error(async |c| EndpointInfo::create(c).await.map(|_| ())).await;
+        let clos = async |c| EndpointInfo::create(c).await.map(|_| ());
+        test_error_method!(clos, Method::GET);
     }
 
     fn dummy_machine() -> Machine {
@@ -319,11 +325,10 @@ mod tests {
 
     #[tokio::test]
     async fn test_create_machine_error() {
-        test_create_error(async |c| {
-            create_machine(c, "test", dummy_owner_reference())
-                .await
-                .map(|_| ())
-        })
-        .await;
+        let clos = async |c| {
+            let machine = create_machine(c, "test", dummy_owner_reference());
+            machine.await.map(|_| ())
+        };
+        test_error_method!(clos, Method::POST);
     }
 }

test_utils/src/mock_client.rs

@@ -43,6 +43,17 @@ macro_rules! count_check {
     }
 }
 
+#[macro_export]
+macro_rules! test_error_method {
+    ($action:ident, $method:path) => {
+        let clos = async |req: Request<_>, _| match req.method() {
+            &$method => Err(StatusCode::INTERNAL_SERVER_ERROR),
+            _ => panic!("unexpected API interaction: {req:?}"),
+        };
+        test_error($action, clos).await;
+    };
+}
+
 pub use count_check;
 
 async fn create_response<T: Future<Output = Result<String, StatusCode>>>(
@@ -141,7 +152,7 @@ pub async fn test_create_already_exists<
     });
 }
 
-async fn test_error<
+pub async fn test_error<
     F: Fn(Client) -> S,
     S: Future<Output = anyhow::Result<T>>,
     T: Debug,
@@ -158,24 +169,6 @@ async fn test_error<
     });
 }
 
-pub async fn test_create_error<F: Fn(Client) -> S, S: Future<Output = anyhow::Result<()>>>(
-    create: F,
-) {
-    let clos = async |req: Request<_>, _| match req.method() {
-        &Method::POST => Err(StatusCode::INTERNAL_SERVER_ERROR),
-        _ => panic!("unexpected API interaction: {req:?}"),
-    };
-    test_error(create, clos).await;
-}
-
-pub async fn test_get_error<F: Fn(Client) -> S, S: Future<Output = anyhow::Result<()>>>(get: F) {
-    let clos = async |req: Request<_>, _| match req.method() {
-        &Method::GET => Err(StatusCode::INTERNAL_SERVER_ERROR),
-        _ => panic!("unexpected API interaction: {req:?}"),
-    };
-    test_error(get, clos).await;
-}
-
 pub fn dummy_cluster() -> TrustedExecutionCluster {
     TrustedExecutionCluster {
         metadata: ObjectMeta {