232 unify oss and cloud cli

golemcloud · May 31, 2024 · 8d1e834 · 8d1e834
1 parent 6c713a5
commit 8d1e834
Show file tree

Hide file tree

Showing 86 changed files with 9,584 additions and 2,403 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/golem-cli/Cargo.toml b/golem-cli/Cargo.toml
@@ -10,6 +10,14 @@ readme = "README.md"
 description = "Command line interface for OSS version of Golem. See also golem-cloud-cli."
 autotests = false
 
+[[bin]]
+name = "golem-cli"
+path = "src/main.rs"
+
+[[bin]]
+name = "golem-cloud-cli"
+path = "src/cloud_main.rs"
+
 [[test]]
 name = "integration"
 path = "tests/main.rs"
@@ -18,6 +26,10 @@ harness = false
 [dependencies]
 golem-client = { path = "../golem-client", version = "0.0.0" }
 
+golem-cloud-client = { path = "../../golem-cloud/golem-cloud-client", version="0.0.0" }
+golem-cloud-worker-client = { path = "../../golem-cloud/golem-cloud-worker-client", version="0.0.0" }
+
+
 async-trait = { workspace = true }
 chrono = { workspace = true }
 clap = { workspace = true }
@@ -56,6 +68,8 @@ version-compare = "=0.0.11"
 wasm-wave = { workspace = true }
 cli-table = { workspace = true }
 textwrap = "0.16.1"
+anyhow.workspace = true
+colored = "2.1.0"
 
 [dev-dependencies]
 golem-test-framework = { path = "../golem-test-framework", version = "0.0.0" }

diff --git a/golem-cli/src/api_definition.rs b/golem-cli/src/api_definition.rs
diff --git a/golem-cli/src/clients.rs b/golem-cli/src/clients.rs
@@ -15,6 +15,5 @@
 pub mod api_definition;
 pub mod api_deployment;
 pub mod component;
-pub mod errors;
 pub mod health_check;
 pub mod worker;