chore: remove models

dozer-cli/Cargo.toml

@@ -11,7 +11,7 @@ name = "dozer"
 
 [dependencies]
 
-dozer-cloud-client = { git = "ssh://[email protected]/getdozer/dozer-cloud.git", rev = "refs/pull/628/head", optional = true }
+dozer-cloud-client = { git = "ssh://[email protected]/getdozer/dozer-cloud.git", rev = "c0ff1cb" }
 dozer-api = { path = "../dozer-api" }
 dozer-ingestion = { path = "../dozer-ingestion" }
 dozer-core = { path = "../dozer-core" }
@@ -59,5 +59,5 @@ path = "src/main.rs"
 snowflake = ["dozer-ingestion/snowflake"]
 mongodb = ["dozer-ingestion/mongodb"]
 onnx = ["dozer-sql/onnx"]
-cloud = ["dozer-cloud-client"]
+cloud = []
 tokio-console = ["dozer-tracing/tokio-console"]

dozer-cli/src/main.rs

@@ -191,13 +191,8 @@ fn run() -> Result<(), OrchestrationError> {
         #[cfg(feature = "cloud")]
         Commands::Cloud(cloud) => {
             render_logo();
-            run_cloud(
-                dozer.runtime.clone(),
-                dozer.config.clone(),
-                cloud,
-                cli.config_paths,
-            )
-            .map_err(OrchestrationError::CloudError)
+            run_cloud(dozer.runtime.clone(), cloud, cli.config_paths)
+                .map_err(OrchestrationError::CloudError)
         }
         Commands::Init => {
             panic!("This should not happen as it is handled in parse_and_generate");
@@ -275,18 +270,14 @@ 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);
+        dozer_cloud_client::errors::display_cloud_error(e);
     } else {
         error!("{}", e);
     }
 }
-fn display_error(e: &OrchestrationError) {
-    error!("{}", e);
-}
-
 struct Telemetry();
 
 impl Telemetry {

dozer-types/Cargo.toml

@@ -7,6 +7,7 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+dozer-cloud-client = { git = "ssh://[email protected]/getdozer/dozer-cloud.git", rev = "c0ff1cb" }
 chrono = { version = "0.4.23", features = ["serde"] }
 serde = { version = "1.0.152", features = ["derive", "rc"] }
 serde_json = { version = "1.0.93", features = ["std"] }

dozer-types/src/lib.rs

@@ -47,6 +47,8 @@ pub use serde_yaml;
 pub use thiserror;
 pub use tracing;
 
+pub use dozer_cloud_client;
+
 // Types required by API and other clients
 pub mod api {
     use serde::{Deserialize, Serialize};

dozer-types/src/models/config.rs

@@ -1,7 +1,7 @@
 use std::path::Path;
 
 use super::{
-    api_config::ApiConfig, api_endpoint::ApiEndpoint, app_config::AppConfig, cloud::Cloud,
+    api_config::ApiConfig, api_endpoint::ApiEndpoint, app_config::AppConfig,
     connection::Connection, flags::Flags, source::Source, telemetry::TelemetryConfig,
 };
 use crate::constants::DEFAULT_HOME_DIR;
@@ -75,10 +75,11 @@ pub struct Config {
     /// Instrument using Dozer
     #[serde(skip_serializing_if = "Option::is_none")]
     pub telemetry: Option<TelemetryConfig>,
-    #[prost(message, optional, tag = "14")]
+
     /// Dozer Cloud specific configuration
+    #[prost(message, optional, tag = "14")]
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub cloud: Option<Cloud>,
+    pub cloud: Option<dozer_cloud_client::models::Cloud>,
 
     #[prost(message, repeated, tag = "15")]
     /// UDF specific configuration (eg. !Onnx)

dozer-types/src/models/mod.rs

@@ -2,7 +2,6 @@ pub mod api_config;
 pub mod api_endpoint;
 pub mod api_security;
 pub mod app_config;
-pub mod cloud;
 pub mod config;
 pub mod connection;
 pub mod flags;