chore: Rename dozer-orchestrator to dozer-cli (#1592)

getdozer · May 24, 2023 · 51861b8 · 51861b8
1 parent 72f2861
commit 51861b8
Show file tree

Hide file tree

Showing 48 changed files with 53 additions and 53 deletions.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -137,7 +137,7 @@ jobs:
         run: cargo install cargo-deb
 
       - name: Compile deb file
-        run: cargo-deb -p dozer-orchestrator --target ${{ matrix.target }} --output ./deb/${{matrix.asset_name}}.deb
+        run: cargo-deb -p dozer-cli --target ${{ matrix.target }} --output ./deb/${{matrix.asset_name}}.deb
 
       - name: Prepare release assets
         shell: bash
@@ -347,7 +347,7 @@ jobs:
 
       - name: Compile deb file
         if: matrix.os == 'ubuntu-20-16-cores'
-        run: cargo-deb -p dozer-orchestrator  --output ./deb/${{matrix.asset_name}}.deb
+        run: cargo-deb -p dozer-cli  --output ./deb/${{matrix.asset_name}}.deb
 
       # - name: Build Linux binary
       #   if: matrix.os == 'ubuntu-20-16-cores'

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -5,7 +5,7 @@ members = [
   "dozer-types",
   "dozer-storage",
   "dozer-core",
-  "dozer-orchestrator",
+  "dozer-cli",
   "dozer-sql",
   "dozer-cache",
   "dozer-tracing",

diff --git a/README.md b/README.md
@@ -54,7 +54,7 @@ Dozer requires `protobuf-compiler`, installation instructions can be found in [a
 **Build from source**
 
 ```bash
-cargo install --path dozer-orchestrator --locked
+cargo install --path dozer-cli --locked
 ```
 
 ### Run it

diff --git a/dozer-orchestrator/Cargo.toml → dozer-cli/Cargo.toml b/dozer-orchestrator/Cargo.toml → dozer-cli/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "dozer-orchestrator"
+name = "dozer-cli"
 version = "0.1.22"
 edition = "2021"
 default-run = "dozer"

diff --git a/dozer-orchestrator/src/cli/cloud.rs → dozer-cli/src/cli/cloud.rs b/dozer-orchestrator/src/cli/cloud.rs → dozer-cli/src/cli/cloud.rs
diff --git a/dozer-orchestrator/src/cli/helper.rs → dozer-cli/src/cli/helper.rs b/dozer-orchestrator/src/cli/helper.rs → dozer-cli/src/cli/helper.rs
diff --git a/dozer-orchestrator/src/cli/init.rs → dozer-cli/src/cli/init.rs b/dozer-orchestrator/src/cli/init.rs → dozer-cli/src/cli/init.rs
diff --git a/dozer-orchestrator/src/cli/mod.rs → dozer-cli/src/cli/mod.rs b/dozer-orchestrator/src/cli/mod.rs → dozer-cli/src/cli/mod.rs
diff --git a/dozer-orchestrator/src/cli/tests.rs → dozer-cli/src/cli/tests.rs b/dozer-orchestrator/src/cli/tests.rs → dozer-cli/src/cli/tests.rs
diff --git a/...orchestrator/src/cli/tests/deserialize.rs → dozer-cli/src/cli/tests/deserialize.rs b/...orchestrator/src/cli/tests/deserialize.rs → dozer-cli/src/cli/tests/deserialize.rs
diff --git a/dozer-orchestrator/src/cli/tests/helper.rs → dozer-cli/src/cli/tests/helper.rs b/dozer-orchestrator/src/cli/tests/helper.rs → dozer-cli/src/cli/tests/helper.rs
diff --git a/dozer-orchestrator/src/cli/tests/mod.rs → dozer-cli/src/cli/tests/mod.rs b/dozer-orchestrator/src/cli/tests/mod.rs → dozer-cli/src/cli/tests/mod.rs
diff --git a/...-orchestrator/src/cli/tests/validation.rs → dozer-cli/src/cli/tests/validation.rs b/...-orchestrator/src/cli/tests/validation.rs → dozer-cli/src/cli/tests/validation.rs
diff --git a/dozer-orchestrator/src/cli/types.rs → dozer-cli/src/cli/types.rs b/dozer-orchestrator/src/cli/types.rs → dozer-cli/src/cli/types.rs
diff --git a/dozer-orchestrator/src/cloud_helper.rs → dozer-cli/src/cloud_helper.rs b/dozer-orchestrator/src/cloud_helper.rs → dozer-cli/src/cloud_helper.rs
diff --git a/dozer-orchestrator/src/console_helper.rs → dozer-cli/src/console_helper.rs b/dozer-orchestrator/src/console_helper.rs → dozer-cli/src/console_helper.rs
diff --git a/dozer-orchestrator/src/errors.rs → dozer-cli/src/errors.rs b/dozer-orchestrator/src/errors.rs → dozer-cli/src/errors.rs
diff --git a/dozer-orchestrator/src/lib.rs → dozer-cli/src/lib.rs b/dozer-orchestrator/src/lib.rs → dozer-cli/src/lib.rs
diff --git a/dozer-orchestrator/src/main.rs → dozer-cli/src/main.rs b/dozer-orchestrator/src/main.rs → dozer-cli/src/main.rs
@@ -1,14 +1,14 @@
 use clap::Parser;
 #[cfg(feature = "cloud")]
-use dozer_orchestrator::cli::cloud::CloudCommands;
-use dozer_orchestrator::cli::generate_config_repl;
-use dozer_orchestrator::cli::types::{ApiCommands, AppCommands, Cli, Commands, ConnectorCommands};
-use dozer_orchestrator::cli::{init_dozer, init_dozer_with_default_config, list_sources, LOGO};
-use dozer_orchestrator::errors::{CliError, OrchestrationError};
-use dozer_orchestrator::simple::SimpleOrchestrator;
+use dozer_cli::cli::cloud::CloudCommands;
+use dozer_cli::cli::generate_config_repl;
+use dozer_cli::cli::types::{ApiCommands, AppCommands, Cli, Commands, ConnectorCommands};
+use dozer_cli::cli::{init_dozer, init_dozer_with_default_config, list_sources, LOGO};
+use dozer_cli::errors::{CliError, OrchestrationError};
+use dozer_cli::simple::SimpleOrchestrator;
 #[cfg(feature = "cloud")]
-use dozer_orchestrator::CloudOrchestrator;
-use dozer_orchestrator::{set_ctrl_handler, set_panic_hook, shutdown, Orchestrator};
+use dozer_cli::CloudOrchestrator;
+use dozer_cli::{set_ctrl_handler, set_panic_hook, shutdown, Orchestrator};
 use dozer_types::models::telemetry::TelemetryConfig;
 use dozer_types::tracing::{error, info};
 use serde::Deserialize;

diff --git a/dozer-orchestrator/src/pipeline/builder.rs → dozer-cli/src/pipeline/builder.rs b/dozer-orchestrator/src/pipeline/builder.rs → dozer-cli/src/pipeline/builder.rs
diff --git a/...estrator/src/pipeline/connector_source.rs → dozer-cli/src/pipeline/connector_source.rs b/...estrator/src/pipeline/connector_source.rs → dozer-cli/src/pipeline/connector_source.rs
diff --git a/dozer-orchestrator/src/pipeline/log_sink.rs → dozer-cli/src/pipeline/log_sink.rs b/dozer-orchestrator/src/pipeline/log_sink.rs → dozer-cli/src/pipeline/log_sink.rs
diff --git a/dozer-orchestrator/src/pipeline/mod.rs → dozer-cli/src/pipeline/mod.rs b/dozer-orchestrator/src/pipeline/mod.rs → dozer-cli/src/pipeline/mod.rs
diff --git a/...chestrator/src/pipeline/source_builder.rs → dozer-cli/src/pipeline/source_builder.rs b/...chestrator/src/pipeline/source_builder.rs → dozer-cli/src/pipeline/source_builder.rs
diff --git a/...rchestrator/src/pipeline/tests/builder.rs → dozer-cli/src/pipeline/tests/builder.rs b/...rchestrator/src/pipeline/tests/builder.rs → dozer-cli/src/pipeline/tests/builder.rs
diff --git a/dozer-orchestrator/src/pipeline/tests/mod.rs → dozer-cli/src/pipeline/tests/mod.rs b/dozer-orchestrator/src/pipeline/tests/mod.rs → dozer-cli/src/pipeline/tests/mod.rs
diff --git a/...hestrator/src/pipeline/tests/schemas.json → dozer-cli/src/pipeline/tests/schemas.json b/...hestrator/src/pipeline/tests/schemas.json → dozer-cli/src/pipeline/tests/schemas.json
diff --git a/dozer-orchestrator/src/pipeline/validate.rs → dozer-cli/src/pipeline/validate.rs b/dozer-orchestrator/src/pipeline/validate.rs → dozer-cli/src/pipeline/validate.rs
diff --git a/dozer-orchestrator/src/shutdown.rs → dozer-cli/src/shutdown.rs b/dozer-orchestrator/src/shutdown.rs → dozer-cli/src/shutdown.rs
diff --git a/...orchestrator/src/simple/cloud/deployer.rs → dozer-cli/src/simple/cloud/deployer.rs b/...orchestrator/src/simple/cloud/deployer.rs → dozer-cli/src/simple/cloud/deployer.rs
diff --git a/dozer-orchestrator/src/simple/cloud/mod.rs → dozer-cli/src/simple/cloud/mod.rs b/dozer-orchestrator/src/simple/cloud/mod.rs → dozer-cli/src/simple/cloud/mod.rs
diff --git a/...-orchestrator/src/simple/cloud/monitor.rs → dozer-cli/src/simple/cloud/monitor.rs b/...-orchestrator/src/simple/cloud/monitor.rs → dozer-cli/src/simple/cloud/monitor.rs
diff --git a/...-orchestrator/src/simple/cloud/version.rs → dozer-cli/src/simple/cloud/version.rs b/...-orchestrator/src/simple/cloud/version.rs → dozer-cli/src/simple/cloud/version.rs
diff --git a/...estrator/src/simple/cloud_orchestrator.rs → dozer-cli/src/simple/cloud_orchestrator.rs b/...estrator/src/simple/cloud_orchestrator.rs → dozer-cli/src/simple/cloud_orchestrator.rs
diff --git a/dozer-orchestrator/src/simple/executor.rs → dozer-cli/src/simple/executor.rs b/dozer-orchestrator/src/simple/executor.rs → dozer-cli/src/simple/executor.rs
diff --git a/dozer-orchestrator/src/simple/helper.rs → dozer-cli/src/simple/helper.rs b/dozer-orchestrator/src/simple/helper.rs → dozer-cli/src/simple/helper.rs
diff --git a/dozer-orchestrator/src/simple/migration.rs → dozer-cli/src/simple/migration.rs b/dozer-orchestrator/src/simple/migration.rs → dozer-cli/src/simple/migration.rs
diff --git a/dozer-orchestrator/src/simple/mod.rs → dozer-cli/src/simple/mod.rs b/dozer-orchestrator/src/simple/mod.rs → dozer-cli/src/simple/mod.rs
diff --git a/...r-orchestrator/src/simple/orchestrator.rs → dozer-cli/src/simple/orchestrator.rs b/...r-orchestrator/src/simple/orchestrator.rs → dozer-cli/src/simple/orchestrator.rs
diff --git a/dozer-orchestrator/src/utils.rs → dozer-cli/src/utils.rs b/dozer-orchestrator/src/utils.rs → dozer-cli/src/utils.rs
diff --git a/dozer-tests/Cargo.toml b/dozer-tests/Cargo.toml
@@ -22,7 +22,7 @@ path = "src/sql_tests/logic_test.rs"
 dozer-types = { path = "../dozer-types" }
 dozer-api = { path = "../dozer-api" }
 dozer-utils = { path = "../dozer-utils" }
-dozer-orchestrator = { path = "../dozer-orchestrator" }
+dozer-cli = { path = "../dozer-cli" }
 dozer-tracing = { path = "../dozer-tracing" }
 
 reqwest = { version = "0.11.14", features = ["json", "rustls-tls"], default-features = false }

diff --git a/dozer-tests/log4rs.tests.yaml b/dozer-tests/log4rs.tests.yaml
@@ -18,5 +18,5 @@ loggers:
       - sql
   dozer_core:
     level: off
-  dozer_orchestrator:
+  dozer_cli:
     level: off
diff --git a/dozer-tests/scripts/load_test_grpc.sh b/dozer-tests/scripts/load_test_grpc.sh
@@ -4,7 +4,7 @@ set -e
 hash ghz 2>/dev/null || { echo >&2 "ghz (https://ghz.sh) is needed for load testing grpc service.  Aborting."; exit 1; }
 
 # Start dozer
-cargo build -p dozer-orchestrator --release
+cargo build -p dozer-cli --release
 ./target/release/dozer &
 DOZER_PID=$!
 echo Dozer server pid $DOZER_PID

diff --git a/dozer-tests/scripts/load_test_rest.sh b/dozer-tests/scripts/load_test_rest.sh
@@ -4,7 +4,7 @@ set -e
 hash drill 2>/dev/null || { echo >&2 "drill (cargo install drill) is needed for load testing grpc service.  Aborting."; exit 1; }
 
 # Start dozer
-cargo build -p dozer-orchestrator --release
+cargo build -p dozer-cli --release
 ./target/release/dozer &
 DOZER_PID=$!
 echo Dozer server pid $DOZER_PID

diff --git a/dozer-tests/src/e2e_tests/case.rs b/dozer-tests/src/e2e_tests/case.rs
@@ -1,4 +1,4 @@
-use dozer_orchestrator::cli::load_config_from_file;
+use dozer_cli::cli::load_config_from_file;
 use dozer_types::constants::DEFAULT_CONFIG_PATH;
 use std::{
     collections::HashMap,

diff --git a/dozer-tests/src/init.rs b/dozer-tests/src/init.rs
@@ -23,6 +23,6 @@ pub fn init() {
         let _ = dozer_tracing::init_telemetry(None, None);
         download("actor");
 
-        dozer_orchestrator::set_panic_hook();
+        dozer_cli::set_panic_hook();
     });
 }
diff --git a/dozer-tests/src/tests/e2e/mod.rs b/dozer-tests/src/tests/e2e/mod.rs
@@ -1,7 +1,7 @@
 use std::{future::Future, sync::Arc, thread::JoinHandle, time::Duration};
 
 use dozer_api::tonic::transport::Channel;
-use dozer_orchestrator::{
+use dozer_cli::{
     shutdown::{self, ShutdownSender},
     simple::SimpleOrchestrator,
     Orchestrator,