chore: include feature cloud

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

Hide file tree

Showing 4 changed files with 59 additions and 24 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/dozer-cli/Cargo.toml b/dozer-cli/Cargo.toml
@@ -10,7 +10,8 @@ authors = ["getdozer/dozer-dev"]
 name = "dozer"
 
 [dependencies]
-dozer-cloud-client = { path = "../../dozer-cloud-client" }
+
+dozer-cloud-client = { git = "ssh://[email protected]/getdozer/dozer-cloud.git", rev = "refs/pull/628/head", optional = true }
 dozer-api = { path = "../dozer-api" }
 dozer-ingestion = { path = "../dozer-ingestion" }
 dozer-core = { path = "../dozer-core" }
@@ -58,5 +59,5 @@ path = "src/main.rs"
 snowflake = ["dozer-ingestion/snowflake"]
 mongodb = ["dozer-ingestion/mongodb"]
 onnx = ["dozer-sql/onnx"]
-cloud = []
+cloud = ["dozer-cloud-client"]
 tokio-console = ["dozer-tracing/tokio-console"]
diff --git a/dozer-cli/src/errors.rs b/dozer-cli/src/errors.rs
@@ -4,7 +4,6 @@ use crate::live::LiveError;
 use dozer_api::errors::{ApiInitError, AuthError, GenerationError, GrpcError};
 use dozer_cache::dozer_log::storage;
 use dozer_cache::errors::CacheError;
-use dozer_cloud_client::errors::CloudError;
 use dozer_core::errors::ExecutionError;
 use dozer_ingestion::errors::ConnectorError;
 use dozer_sql::errors::PipelineError;
@@ -58,8 +57,6 @@ pub enum OrchestrationError {
     PipelineError(#[from] PipelineError),
     #[error(transparent)]
     CliError(#[from] CliError),
-    #[error(transparent)]
-    CloudError(#[from] CloudError),
     #[error("table_name: {0:?} not found in any of the connections")]
     SourceValidationError(String),
     #[error("connection: {0:?} not found")]
@@ -78,6 +75,9 @@ pub enum OrchestrationError {
     LockedOutdatedLockfile,
     #[error("{LOCK_FILE} does not exist. `--locked` requires a lock file.")]
     LockedNoLockFile,
+    #[cfg(feature = "cloud")]
+    #[error(transparent)]
+    CloudError(#[from] dozer_cloud_client::errors::CloudError),
 }
 
 #[derive(Error, Debug)]

diff --git a/dozer-cli/src/main.rs b/dozer-cli/src/main.rs
@@ -1,12 +1,10 @@
-use ::dozer_cloud_client::run_cloud;
 use clap::Parser;
 use dozer_cli::cli::generate_config_repl;
 use dozer_cli::cli::types::{Cli, Commands, ConnectorCommand, RunCommands, SecurityCommands};
 use dozer_cli::cli::{init_dozer, list_sources, LOGO};
 use dozer_cli::errors::{CliError, OrchestrationError};
 use dozer_cli::simple::SimpleOrchestrator;
 use dozer_cli::{live, set_ctrl_handler, set_panic_hook, shutdown};
-use dozer_cloud_client::errors::display_cloud_error;
 
 use dozer_tracing::LabelsAndProgress;
 use dozer_types::models::telemetry::{TelemetryConfig, TelemetryMetricsConfig};
@@ -277,14 +275,17 @@ fn init_orchestrator(cli: &Cli) -> Result<SimpleOrchestrator, CliError> {
         }
     })
 }
-
+#[cfg(feature = "cloud")]
 fn display_error(e: &OrchestrationError) {
     if let OrchestrationError::CloudError(e) = &e {
         display_cloud_error(e);
     } else {
         error!("{}", e);
     }
 }
+fn display_error(e: &OrchestrationError) {
+    error!("{}", e);
+}
 
 struct Telemetry();