fix config test (#1122)

* ET-XXXX-fix-config-test * fixed config tests * moved cmd test back to web-api * renamed WebApiConfig => Config to follow naming conventions * removed some now uneccessary generics and updated the --print-config setup * fix doc
xaynetwork · Dec 13, 2023 · 9061557 · 9061557
1 parent 4499fca
commit 9061557
Show file tree

Hide file tree

Showing 19 changed files with 435 additions and 259 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/integration-tests/Cargo.toml b/integration-tests/Cargo.toml
@@ -33,7 +33,6 @@ xayn-web-api-shared = { path = "../web-api-shared" }
 [dev-dependencies]
 base64 = { workspace = true }
 itertools = { workspace = true }
-trycmd = "0.14.16"
 url = { workspace = true }
 
 [dev-dependencies.old-xayn-web-api]

diff --git a/integration-tests/src/lib.rs b/integration-tests/src/lib.rs
@@ -62,7 +62,7 @@ use tracing_subscriber::{
     Layer,
 };
 use xayn_test_utils::{asset::ort_target, env::clear_env, workspace::find_workspace_dir};
-use xayn_web_api::{config, start, AppHandle, Application, WebApi};
+use xayn_web_api::{config::Config, start, AppHandle, Application, WebApi};
 use xayn_web_api_db_ctrl::{Silo, Tenant};
 use xayn_web_api_shared::{
     elastic,
@@ -625,7 +625,9 @@ where
         &format!("inline:{config}"),
     ];
 
-    let config = config::load_with_args([""; 0], args);
+    let config = Config::load_with_args([""; 0], args)
+        .finalize(false)
+        .unwrap();
 
     start::<A>(config)
         .instrument(error_span!("test", test_id = %services.test_id))

diff --git a/integration-tests/tests/cmd/default_personalization_config.auto.toml b/integration-tests/tests/cmd/default_personalization_config.auto.toml
diff --git a/integration-tests/tests/legacy_tenant_migration.rs b/integration-tests/tests/legacy_tenant_migration.rs
@@ -35,7 +35,7 @@ use xayn_integration_tests::{
     TEST_EMBEDDING_SIZE,
 };
 use xayn_test_utils::{asset::ort_target, env::clear_env};
-use xayn_web_api::{config, start, Application, WebApi};
+use xayn_web_api::{config::Config, start, Application, WebApi};
 use xayn_web_api_db_ctrl::{elastic_create_tenant, LegacyTenantInfo, Silo};
 use xayn_web_api_shared::{
     elastic,
@@ -306,7 +306,7 @@ fn test_full_migration() {
             .await?;
         conn.close().await?;
 
-        let config = config::load_with_args([""; 0], {
+        let config = Config::load_with_args([""; 0], {
             let config = build_test_config_from_parts_and_names(
                 WebApi::NAME,
                 &pg_config,
@@ -322,11 +322,12 @@ fn test_full_migration() {
                 "--config",
                 &format!("inline:{config}"),
             ]
-        });
+        })
+        .finalize(false)?;
         let ingestion = start::<WebApi>(config).await?;
         info!("started new ingestion");
         let ingestion_url = ingestion.url();
-        let config = config::load_with_args([""; 0], {
+        let config = Config::load_with_args([""; 0], {
             let config = build_test_config_from_parts_and_names(
                 WebApi::NAME,
                 &pg_config,
@@ -342,7 +343,8 @@ fn test_full_migration() {
                 "--config",
                 &format!("inline:{config}"),
             ]
-        });
+        })
+        .finalize(false)?;
         let personalization = start::<WebApi>(config).await?;
         info!("started new personalization");
         let personalization_url = personalization.url();

diff --git a/web-api/Cargo.toml b/web-api/Cargo.toml
@@ -59,6 +59,7 @@ npyz = "0.8.1"
 ouroboros = "0.17.0"
 tokio = { workspace = true, features = ["sync"] }
 toml = { workspace = true }
+trycmd = "0.14.16"
 xayn-test-utils = { path = "../test-utils" }
 
 [[bench]]