test(integration): allow using different PolicyServer config accross tests

Signed-off-by: Fabrizio Sestito <fabrizio.sestito@suse.com>

Author: fabriziosestito

tests/common/mod.rs

@@ -9,7 +9,7 @@ use std::{
 };
 use tempfile::tempdir;
 
-pub(crate) async fn app() -> Router {
+pub(crate) fn default_test_config() -> Config {
     let policies = HashMap::from([
         (
             "pod-privileged".to_owned(),
@@ -47,32 +47,9 @@ pub(crate) async fn app() -> Router {
                 context_aware_resources: BTreeSet::new(),
             },
         ),
-        (
-            "invalid_settings".to_owned(),
-            Policy {
-                url: "ghcr.io/kubewarden/tests/sleeping-policy:v0.1.0".to_owned(),
-                policy_mode: PolicyMode::Protect,
-                allowed_to_mutate: None,
-                settings: Some(HashMap::from([(
-                    "sleepMilliseconds".to_owned(),
-                    "abc".into(),
-                )])),
-                context_aware_resources: BTreeSet::new(),
-            },
-        ),
-        (
-            "wrong_url".to_owned(),
-            Policy {
-                url: "ghcr.io/kubewarden/tests/not_existing:v0.1.0".to_owned(),
-                policy_mode: PolicyMode::Protect,
-                allowed_to_mutate: None,
-                settings: None,
-                context_aware_resources: BTreeSet::new(),
-            },
-        ),
     ]);
 
-    let config = Config {
+    Config {
         addr: SocketAddr::from(([127, 0, 0, 1], 3001)),
         sources: None,
         policies,
@@ -93,9 +70,11 @@ pub(crate) async fn app() -> Router {
         daemon_stdout_file: None,
         daemon_stderr_file: None,
         enable_pprof: true,
-        continue_on_errors: true,
-    };
+        continue_on_errors: false,
+    }
+}
 
+pub(crate) async fn app(config: Config) -> Router {
     let server = PolicyServer::new_from_config(config).await.unwrap();
 
     server.router()

tests/integration_test.rs

@@ -1,20 +1,31 @@
 mod common;
 
+use std::collections::{BTreeSet, HashMap};
+
 use common::app;
 
 use axum::{
     body::Body,
     http::{self, header, Request},
 };
 use http_body_util::BodyExt;
-use policy_evaluator::admission_response::AdmissionResponseStatus;
-use policy_server::api::admission_review::AdmissionReviewResponse;
+use policy_evaluator::{
+    admission_response::AdmissionResponseStatus,
+    policy_fetcher::verify::config::VerificationConfigV1,
+};
+use policy_server::{
+    api::admission_review::AdmissionReviewResponse,
+    config::{Policy, PolicyMode},
+};
 use regex::Regex;
 use tower::ServiceExt;
 
+use crate::common::default_test_config;
+
 #[tokio::test]
 async fn test_validate() {
-    let app = app().await;
+    let config = default_test_config();
+    let app = app(config).await;
 
     let request = Request::builder()
         .method(http::Method::POST)
@@ -46,7 +57,8 @@ async fn test_validate() {
 
 #[tokio::test]
 async fn test_validate_policy_not_found() {
-    let app = app().await;
+    let config = default_test_config();
+    let app = app(config).await;
 
     let request = Request::builder()
         .method(http::Method::POST)
@@ -64,7 +76,8 @@ async fn test_validate_policy_not_found() {
 
 #[tokio::test]
 async fn test_validate_invalid_payload() {
-    let app = app().await;
+    let config = default_test_config();
+    let app = app(config).await;
 
     let request = Request::builder()
         .method(http::Method::POST)
@@ -80,7 +93,8 @@ async fn test_validate_invalid_payload() {
 
 #[tokio::test]
 async fn test_validate_raw() {
-    let app = app().await;
+    let config = default_test_config();
+    let app = app(config).await;
 
     let request = Request::builder()
         .method(http::Method::POST)
@@ -107,7 +121,8 @@ async fn test_validate_raw() {
 
 #[tokio::test]
 async fn test_validate_raw_policy_not_found() {
-    let app = app().await;
+    let config = default_test_config();
+    let app = app(config).await;
 
     let request = Request::builder()
         .method(http::Method::POST)
@@ -125,7 +140,8 @@ async fn test_validate_raw_policy_not_found() {
 
 #[tokio::test]
 async fn test_validate_raw_invalid_payload() {
-    let app = app().await;
+    let config = default_test_config();
+    let app = app(config).await;
 
     let request = Request::builder()
         .method(http::Method::POST)
@@ -141,7 +157,8 @@ async fn test_validate_raw_invalid_payload() {
 
 #[tokio::test]
 async fn test_audit() {
-    let app = app().await;
+    let config = default_test_config();
+    let app = app(config).await;
 
     let request = Request::builder()
         .method(http::Method::POST)
@@ -171,7 +188,8 @@ async fn test_audit() {
 
 #[tokio::test]
 async fn test_audit_policy_not_found() {
-    let app = app().await;
+    let config = default_test_config();
+    let app = app(config).await;
 
     let request = Request::builder()
         .method(http::Method::POST)
@@ -189,7 +207,8 @@ async fn test_audit_policy_not_found() {
 
 #[tokio::test]
 async fn test_audit_invalid_payload() {
-    let app = app().await;
+    let config = default_test_config();
+    let app = app(config).await;
 
     let request = Request::builder()
         .method(http::Method::POST)
@@ -205,7 +224,8 @@ async fn test_audit_invalid_payload() {
 
 #[tokio::test]
 async fn test_timeout_protection_accept() {
-    let app = app().await;
+    let config = default_test_config();
+    let app = app(config).await;
 
     let request = Request::builder()
         .method(http::Method::POST)
@@ -226,7 +246,8 @@ async fn test_timeout_protection_accept() {
 
 #[tokio::test]
 async fn test_timeout_protection_reject() {
-    let app = app().await;
+    let config = default_test_config();
+    let app = app(config).await;
 
     let request = Request::builder()
         .method(http::Method::POST)
@@ -256,7 +277,23 @@ async fn test_timeout_protection_reject() {
 
 #[tokio::test]
 async fn test_policy_with_invalid_settings() {
-    let app = app().await;
+    let mut config = default_test_config();
+    config.policies.insert(
+        "invalid_settings".to_owned(),
+        Policy {
+            url: "ghcr.io/kubewarden/tests/sleeping-policy:v0.1.0".to_owned(),
+            policy_mode: PolicyMode::Protect,
+            allowed_to_mutate: None,
+            settings: Some(HashMap::from([(
+                "sleepMilliseconds".to_owned(),
+                "abc".into(),
+            )])),
+            context_aware_resources: BTreeSet::new(),
+        },
+    );
+    config.continue_on_errors = true;
+
+    let app = app(config).await;
 
     let request = Request::builder()
         .method(http::Method::POST)
@@ -286,7 +323,20 @@ async fn test_policy_with_invalid_settings() {
 
 #[tokio::test]
 async fn test_policy_with_wrong_url() {
-    let app = app().await;
+    let mut config = default_test_config();
+    config.policies.insert(
+        "wrong_url".to_owned(),
+        Policy {
+            url: "ghcr.io/kubewarden/tests/not_existing:v0.1.0".to_owned(),
+            policy_mode: PolicyMode::Protect,
+            allowed_to_mutate: None,
+            settings: None,
+            context_aware_resources: BTreeSet::new(),
+        },
+    );
+    config.continue_on_errors = true;
+
+    let app = app(config).await;
 
     let request = Request::builder()
         .method(http::Method::POST)