chore: refactor into cloud client crate

getdozer · Sep 20, 2023 · d8c619b · d8c619b
1 parent 3ee2bab
commit d8c619b
Show file tree

Hide file tree

Showing 27 changed files with 81 additions and 1,824 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/dozer-api/src/rest/api_generator.rs b/dozer-api/src/rest/api_generator.rs
@@ -4,7 +4,8 @@ use actix_web::web::ReqData;
 use actix_web::{web, HttpResponse};
 use dozer_cache::cache::expression::{QueryExpression, Skip};
 use dozer_cache::cache::CacheRecord;
-use dozer_cache::{CacheReader, Phase};
+use dozer_cache::CacheReader;
+use dozer_types::api::Phase;
 use dozer_types::errors::types::CannotConvertF64ToJson;
 use dozer_types::indexmap::IndexMap;
 use dozer_types::models::api_endpoint::ApiEndpoint;

diff --git a/dozer-api/src/rest/mod.rs b/dozer-api/src/rest/mod.rs
@@ -20,6 +20,7 @@ use actix_web::{
 };
 use actix_web_httpauth::middleware::HttpAuthentication;
 use dozer_tracing::LabelsAndProgress;
+use dozer_types::api::DOZER_SERVER_NAME_HEADER;
 use dozer_types::{log::info, models::api_config::RestApiOptions};
 use dozer_types::{
     models::api_security::ApiSecurity,
@@ -38,8 +39,6 @@ enum CorsOptions {
     Custom(Vec<String>, usize),
 }
 
-pub const DOZER_SERVER_NAME_HEADER: &str = "x-dozer-server-name";
-
 #[derive(Clone)]
 pub struct ApiServer {
     shutdown_timeout: u64,

diff --git a/dozer-api/src/rest/tests/routes.rs b/dozer-api/src/rest/tests/routes.rs
@@ -5,7 +5,7 @@ use crate::{generator::oapi::generator::OpenApiGenerator, test_utils, CacheEndpo
 use actix_http::{body::MessageBody, Request};
 use actix_web::dev::{Service, ServiceResponse};
 use actix_web::http::header::ContentType;
-use dozer_cache::Phase;
+use dozer_types::api::Phase;
 use dozer_types::models::api_endpoint::ApiEndpoint;
 use dozer_types::serde_json::{json, Value};
 use http::StatusCode;

diff --git a/dozer-cache/src/lib.rs b/dozer-cache/src/lib.rs
@@ -3,4 +3,4 @@ pub mod errors;
 mod reader;
 
 pub use dozer_log;
-pub use reader::{AccessFilter, CacheReader, Phase};
+pub use reader::{AccessFilter, CacheReader};
diff --git a/dozer-cache/src/reader.rs b/dozer-cache/src/reader.rs
@@ -3,6 +3,7 @@ use crate::cache::{expression::QueryExpression, CacheRecord, RoCache};
 use super::cache::expression::FilterExpression;
 use crate::errors::CacheError;
 use dozer_types::{
+    api::Phase,
     serde,
     types::{Record, SchemaWithIndex},
 };
@@ -21,13 +22,6 @@ pub struct AccessFilter {
     pub fields: Vec<String>,
 }
 
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
-#[serde(crate = "dozer_types::serde")]
-pub enum Phase {
-    Snapshotting,
-    Streaming,
-}
-
 #[derive(Debug)]
 /// CacheReader dynamically attaches permissions on top of queries
 pub struct CacheReader {

diff --git a/dozer-cli/Cargo.toml b/dozer-cli/Cargo.toml
@@ -10,6 +10,7 @@ authors = ["getdozer/dozer-dev"]
 name = "dozer"
 
 [dependencies]
+dozer-cloud-client = { path = "../../dozer-cloud-client" }
 dozer-api = { path = "../dozer-api" }
 dozer-ingestion = { path = "../dozer-ingestion" }
 dozer-core = { path = "../dozer-core" }

diff --git a/dozer-cli/src/cli/cloud.rs b/dozer-cli/src/cli/cloud.rs
diff --git a/dozer-cli/src/cli/mod.rs b/dozer-cli/src/cli/mod.rs
@@ -1,5 +1,3 @@
-#[cfg(feature = "cloud")]
-pub mod cloud;
 mod helper;
 mod init;
 pub mod types;

diff --git a/dozer-cli/src/cli/types.rs b/dozer-cli/src/cli/types.rs
@@ -3,7 +3,7 @@ use clap::{Args, Parser, Subcommand};
 use super::helper::{DESCRIPTION, LOGO};
 
 #[cfg(feature = "cloud")]
-use crate::cli::cloud::Cloud;
+use dozer_cloud_client::cli::cloud::Cloud;
 use dozer_types::{
     constants::{DEFAULT_CONFIG_PATH_PATTERNS, LOCK_FILE},
     serde_json,