Reuse cli api client

kamu-data · Feb 6, 2025 · f984a0a · f984a0a
1 parent 39b5bde
commit f984a0a
Show file tree

Hide file tree

Showing 14 changed files with 135 additions and 19 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -78,7 +78,10 @@ kamu-task-system-inmem = { git = "https://github.com/kamu-data/kamu-cli", tag =
 kamu-task-system-postgres = { git = "https://github.com/kamu-data/kamu-cli", tag = "v0.221.0", version = "0.221.0", default-features = false }
 kamu-task-system-sqlite = { git = "https://github.com/kamu-data/kamu-cli", tag = "v0.221.0", version = "0.221.0", default-features = false }
 
-# E2E
+#E2E
+kamu-cli-e2e-common = { git = "https://github.com/kamu-data/kamu-cli", tag = "v0.221.0", version = "0.221.0", default-features = false }
+
+# Workspace E2E
 kamu-node-e2e-common = { path = "src/e2e/app/common", version = "0.53.0", default-features = false }
 kamu-node-e2e-common-macros = { path = "src/e2e/app/common-macros", version = "0.53.0", default-features = false }
 kamu-node-puppet = { path = "src/e2e/app/kamu-node-puppet", version = "0.53.0", default-features = false }

diff --git a/src/e2e/app/common/Cargo.toml b/src/e2e/app/common/Cargo.toml
@@ -24,6 +24,7 @@ doctest = false
 [dependencies]
 internal-error = { workspace = true }
 kamu-adapter-http = { workspace = true }
+kamu-cli-e2e-common = { workspace = true }
 kamu-node-e2e-common-macros = { workspace = true }
 kamu-node-puppet = { workspace = true, default-features = false, features = [
     "extensions",

diff --git a/src/e2e/app/common/src/e2e_harness.rs b/src/e2e/app/common/src/e2e_harness.rs
@@ -9,12 +9,13 @@
 
 use std::future::Future;
 
+use kamu_cli_e2e_common::KamuApiServerClient;
 use kamu_node_puppet::extensions::KamuNodePuppetExt;
 use kamu_node_puppet::{KamuNodePuppet, NewWorkspaceOptions};
 use regex::Regex;
 use sqlx::{PgPool, SqlitePool};
 
-use crate::{api_server_e2e_test, KamuApiServerClient};
+use crate::api_server_e2e_test;
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 

diff --git a/src/e2e/app/common/src/e2e_test.rs b/src/e2e/app/common/src/e2e_test.rs
@@ -11,13 +11,12 @@ use std::future::Future;
 use std::path::PathBuf;
 
 use internal_error::{InternalError, ResultIntoInternal};
+use kamu_cli_e2e_common::KamuApiServerClient;
 use kamu_node_puppet::extensions::ServerOutput;
 use reqwest::Url;
 use tokio_retry::strategy::FixedInterval;
 use tokio_retry::Retry;
 
-use crate::KamuApiServerClient;
-
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 pub async fn api_server_e2e_test<ServerRunFut, Fixture, FixtureFut>(

diff --git a/src/e2e/app/common/src/lib.rs b/src/e2e/app/common/src/lib.rs
@@ -11,12 +11,12 @@
 
 mod e2e_harness;
 mod e2e_test;
-mod kamu_api_server_client;
-mod kamu_api_server_client_ext;
+// mod kamu_api_server_client;
+// mod kamu_api_server_client_ext;
 
 pub use e2e_harness::*;
 pub use e2e_test::*;
-pub use kamu_api_server_client::*;
-pub use kamu_api_server_client_ext::*;
+// pub use kamu_api_server_client::*;
+// pub use kamu_api_server_client_ext::*;
 
 pub mod prelude;
diff --git a/src/e2e/app/repo-tests/Cargo.toml b/src/e2e/app/repo-tests/Cargo.toml
@@ -26,7 +26,7 @@ normal = ["kamu-node"]
 
 
 [dependencies]
-kamu-node-e2e-common = { workspace = true }
+kamu-cli-e2e-common = { workspace = true }
 kamu-adapter-http = { workspace = true }
 kamu-accounts = { workspace = true }
 odf = { workspace = true }

diff --git a/src/e2e/app/repo-tests/src/test_accounts.rs b/src/e2e/app/repo-tests/src/test_accounts.rs
@@ -10,7 +10,7 @@
 use std::assert_matches::assert_matches;
 
 use kamu_accounts::{DEFAULT_ACCOUNT_ID, DEFAULT_ACCOUNT_NAME};
-use kamu_node_e2e_common::*;
+use kamu_cli_e2e_common::{AccountMeError, KamuApiServerClient, KamuApiServerClientExt};
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 

diff --git a/src/e2e/app/repo-tests/src/test_auth.rs b/src/e2e/app/repo-tests/src/test_auth.rs
@@ -9,7 +9,8 @@
 
 use std::assert_matches::assert_matches;
 
-use kamu_node_e2e_common::{
+use kamu_cli_e2e_common::{
+    GraphQLResponseExt,
     KamuApiServerClient,
     KamuApiServerClientExt,
     LoginError,
@@ -65,7 +66,9 @@ pub async fn test_kamu_access_token_middleware(mut kamu_api_server_client: KamuA
       }
       "#,
        ))
-   .await;
+   .await
+   .data();
+
     let access_token = login_response["auth"]["login"]["accessToken"]
         .as_str()
         .map(ToOwned::to_owned)
@@ -103,7 +106,9 @@ pub async fn test_kamu_access_token_middleware(mut kamu_api_server_client: KamuA
             .replace("<account_id>", account_id.as_str())
             .as_str(),
         )
-        .await;
+        .await
+        .data();
+
     let kamu_token = create_token_response["auth"]["createAccessToken"]["token"]["composed"]
         .as_str()
         .map(ToOwned::to_owned)

diff --git a/src/e2e/app/repo-tests/src/test_dataset.rs b/src/e2e/app/repo-tests/src/test_dataset.rs
@@ -10,7 +10,7 @@
 use std::assert_matches::assert_matches;
 
 use kamu_adapter_http::general::DatasetInfoResponse;
-use kamu_node_e2e_common::{
+use kamu_cli_e2e_common::{
     CreateDatasetResponse,
     DatasetByIdError,
     KamuApiServerClient,

diff --git a/src/e2e/app/repo-tests/src/test_odf_core.rs b/src/e2e/app/repo-tests/src/test_odf_core.rs
@@ -10,7 +10,7 @@
 use std::assert_matches::assert_matches;
 
 use kamu_adapter_http::general::NodeInfoResponse;
-use kamu_node_e2e_common::{KamuApiServerClient, KamuApiServerClientExt};
+use kamu_cli_e2e_common::{KamuApiServerClient, KamuApiServerClientExt};
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 

diff --git a/src/e2e/app/repo-tests/src/test_openapi.rs b/src/e2e/app/repo-tests/src/test_openapi.rs
@@ -9,7 +9,7 @@
 
 use std::path::PathBuf;
 
-use kamu_node_e2e_common::KamuApiServerClient;
+use kamu_cli_e2e_common::KamuApiServerClient;
 use reqwest::Method;
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

diff --git a/src/e2e/app/repo-tests/src/test_selftest.rs b/src/e2e/app/repo-tests/src/test_selftest.rs
@@ -7,7 +7,7 @@
 // the Business Source License, use of this software will be governed
 // by the Apache License, Version 2.0.
 
-use kamu_node_e2e_common::KamuApiServerClient;
+use kamu_cli_e2e_common::KamuApiServerClient;
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 

diff --git a/src/e2e/app/repo-tests/src/test_swagger.rs b/src/e2e/app/repo-tests/src/test_swagger.rs
@@ -9,7 +9,7 @@
 
 use std::path::PathBuf;
 
-use kamu_node_e2e_common::{KamuApiServerClient, KamuApiServerClientExt};
+use kamu_cli_e2e_common::{KamuApiServerClient, KamuApiServerClientExt};
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////